altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 3 Packages Projects Releases Wiki Activity

Tweaked mergeready to accept an additional hold-for-merge file outside the repository.

Browse source 
- Legacy-Id: 14894
This commit is contained in:
Henrik Levkowetz 2018-03-21 13:12:18 +00:00
parent 0b0256c655
commit 893015b8d1
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
bin/mergeready
View file

@ -216,7 +216,11 @@ def get_changeset_list_from_file(repo, filename):
and hold-for-merge files.
"""
list = []
note("Reading list from '%s'" % filename)
if os.path.exists(filename):
note("Reading list from '%s'" % filename)
else:
note("File doesn't exist: '%s'" % filename)
return list
with open(filename) as file:
for line in file:
line = line.strip()
@ -231,6 +235,8 @@ def get_changeset_list_from_file(repo, filename):
else:
changeset = parts[0]
branch, rev = changeset.split('@')
if branch.startswith('^'):
branch = branch[1:]
if branch.startswith('/'):
branch = branch[1:]
if not (rev in merged_revs and branch == merged_revs[rev]):
@ -277,6 +283,7 @@ def get_ready_commits(repo, tree):
ready = get_changeset_list_from_file(repo, 'ready-for-merge')
hold = get_changeset_list_from_file(repo, 'hold-for-merge')
hold += get_changeset_list_from_file(repo, '../hold-for-merge')
ready += get_ready_commits(repo, 'personal')
ready += get_ready_commits(repo, 'branch/amsl')
ready += get_ready_commits(repo, 'branch/iola')