Make gcl delete foo more useful by being able to delete corrupted change.

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 simplifies working with groups
 of files.
 """
 
@@ skipping 427 matching lines @@
     """
     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:
-      ErrorExit("Changelist file %s is corrupt" % info_file)
+      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
     if update_status:
-      for item in files:
+      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
@@ skipping 708 matching lines @@
   return 0
 
 
 @need_change
 def CMDdescription(change_info):
   """Prints the description of the specified change to stdout."""
   print change_info.description
   return 0
 
 
-@need_change
-def CMDdelete(change_info):
+def CMDdelete(args):
   """Deletes a changelist."""
-  change_info.Delete()
+  if not len(args) == 1:
+    ErrorExit('You need to pass a change list name')
+  os.remove(GetChangelistInfoFile(args[0]))
   return 0
 
 
 def CMDtry(args):
   """Sends the change to the tryserver to do a test run on your code.
 
   To send multiple changes as one path, use a comma-separated list of
   changenames. Use 'gcl help try' for more information!"""
   # When the change contains no file, send the "changename" positional
   # argument to trychange.py.
@@ skipping 127 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:]))