Make safely-roll-deps work with git commit hashes

tools/safely-roll-deps.py

 #!/usr/bin/env python
 # Copyright 2014 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.
 
 """Generate a CL to roll a DEPS entry to the specified revision number and post
 it to Rietveld so that the CL will land automatically if it passes the
 commit-queue's checks.
 """
 
@@ skipping 15 matching lines @@
 
 def process_deps(path, project, new_rev, is_dry_run):
   """Update project_revision to |new_issue|.
 
   A bit hacky, could it be made better?
   """
   content = open(path).read()
   # Hack for Blink to get the AutoRollBot running again.
   if project == "blink":
     project = "webkit"
-  old_line = r'(\s+)"%s_revision": "(\d+)",' % project
-  new_line = r'\1"%s_revision": "%d",' % (project, new_rev)
+  old_line = r'(\s+)"%s_revision": "(.+)",' % project

[M-A Ruel, 2014/05/08 16:44:34]

[0-9a-f]{2,40}

[borenet, 2014/05/08 17:10:58]

Done.

+  new_line = r'\1"%s_revision": "%s",' % (project, new_rev)
   new_content = re.sub(old_line, new_line, content, 1)
   old_rev = re.search(old_line, content).group(2)
   if not old_rev or new_content == content:
     die_with_error('Failed to update the DEPS file')
 
   if not is_dry_run:
     open(path, 'w').write(new_content)
   return old_rev
 
 
@@ skipping 38 matching lines @@
           [logging.WARNING, logging.INFO, logging.DEBUG][
             min(2, options.verbose)])
   if len(args) != 2:
     parser.print_help()
     exit(0)
 
   root_dir = os.path.dirname(tool_dir)
   os.chdir(root_dir)
 
   project = args[0]
-  new_rev = int(args[1])
+  new_rev = args[1]
 
   # Silence the editor.
   os.environ['EDITOR'] = 'true'
 
   if options.force and not options.dry_run:
     prnt_subprocess.check_call(['git', 'clean', '-d', '-f'])
     prnt_subprocess.call(['git', 'rebase', '--abort'])
 
   old_branch = scm.GIT.GetBranch(root_dir)
   new_branch = '%s_roll' % project
@@ skipping 12 matching lines @@
 
   if not options.dry_run:
     prnt_subprocess.check_call(['git', 'fetch', 'origin'])
     prnt_subprocess.call(['git', 'svn', 'fetch'])
     branch_cmd = ['git', 'checkout', '-b', new_branch, options.upstream]
     if options.force:
       branch_cmd.append('-f')
     prnt_subprocess.check_output(branch_cmd)
 
   try:
-    old_rev = int(process_deps(os.path.join(root_dir, 'DEPS'), project, new_rev,
-                               options.dry_run))
+    old_rev = process_deps(os.path.join(root_dir, 'DEPS'), project, new_rev,
+                           options.dry_run)
     print '%s roll %s:%s' % (project.title(), old_rev, new_rev)
 
     review_field = 'TBR' if options.commit else 'R'
     commit_msg = options.message or '%s roll %s:%s\n' % (project.title(),
                                                          old_rev, new_rev)
     commit_msg += '\n%s=%s\n' % (review_field, options.reviewers)
 
     if options.dry_run:
       print 'Commit message: ' + commit_msg
       return 0
@@ skipping 11 matching lines @@
     prnt_subprocess.check_call(upload_cmd)
   finally:
     if not options.dry_run:
       prnt_subprocess.check_output(['git', 'checkout', old_branch])
       prnt_subprocess.check_output(['git', 'branch', '-D', new_branch])
   return 0
 
 
 if __name__ == '__main__':
   sys.exit(main())