Refactor ChangeInfo.Load() to make it possible to switch to a new format more easily.

gcl.py

 #!/usr/bin/python
 # Copyright (c) 2006-2009 The Chromium Authors. All rights reserved.

[jochen (gone - plz use gerrit), 2010/10/29 18:25:08]

nit non-std license header

 # 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 simplifies working with groups
 of files.
 """
 
 import getpass
 import os
@@ skipping 422 matching lines @@
         and unchanged files will be removed.
 
     Returns: a ChangeInfo object.
     """
     info_file = GetChangelistInfoFile(changename)
     if not os.path.exists(info_file):
       if fail_on_not_found:
         ErrorExit("Changelist " + changename + " not found.")
       return ChangeInfo(changename, 0, 0, '', None, local_root,
                         needs_upload=False)
-    split_data = gclient_utils.FileRead(info_file, 'r').split(
-        ChangeInfo._SEPARATOR, 2)
-    if len(split_data) != 3:
+    content = gclient_utils.FileRead(info_file, 'r')
+    save = False
+    try:
+      values = ChangeInfo._LoadOldFormat(content)
+    except ValueError:
       ErrorExit(
           ('Changelist file %s is corrupt.\n'
            'Either run "gcl delete %s" or manually edit the file') % (
               info_file, changename))
-    items = split_data[0].split(', ')
-    issue = 0
-    patchset = 0
-    needs_upload = False
-    if items[0]:
-      issue = int(items[0])
-    if len(items) > 1:
-      patchset = int(items[1])
-    if len(items) > 2:
-      needs_upload = (items[2] == "dirty")
-    files = []
-    for line in split_data[1].splitlines():
-      status = line[:7]
-      filename = line[7:]
-      files.append((status, filename))
-    description = split_data[2]
-    save = False
+    files = values['files']
     if update_status:
       for item in files[:]:
         filename = os.path.join(local_root, item[1])
         status_result = SVN.CaptureStatus(filename)
         if not status_result or not status_result[0][0]:
           # File has been reverted.
           save = True
           files.remove(item)
           continue
         status = status_result[0][0]
         if status != item[0]:
           save = True
           files[files.index(item)] = (status, item[1])
-    change_info = ChangeInfo(changename, issue, patchset, description, files,
-                             local_root, needs_upload)
+    change_info = ChangeInfo(changename, values['issue'], values['patchset'],
+                             values['description'], files,
+                             local_root, values['needs_upload'])
     if save:
       change_info.Save()
     return change_info
 
+  @staticmethod
+  def _LoadOldFormat(content):
+    split_data = content.split(ChangeInfo._SEPARATOR, 2)
+    if len(split_data) != 3:
+      raise ValueError('Bad change format')
+    values = {
+      'issue': 0,
+      'patchset': 0,
+      'needs_upload': False,
+      'files': [],
+    }
+    items = split_data[0].split(', ')
+    if items[0]:
+      values['issue'] = int(items[0])
+    if len(items) > 1:
+      values['patchset'] = int(items[1])
+    if len(items) > 2:
+      values['needs_upload'] = (items[2] == "dirty")
+    for line in split_data[1].splitlines():
+      status = line[:7]
+      filename = line[7:]
+      values['files'].append((status, filename))
+    values['description'] = split_data[2]
+    return values
+
 
 def GetChangelistInfoFile(changename):
   """Returns the file that stores information about a changelist."""
   if not changename or re.search(r'[^\w-]', changename):
     ErrorExit("Invalid changelist name: " + changename)
   return os.path.join(GetChangesDir(), changename)
 
 
 def LoadChangelistInfoForMultiple(changenames, local_root, fail_on_not_found,
                                   update_status):
@@ skipping 843 matching lines @@
     if e.code != 500:
       raise
     print >> sys.stderr, (
         'AppEngine is misbehaving and returned HTTP %d, again. Keep faith '
         'and retry or visit go/isgaeup.\n%s') % (e.code, str(e))
     return 1
 
 
 if __name__ == "__main__":
   sys.exit(main(sys.argv[1:]))