buildhistory-diff: add option to compare task signature list
Having added writing out of the task signature list to buildhistory (when BUILDHISTORY_FEATURES includes "task"), we now need a way to compare the list. This just shows which tasks have been added / changed signature / removed. (From OE-Core rev: 63bd7e9f780a98dda458d612877495756bcc5463) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
6774995322
commit
9049c09793
|
@ -1,6 +1,6 @@
|
|||
# Report significant differences in the buildhistory repository since a specific revision
|
||||
#
|
||||
# Copyright (C) 2012 Intel Corporation
|
||||
# Copyright (C) 2012-2013, 2016-2017 Intel Corporation
|
||||
# Author: Paul Eggleton <paul.eggleton@linux.intel.com>
|
||||
#
|
||||
# Note: requires GitPython 0.3.1+
|
||||
|
@ -410,13 +410,58 @@ def compare_dict_blobs(path, ablob, bblob, report_all, report_ver):
|
|||
return changes
|
||||
|
||||
|
||||
def process_changes(repopath, revision1, revision2='HEAD', report_all=False, report_ver=False):
|
||||
def compare_siglists(a_blob, b_blob):
|
||||
# FIXME collapse down a recipe's tasks?
|
||||
alines = a_blob.data_stream.read().decode('utf-8').splitlines()
|
||||
blines = b_blob.data_stream.read().decode('utf-8').splitlines()
|
||||
keys = []
|
||||
pnmap = {}
|
||||
def readsigs(lines):
|
||||
sigs = {}
|
||||
for line in lines:
|
||||
linesplit = line.split()
|
||||
if len(linesplit) > 2:
|
||||
sigs[linesplit[0]] = linesplit[2]
|
||||
if not linesplit[0] in keys:
|
||||
keys.append(linesplit[0])
|
||||
pnmap[linesplit[1]] = linesplit[0].rsplit('.', 1)[0]
|
||||
return sigs
|
||||
adict = readsigs(alines)
|
||||
bdict = readsigs(blines)
|
||||
out = []
|
||||
changecount = 0
|
||||
addcount = 0
|
||||
removecount = 0
|
||||
for key in keys:
|
||||
siga = adict.get(key, None)
|
||||
sigb = bdict.get(key, None)
|
||||
if siga is not None and sigb is not None and siga != sigb:
|
||||
out.append('%s changed from %s to %s' % (key, siga, sigb))
|
||||
changecount += 1
|
||||
elif siga is None:
|
||||
out.append('%s was added' % key)
|
||||
addcount += 1
|
||||
elif sigb is None:
|
||||
removecount += 1
|
||||
out.append('%s was removed' % key)
|
||||
out.append('Summary: %d tasks added, %d tasks removed, %d tasks modified (%.1f%%)' % (addcount, removecount, changecount, (changecount / float(len(bdict)) * 100)))
|
||||
return '\n'.join(out)
|
||||
|
||||
|
||||
def process_changes(repopath, revision1, revision2='HEAD', report_all=False, report_ver=False, sigs=False):
|
||||
repo = git.Repo(repopath)
|
||||
assert repo.bare == False
|
||||
commit = repo.commit(revision1)
|
||||
diff = commit.diff(revision2)
|
||||
|
||||
changes = []
|
||||
|
||||
if sigs:
|
||||
for d in diff.iter_change_type('M'):
|
||||
if d.a_blob.path == 'siglist.txt':
|
||||
changes.append(compare_siglists(d.a_blob, d.b_blob))
|
||||
return changes
|
||||
|
||||
for d in diff.iter_change_type('M'):
|
||||
path = os.path.dirname(d.a_blob.path)
|
||||
if path.startswith('packages/'):
|
||||
|
|
|
@ -217,9 +217,9 @@ class SignatureGeneratorOEBasicHash(bb.siggen.SignatureGeneratorBasicHash):
|
|||
for taskitem in self.taskhash:
|
||||
(fn, task) = taskitem.rsplit(".", 1)
|
||||
pn = self.lockedpnmap[fn]
|
||||
tasks.append((pn, task, self.taskhash[taskitem]))
|
||||
for (pn, task, taskhash) in sorted(tasks):
|
||||
f.write('%s.%s %s\n' % (pn, task, taskhash))
|
||||
tasks.append((pn, task, fn, self.taskhash[taskitem]))
|
||||
for (pn, task, fn, taskhash) in sorted(tasks):
|
||||
f.write('%s.%s %s %s\n' % (pn, task, fn, taskhash))
|
||||
|
||||
def checkhashes(self, missed, ret, sq_fn, sq_task, sq_hash, sq_hashfn, d):
|
||||
warn_msgs = []
|
||||
|
|
|
@ -33,6 +33,9 @@ def main():
|
|||
parser.add_option("-a", "--report-all",
|
||||
help = "Report all changes, not just the default significant ones",
|
||||
action="store_true", dest="report_all", default=False)
|
||||
parser.add_option("-s", "--signatures",
|
||||
help = "Report on signature differences instead of output",
|
||||
action="store_true", dest="sigs", default=False)
|
||||
|
||||
options, args = parser.parse_args(sys.argv)
|
||||
|
||||
|
@ -86,7 +89,7 @@ def main():
|
|||
|
||||
import gitdb
|
||||
try:
|
||||
changes = oe.buildhistory_analysis.process_changes(options.buildhistory_dir, fromrev, torev, options.report_all, options.report_ver)
|
||||
changes = oe.buildhistory_analysis.process_changes(options.buildhistory_dir, fromrev, torev, options.report_all, options.report_ver, options.sigs)
|
||||
except gitdb.exc.BadObject as e:
|
||||
if len(args) == 1:
|
||||
sys.stderr.write("Unable to find previous build revision in buildhistory repository\n\n")
|
||||
|
|
Loading…
Reference in New Issue