Fix revert.py.

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
@@ skipping 116 matching lines @@
 
   if blames:
     print "Blaming %s\n" % ",".join(blames)
   if reviewers != blames:
     print "Emailing %s\n" % ",".join(reviewers)
   print "These files were modified in %s:" % revisions_string
   print "\n".join(files)
   print ""
 
   # Make sure these files are unmodified with svn status.
-  status = gcl.GetSVNStatus(files)
+  status = gclient.CaptureSVNStatus(files)
   if status:
     if force:
       # TODO(maruel): Use the tool to correctly revert '?' files.
       gcl.RunShell(["svn", "revert"] + files)
     else:
       raise ModifiedFile(status)
   # svn up on each of these files
   gcl.RunShell(["svn", "up"] + files)
 
   files_status = {}
@@ skipping 23 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))