Add an option to ignore a dirty tree to roll_dep.py

roll_dep.py

 #!/usr/bin/env python
 # Copyright 2015 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Rolls DEPS controlled dependency.
 
 Works only with git checkout and git dependencies.  Currently this
 script will always roll to the tip of to origin/master.
 """
@@ skipping 49 matching lines @@
   if upstream_url.endswith((
       '/angle/angle.git',
       '/catapult-project/catapult.git',
       '/v8/v8.git')):
     return False
   if 'webrtc' in upstream_url:
     return False
   return True
 
 
-def roll(root, deps_dir, roll_to, key, reviewers, bug, no_log, log_limit):
+def roll(root, deps_dir, roll_to, key, reviewers, bug, no_log, log_limit,
+         ignore_dirty_tree=False):

[M-A Ruel, 2015/11/14 01:54:20]

Remove the default value

   deps = os.path.join(root, 'DEPS')
   try:
     with open(deps, 'rb') as f:
       deps_content = f.read()
   except (IOError, OSError):
     raise Error('Ensure the script is run in the directory '
                 'containing DEPS file.')
 
-  if not is_pristine(root):
+  if not ignore_dirty_tree and not is_pristine(root):
     raise Error('Ensure %s is clean first.' % root)
 
   full_dir = os.path.normpath(os.path.join(os.path.dirname(root), deps_dir))
   if not os.path.isdir(full_dir):
     raise Error('Directory not found: %s' % deps_dir)
   head = check_output(['git', 'rev-parse', 'HEAD'], cwd=full_dir).strip()
 
   if not head in deps_content:
     print('Warning: %s is not checked out at the expected revision in DEPS' %
           deps_dir)
@@ skipping 73 matching lines @@
     print('You forgot to pass -r, make sure to insert a R=foo@example.com line')
     print('to the commit description before emailing.')
     print('')
   print('Run:')
   print('  git cl upload --send-mail')
 
 
 def main():
   parser = argparse.ArgumentParser(description=__doc__)
   parser.add_argument(
+      '--ignore-dirty-tree', action='store_true',
+      help='Roll anyways, even if there is a diff.')
+  parser.add_argument(
       '-r', '--reviewer',
       help='To specify multiple reviewers, use comma separated list, e.g. '
            '-r joe,jane,john. Defaults to @chromium.org')
   parser.add_argument('-b', '--bug', help='Associate a bug number to the roll')
   parser.add_argument(
       '--no-log', action='store_true',
       help='Do not include the short log in the commit message')
   parser.add_argument(
       '--log-limit', type=int, default=100,
       help='Trim log after N commits (default: %(default)s)')
@@ skipping 14 matching lines @@
 
   try:
     roll(
         os.getcwd(),
         args.dep_path,
         args.roll_to,
         args.key,
         reviewers,
         args.bug,
         args.no_log,
-        args.log_limit)
+        args.log_limit,
+        args.ignore_dirty_tree)
 
   except Error as e:
     sys.stderr.write('error: %s\n' % e)
     return 1
 
   return 0
 
 
 if __name__ == '__main__':
   sys.exit(main())