Change CaptureSVNInfo() to return a dictionary instead of a object.

gclient.py

 #!/usr/bin/python
 #
 # Copyright 2008 Google Inc.  All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #      http://www.apache.org/licenses/LICENSE-2.0
 #
@@ skipping 539 matching lines @@
         'checkout': update_pattern,
         'status':   status_pattern,
         'update':   update_pattern,
       }[args[0]]
 
   SubprocessCallAndCapture(command, in_directory, options.stdout,
                            pattern=pattern, capture_list=file_list)
 
 
 def CaptureSVNInfo(options, relpath, in_directory):
-  """Runs 'svn info' on an existing path.
+  """Returns a dictionary from the svn info output for the given file.
 
   Args:
     relpath: The directory where the working copy resides relative to
       the directory given by in_directory.
     in_directory: The directory where svn is to be run.
-
-  Returns:
-    An object with fields corresponding to the output of 'svn info'
   """
   dom = ParseXML(CaptureSVN(options, ["info", "--xml", relpath], in_directory))
-  result = PrintableObject()
+  result = {}
   if dom:
+    def C(item, f):
+      if item is not None: return f(item)
     # /info/entry/
     #   url
     #   reposityory/(root|uuid)
     #   wc-info/(schedule|depth)
     #   commit/(author|date)
     # str() the results because they may be returned as Unicode, which
     # interferes with the higher layers matching up things in the deps
     # dictionary.
-    result = PrintableObject()
-    result.root = str(GetNamedNodeText(dom, 'root'))
-    result.url = str(GetNamedNodeText(dom, 'url'))
-    result.uuid = str(GetNamedNodeText(dom, 'uuid'))
-    result.revision = int(GetNodeNamedAttributeText(dom, 'entry', 'revision'))
+    # TODO(maruel): Fix at higher level instead (!)
+    result['Repository Root'] = C(GetNamedNodeText(dom, 'root'), str)
+    result['URL'] = C(GetNamedNodeText(dom, 'url'), str)
+    result['UUID'] = C(GetNamedNodeText(dom, 'uuid'), str)
+    result['Revision'] = C(GetNodeNamedAttributeText(dom, 'entry', 'revision'),
+                           int)
+    result['Node Kind'] = C(GetNodeNamedAttributeText(dom, 'entry', 'kind'),
+                            str)
+    result['Schedule'] = C(GetNamedNodeText(dom, 'schedule'), str)
+    result['Path'] = C(GetNodeNamedAttributeText(dom, 'entry', 'path'), str)
+    result['Copied From URL'] = C(GetNamedNodeText(dom, 'copy-from-url'), str)
+    result['Copied From Rev'] = C(GetNamedNodeText(dom, 'copy-from-rev'), str)
   return result
 
 
 def CaptureSVNHeadRevision(options, url):
   """Get the head revision of a SVN repository.
 
   Returns:
     Int head revision
   """
   info = CaptureSVN(options, ["info", "--xml", url], os.getcwd())
@@ skipping 178 matching lines @@
       return
 
     # Get the existing scm url and the revision number of the current checkout.
     from_info = CaptureSVNInfo(options,
                                os.path.join(self._root_dir, self.relpath, '.'),
                                '.')
 
     if options.manually_grab_svn_rev:
       # Retrieve the current HEAD version because svn is slow at null updates.
       if not revision:
-        from_info_live = CaptureSVNInfo(options, from_info.url, '.')
-        revision = int(from_info_live.revision)
+        from_info_live = CaptureSVNInfo(options, from_info['URL'], '.')
+        revision = int(from_info_live['Revision'])
         rev_str = ' at %d' % revision
 
-    if from_info.url != components[0]:
+    if from_info['URL'] != components[0]:
       to_info = CaptureSVNInfo(options, url, '.')
-      if from_info.root != to_info.root:
+      if from_info['Repository Root'] != to_info['Repository Root']:
         # We have different roots, so check if we can switch --relocate.
         # Subversion only permits this if the repository UUIDs match.
-        if from_info.uuid != to_info.uuid:
-          raise Error("Can't switch the checkout to %s; UUID don't match" % url)
+        if from_info['UUID'] != to_info['UUID']:
+          raise Error("Can't switch the checkout to %s; UUID don't match. That "
+                      "simply means in theory, gclient should verify you don't "
+                      "have a local change, remove the old checkout and do a "
+                      "fresh new checkout of the new repo. Contributions are "
+                      "welcome." % url)
 
         # Perform the switch --relocate, then rewrite the from_url
         # to reflect where we "are now."  (This is the same way that
         # Subversion itself handles the metadata when switch --relocate
         # is used.)  This makes the checks below for whether we
         # can update to a revision or have to switch to a different
         # branch work as expected.
         # TODO(maruel):  TEST ME !
-        command = ["switch", "--relocate", from_info.root, to_info.root,
+        command = ["switch", "--relocate",
+                   from_info['Repository Root'],
+                   to_info['Repository Root'],
                    self.relpath]
         RunSVN(options, command, self._root_dir)
-        from_info.url = from_info.url.replace(from_info.root, to_info.root)
+        from_info['URL'] = from_info['URL'].replace(
+            from_info['Repository Root'],
+            to_info['Repository Root'])
 
     # If the provided url has a revision number that matches the revision
     # number of the existing directory, then we don't need to bother updating.
-    if not options.force and from_info.revision == revision:
+    if not options.force and from_info['Revision'] == revision:
       if options.verbose or not forced_revision:
         print >>options.stdout, ("\n_____ %s%s" % (
             self.relpath, rev_str))
       return
 
     command = ["update", os.path.join(self._root_dir, self.relpath)]
     if revision:
       command.extend(['--revision', str(revision)])
     RunSVNAndGetFileList(options, command, self._root_dir, file_list)
 
@@ skipping 881 matching lines @@
 
 if "__main__" == __name__:
   try:
     result = Main(sys.argv)
   except Error, e:
     print "Error: %s" % str(e)
     result = 1
   sys.exit(result)
 
 # vim: ts=2:sw=2:tw=80:et: