Autoroller: Add --ignore-unclean-workdir flag

tools/autoroller/roll_chromium_revision.py

 #!/usr/bin/env python
 # Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
 #
 # Use of this source code is governed by a BSD-style license
 # that can be found in the LICENSE file in the root of the source
 # tree. An additional intellectual property rights grant can be found
 # in the file PATENTS.  All contributing project authors may
 # be found in the AUTHORS file in the root of the source tree.
 
 """Script to roll chromium_revision in the WebRTC DEPS file."""
@@ skipping 431 matching lines @@
                  help=('Chromium Git revision to roll to. Defaults to the '
                        'Chromium HEAD revision if omitted.'))
   p.add_argument('-u', '--rietveld-email',
                  help=('E-mail address to use for creating the CL at Rietveld'
                        'If omitted a previously cached one will be used or an '
                        'error will be thrown during upload.'))
   p.add_argument('--dry-run', action='store_true', default=False,
                  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,
                  help='Be extra verbose in printing of log messages.')
   opts = p.parse_args()
 
   if opts.verbose:
     logging.basicConfig(level=logging.DEBUG)
   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:
     stdout, _ = _RunCommand(['git', 'ls-remote', CHROMIUM_SRC_URL, 'HEAD'])
     head_rev = stdout.strip().split('\t')[0]
     logging.info('No revision specified. Using HEAD: %s', head_rev)
     new_cr_rev = head_rev
 
   deps_filename = os.path.join(CHECKOUT_SRC_DIR, 'DEPS')
   webrtc_deps = ParseLocalDepsFile(deps_filename)
@@ skipping 15 matching lines @@
   _CreateRollBranch(opts.dry_run)
   UpdateDepsFile(deps_filename, current_cr_rev, new_cr_rev, changed_deps)
   _LocalCommit(commit_msg, opts.dry_run)
   _UploadCL(opts.dry_run, opts.rietveld_email)
   _SendToCQ(opts.dry_run, opts.skip_cq)
   return 0
 
 
 if __name__ == '__main__':
   sys.exit(main())