mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-01-29 21:08:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

buildhistory-diff: report directory renames

Browse Source 
The script detects directory renaming if two different
directories with the same set of files are added and removed.

[YOCTO #10691]

(From OE-Core rev: 944db779a9f45cbeeebc976c00da37a517eea237)

Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ed Bartosh
2016-11-28 19:28:03 +02:00
committed by Richard Purdie
parent c21cec8488
commit 46e787b248
1 changed files with 31 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
meta/lib/oe/buildhistory_analysis.py
View File

@@ -69,7 +69,22 @@ class ChangeRecord:
pkglist.append(k)
return pkglist
def detect_renamed_dirs(aitems, bitems):
adirs = set(map(os.path.dirname, aitems))
bdirs = set(map(os.path.dirname, bitems))
files_ab = [(name, sorted(os.path.basename(item) for item in aitems if os.path.dirname(item) == name)) \
for name in adirs - bdirs]
files_ba = [(name, sorted(os.path.basename(item) for item in bitems if os.path.dirname(item) == name)) \
for name in bdirs - adirs]
renamed_dirs = [(dir1, dir2) for dir1, files1 in files_ab for dir2, files2 in files_ba if files1 == files2]
# remove files that belong to renamed dirs from aitems and bitems
for dir1, dir2 in renamed_dirs:
aitems = [item for item in aitems if os.path.dirname(item) not in (dir1, dir2)]
bitems = [item for item in bitems if os.path.dirname(item) not in (dir1, dir2)]
return renamed_dirs, aitems, bitems
if self.fieldname in list_fields or self.fieldname in list_order_fields:
renamed_dirs = []
if self.fieldname in ['RPROVIDES', 'RDEPENDS', 'RRECOMMENDS', 'RSUGGESTS', 'RREPLACES', 'RCONFLICTS']:
(depvera, depverb) = compare_pkg_lists(self.oldvalue, self.newvalue)
aitems = pkglist_combine(depvera)
@@ -77,16 +92,29 @@ class ChangeRecord:
else:
aitems = self.oldvalue.split()
bitems = self.newvalue.split()
if self.fieldname == 'FILELIST':
renamed_dirs, aitems, bitems = detect_renamed_dirs(aitems, bitems)
removed = list(set(aitems) - set(bitems))
added = list(set(bitems) - set(aitems))
lines = []
if renamed_dirs:
for dfrom, dto in renamed_dirs:
lines.append('directory renamed %s -> %s' % (dfrom, dto))
if removed or added:
if removed and not bitems:
out = '%s: removed all items "%s"' % (self.fieldname, ' '.join(removed))
lines.append('removed all items "%s"' % ' '.join(removed))
else:
out = '%s:%s%s' % (self.fieldname, ' removed "%s"' % ' '.join(removed) if removed else '', ' added "%s"' % ' '.join(added) if added else '')
if removed:
lines.append('removed "%s"' % ' '.join(removed))
if added:
lines.append('added "%s"' % ' '.join(added))
else:
out = '%s changed order' % self.fieldname
lines.append('changed order')
out = '%s: %s' % (self.fieldname, ', '.join(lines))
elif self.fieldname in numeric_fields:
aval = int(self.oldvalue or 0)
bval = int(self.newvalue or 0)