Show extended commit message for automated server syncs

Author: Noordfrees

generate_commit_notes.sh

@@ -0,0 +1,56 @@
+#!/bin/bash
+
+# Header
+echo "Automated server sync"
+echo
+
+strip_key() {
+	name="$1"
+	name="${name%\"}"
+	name="${name#$2}"
+	name="${name#=}"
+	name="${name#_}"
+	name="${name#\"}"
+	echo "$name"
+}
+
+# New and updated add-ons
+for file in $(git --no-pager diff --name-status --no-color --cached addons/*/addon | awk '$1 != "D" { print $NF}')
+do
+	name="${file%/addon}"
+	name="${name#addons/}"
+
+	versionold="$(git diff --cached "$file" | grep -P -- '^-version=')"
+	versionold="$(strip_key "$versionold" "-version")"
+
+	if [ -n "$versionold" ]
+	then
+		versionnew="$(grep -P -- '^version=' "$file")"
+		versionnew="$(strip_key "$versionnew" "version")"
+		echo "- Updated $name from $versionold to $versionnew"
+	else
+		echo "- New add-on $name"
+	fi
+done
+
+# Updated translations
+find_updated_translations() {
+	for file in $(git --no-pager diff --name-status --no-color --cached i18n/*.wad | awk '$1 != "D" { print $NF}')
+	do
+		file="${file#i18n/}"
+		file="${file%/*.mo}"
+		echo "$file"
+	done
+}
+
+for addon in $(find_updated_translations | sort --unique)
+do
+	echo "- Updated translations for $addon"
+done
+
+# Website map versions
+if [ -n "$(git diff --cached website_maps_i18n_version)" ]
+then
+	echo "- Updated website map translations"
+fi
+

wl/server/ThreadActivityAndGitHubSyncManager.java

@@ -20,8 +20,10 @@
 package wl.server;
 
 import java.io.BufferedReader;
+import java.io.File;
 import java.io.InputStreamReader;
 import java.net.Socket;
+import java.nio.file.Files;
 import java.util.HashMap;
 import wl.utils.UpdateList;
 import wl.utils.Utils;
@@ -63,13 +65,19 @@ public synchronized void sync() throws Exception {
 			if (str != null) throw new Exception("Detected merge conflicts: " + str);
 		}
 		UpdateList.rebuildLists();
+
+		File commitNotes = Files.createTempFile(null, null).toFile();
 		Utils.bash("bash", "-c", "git add .");
-		Utils.bash("bash", "-c", "git commit -m 'Automated server sync'");
+		Utils.bash(
+		    "bash", "-c", "./generate_commit_notes.sh > '" + commitNotes.getAbsolutePath() + "'");
+		Utils.bash("bash", "-c", "git commit -F '" + commitNotes.getAbsolutePath() + "'");
 		Utils.bash("bash", "-c",
 		           "git push https://" + Utils.config("githubusername") + ":" +
 		               Utils.config("githubtoken") +
 		               "@github.com/widelands/wl_addons_server.git master");
+
 		Utils.bash("bash", "-c", "git stash clear");
+		commitNotes.delete();
 	}
 
 	private static class Data {