Add more difference infrastructure
This commit is contained in:
parent
99238fb9c5
commit
cfff9bd102
1 changed files with 25 additions and 20 deletions
|
|
@ -306,21 +306,6 @@ def getdifferencerecords(earlymeta, latermeta, String sourcepath) {
|
|||
return [result, differencerecords]
|
||||
}
|
||||
|
||||
def compare(earlymetaitems, latermetaitems, key) {
|
||||
boolean result = true;
|
||||
echo "Collecting changes between early and later versions of component: ${key}"
|
||||
summaryappend("Changed: ")
|
||||
|
||||
def earlymeta = earlymetaitems[key].meta
|
||||
def latermeta = latermetaitems[key].meta
|
||||
|
||||
def uniquefolderforsourcerepo = getcomponent(earlymeta)
|
||||
|
||||
(result, differencerecords) = getdifferencerecords(earlymeta, latermeta, uniquefolderforsourcerepo)
|
||||
|
||||
return [result, differencerecords];
|
||||
}
|
||||
|
||||
def deletedcomponent(earlymetaitems, key) {
|
||||
echo "Component ${key} has been deleted in later version"
|
||||
summaryappend("Deleted ")
|
||||
|
|
@ -378,7 +363,7 @@ def boolean componentreport(meta, componentdifferencerecords) {
|
|||
dir(componentreportfolder) {
|
||||
String ticketlist = "Ticket list:\n"
|
||||
for (ticketnumber in tickets.sort()*.key) {
|
||||
ticketlist += "${ticketnumber} (${tickets[ticketnumber]})"
|
||||
ticketlist += "${ticketnumber} (${tickets[ticketnumber]})\n"
|
||||
}
|
||||
writeFile(file: "ticketlist", text: ticketlist)
|
||||
}
|
||||
|
|
@ -387,6 +372,26 @@ def boolean componentreport(meta, componentdifferencerecords) {
|
|||
//tickets.sort { a, b -> a.value <=> b.value }
|
||||
//myMap.sort()*.key
|
||||
|
||||
def compare(earlymetaitems, latermetaitems, key) {
|
||||
boolean result = true;
|
||||
echo "Collecting changes between early and later versions of component: ${key}"
|
||||
|
||||
def earlymeta = earlymetaitems[key].meta
|
||||
def latermeta = latermetaitems[key].meta
|
||||
|
||||
summaryappend("${earlymeta.productinfo.productname} ${earlymeta.productinfo.subcomponentname}: Changed: ")
|
||||
|
||||
def uniquefolderforsourcerepo = getcomponent(earlymeta)
|
||||
|
||||
(result, differencerecords) = getdifferencerecords(earlymeta, latermeta, uniquefolderforsourcerepo)
|
||||
|
||||
summaryappend(" Items: ${differencerecords.size()} ")
|
||||
componentreport(earlymeta, differencerecords)
|
||||
summaryappend("\n")
|
||||
|
||||
return [result, differencerecords];
|
||||
}
|
||||
|
||||
def comparehierarchy(meta, String earlymetafolder, String latermetafolder, String maxdepth, String summaryfolder) {
|
||||
def List differencerecords = []
|
||||
|
||||
|
|
@ -410,12 +415,8 @@ def comparehierarchy(meta, String earlymetafolder, String latermetafolder, Strin
|
|||
|
||||
for (key in earlymetaitems.keySet()) {
|
||||
if (latermetaitems.containsKey(key)) {
|
||||
summaryappend("${earlymeta.productinfo.productname} ${earlymeta.productinfo.subcomponentname}: ")
|
||||
(result, componentdifferencerecords) = compare(earlymetaitems, latermetaitems, key)
|
||||
summaryappend("Items: ${componentdifferencerecords.size()} ")
|
||||
componentreport(earlymeta, componentdifferencerecords)
|
||||
differencerecords = differencerecords + componentdifferencerecords
|
||||
summaryappend("\n")
|
||||
} else {
|
||||
summaryappend("${earlymeta.productinfo.productname} ${earlymeta.productinfo.subcomponentname}: ")
|
||||
deletedcomponent(earlymetaitems, key)
|
||||
|
|
@ -435,4 +436,8 @@ def comparehierarchy(meta, String earlymetafolder, String latermetafolder, Strin
|
|||
return [summarystring, markunstable, unstablereason]
|
||||
}
|
||||
|
||||
for (key in metaitems.keySet()) {
|
||||
def relatedmetainfo = metaitems[key]
|
||||
|
||||
|
||||
return this;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue