Add more difference infrastructure
This commit is contained in:
parent
c75e58cc69
commit
fe72ba4a9f
1 changed files with 14 additions and 14 deletions
|
|
@ -94,11 +94,8 @@ def String getcomponent(meta) {
|
|||
def String uniquefoldertemp = "${tempfolder}/${uniquefolder}"
|
||||
def String uniquefolderforsourcerepo = "${sourcerepofolder}/${uniquefolder}"
|
||||
|
||||
summaryappend("${meta.productinfo.productname} ${meta.productinfo.subcomponentname}: ")
|
||||
|
||||
checkoutsourcerepo(meta, uniquefolderforsourcerepo)
|
||||
|
||||
summaryappend("\n")
|
||||
return uniquefolderforsourcerepo
|
||||
}
|
||||
|
||||
|
|
@ -120,11 +117,9 @@ def getgitlogdifferences(String gitrootfolder, String earlyrevision, String late
|
|||
def List processtext(meta, String text) {
|
||||
def List differencerecords = []
|
||||
|
||||
record = 0;
|
||||
text.split('\n').each {
|
||||
def DifferenceRecord dr = new DifferenceRecord()
|
||||
|
||||
echo "Creating record: ${record}"
|
||||
dr.productname = meta.productinfo.productname
|
||||
dr.subcomponentname = meta.productinfo.subcomponentname
|
||||
dr.jirakey = meta.productinfo.jirakey
|
||||
|
|
@ -135,7 +130,6 @@ def List processtext(meta, String text) {
|
|||
dr.jiraticketinfo = "info"
|
||||
|
||||
differencerecords.add(dr)
|
||||
record += 1
|
||||
}
|
||||
return differencerecords
|
||||
}
|
||||
|
|
@ -151,12 +145,14 @@ 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}"
|
||||
summaryappend("Early revision: ${earlyrevision} Later revision: ${laterrevision}")
|
||||
def String differencetext = getgitlogdifferences(sourcepath, earlyrevision, laterrevision)
|
||||
echo "Difference text is:\n${differencetext}"
|
||||
differencerecords = processtext(earlymeta, differencetext)
|
||||
} else {
|
||||
summaryappend("The early and later git urls don't match")
|
||||
echo "The early and later git urls don't match"
|
||||
result = false;
|
||||
setunstable("The early and later git urls don't match in: ${earlymeta.componentidentifier()}")
|
||||
}
|
||||
|
||||
return [result, differencerecords]
|
||||
|
|
@ -165,6 +161,7 @@ def getdifferencerecords(earlymeta, latermeta, String sourcepath) {
|
|||
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
|
||||
|
|
@ -178,10 +175,12 @@ def compare(earlymetaitems, latermetaitems, key) {
|
|||
|
||||
def deletedcomponent(earlymetaitems, key) {
|
||||
echo "Component ${key} has been deleted in later version"
|
||||
summaryappend("Deleted ")
|
||||
}
|
||||
|
||||
def addedcomponent(latermetaitems, key) {
|
||||
echo "Component ${key} has been added in later version"
|
||||
summaryappend("Added ")
|
||||
}
|
||||
|
||||
def comparehierarchy(meta, String earlymetafolder, String latermetafolder, String maxdepth, String summaryfolder) {
|
||||
|
|
@ -193,10 +192,6 @@ def comparehierarchy(meta, String earlymetafolder, String latermetafolder, Strin
|
|||
|
||||
echo "Comparing product meta hierarchy from folders: ${earlymetafolder} and ${latermetafolder} to a depth of ${md}. Exporting summary to ${summaryfolder}"
|
||||
|
||||
summarystring = "No summary"
|
||||
markunstable = true
|
||||
unstablereason = "No compare implementation yet"
|
||||
|
||||
def earlymeta = meta.importrelated(earlymetafolder)
|
||||
def latermeta = meta.importrelated(latermetafolder)
|
||||
|
||||
|
|
@ -210,21 +205,26 @@ def comparehierarchy(meta, String earlymetafolder, String latermetafolder, Strin
|
|||
showmetaitems(latermetaitems)
|
||||
|
||||
for (key in earlymetaitems.keySet()) {
|
||||
def earlymeta = earlymetaitems[key].meta
|
||||
if (latermetaitems.containsKey(key)) {
|
||||
summaryappend("${earlymeta.productinfo.productname} ${earlymeta.productinfo.subcomponentname}: ")
|
||||
(result, componentdifferencerecords) = compare(earlymetaitems, latermetaitems, key)
|
||||
echo "Returned: ${result}, records: ${componentdifferencerecords.size()}"
|
||||
|
||||
differencerecords = differencerecords + componentdifferencerecords
|
||||
summaryappend("\n")
|
||||
} else {
|
||||
summaryappend("${earlymeta.productinfo.productname} ${earlymeta.productinfo.subcomponentname}: ")
|
||||
deletedcomponent(earlymetaitems, key)
|
||||
summaryappend("\n")
|
||||
}
|
||||
}
|
||||
for (key in latermetaitems.keySet()) {
|
||||
def latermeta = latermetaitems[key].meta
|
||||
if (!earlymetaitems.containsKey(key)) {
|
||||
summaryappend("${latermeta.productinfo.productname} ${latermeta.productinfo.subcomponentname}: ")
|
||||
addedcomponent(latermetaitems, key)
|
||||
summaryappend("\n")
|
||||
}
|
||||
}
|
||||
echo "Result: ${result}, total records: ${differencerecords.size()}"
|
||||
for (record in differencerecords) {
|
||||
echo "${record.dump()}"
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue