Get rid of annoying empty changelists!...

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 663 matching lines @@
    gcl status
       Lists modified and unknown files in the current directory and
       subdirectories.
 
    gcl try change_name
       Sends the change to the tryserver so a trybot can 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!
 
+   gcl deleteempties
+      Deletes all changelists that have no files associated with them. Careful,
+      you can lose your descriptions.
+
    gcl help [command]
       Print this help menu, or help for the given command if it exists.
 """)
 
 def GetEditor():
   editor = os.environ.get("SVN_EDITOR")
   if not editor:
     editor = os.environ.get("EDITOR")
 
   if not editor:
@@ skipping 272 matching lines @@
         change_info.Save()
       else:
         ErrorExit("Error getting the description from Rietveld: " + err)
   else:
     if override_description:
       description = override_description
     else:
       description = change_info.description
 
   other_files = GetFilesNotInCL()
-  
+
   #Edited files will have a letter for the first character in a string.
   #This regex looks for the presence of that character.
   file_re = re.compile(r"^[a-z].+\Z", re.IGNORECASE)
   affected_files = filter(lambda x: file_re.match(x[0]), other_files)
   unaffected_files = filter(lambda x: not file_re.match(x[0]), other_files)
 
   separator1 = ("\n---All lines above this line become the description.\n"
                 "---Repository Root: " + change_info.GetLocalRoot() + "\n"
                 "---Paths in this changelist (" + change_info.name + "):\n")
   separator2 = "\n\n---Paths modified but not in any changelist:\n\n"
@@ skipping 29 matching lines @@
 
   new_cl_files = []
   for line in cl_files_text.splitlines():
     if not len(line):
       continue
     if line.startswith("---"):
       break
     status = line[:7]
     file = line[7:]
     new_cl_files.append((status, file))
+
+  if (not len(change_info._files)) and (not change_info.issue) and \
+      (not len(new_description) and (not new_cl_files)):
+    ErrorExit("Empty changelist not saved")
+
   change_info._files = new_cl_files
 
   change_info.Save()
   print change_info.name + " changelist saved."
   if change_info.MissingTests():
     Warn("WARNING: " + MISSING_TEST_MSG)
 
 # We don't lint files in these path prefixes.
 IGNORE_PATHS = ("webkit",)
 
@@ skipping 51 matching lines @@
 
 def Changes():
   """Print all the changelists and their files."""
   for cl in GetCLs():
     change_info = ChangeInfo.Load(cl, GetRepositoryRoot(), True, True)
     print "\n--- Changelist " + change_info.name + ":"
     for file in change_info.GetFiles():
       print "".join(file)
 
 
+def DeleteEmptyChangeLists():
+  """Delete all changelists that have no files."""
+  print "\n--- Deleting:"
+  for cl in GetCLs():
+    change_info = ChangeInfo.Load(cl, GetRepositoryRoot(), True, True)
+    if not len(change_info._files):
+      print change_info.name
+      change_info.Delete()
+
+
 def main(argv=None):
   if argv is None:
     argv = sys.argv
 
   if len(argv) == 1:
     Help()
     return 0;
 
   try:
     # Create the directories where we store information about changelists if it
@@ skipping 37 matching lines @@
   if command == "diff" and len(argv) == 2:
     files = GetFilesNotInCL()
     print GenerateDiff([x[1] for x in files])
     return 0
   if command == "settings":
     ignore = GetCodeReviewSetting("UNKNOWN");
     del CODEREVIEW_SETTINGS['__just_initialized']
     print '\n'.join(("%s: %s" % (str(k), str(v))
                      for (k,v) in CODEREVIEW_SETTINGS.iteritems()))
     return 0
+  if command == "deleteempties":
+    DeleteEmptyChangeLists()
+    return 0
 
   if len(argv) == 2:
     if command == "change":
       # Generate a random changelist name.
       changename = GenerateChangeName()
     else:
       ErrorExit("Need a changelist name.")
   else:
     changename = argv[2]
 
@@ skipping 41 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.GetFileNames()])
     RunShell(args, True)
   return 0
 
 
 if __name__ == "__main__":
   sys.exit(main())