From 1c5fae0ab028666c4b083da36ce822211bbfb542 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Thu, 4 Jul 2019 19:09:23 +0100 Subject: [PATCH] Add more difference infrastructure --- differences/dometahierarchy.groovy | 47 +++++++++++++++++++++++------- 1 file changed, 36 insertions(+), 11 deletions(-) diff --git a/differences/dometahierarchy.groovy b/differences/dometahierarchy.groovy index 5b85543..bcc79dc 100644 --- a/differences/dometahierarchy.groovy +++ b/differences/dometahierarchy.groovy @@ -15,7 +15,7 @@ class DifferenceRecord { String rawdifferencetext String sha - int type + String type String mergeinfo List jiraticketinfo String comment @@ -163,6 +163,28 @@ def extractjiraticketinfo(String line) { return [result, [], line] } +def extractreverts(String line) { + boolean result = true + + def pattern1 = '^(.*)(Revert \"(.*)\"' + def match1 = (line =~ pattern1) + if (match1.find()) { + def line2 = match1.group(2) + (result, originaljiraticketinfo, originalcomment) = extractjiraticketinfo(line2) + return [true, originaljiraticketinfo, originalcomment] + } + + def pattern2 = '^(.*)(Partial Revert \"(.*)\"' + def match2 = (line =~ pattern2) + if (match2.find()) { + def line2 = match2.group(2) + (result, originaljiraticketinfo, originalcomment) = extractjiraticketinfo(line2) + return [true, originaljiraticketinfo, originalcomment] + } + + return [false, [], line] +} + def DifferenceRecord fillrecord(meta, line) { def DifferenceRecord dr = new DifferenceRecord() @@ -180,22 +202,25 @@ def DifferenceRecord fillrecord(meta, line) { (result, mergeinfo) = extractmerges(line2) if (result) { - dr.type = 1 - dr.jiraticketinfo = [] + dr.type = "Merge" dr.mergeinfo = mergeinfo - dr.comment = "" } else { - (result, jiraticketinfo, comment) = extractjiraticketinfo(line2) + (result, jiraticketinfo, comment) = extractreverts(line2) if (result) { - dr.type = 2 + dr.type = "Revert" dr.jiraticketinfo = jiraticketinfo - dr.mergeinfo = "" dr.comment = comment } else { - dr.type = 3 - dr.jiraticketinfo = [] - dr.mergeinfo = "" - df.comment = line2 + (result, jiraticketinfo, comment) = extractjiraticketinfo(line2) + if (result) { + dr.type = "Ticketed" + dr.jiraticketinfo = jiraticketinfo + dr.comment = comment + } else { + dr.type = "Unticketed" + dr.jiraticketinfo = [] + df.comment = line2 + } } }