Changes in / [34e1494:970141d]

Files:

• Jenkinsfile (modified) (1 diff)
• tools/PrettyGitLogs.sh (deleted)

Jenkinsfile

@@ -224 +224 @@
 //Routine responsible of sending the email notification once the build is completed
 //===========================================================================================================
+@NonCPS
+def SplitLines(String text) {
+        def list = []
+
+        text.eachLine {
+                list += it
+        }
+
+        return list
+}
+
 def GitLogMessage() {
         if (!Settings || !Settings.GitOldRef || !Settings.GitNewRef) return "\nERROR retrieveing git information!\n"
 
-        sh "${SrcDir}/tools/PrettyGitLogs.sh ${SrcDir} ${BuildDir} ${Settings.GitOldRef} ${Settings.GitNewRef}"
-
-        def gitUpdate = readFile("${BuildDir}/GIT_UPDATE")
-        def gitLog    = readFile("${BuildDir}/GIT_LOG")
-        def gitDiff   = readFile("${BuildDir}/GIT_DIFF")
+        def oldRef = Settings.GitOldRef
+        def newRef = Settings.GitNewRef
+
+        def revText = sh(returnStdout: true, script: "git rev-list ${oldRef}..${newRef}").trim()
+        def revList = SplitLines( revText )
+
+        def gitUpdate = ""
+        revList.each { rev ->
+                def type = sh(returnStdout: true, script: "git cat-file -t ${rev}").trim()
+                gitUpdate = gitUpdate + "       via  ${rev} (${type})"
+        }
+
+        def rev = oldRef
+        def type = sh(returnStdout: true, script: "git cat-file -t ${rev}").trim()
+        gitUpdate = gitUpdate + "      from  ${rev} (${type})"
+
+        def gitLog    = sh(returnStdout: true, script: "git rev-list --format=short ${oldRef}...${newRef}").trim()
+
+        def gitDiff   = sh(returnStdout: true, script: "git diff --stat --color ${newRef} ${oldRef}").trim()
+        gitDiff = gitDiff.replace('[32m', '<span style="color: #00AA00;">')
+        gitDiff = gitDiff.replace('[31m', '<span style="color: #AA0000;">')
+        gitDiff = gitDiff.replace('[m', '</span>')
 
         return """