Fix gcl breakage.

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 247 matching lines @@
 
 class ChangeInfo(object):
   """Holds information about a changelist.
 
     name: change name.
     issue: the Rietveld issue number or 0 if it hasn't been uploaded yet.
     patchset: the Rietveld latest patchset number or 0.
     description: the description.
     files: a list of 2 tuple containing (status, filename) of changed files,
            with paths being relative to the top repository directory.
+    local_root: Local root directory
   """
 
   _SEPARATOR = "\n-----\n"
   # The info files have the following format:
   # issue_id, patchset\n   (, patchset is optional)
   # _SEPARATOR\n
   # filepath1\n
   # filepath2\n
   # .
   # .
   # filepathn\n
   # _SEPARATOR\n
   # description
 
-  def __init__(self, name, issue, patchset, description, files):
+  def __init__(self, name, issue, patchset, description, files, local_root):
     self.name = name
     self.issue = int(issue)
     self.patchset = int(patchset)
     self.description = description
     if files is None:
       files = []
     self._files = files
     self.patch = None
-    self._local_root = GetRepositoryRoot()
+    self._local_root = local_root
 
   def GetFileNames(self):
     """Returns the list of file names included in this change."""
     return [file[1] for file in self._files]
 
   def GetFiles(self):
     """Returns the list of files included in this change with their status."""
     return self._files
 
   def GetLocalRoot(self):
@@ skipping 108 matching lines @@
           (line == "{" or line.startswith(" ") or line.startswith("\t"))):
         definition += line
 
       # A flush-left line starts a new possible function definition.
       elif not line.startswith(" ") and not line.startswith("\t"):
         definition = line
 
     return False
 
   @staticmethod
-  def Load(changename, fail_on_not_found=True, update_status=False):
+  def Load(changename, local_root, fail_on_not_found, update_status):
     """Gets information about a changelist.
 
     Args:
       fail_on_not_found: if True, this function will quit the program if the
         changelist doesn't exist.
       update_status: if True, the svn status will be updated for all the files
         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)
+      return ChangeInfo(changename, 0, 0, '', None, local_root)
     split_data = ReadFile(info_file).split(ChangeInfo._SEPARATOR, 2)
     if len(split_data) != 3:
       ErrorExit("Changelist file %s is corrupt" % info_file)
     items = split_data[0].split(',')
     issue = 0
     patchset = 0
     if items[0]:
       issue = int(items[0])
     if len(items) > 1:
       patchset = int(items[1])
     files = []
     for line in split_data[1].splitlines():
       status = line[:7]
       file = line[7:]
       files.append((status, file))
     description = split_data[2]
     save = False
     if update_status:
       for file in files:
-        filename = os.path.join(GetRepositoryRoot(), file[1])
+        filename = os.path.join(local_root, file[1])
         status_result = gclient.CaptureSVNStatus(filename)
         if not status_result or not status_result[0][0]:
           # File has been reverted.
           save = True
           files.remove(file)
           continue
         status = status_result[0][0]
         if status != file[0]:
           save = True
           files[files.index(file)] = (status, file[1])
-    change_info = ChangeInfo(changename, issue, patchset, description, files)
+    change_info = ChangeInfo(changename, issue, patchset, description, files,
+                             local_root)
     if save:
       change_info.Save()
     return change_info
 
 
 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, fail_on_not_found=True,
-                                  update_status=False):
+def LoadChangelistInfoForMultiple(changenames, local_root, fail_on_not_found,
+                                  update_status):
   """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(changenames, 0, 0, '', None)
+  aggregate_change_info = ChangeInfo(changenames, 0, 0, '', None, local_root)
   for change in changes:
