Extend drover so it can revert any chrome revision.

drover.py

 #!/usr/bin/env python
 # Copyright (c) 2012 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.
 
 import optparse
 import os
 import re
 import string
 import sys
@@ skipping 54 matching lines @@
   command = "%s %s" % (gcl_path, subcommand)
   return os.system(command)
 
 def gclUpload(revision, author):
   command = ("upload " + str(revision) +
              " --send_mail --no_presubmit --reviewers=" + author)
   return runGcl(command)
 
 def getSVNInfo(url, revision):
   info = {}
-  try:
-    svn_info = subprocess2.check_output(
-        ['svn', 'info', '%s@%s' % (url, revision)]).splitlines()
-    for line in svn_info:
-      match = re.search(r"(.*?):(.*)", line)
-      if match:
-        info[match.group(1).strip()] = match.group(2).strip()
-  except subprocess2.CalledProcessError:
-    pass
+  svn_info = subprocess2.capture(
+      ['svn', 'info', '--non-interactive', '%s@%s' % (url, revision)],
+      stderr=subprocess2.VOID).splitlines()
+  for line in svn_info:
+    match = re.search(r"(.*?):(.*)", line)
+    if match:
+      info[match.group(1).strip()] = match.group(2).strip()
   return info
 
 def isSVNDirty():
   svn_status = subprocess2.check_output(['svn', 'status']).splitlines()
   for line in svn_status:
     match = re.search(r"^[^X?]", line)
     if match:
       return True
 
   return False
@@ skipping 390 matching lines @@
     return default
   return answer
 
 
 def drover(options, args):
   revision = options.revert or options.merge
 
   # Initialize some variables used below. They can be overwritten by
   # the drover.properties file.
   BASE_URL = "svn://svn.chromium.org/chrome"
+  REVERT_ALT_URLS = ['svn://svn.chromium.org/chrome-internal',
+                     'svn://svn.chromium.org/native_client']
   TRUNK_URL = BASE_URL + "/trunk/src"
   BRANCH_URL = BASE_URL + "/branches/$branch/src"
   SKIP_CHECK_WORKING = True
   PROMPT_FOR_AUTHOR = False
 
   # Translate a given milestone to the appropriate branch number.
   if options.milestone:
     options.branch = getBranchForMilestone(options.milestone)
     if not options.branch:
       return 1
@@ skipping 10 matching lines @@
   global file_pattern_
   if os.path.exists("drover.properties"):
     FILE_PATTERN = file_pattern_
     f = open("drover.properties")
     exec(f)
     f.close()
     if FILE_PATTERN:
       file_pattern_ = FILE_PATTERN
 
   if options.revert and options.branch:
+    print 'Note: --branch is usually not needed for reverts.'
     url = BRANCH_URL.replace("$branch", options.branch)
   elif options.merge and options.sbranch:
     url = BRANCH_URL.replace("$branch", options.sbranch)
-  elif options.revert and options.url:
-    url = options.url
+  elif options.revert:
+    url = options.url or BASE_URL
     file_pattern_ = r"[ ]+([MADUC])[ ]+((/.*)/(.*))"
   else:
     url = TRUNK_URL
 
   working = options.workdir or DEFAULT_WORKING
 
   if options.local:
     working = os.getcwd()
     if not inCheckoutRoot(working):
       print "'%s' appears not to be the root of a working copy" % working
       return 1
     if (isSVNDirty() and not
         prompt("Working copy contains uncommitted files. Continue?")):
       return 1
 
+  if options.revert and not options.no_alt_urls:
+    for cur_url in [url] + REVERT_ALT_URLS:
+      try:
+        url_rev = int(getSVNInfo(cur_url, 'HEAD', ).get('Revision', ''))
+        if 0 <= url_rev - options.revert < 20000:

[M-A Ruel, 2013/03/18 17:09:37]

Maybe 10000 to be on the safer side?

[Isaac (away), 2013/03/18 19:25:59]

I started w/ 10000 but it's only 2 months of chromium. The issue is that 20k
revisions means different things for different repos.  So I have changed this
heuristic to use <120 days since commit instead of revision difference.

If we want to add more repos that might have conflicts, we can improve change
the heuristic to read multiple or maybe ask multiple times in the prompt "Is
this the correct revision" below.  For now I think it is sufficient.

+          if cur_url != url:
+            print 'Guessing svn repo: %s.' % cur_url,
+            print 'Use --no-alt-urls to disable heuristic.'
+            url = cur_url
+          break
+      except ValueError:
+        pass
   command = 'svn log ' + url + " -r "+str(revision) + " -v"
   os.system(command)
 
   if not (options.revertbot or prompt("Is this the correct revision?")):
     return 0
 
   if (os.path.exists(working)) and not options.local:
     if not (options.revertbot or SKIP_CHECK_WORKING or
         prompt("Working directory: '%s' already exists, clobber?" % working)):
       return 0
@@ skipping 11 matching lines @@
       checkoutRevision(url, revision, branch_url)
     # Merge everything that changed
     mergeRevision(url, revision)
     # "Export" files that were added from the source and add them to branch
     exportRevision(url, revision)
     # Delete directories that were deleted (file deletes are handled in the
     # merge).
     deleteRevision(url, revision)
   elif options.revert:
     action = "Revert"
-    if options.branch:
-      url = BRANCH_URL.replace("$branch", options.branch)
     pop_em = not options.url
     checkoutRevision(url, revision, url, True, pop_em)
     revertRevision(url, revision)
     revertExportRevision(url, revision)
 
   # Check the base url so we actually find the author who made the change
   if options.auditor:
     author = options.auditor
   else:
     author = getAuthor(url, revision)
@@ skipping 78 matching lines @@
   option_parser.add_option('-s', '--sbranch',
                            help='Source branch for merge')
   option_parser.add_option('-r', '--revert', type="int",
                            help='Revision to revert')
   option_parser.add_option('-w', '--workdir',
                            help='subdir to use for the revert')
   option_parser.add_option('-u', '--url',
                            help='svn url to use for the revert')
   option_parser.add_option('-a', '--auditor',
                            help='overrides the author for reviewer')
-  option_parser.add_option('', '--revertbot', action='store_true',
+  option_parser.add_option('--revertbot', action='store_true',
                            default=False)
-  option_parser.add_option('', '--revertbot-commit', action='store_true',
+  option_parser.add_option('--no-alt-urls', action='store_true',
+                           help='Disable heuristics used to determine svn url')
+  option_parser.add_option('--revertbot-commit', action='store_true',
                            default=False)
-  option_parser.add_option('', '--revertbot-reviewers')
+  option_parser.add_option('--revertbot-reviewers')
   options, args = option_parser.parse_args()
 
   if not options.merge and not options.revert:
     option_parser.error("You need at least --merge or --revert")
     return 1
 
   if options.merge and not (options.branch or options.milestone or
                             options.local):
     option_parser.error("--merge requires either --branch "
                         "or --milestone or --local")
     return 1
 
   if options.local and (options.revert or options.branch or options.milestone):
     option_parser.error("--local cannot be used with --revert "
                         "or --branch or --milestone")
     return 1
 
   if options.branch and options.milestone:
     option_parser.error("--branch cannot be used with --milestone")
     return 1
 
   return drover(options, args)
 
 
 if __name__ == "__main__":
   sys.exit(main())