Deprecate gcl.GetSVNStatus() for gclient.CaptureSVNStatus() and fix some stat...

gcl.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.
 #
 # Wrapper script around Rietveld's upload.py that groups files into
 # changelists.
 
 import getpass
 import os
@@ skipping 58 matching lines @@
     empty string is also returned.
   """
   output = RunShell(["svn", "propget", property_name, file])
   if (output.startswith("svn: ") and
       output.endswith("is not under version control")):
     return ""
   else:
     return output
 
 
-def GetSVNStatus(file):
-  """Returns the svn 1.5 svn status emulated output.
-  
-  @file can be a string (one file) or a list of files."""
-  command = ["svn", "status", "--xml"]
-  if file is None:
-    pass
-  elif isinstance(file, basestring):
-    command.append(file)
-  else:
-    command.extend(file)
-
-  status_letter = {
-    '': ' ',
-    'added': 'A',
-    'conflicted': 'C',
-    'deleted': 'D',
-    'ignored': 'I',
-    'missing': '!',
-    'modified': 'M',
-    'normal': ' ',
-    'replaced': 'R',
-    'unversioned': '?',
-    # TODO(maruel): Find the corresponding strings for X, ~
-  }
-  output = RunShell(command)
-  dom = gclient.ParseXML(output)
-  results = []
-  if dom:
-    # /status/target/entry/(wc-status|commit|author|date)
-    for target in dom.getElementsByTagName('target'):
-      base_path = target.getAttribute('path')
-      for entry in target.getElementsByTagName('entry'):
-        file = entry.getAttribute('path')
-        wc_status = entry.getElementsByTagName('wc-status')
-        assert len(wc_status) == 1
-        # Emulate svn 1.5 status ouput...
-        statuses = [' ' for i in range(7)]
-        # Col 0
-        xml_item_status = wc_status[0].getAttribute('item')
-        if xml_item_status in status_letter:
-          statuses[0] = status_letter[xml_item_status]
-        else:
-          raise Exception('Unknown item status "%s"; please implement me!' %
-                          xml_item_status)
-        # Col 1
-        xml_props_status = wc_status[0].getAttribute('props')
-        if xml_props_status == 'modified':
-          statuses[1] = 'M'
-        elif xml_props_status == 'conflicted':
-          statuses[1] = 'C'
-        elif (not xml_props_status or xml_props_status == 'none' or
-              xml_props_status == 'normal'):
-          pass
-        else:
-          raise Exception('Unknown props status "%s"; please implement me!' %
-                          xml_props_status)
-        # Col 3
-        if wc_status[0].getAttribute('copied') == 'true':
-          statuses[3] = '+'
-        item = (''.join(statuses), file)
-        results.append(item)
-  return results
-
-
 def UnknownFiles(extra_args):
   """Runs svn status and prints unknown files.
 
   Any args in |extra_args| are passed to the tool to support giving alternate
   code locations.
   """
-  return [item[1] for item in GetSVNStatus(extra_args) if item[0][0] == '?']
+  return [item[1] for item in gclient.CaptureSVNStatus(extra_args)
+          if item[0][0] == '?']
 
 
 def GetRepositoryRoot():
   """Returns the top level directory of the current repository.
 
   The directory is returned as an absolute path.
   """
   global repository_root
   if not repository_root:
     infos = gclient.CaptureSVNInfo(os.getcwd(), print_error=False)
@@ skipping 320 matching lines @@
   files = []
   for line in split_data[1].splitlines():
     status = line[:7]
     file = line[7:]
     files.append((status, file))
   description = split_data[2]
   save = False
   if update_status:
     for file in files:
       filename = os.path.join(GetRepositoryRoot(), file[1])
-      status_result = GetSVNStatus(filename)
+      status_result = gclient.CaptureSVNStatus(filename)
       if not status_result or not status_result[0][0]:
         # File has been reverted.
         save = True
         files.remove(file)
         continue
       status = status_result[0][0]
       if status != file[0]:
         save = True
         files[files.index(file)] = (status, file[1])
   change_info = ChangeInfo(changename, issue, description, files)
@@ skipping 38 matching lines @@
   dir_prefix = os.getcwd()[len(GetRepositoryRoot()):].strip(os.sep)
 
   # Get a list of all files in changelists.
   files_in_cl = {}
   for cl in GetCLs():
     change_info = LoadChangelistInfo(cl)
     for status, filename in change_info.files:
       files_in_cl[filename] = change_info.name
 
   # Get all the modified files.
-  status_result = GetSVNStatus(None)
+  status_result = gclient.CaptureSVNStatus(None)
   for line in status_result:
     status = line[0]
     filename = line[1]
     if status[0] == "?":
       continue
     if dir_prefix:
       filename = os.path.join(dir_prefix, filename)
     change_list_name = ""
     if filename in files_in_cl:
       change_list_name = files_in_cl[filename]
@@ skipping 585 matching lines @@
     # the files. This allows commands such as 'gcl diff xxx' to work.
     args =["svn", command]
     root = GetRepositoryRoot()
     args.extend([os.path.join(root, x) for x in change_info.FileList()])
     RunShell(args, True)
   return 0
 
 
 if __name__ == "__main__":
   sys.exit(main())