Clean up revert.py and fixes an issue when only one file is reverted in a subdirectory.

revert.py

 #!/usr/bin/python
 # Copyright (c) 2006-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.
 #
 # Tool to quickly revert a change.
 
 import exceptions
 import optparse
 import os
 import sys
 import xml
 
 import gcl
 import gclient
 
 class ModifiedFile(exceptions.Exception):
   pass
 class NoModifiedFile(exceptions.Exception):
   pass
 class NoBlameList(exceptions.Exception):
   pass
 class OutsideOfCheckout(exceptions.Exception):
   pass
 
 
-def getTexts(nodelist):
-  """Return a list of texts in the children of a list of DOM nodes."""
-  rc = []
-  for node in nodelist:
-    if node.nodeType == node.TEXT_NODE:
-      rc.append(node.data)
-    else:
-      rc.extend(getTexts(node.childNodes))
-  return rc
-
-
-def RunShellXML(command, print_output=False, keys=None):
-  output = gcl.RunShell(command, print_output)
-  try:
-    dom = xml.dom.minidom.parseString(output)
-    if not keys:
-      return dom
-    result = {}
-    for key in keys:
-      result[key] = getTexts(dom.getElementsByTagName(key))
-  except xml.parsers.expat.ExpatError:
-    print "Failed to parse output:\n%s" % output
-    raise
-  return result
-
-
 def UniqueFast(list):
   list = [item for item in set(list)]
   list.sort()
   return list
 
 
 def GetRepoBase():
   """Returns the repository base of the root local checkout."""
-  xml_data = RunShellXML(['svn', 'info', '.', '--xml'], keys=['root', 'url'])
-  root = xml_data['root'][0]
-  url = xml_data['url'][0]
+  info = gclient.CaptureSVNInfo('.')
+  root = info['Repository Root']
+  url = info['URL']
   if not root or not url:
     raise exceptions.Exception("I'm confused by your checkout")
   if not url.startswith(root):
     raise exceptions.Exception("I'm confused by your checkout", url, root)
   return url[len(root):] + '/'
 
 
+def CaptureSVNLog(args):
+  command = ['log', '--xml']
+  if args:
+    command += args
+  output = gclient.CaptureSVN(command)
+  dom = gclient.ParseXML(output)
+  entries = []
+  if dom:
+    # /log/logentry/
+    #   @revision
+    #   author|date
+    #   paths/
+    #     path (@kind&@action)
+    for node in dom.getElementsByTagName('logentry'):
+      paths = []
+      for path in node.getElementsByTagName('path'):
+        item = {
+          'kind': path.getAttribute('kind'),
+          'action': path.getAttribute('action'),
+          'path': path.firstChild.nodeValue,
+        }
+        paths.append(item)
+      entry = {
+        'revision': int(node.getAttribute('revision')),
+        'author': gclient.GetNamedNodeText(node, 'author'),
+        'date': gclient.GetNamedNodeText(node, 'date'),
+        'paths': paths,
+      }
+      entries.append(entry)
+  return entries
+
+
 def Revert(revisions, force=False, commit=True, send_email=True, message=None,
            reviewers=None):
   """Reverts many revisions in one change list.
 
   If force is True, it will override local modifications.
   If commit is True, a commit is done after the revert.
   If send_mail is True, a review email is sent.
   If message is True, it is used as the change description.
   reviewers overrides the blames email addresses for review email."""
 
   # Use the oldest revision as the primary revision.
   changename = "revert%d" % revisions[len(revisions)-1]
   if not force and os.path.exists(gcl.GetChangelistInfoFile(changename)):
     print "Error, change %s already exist." % changename
     return 1
 
   # Move to the repository root and make the revision numbers sorted in
   # decreasing order.
   os.chdir(gcl.GetRepositoryRoot())
   revisions.sort(reverse=True)
   revisions_string = ",".join([str(rev) for rev in revisions])
   revisions_string_rev = ",".join([str(-rev) for rev in revisions])
 
-  repo_base = GetRepoBase()
+  # Get all the modified files by the revision. We'll use this list to optimize
+  # the svn merge.
+  logs = []
+  for revision in revisions:
+    logs.extend(CaptureSVNLog(["-r", str(revision), "-v"]))
+
   files = []
   blames = []
-  # Get all the modified files by the revision. We'll use this list to optimize
-  # the svn merge.
-  for revision in revisions:
-    log = RunShellXML(["svn", "log", "-r", str(revision), "-v", "--xml"],
-                        keys=['path', 'author'])
-    for file in log['path']:
+  repo_base = GetRepoBase()
+  for log in logs:
+    for file in log['paths']:
+      file_name = file['path']
       # Remove the /trunk/src/ part. The + 1 is for the last slash.
-      if not file.startswith(repo_base):
-        raise OutsideOfCheckout(file)
-      files.append(file[len(repo_base):])
-    blames.extend(log['author'])
+      if not file_name.startswith(repo_base):
+        raise OutsideOfCheckout(file_name)
+      files.append(file_name[len(repo_base):])
+    blames.append(log['author'])
 
   # On Windows, we need to fix the slashes once they got the url part removed.
   if sys.platform == 'win32':
     # On Windows, gcl expect the correct slashes.
     files = [file.replace('/', os.sep) for file in files]
 
   # Keep unique.
   files = UniqueFast(files)
   blames = UniqueFast(blames)
   if not reviewers:
@@ skipping 53 matching lines @@
 
     print "Reverting %s in %s/" % (revisions_string, root)
     if need_to_update:
       # Make sure '.' revision is high enough otherwise merge will be
       # unhappy.
       retcode = gcl.RunShellWithReturnCode(['svn', 'up', '.', '-N'])[1]
       if retcode:
         print 'svn up . -N failed in %s/.' % root
         return retcode
 
-    # TODO(maruel): BUG WITH ONLY ONE FILE.
     command = ["svn", "merge", "-c", revisions_string_rev]
     command.extend(file_list)
     (output, retcode) = gcl.RunShellWithReturnCode(command, print_output=True)
     if retcode:
       print "'%s' failed:" % command
       return retcode
 
     # Grab the status
     lines = output.split('\n')
     for line in lines:
@@ skipping 84 matching lines @@
     print "".join(e.args)
     print "You can use the --force flag to revert the files."
   except OutsideOfCheckout, e:
     print "Your repository doesn't contain ", str(e)
 
   return retcode
 
 
 if __name__ == "__main__":
   sys.exit(Main(sys.argv))