Chromium Code Reviews| Index: tools/autoroller/roll_chromium_revision.py |
| diff --git a/tools/autoroller/roll_chromium_revision.py b/tools/autoroller/roll_chromium_revision.py |
| index 787e3db7fbf3625423a6979d41a8fd9838dfc2a2..f46b55e9ab175232f2cdeffb8f380f968bf487b4 100755 |
| --- a/tools/autoroller/roll_chromium_revision.py |
| +++ b/tools/autoroller/roll_chromium_revision.py |
| @@ -449,6 +449,9 @@ 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-changes', action='store_true', default=False, |
|
phoglund
2016/12/14 10:24:50
ignore-unclean-workdir?
kjellander_webrtc
2016/12/14 11:54:06
That's better; I changed it.
|
| + 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 +463,15 @@ def main(): |
| else: |
| logging.basicConfig(level=logging.INFO) |
| - if not _IsTreeClean(): |
| + if not opts.ignore_changes 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_changes: |
| + _EnsureUpdatedMasterBranch(opts.dry_run) |
| new_cr_rev = opts.revision |
| if not new_cr_rev: |