Remove code duplication and improve style.

drover.py

 #!/usr/bin/python
 # Copyright (c) 2010 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
 
+import gclient_utils
+
 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>
@@ skipping 14 matching lines @@
 [Revert from branch]
 --revert <revision> --branch <branch_num>
 Example: %(app)s --revert 12345 --branch 187
 """
 
 export_map_ = None
 files_info_ = None
 delete_map_ = None
 file_pattern_ =  r"[ ]+([MADUC])[ ]+/((?:trunk|branches/.*?)/src(.*)/(.*))"
 
-def deltree(root):
-  """Removes a given directory"""
-  if (not os.path.exists(root)):
-    return
-
-  if sys.platform == 'win32':
-    os.system('rmdir /S /Q ' + root.replace('/','\\'))
-  else:
-    for name in os.listdir(root):
-      path = os.path.join(root, name)
-      if os.path.isdir(path):
-        deltree(path)
-      else:
-        os.unlink(path)
-    os.rmdir(root)
-
-def clobberDir(dirname):
-  """Removes a given directory"""
-
-  if (os.path.exists(dirname)):
-    print dir + " directory found, deleting"
-    # The following line was removed due to access controls in Windows
-    # which make os.unlink(path) calls impossible.
-    #TODO(laforge) : Is this correct?
-    deltree(dirname)
 
 def runGcl(subcommand):
   gcl_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), "gcl")
   if not os.path.exists(gcl_path):
     print "WARNING: gcl not found beside drover.py. Using system gcl instead..."
     gcl_path = 'gcl'
 
   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):
-  command = 'svn info ' + url + "@"+str(revision)
-  svn_info = subprocess.Popen(command,
-                              shell=True,
-                              stdout=subprocess.PIPE,
-                              stderr=subprocess.PIPE).stdout.readlines()
+  svn_info = gclient_utils.Popen(['svn', 'info', '%s@%s' % (url, revision)],
+                                 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()
+  svn_status = gclient_utils.Popen(['svn', 'status'],
+                                   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")):
@@ skipping 19 matching lines @@
   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()
+  svn_log = gclient_utils.Popen(['svn', 'log', url, '-r', str(revision)],
+                                stdout=subprocess.PIPE,
+                                stderr=subprocess.PIPE).stdout.readlines()
   # Don't include the header lines and the trailing "---..." line and eliminate
   # any '\r's.
   return ''.join([l.replace('\r','') for l in svn_log[3:-1]])
 
 def getSVNVersionInfo():
   """Extract version information from SVN"""
-  command = 'svn --version'
-  svn_info = subprocess.Popen(command,
-                              shell=True,
-                              stdout=subprocess.PIPE,
-                              stderr=subprocess.PIPE).stdout.readlines()
+  svn_info = gclient_utils.Popen(['svn', '--version'],
+                                 stdout=subprocess.PIPE,
+                                 stderr=subprocess.PIPE).stdout.readlines()
   info = {}
   for line in svn_info:
     match = re.search(r"svn, version ((\d+)\.(\d+)\.(\d+)) \(r(\d+)\)", line)
     if match:
       info['version'] = match.group(1)
       info['major'] = int(match.group(2))
       info['minor'] = int(match.group(3))
       info['patch'] = int(match.group(4))
       info['revision'] = match.group(5)
       return info
@@ skipping 123 matching lines @@
 
 def revertRevision(url, revision):
   paths = getBestMergePaths(url, revision)
   for path in paths:
     command = ('svn merge -N -r ' + str(revision) + ":" + str(revision-1) +
                 " " + url + path + " ." + path)
     print command
     os.system(command)
 
 def getFileInfo(url, revision):
-  global files_info_, file_pattern_
+  global files_info_
 
   if (files_info_ != None):
     return files_info_
 
-  command = 'svn log ' + url + " -r " + str(revision) + " -v"
-  svn_log = subprocess.Popen(command,
-                             shell=True,
-                             stdout=subprocess.PIPE,
-                             stderr=subprocess.PIPE).stdout.readlines()
+  svn_log = gclient_utils.Popen(['svn', 'log', url, '-r', str(revision), '-v'],
+                                stdout=subprocess.PIPE,
+                                stderr=subprocess.PIPE).stdout.readlines()
 
   info = []
   for line in svn_log:
     # A workaround to dump the (from .*) stuff, regex not so friendly in the 2nd
     # pass...
     match = re.search(r"(.*) \(from.*\)", line)
     if match:
       line = match.group(1)
     match = re.search(file_pattern_, line)
     if match:
@@ skipping 136 matching lines @@
   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
-    deltree(working)
+    gclient_utils.RemoveDirectory(working)
 
   if not options.local:
     os.makedirs(working)
     os.chdir(working)
 
   if options.merge:
     action = "Merge"
     if not options.local:
       branch_url = BRANCH_URL.replace("$branch", options.branch)
       # Checkout everything but stuff that got added into a new dir
@@ skipping 100 matching lines @@
 
   if options.local and (options.revert or options.branch):
     option_parser.error("--local cannot be used with --revert or --branch")
     return 1
 
   return drover(options, args)
 
 
 if __name__ == "__main__":
   sys.exit(main())