From 437a15986dd6d3f1cc3c7a7cb6ceca595b144502 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Fri, 5 Jul 2019 13:52:26 +0100 Subject: [PATCH] Add more difference infrastructure --- differences/dometahierarchy.groovy | 55 ++++++++++++++++++------------ 1 file changed, 33 insertions(+), 22 deletions(-) diff --git a/differences/dometahierarchy.groovy b/differences/dometahierarchy.groovy index fef482b..29c8a43 100644 --- a/differences/dometahierarchy.groovy +++ b/differences/dometahierarchy.groovy @@ -313,7 +313,7 @@ def addedcomponent(latermetaitems, key) { summaryappend("Added ") } -def mergereport(String componentreportfolder, merges) { +def mergereport(String componentreportfolder, merges, boolean iscomponent = true) { dir(componentreportfolder) { String mergelist = "Merge list:\n" mergessorted = merges.sort() @@ -324,13 +324,10 @@ def mergereport(String componentreportfolder, merges) { } } -def revertsreport(String componentreportfolder, reverts) { - echo "Size of reverts map: ${reverts.size()}" +def revertsreport(String componentreportfolder, reverts, boolean iscomponent = true) { dir(componentreportfolder) { String revertlist = "Revert list:\n" - echo "reverts map:\n${reverts}" revertssorted = reverts.sort() - echo "reverts map sorted:\n${revertssorted}" for (arevert in revertssorted) { revertlist += "${arevert.key}:\n${arevert.value.join("\n")}\n" } @@ -338,13 +335,10 @@ def revertsreport(String componentreportfolder, reverts) { } } -def ticketedreport(String componentreportfolder, ticketed) { - echo "Size of ticketed map: ${ticketed.size()}" +def ticketedreport(String componentreportfolder, ticketed, boolean iscomponent = true) { dir(componentreportfolder) { String ticketedlist = "Ticketed list:\n" - echo "ticketed map:\n${ticketed}" ticketedsorted = ticketed.sort() - echo "ticketed map sorted:\n${ticketedsorted}" for (aticketed in ticketedsorted) { ticketedlist += "${aticketed.key}:\n${aticketed.value.join("\n")}\n" } @@ -352,7 +346,21 @@ def ticketedreport(String componentreportfolder, ticketed) { } } -def ticketsreport(String componentreportfolder, tickets) { +def unticketedreport(String componentreportfolder, unticketed, boolean iscomponent = true) { + echo "Size of ticketed map: ${unticketed.size()}" + dir(componentreportfolder) { + String unticketedlist = "Unticketed list:\n" + echo "unticketed map:\n${unticketed}" + unticketedsorted = unticketed.sort() + echo "unticketed map sorted:\n${unticketedsorted}" + for (anunticketed in unticketedsorted) { + unticketedlist += "${anunticketed.key}\n" + } + writeFile(file: "unticketedlist.txt", text: unticketedlist) + } +} + +def ticketsreport(String componentreportfolder, tickets, boolean iscomponent = true) { dir(componentreportfolder) { String ticketlist = "Ticket list:\n" ticketssorted = tickets.sort() @@ -363,14 +371,14 @@ def ticketsreport(String componentreportfolder, tickets) { } } -def boolean componentreport(meta, componentdifferencerecords) { +def boolean report(meta, differencerecords, boolean iscomponent = true) { def Map ticketed = [:] def Map merges = [:] def Map reverts = [:] def Map unticketed = [:] def Map tickets = [:] - for (dr in componentdifferencerecords) { + for (dr in differencerecords) { echo "Processing:\n${dr.dump()}" if (dr.type == "Merge") { @@ -422,16 +430,18 @@ def boolean componentreport(meta, componentdifferencerecords) { unticketed[dr.comment] = dr } } - String componentreportfolder = "${reportfolder}/${meta.componentidentifier()}" - mergereport(componentreportfolder, merges) - revertsreport(componentreportfolder, reverts) - ticketedreport(componentreportfolder, ticketed) - ticketsreport(componentreportfolder, tickets) - + String reportsubfolder = "" + if (iscomponent) { + reportsubfolder = "${reportfolder}/${meta.componentidentifier()}" + } else { + reportsubfolder = "${reportfolder}/Combined" + } + mergereport(reportsubfolder, merges, iscomponent) + revertsreport(reportsubfolder, reverts, iscomponent) + ticketedreport(reportsubfolder, ticketed, iscomponent) + unticketedreport(reportsubfolder, unticketed, iscomponent) + ticketsreport(reportsubfolder, tickets, iscomponent) } -//m.sort( { k1, k2 -> k1 <=> k2 } as Comparator )*.key -//tickets.sort { a, b -> a.value <=> b.value } -//myMap.sort()*.key def compare(earlymetaitems, latermetaitems, key) { boolean result = true; @@ -447,7 +457,7 @@ def compare(earlymetaitems, latermetaitems, key) { (result, differencerecords) = getdifferencerecords(earlymeta, latermeta, uniquefolderforsourcerepo) summaryappend(" Items: ${differencerecords.size()} ") - componentreport(earlymeta, differencerecords) + report(earlymeta, differencerecords) summaryappend("\n") return [result, differencerecords]; @@ -491,6 +501,7 @@ def comparehierarchy(meta, String earlymetafolder, String latermetafolder, Strin summaryappend("\n") } } + report(meta, differencerecords, false) return [summarystring, markunstable, unstablereason] }