Move the changelist files into a subdirectory for cached files implementation.

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
 import random
 import re
+import shutil
 import string
 import subprocess
 import sys
 import tempfile
 import upload
 import urllib2
 import xml.dom.minidom
 
 # gcl now depends on gclient.
 import gclient
 
-__version__ = '1.0'
+__version__ = '1.1'
 
 
 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=",
 }
 
 # 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!"
 
 # Caches whether we read the codereview.settings file yet or not.
 read_gcl_info = False
 
@@ skipping 55 matching lines @@
       parent = os.path.dirname(repository_root)
       if (gclient.CaptureSVNInfo(parent, print_error=False).get(
               "Repository Root") != cur_dir_repo_root):
         break
       repository_root = parent
   return repository_root
 
 
 def GetInfoDir():
   """Returns the directory where gcl info files are stored."""
-  global gcl_info_dir
-  if not gcl_info_dir:
-    gcl_info_dir = os.path.join(GetRepositoryRoot(), '.svn', 'gcl_info')
-  return gcl_info_dir
+  return os.path.join(GetRepositoryRoot(), '.svn', 'gcl_info')
+
+
+def GetChangesDir():
+  """Returns the directory where gcl change files are stored."""
+  return os.path.join(GetInfoDir(), 'changes')
 
 
 def GetCodeReviewSetting(key):
   """Returns a value for the given key for this repository."""
   global read_gcl_info
   if not read_gcl_info:
     read_gcl_info = True
     # First we check if we have a cached version.
     cached_settings_file = os.path.join(GetInfoDir(), CODEREVIEW_SETTINGS_FILE)
     if (not os.path.exists(cached_settings_file) or
@@ skipping 239 matching lines @@
 # .
 # filepathn\n
 # SEPARATOR\n
 # description
 
 
 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(GetInfoDir(), changename)
+  return os.path.join(GetChangesDir(), changename)
 
 
 def LoadChangelistInfoForMultiple(changenames, fail_on_not_found=True,
                                   update_status=False):
   """Loads many changes and merge their files list into one pseudo change.
 
   This is mainly usefull to concatenate many changes into one for a 'gcl try'.
   """
   changes = changenames.split(',')
   aggregate_change_info = ChangeInfo(name=changenames)
@@ skipping 48 matching lines @@
         save = True
         files[files.index(file)] = (status, file[1])
   change_info = ChangeInfo(changename, issue, description, files)
   if save:
     change_info.Save()
   return change_info
 
 
 def GetCLs():
   """Returns a list of all the changelists in this repository."""
-  cls = os.listdir(GetInfoDir())
+  cls = os.listdir(GetChangesDir())
   if CODEREVIEW_SETTINGS_FILE in cls:
     cls.remove(CODEREVIEW_SETTINGS_FILE)
   return cls
 
 
 def GenerateChangeName():
   """Generate a random changelist name."""
   random.seed()
   current_cl_names = GetCLs()
   while True:
@@ skipping 557 matching lines @@
 
 
 def main(argv=None):
   if argv is None:
     argv = sys.argv
 
   if len(argv) == 1:
     Help()
     return 0;
 
-  # Create the directory where we store information about changelists if it
+  # Create the directories where we store information about changelists if it
   # doesn't exist.
   if not os.path.exists(GetInfoDir()):
     os.mkdir(GetInfoDir())
+  if not os.path.exists(GetChangesDir()):
+    os.mkdir(GetChangesDir())
+    # For smooth upgrade support, move the files in GetInfoDir() to
+    # GetChangesDir().
+    # TODO(maruel): Remove this code in August 2009.
+    for file in os.listdir(unicode(GetInfoDir())):
+      file_path = os.path.join(unicode(GetInfoDir()), file)
+      if os.path.isfile(file_path) and file != CODEREVIEW_SETTINGS_FILE:
+        shutil.move(file_path, GetChangesDir())
 
   # Commands that don't require an argument.
   command = argv[1]
   if command == "opened":
     Opened()
     return 0
   if command == "status":
     Opened()
     print "\n--- Not in any changelist:"
     UnknownFiles([])
@@ skipping 60 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())