From 437e27b0e2e67b31e1c03a28ba2c30a0741d8f7b Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Wed, 3 Jul 2019 16:09:14 +0100 Subject: [PATCH] More infrastructure for differencing versions of component --- differences/do.groovy | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/differences/do.groovy b/differences/do.groovy index 6c5c947..0bf3f4f 100644 --- a/differences/do.groovy +++ b/differences/do.groovy @@ -15,6 +15,20 @@ def differences(meta, String sourcerevision, String previoussourcerevision, Stri } } +def getgitlogdifferences(String gitrootfolder, String earlyrevision, String laterrevision, boolean tripledot = false) { + def differencerecords = [] + def String releaseexpression + if tripledot: + releaseexpression = earlyrevision + "..." + laterrevision + else: + releaseexpression = earlyrevision + ".." + laterrevision + def String differencetext + dir(gitrootfolder) { + differencetext = sh(returnStdout: true, script: "git log --oneline ${releaseexpression}").trim() + } + return differencetext +} + def getdifferencerecords(earlymeta, latermeta, String sourcepath) { boolean result = true; def List differencerecords = [] @@ -26,6 +40,8 @@ def getdifferencerecords(earlymeta, latermeta, String sourcepath) { def earlyrevision = earlygitinfo.gitrevision def laterrevision = latergitinfo.gitrevision echo "Comparing early revision: ${earlyrevision} with: ${laterrevision} Working copy path: ${sourcepath}" + def String differencetext = getgitlogdifferences(sourcepath, earlyrevision, laterrevision) + echo "Difference text is:\n${differencetext}" } else { echo "The early and later git urls don't match" result = false;