buildman: Allow selection of the number of commits to build
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:
parent
6131beab69
commit
3b74ba5f1a
@ -144,18 +144,25 @@ def DoBuildman(options, args):
|
|||||||
# a merge commit (it will list all the commits that form part of the
|
# a merge commit (it will list all the commits that form part of the
|
||||||
# merge)
|
# merge)
|
||||||
if options.branch:
|
if options.branch:
|
||||||
range_expr = gitutil.GetRangeInBranch(options.git_dir, options.branch)
|
if count == -1:
|
||||||
upstream_commit = gitutil.GetUpstream(options.git_dir, options.branch)
|
range_expr = gitutil.GetRangeInBranch(options.git_dir,
|
||||||
series = patchstream.GetMetaDataForList(upstream_commit,
|
options.branch)
|
||||||
options.git_dir, 1)
|
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
|
# Conflicting tags are not a problem for buildman, since it does
|
||||||
# use them. For example, Series-version is not useful for buildman. On
|
# not use them. For example, Series-version is not useful for
|
||||||
# the other hand conflicting tags will cause an error. So allow later
|
# buildman. On the other hand conflicting tags will cause an
|
||||||
# tags to overwrite earlier ones.
|
# error. So allow later tags to overwrite earlier ones.
|
||||||
series.allow_overwrite = True
|
series.allow_overwrite = True
|
||||||
series = patchstream.GetMetaDataForList(range_expr, options.git_dir, None,
|
series = patchstream.GetMetaDataForList(range_expr,
|
||||||
series)
|
options.git_dir, None, series)
|
||||||
|
else:
|
||||||
|
# Honour the count
|
||||||
|
series = patchstream.GetMetaDataForList(options.branch,
|
||||||
|
options.git_dir, count)
|
||||||
else:
|
else:
|
||||||
series = None
|
series = None
|
||||||
options.verbose = True
|
options.verbose = True
|
||||||
|
Loading…
Reference in New Issue
Block a user