leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

buildman: Allow selection of the number of commits to build

Browse Source 
It is useful to be able to build only some of the commits in a branch. Add
support for the -c option to allow this. It was previously parsed by
buildman but not implemented.

Suggested-by: York Sun <yorksun@freescale.com>
Signed-off-by: Simon Glass <sjg@chromium.org>
Acked-by: York Sun <yorksun@freescale.com>
This commit is contained in:
Simon Glass 2014-08-09 15:33:09 -06:00
parent 6131beab69
commit 3b74ba5f1a
1 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
tools/buildman/control.py
View File

@ -144,18 +144,25 @@ def DoBuildman(options, args):
# a merge commit (it will list all the commits that form part of the
# merge)
if options.branch:
range_expr = gitutil.GetRangeInBranch(options.git_dir, options.branch)
upstream_commit = gitutil.GetUpstream(options.git_dir, options.branch)
series = patchstream.GetMetaDataForList(upstream_commit,
options.git_dir, 1)
if count == -1:
range_expr = gitutil.GetRangeInBranch(options.git_dir,
options.branch)
upstream_commit = gitutil.GetUpstream(options.git_dir,
options.branch)
series = patchstream.GetMetaDataForList(upstream_commit,
options.git_dir, 1)
# Conflicting tags are not a problem for buildman, since it does not
# use them. For example, Series-version is not useful for buildman. On
# the other hand conflicting tags will cause an error. So allow later
# tags to overwrite earlier ones.
series.allow_overwrite = True
series = patchstream.GetMetaDataForList(range_expr, options.git_dir, None,
series)
# Conflicting tags are not a problem for buildman, since it does
# not use them. For example, Series-version is not useful for
# buildman. On the other hand conflicting tags will cause an
# error. So allow later tags to overwrite earlier ones.
series.allow_overwrite = True
series = patchstream.GetMetaDataForList(range_expr,
options.git_dir, None, series)
else:
# Honour the count
series = patchstream.GetMetaDataForList(options.branch,
options.git_dir, count)
else:
series = None
options.verbose = True