Add more tests and cleanup ChangeInfo class.

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 11 matching lines @@
 __version__ = '1.0'
 
 
 CODEREVIEW_SETTINGS = {
   # Default values.
   "CODE_REVIEW_SERVER": "codereview.chromium.org",
   "CC_LIST": "chromium-reviews@googlegroups.com",
   "VIEW_VC": "http://src.chromium.org/viewvc/chrome?view=rev&revision=",
 }
 
-# Use a shell for subcommands on Windows to get a PATH search, and because svn
-# may be a batch file.
-use_shell = sys.platform.startswith("win")
-
 # globals that store the root of the current repository and the directory where
 # we store information about changelists.
 repository_root = ""
 gcl_info_dir = ""
 
 # Filename where we store repository specific information for gcl.
 CODEREVIEW_SETTINGS_FILE = "codereview.settings"
 
 # Warning message when the change appears to be missing tests.
 MISSING_TEST_MSG = "Change contains new or modified methods, but no new tests!"
@@ skipping 31 matching lines @@
 def IsSVNMoved(filename):
   """Determine if a file has been added through svn mv"""
   info = GetSVNFileInfo(filename)
   return (info.get('Copied From URL') and
           info.get('Copied From Rev') and
           info.get('Schedule') == 'add')
 
 
 def GetSVNFileInfo(file):
   """Returns a dictionary from the svn info output for the given file."""
-  dom = ParseXML(RunShell(["svn", "info", "--xml", file]))
+  output = RunShell(["svn", "info", "--xml", file])
+  dom = ParseXML(output)
   result = {}
   if dom:
     # /info/entry/
     #   url
     #   reposityory/(root|uuid)
     #   wc-info/(schedule|depth)
     #   commit/(author|date)
     result['Node Kind'] = GetNodeNamedAttributeText(dom, 'entry', 'kind')
     result['Repository Root'] = GetNamedNodeText(dom, 'root')
     result['Schedule'] = GetNamedNodeText(dom, 'schedule')
@@ skipping 42 matching lines @@
     'conflicted': 'C',
     'deleted': 'D',
     'ignored': 'I',
     'missing': '!',
     'modified': 'M',
     'normal': ' ',
     'replaced': 'R',
     'unversioned': '?',
     # TODO(maruel): Find the corresponding strings for X, ~
   }
-  dom = ParseXML(RunShell(command))
+  output = RunShell(command)
+  dom = 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...
@@ skipping 118 matching lines @@
 
 def ErrorExit(msg, exit=True):
   """Print an error message to stderr and optionally exit."""
   print >>sys.stderr, msg
   if exit:
     sys.exit(1)
 
 
 def RunShellWithReturnCode(command, print_output=False):
   """Executes a command and returns the output and the return code."""
+  # Use a shell for subcommands on Windows to get a PATH search, and because svn
+  # may be a batch file.
+  use_shell = sys.platform.startswith("win")
   p = subprocess.Popen(command, stdout=subprocess.PIPE,
                        stderr=subprocess.STDOUT, shell=use_shell,
                        universal_newlines=True)
   if print_output:
     output_array = []
     while True:
       line = p.stdout.readline()
       if not line:
         break
       if print_output:
@@ skipping 20 matching lines @@
   return result
 
 
 def WriteFile(filename, contents):
   """Overwrites the file with the given contents."""
   file = open(filename, 'w')
   file.write(contents)
   file.close()
 
 
-class ChangeInfo:
+class ChangeInfo(object):
   """Holds information about a changelist.
 
     issue: the Rietveld issue number, of "" if it hasn't been uploaded yet.
     description: the description.
     files: a list of 2 tuple containing (status, filename) of changed files,
            with paths being relative to the top repository directory.
   """
-  def __init__(self, name="", issue="", description="", files=[]):
+  def __init__(self, name="", issue="", description="", files=None):
     self.name = name
     self.issue = issue
     self.description = description
+    if files is None:
+      files = []
     self.files = files
     self.patch = None
 
   def FileList(self):
     """Returns a list of files."""
     return [file[1] for file in self.files]
 
   def _NonDeletedFileList(self):
     """Returns a list of files in this change, not including deleted files."""
     return [file[1] for file in self.files if not file[0].startswith("D")]
@@ skipping 833 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())