GIS-1621 - Extract differences from squashed commits

This commit is contained in:
Dan Hawkins 2019-12-23 14:31:18 +00:00
commit efaa302b54

View file

@ -166,6 +166,16 @@ def extractsha(String line) {
return [sha.trim(), restofline.trim()]
}
def extractsquashes(String line) {
def pattern1 = "^(.*)(Squashed .*)"
def match1 = (line =~ pattern1)
if (match1.find()) {
return [true, match1.group(2)]
}
return [false, line]
}
def extractmerges(String line) {
def pattern1 = "^(.*)(Merge branch .*)"
def match1 = (line =~ pattern1)
@ -302,7 +312,35 @@ def extractreverts(String line) {
return [false, [], line]
}
def DifferenceRecord fillrecord(meta, line) {
def getgitlogdifferencesfromsquash(String gitrootfolder, String squashedrevision) {
def String differencetext
dir(gitrootfolder) {
differencetext = sh(returnStdout: true, script: "git --no-pager log --oneline ${squashedrevision}").trim()
}
return differencetext
}
def List fillsquashrecords(String sourcepath, String sha) {
def List differencerecords = []
String squashloglines = getgitlogdifferencesfromsquash(sourcepath, sha)
int count = 0
squashloglines.split('\n').each {
if (count > 0) { // Ignore first line
def line = it
if (line?.trim()) {
def DifferenceRecord dr = fillrecord(meta, line.trim(), sourcepath)
differencerecords.add(dr)
//echo "${dr.dump()}"
}
}
count += 1
}
return differencerecords
}
def List fillrecord(meta, line, String sourcepath) {
def List differencerecords = []
def DifferenceRecord dr = new DifferenceRecord()
dr.productname = meta.productinfo.productname
@ -316,41 +354,49 @@ def DifferenceRecord fillrecord(meta, line) {
(sha, line2) = extractsha(line)
dr.sha = sha
(result, mergeinfo) = extractmerges(line2)
(result, squashinfo) = extractsquashes(line2)
if (result) {
dr.type = "Merge"
dr.mergeinfo = mergeinfo
dr.type = "Squash"
dr.squashinfo = squashinfo
squashrecords = fillsquashrecords(sourcepath, sha)
differencerecords.addAll(squashrecords)
} else {
(result, jiraticketinfo, comment) = extractreverts(line2)
(result, mergeinfo) = extractmerges(line2)
if (result) {
dr.type = "Revert"
dr.jiraticketinfo = jiraticketinfo
dr.comment = comment
dr.type = "Merge"
dr.mergeinfo = mergeinfo
} else {
(result, jiraticketinfo, comment) = extractjiraticketinfo(line2)
(result, jiraticketinfo, comment) = extractreverts(line2)
if (result) {
dr.type = "Ticketed"
dr.type = "Revert"
dr.jiraticketinfo = jiraticketinfo
dr.comment = comment
} else {
dr.type = "Unticketed"
dr.comment = line2
(result, jiraticketinfo, comment) = extractjiraticketinfo(line2)
if (result) {
dr.type = "Ticketed"
dr.jiraticketinfo = jiraticketinfo
dr.comment = comment
} else {
dr.type = "Unticketed"
dr.comment = line2
}
}
}
}
return dr
differencerecords.add(dr)
return differencerecords
}
def List processtext(meta, String text) {
def List processtext(meta, String text, String sourcepath) {
def List differencerecords = []
text.split('\n').each {
def line = it
if (line?.trim()) {
def DifferenceRecord dr = fillrecord(meta, line.trim())
differencerecords.add(dr)
def List drs = fillrecord(meta, line.trim(), sourcepath)
differencerecords.addAll(drs)
//echo "${dr.dump()}"
}
}
@ -370,7 +416,7 @@ def getdifferencerecords(earlymeta, latermeta, String sourcepath) {
echo "Comparing early revision: ${earlyrevision} with: ${laterrevision} Working copy path: ${sourcepath}"
summaryappend("Early revision: ${earlyrevision} Later revision: ${laterrevision}")
def String differencetext = getgitlogdifferences(sourcepath, earlyrevision, laterrevision)
differencerecords = processtext(earlymeta, differencetext)
differencerecords = processtext(earlymeta, differencetext, sourcepath)
if (earlyrevision == laterrevision) {
summaryappend(" No change")
}