admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Autoroller: Add --ignore-unclean-workdir flag

Browse Source 
Add a flag that makes the script more useful for local development, when
you normally develop on a local branch.

BUG=webrtc:5006
NOTRY=True

Review-Url: https://codereview.webrtc.org/2566223007
Cr-Commit-Position: refs/heads/master@{#15602}
This commit is contained in:
kjellander 2016-12-14 03:57:08 -08:00 committed by Commit bot
parent a5bb562bfe
commit 665da28857
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tools/autoroller/roll_chromium_revision.py
View File

@ -449,6 +449,10 @@ def main():
help=('Calculate changes and modify DEPS, but don\'t create '
'any local branch, commit, upload CL or send any '
'tryjobs.'))
p.add_argument('-i', '--ignore-unclean-workdir', action='store_true',
default=False,
help=('Ignore if the current branch is not master or if there '
'are uncommitted changes (default: %(default)s).'))
p.add_argument('--skip-cq', action='store_true', default=False,
help='Skip sending the CL to the CQ (default: %(default)s)')
p.add_argument('-v', '--verbose', action='store_true', default=False,
@ -460,14 +464,15 @@ def main():
else:
logging.basicConfig(level=logging.INFO)
if not _IsTreeClean():
if not opts.ignore_unclean_workdir and not _IsTreeClean():
logging.error('Please clean your local checkout first.')
return 1
if opts.clean:
_RemovePreviousRollBranch(opts.dry_run)
_EnsureUpdatedMasterBranch(opts.dry_run)
if not opts.ignore_unclean_workdir:
_EnsureUpdatedMasterBranch(opts.dry_run)
new_cr_rev = opts.revision
if not new_cr_rev: