Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2025-02-27 04:47:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

buildman: Move counting of commits into a function

Browse source 
Move this code into a separate function to avoid a pylint warning in
determine_series().

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2023-07-19 17:48:48 -06:00
parent 168d792ffa
commit aeb2381b27
1 changed files with 41 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

63
tools/buildman/control.py
View file

@ -159,6 +159,46 @@ def get_allow_missing(opt_allow, opt_no_allow, num_selected, has_branch):
return allow_missing
def count_commits(branch, count, col, git_dir):
"""Could the number of commits in the branch/ranch being built
Args:
branch (str): Name of branch to build, or None if none
count (int): Number of commits to build, or -1 for all
col (Terminal.Color): Color object to use
git_dir (str): Git directory to use, e.g. './.git'
Returns:
tuple:
Number of commits being built
True if the 'branch' string contains a range rather than a simple
name
"""
has_range = branch and '..' in branch
if count == -1:
if not branch:
count = 1
else:
if has_range:
count, msg = gitutil.count_commits_in_range(git_dir, branch)
else:
count, msg = gitutil.count_commits_in_branch(git_dir, branch)
if count is None:
sys.exit(col.build(col.RED, msg))
elif count == 0:
sys.exit(col.build(col.RED,
f"Range '{branch}' has no commits"))
if msg:
print(col.build(col.YELLOW, msg))
count += 1 # Build upstream commit also
if not count:
msg = (f"No commits found to process in branch '{branch}': "
"set branch's upstream or use -c flag")
sys.exit(col.build(col.RED, msg))
return count, has_range
def determine_series(selected, col, git_dir, count, branch, work_in_output):
"""Determine the series which is to be built, if any
@ -189,28 +229,7 @@ def determine_series(selected, col, git_dir, count, branch, work_in_output):
# Work out how many commits to build. We want to build everything on the
# branch. We also build the upstream commit as a control so we can see
# problems introduced by the first commit on the branch.
has_range = branch and '..' in branch
if count == -1:
if not branch:
count = 1
else:
if has_range:
count, msg = gitutil.count_commits_in_range(git_dir, branch)
else:
count, msg = gitutil.count_commits_in_branch(git_dir, branch)
if count is None:
sys.exit(col.build(col.RED, msg))
elif count == 0:
sys.exit(col.build(col.RED,
f"Range '{branch}' has no commits"))
if msg:
print(col.build(col.YELLOW, msg))
count += 1 # Build upstream commit also
if not count:
msg = (f"No commits found to process in branch '{branch}': "
"set branch's upstream or use -c flag")
sys.exit(col.build(col.RED, msg))
count, has_range = count_commits(branch, count, col, git_dir)
if work_in_output:
if len(selected) != 1:
sys.exit(col.build(col.RED,