-    aggregate_change_info._files += ChangeInfo.Load(change, fail_on_not_found,
+    aggregate_change_info._files += ChangeInfo.Load(change,
+                                                    local_root,
+                                                    fail_on_not_found,
                                                     update_status).GetFiles()
   return aggregate_change_info
 
 
 def GetCLs():
   """Returns a list of all the changelists in this repository."""
   cls = os.listdir(GetChangesDir())
   if CODEREVIEW_SETTINGS_FILE in cls:
     cls.remove(CODEREVIEW_SETTINGS_FILE)
   return cls
@@ skipping 22 matching lines @@
   """
   files = {}
 
   # Since the files are normalized to the root folder of the repositary, figure
   # out what we need to add to the paths.
   dir_prefix = os.getcwd()[len(GetRepositoryRoot()):].strip(os.sep)
 
   # Get a list of all files in changelists.
   files_in_cl = {}
   for cl in GetCLs():
-    change_info = ChangeInfo.Load(cl)
+    change_info = ChangeInfo.Load(cl, GetRepositoryRoot(),
+                                  fail_on_not_found=True, update_status=False)
     for status, filename in change_info.GetFiles():
       files_in_cl[filename] = change_info.name
 
   # Get all the modified files.
   status_result = gclient.CaptureSVNStatus(None)
   for line in status_result:
     status = line[0]
     filename = line[1]
     if status[0] == "?":
       continue
@@ skipping 48 matching lines @@
 
 
 def Opened():
   """Prints a list of modified files in the current directory down."""
   files = GetModifiedFiles()
   cl_keys = files.keys()
   cl_keys.sort()
   for cl_name in cl_keys:
     if cl_name:
       note = ""
-      if len(ChangeInfo.Load(cl_name).GetFiles()) != len(files[cl_name]):
+      change_info = ChangeInfo.Load(cl_name, GetRepositoryRoot(),
+                                    fail_on_not_found=True, update_status=False)
+      if len(change_info.GetFiles()) != len(files[cl_name]):
         note = " (Note: this changelist contains files outside this directory)"
       print "\n--- Changelist " + cl_name + note + ":"
     for file in files[cl_name]:
       print "".join(file)
 
 
 def Help(argv=None):
   if argv:
     if argv[0] == 'try':
       TryChange(None, ['--help'], swallow_exception=False)
@@ skipping 454 matching lines @@
                                                default_presubmit=root_presubmit,
                                                may_prompt=may_prompt)
   if not result and may_prompt:
     print "\nPresubmit errors, can't continue (use --no_presubmit to bypass)"
   return result
 
 
 def Changes():
   """Print all the changelists and their files."""
   for cl in GetCLs():
-    change_info = ChangeInfo.Load(cl, True, True)
+    change_info = ChangeInfo.Load(cl, GetRepositoryRoot(), True, True)
     print "\n--- Changelist " + change_info.name + ":"
     for file in change_info.GetFiles():
       print "".join(file)
 
 
 def main(argv=None):
   if argv is None:
     argv = sys.argv
 
   if len(argv) == 1:
@@ skipping 53 matching lines @@
     else:
       ErrorExit("Need a changelist name.")
   else:
     changename = argv[2]
 
   # When the command is 'try' and --patchset is used, the patch to try
   # is on the Rietveld server. 'change' creates a change so it's fine if the
   # change didn't exist. All other commands require an existing change.
   fail_on_not_found = command != "try" and command != "change"
   if command == "try" and changename.find(',') != -1:
-    change_info = LoadChangelistInfoForMultiple(changename, True, True)
+    change_info = LoadChangelistInfoForMultiple(changename, GetRepositoryRoot(),
+                                                True, True)
   else:
-    change_info = ChangeInfo.Load(changename, fail_on_not_found, True)
+    change_info = ChangeInfo.Load(changename, GetRepositoryRoot(),
+                                  fail_on_not_found, True)
 
   if command == "change":
     if (len(argv) == 4):
       filename = argv[3]
       f = open(filename, 'rU')
       override_description = f.read()
       f.close()
     else:
       override_description = None
     Change(change_info, override_description)
@@ skipping 21 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())