Add support for svn paths in the revert (removes need for .properties file).

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 151 matching lines @@
   if (version['minor'] > minor):
     return True
   elif (version['minor'] < minor):
     return False
 
   if (version['patch'] >= patch):
     return True
   else:
     return False
 
-def checkoutRevision(url, revision, branch_url, revert=False):
+def checkoutRevision(url, revision, branch_url, revert=False, pop=True):
   files_info = getFileInfo(url, revision)
   paths = getBestMergePaths2(files_info, revision)
   export_map = getBestExportPathsMap2(files_info, revision)
 
   command = 'svn checkout -N ' + branch_url
   print command
   os.system(command)
 
   match = re.search(r"^[a-z]+://.*/(.*)", branch_url)
 
   if match:
     os.chdir(match.group(1))
 
   # This line is extremely important due to the way svn behaves in the
   # set-depths action.  If parents aren't handled before children, the child
   # directories get clobbered and the merge step fails.
   paths.sort()
 
   # Checkout the directories that already exist
   for path in paths:
     if (export_map.has_key(path) and not revert):
       print "Exclude new directory " + path
       continue
     subpaths = path.split('/')
-    subpaths.pop(0)
+    #In the normal case, where no url override is specified and it's just
+    # chromium source, it's necessary to remove the 'trunk' from the filepath,
+    # since in the checkout we include 'trunk' or 'branch/\d+'.
+    #
+    # However, when a url is specified we want to preserve that because it's
+    # a part of the filepath and necessary for path operations on svn (because
+    # frankly, we are checking out the correct top level, and not hacking it).
+    if pop:
+      subpaths.pop(0)
     base = ''
     for subpath in subpaths:
       base += '/' + subpath
       # This logic ensures that you don't empty out any directories
       if not os.path.exists("." + base):
         command = ('svn update --depth empty ' + "." + base)
         print command
         os.system(command)
 
   if (revert):
@@ skipping 301 matching lines @@
     f = open("drover.properties")
     exec(f)
     f.close()
     if FILE_PATTERN:
       file_pattern_ = FILE_PATTERN
 
   if options.revert and options.branch:
     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
+      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
@@ skipping 27 matching lines @@
     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)
-    checkoutRevision(url, revision, url, True)
+    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)
     if not author:
       author = getAuthor(TRUNK_URL, revision)
@@ skipping 63 matching lines @@
   option_parser.add_option('-M', '--milestone', type="int",
                            help='Milestone to revert or merge from')
   option_parser.add_option('-l', '--local', action='store_true',
                            help='Local working copy to merge to')
   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',
                            default=False)
   option_parser.add_option('', '--revertbot-commit', action='store_true',
                            default=False)
   option_parser.add_option('', '--revertbot-reviewers')
   options, args = option_parser.parse_args()
 
   if not options.merge and not options.revert:
@@ skipping 13 matching lines @@
 
   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())