derek/gem5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

util: update list_changes.py to support multiple Change-Ids (#861)

Browse Source 
The original version of `list_changes.py` assumed no more than one
`Change-Id` tag per commit. However, since transitioning to GitHub, the
repository now contains some merge commits containing multiple
`Change-Id`s.

This patch updates `list_changes.py` to support commits with any number
of `Change-Id` tags.
This commit is contained in:
Richard Cooper
2024-02-27 19:10:31 +00:00
committed by GitHub
parent e5eea7efcc
commit 4e12f2486b
1 changed files with 21 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
util/maint/list_changes.py
View File

@@ -1,6 +1,6 @@
#!/usr/bin/env python3
#
# Copyright (c) 2017-2018 Arm Limited
# Copyright (c) 2017-2018, 2024 Arm Limited
# All rights reserved
#
# The license below extends only to copyright in the software and shall
@@ -88,20 +88,20 @@ class Commit:
return self._tags
@property
def change_id(self):
"""Get the Change-Id tag from the commit
def change_ids(self):
"""Get the Change-Id tag(s) from the commit
Returns: A change ID or None if no change ID has been
specified.
Returns: A list of change IDs. May be empty if no change IDs
have been specified.
"""
try:
cids = self.tags["Change-Id"]
except KeyError:
return None
return list()
assert len(cids) == 1
return cids[0]
return cids[:]
def __str__(self):
return f"{self.rev[0:8]}: {self.log[0]}"
@@ -137,32 +137,26 @@ def list_changes(upstream, feature, paths=[]):
feature_revs = tuple(list_revs(upstream, feature, paths=paths))
upstream_revs = tuple(list_revs(feature, upstream, paths=paths))
feature_cids = {
c.change_id: c for c in feature_revs if c.change_id is not None
}
upstream_cids = {
c.change_id: c for c in upstream_revs if c.change_id is not None
}
feature_cids = {cid: c for c in feature_revs for cid in c.change_ids}
upstream_cids = {cid: c for c in upstream_revs for cid in c.change_ids}
incoming = [
r
for r in reversed(upstream_revs)
if r.change_id and r.change_id not in feature_cids
if any(rcid not in feature_cids for rcid in r.change_ids)
]
outgoing = [
r
for r in reversed(feature_revs)
if r.change_id and r.change_id not in upstream_cids
if any(rcid not in upstream_cids for rcid in r.change_ids)
]
common = [
r for r in reversed(feature_revs) if r.change_id in upstream_cids
]
upstream_unknown = [
r for r in reversed(upstream_revs) if r.change_id is None
]
feature_unknown = [
r for r in reversed(feature_revs) if r.change_id is None
r
for r in reversed(feature_revs)
if any(rcid in upstream_cids for rcid in r.change_ids)
]
upstream_unknown = [r for r in reversed(upstream_revs) if not r.change_ids]
feature_unknown = [r for r in reversed(feature_revs) if not r.change_ids]
return incoming, outgoing, common, upstream_unknown, feature_unknown
@@ -252,12 +246,12 @@ def _main():
print("Incorrectly rebased changes:")
all_upstream_revs = list_revs(args.upstream, paths=args.paths)
all_upstream_cids = {
c.change_id: c
for c in all_upstream_revs
if c.change_id is not None
cid: c for c in all_upstream_revs for cid in c.change_ids
}
incorrect_outgoing = [
r for r in outgoing if r.change_id in all_upstream_cids
r
for r in outgoing
if any(rcid in all_upstream_cids for rcid in r.change_ids)
]
for rev in incorrect_outgoing:
print(rev)