Add option --local allowing for merging changes into a local working copy....

depot_tools/drover.py

 #!/usr/bin/python
 # Copyright (c) 2009 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 subprocess
 import sys
 import webbrowser
 
 import breakpad
 
 USAGE = """
 WARNING: Please use this tool in an empty directory
 (or at least one that you don't mind clobbering.)
 
 REQUIRES: SVN 1.5+
 NOTE: NO NEED TO CHECKOUT ANYTHING IN ADVANCE OF USING THIS TOOL."
 Valid parameters:
 
 [Merge from trunk to branch]
 --merge <revision> --branch <branch_num>
 Example: %(app)s --merge 12345 --branch 187
 
+[Merge from trunk to local copy]
+--merge <revision> --local
+Example: %(app)s --merge 12345 --local
+
 [Merge from branch to branch]
 --merge <revision> --sbranch <branch_num> --branch <branch_num> 
 Example: %(app)s --merge 12345 --sbranch 248 --branch 249
 
 [Revert from trunk]
 --revert <revision>
 Example: %(app)s --revert 12345
 
 [Revert from branch]
 --revert <revision> --branch <branch_num>
@@ skipping 52 matching lines @@
                               stdout=subprocess.PIPE,
                               stderr=subprocess.PIPE).stdout.readlines()
   info = {}
   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():
+  command = 'svn status'
+  svn_status = subprocess.Popen(command,
+                                shell=True,
+                                stdout=subprocess.PIPE,
+                                stderr=subprocess.PIPE).stdout.readlines()
+  for line in svn_status:
+    match = re.search(r"^[^X?]", line)
+    if match:
+      return True
+
+  return False
+
 def getAuthor(url, revision):
   info = getSVNInfo(url, revision)
   if (info.has_key("Last Changed Author")):
     return info["Last Changed Author"]
   return None
 
 def isSVNFile(url, revision):
   info = getSVNInfo(url, revision)
   if (info.has_key("Node Kind")):
     if (info["Node Kind"] == "file"):
       return True
   return False
 
 def isSVNDirectory(url, revision):
   info = getSVNInfo(url, revision)
   if (info.has_key("Node Kind")):
     if (info["Node Kind"] == "directory"):
       return True
   return False
 
+def inCheckoutRoot(path):
+  info = getSVNInfo(path, "HEAD")
+  if (not info.has_key("Repository Root")):
+    return False
+  repo_root = info["Repository Root"];
+  info = getSVNInfo(os.path.dirname(os.path.abspath(path)), "HEAD")
+  if (info.get("Repository Root", None) != repo_root):
+    return True
+  return False
+
 def getRevisionLog(url, revision):
   """Takes an svn url and gets the associated revision."""
   command = 'svn log ' + url + " -r"+str(revision)
   svn_log = subprocess.Popen(command, 
                              shell=True, 
                              stdout=subprocess.PIPE, 
                              stderr=subprocess.PIPE).stdout.readlines()
   log = ""
   pos = 0
   for line in svn_log:
@@ skipping 306 matching lines @@
 
   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)
   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
+      sys.exit(1)
+    if isSVNDirty():
+      print "Working copy contains uncommitted files"
+      sys.exit(1)
+
   command = 'svn log ' + url + " -r "+str(revision) + " -v"
   os.system(command)
 
   if not (options.revertbot or prompt("Is this the correct revision?")):
     sys.exit(0)
 
-  if (os.path.exists(working)):
+  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)):
       sys.exit(0)
     deltree(working)
 
-  os.makedirs(working)
-  os.chdir(working)
+  if not options.local:
+    os.makedirs(working)
+    os.chdir(working)
 
   if options.merge:
     action = "Merge"
-    branch_url = BRANCH_URL.replace("$branch", options.branch)
-    # Checkout everything but stuff that got added into a new dir
-    checkoutRevision(url, revision, branch_url)
+    if not options.local:
+      branch_url = BRANCH_URL.replace("$branch", options.branch)
+      # Checkout everything but stuff that got added into a new dir
+      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:
@@ skipping 16 matching lines @@
   out.write(getRevisionLog(url, revision))
   if (author):
     out.write("TBR=" + author)
   out.close()
 
   change_cmd = 'change ' + str(revision) + " " + filename
   if options.revertbot:
     change_cmd += ' --silent'
   runGcl(change_cmd)
   os.unlink(filename)
+
+  if options.local:
+    sys.exit(0)
+
   print author
   print revision
   print ("gcl upload " + str(revision) +
          " --send_mail --no_try --no_presubmit --reviewers=" + author)
 
   if options.revertbot or prompt("Would you like to upload?"):
     if PROMPT_FOR_AUTHOR:
       author = text_prompt("Enter new author or press enter to accept default",
                            author)
     if options.revertbot and options.revertbot_reviewers:
@@ skipping 14 matching lines @@
     runGcl("commit " + str(revision) + " --no_presubmit --force")
   else:
     sys.exit(0)
 
 if __name__ == "__main__":
   option_parser = optparse.OptionParser(usage=USAGE % {"app": sys.argv[0]})
   option_parser.add_option('-m', '--merge', type="int",
                            help='Revision to merge from trunk to branch')
   option_parser.add_option('-b', '--branch',
                            help='Branch 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('-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:
     option_parser.error("You need at least --merge or --revert")
     sys.exit(1)
 
-  if options.merge and not options.branch:
-    option_parser.error("--merge requires a --branch")
+  if options.merge and not options.branch and not options.local:
+    option_parser.error("--merge requires either --branch or --local")
+    sys.exit(1)
+
+  if options.local and (options.revert or options.branch):
+    option_parser.error("--local cannot be used with --revert or --branch")
     sys.exit(1)
 
   sys.exit(main(options, args))