From 7ac162275369a9fc486509dd5e2986ddc6c2ffbb Mon Sep 17 00:00:00 2001
From: Ed Sanders <esanders@wikimedia.org>
Date: Fri, 17 Nov 2023 13:35:47 +0000
Subject: [PATCH] updateSubmodule: List new files and new i18n keys in commit
 message

These new files and message keys will likely need to be
added to extension.json.

Change-Id: I23067fe946038a2bea3eebe74ecffd274e9138b5
---
 bin/updateSubmodule.sh | 31 +++++++++++++++++++++++++------
 1 file changed, 25 insertions(+), 6 deletions(-)

diff --git a/bin/updateSubmodule.sh b/bin/updateSubmodule.sh
index e18bf8895c..fb4f1524c2 100755
--- a/bin/updateSubmodule.sh
+++ b/bin/updateSubmodule.sh
@@ -49,15 +49,34 @@ fi
 NEWCHANGES=$(git log ..$TARGET --oneline --no-merges --topo-order --reverse --color=never)
 TASKS=$(git log ..$TARGET --no-merges --format=format:%B | grep "Bug: T" | sort | uniq)
 NEWCHANGESDISPLAY=$(git log ..$TARGET --oneline --no-merges --reverse --color=always)
-COMMITMSG=$(cat <<END
-Update VE core submodule to $TARGETDESC
+NEW_I18N_KEYS=$(git diff --color=never HEAD..$TARGET -- i18n/en.json | grep '^+' | grep -v '^+++' | sed -E 's/^\+\s*"([^"]+)":.*/\1/')
+NEW_FILES=$(git diff --color=never HEAD..$TARGET --name-only --diff-filter=A)
+
+COMMITMSG="Update VE core submodule to $TARGETDESC
 
 New changes:
-$NEWCHANGES
+$NEWCHANGES"
 
-$TASKS
-END
-)
+if [ -n "$NEW_I18N_KEYS" ]; then
+	COMMITMSG+="
+
+New i18n keys:
+$NEW_I18N_KEYS"
+fi
+
+if [ -n "$NEW_FILES" ]; then
+	COMMITMSG+="
+
+New files:
+$NEW_FILES"
+fi
+
+COMMITMSG+="
+
+$TASKS"
+
+echo "$COMMITMSG"
+exit 1
 # Check out master of VE core
 git checkout $TARGET