diff --git a/configuration/configuration.groovy b/configuration/configuration.groovy index 30b7086..1864ba9 100644 --- a/configuration/configuration.groovy +++ b/configuration/configuration.groovy @@ -9,7 +9,7 @@ def registerPipelineScriptConfiguration(meta) { } def gitCheckoutAndRegister(meta, String tool, String gitURL, String revision, String targetDir, String repoRoot = "", int cloneDepth = 1, boolean shallowClone = true) { - gh.gitCheckout(gitURL, revision, targetDir, repoRoot, cloneDepth, shallowClone) + gh.gitCheckoutAlt(gitURL, revision, targetDir, repoRoot, cloneDepth, shallowClone) registerConfigurationInfo(meta, tool, gitURL, revision, gh.getGitInfo(targetDir)) } diff --git a/differences/dometahierarchy.groovy b/differences/dometahierarchy.groovy index 1d6885f..f5de8e8 100644 --- a/differences/dometahierarchy.groovy +++ b/differences/dometahierarchy.groovy @@ -1,3 +1,12 @@ +metafolderscript = load("${commonscripts()}/meta/folder.groovy") + +def showmetaitems(metaitems) + for (entry in metaitems) { + def name = entry.meta.componentversionuniqueidentifier() + def offsetpath = entry.offsetpath + echo "Name: ${name}\t\t\t\tPath: ${offsetpath}" + } +} def comparehierarchy(meta, String earlymetafolder, String latermetafolder, String maxdepth, String summaryfolder) { def int md = maxdepth.toInteger() @@ -7,6 +16,18 @@ def comparehierarchy(meta, String earlymetafolder, String latermetafolder, Strin def String summarystring = "No summary" def boolean markunstable = true def unstablereason = "No compare implementation yet" + + def earlymeta = metafolderscript.importrelated(earlymetafolder) + def latermeta = metafolderscript.importrelated(latermetafolder) + + def earlymetaitems = earlymeta.releasewalkerunique(md) + def latermetaitems = latermeta.releasewalkerunique(md) + + echo "Early items:" + showmetaitems(earlymetaitems) + + echo "Later items:" + showmetaitems(latermetaitems) return [summarystring, markunstable, unstablereason] }