Fix gcl path handling to be more consistent.

gcl.py

 #!/usr/bin/env python
 # Copyright (c) 2011 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 215 matching lines @@
 
 
 def ErrorExit(msg):
   print >> sys.stderr, msg
   sys.exit(1)
 
 
 def RunShellWithReturnCode(command, print_output=False):
   """Executes a command and returns the output and the return code."""
   p = subprocess2.Popen(
-      command, stdout=subprocess2.PIPE,
-      stderr=subprocess2.STDOUT, universal_newlines=True)
+      command,
+      cwd=GetRepositoryRoot(),
+      stdout=subprocess2.PIPE,
+      stderr=subprocess2.STDOUT,
+      universal_newlines=True)
   if print_output:
     output_array = []
     while True:
       line = p.stdout.readline()
       if not line:
         break
       if print_output:
         print line.strip('\n')
       output_array.append(line)
     output = "".join(output_array)
@@ skipping 358 matching lines @@
       status = line[:7]
       filename = line[7:]
       values['files'].append((status, filename))
     values['description'] = split_data[2]
     return values
 
   @staticmethod
   def _LoadNewFormat(content):
     return json.loads(content)
 
+  def __str__(self):
+    out = ['%s:' % self.__class__.__name__]
+    for k in dir(self):
+      if k.startswith('__'):
+        continue
+      v = getattr(self, k)
+      if v is self or callable(getattr(self, k)):
+        continue
+      out.append('  %s: %r' % (k, v))
+    return '\n'.join(out)
+
 
 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 46 matching lines @@
   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, 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 = SVN.CaptureStatus(None, GetRepositoryRoot())
-  for line in status_result:
+  # Get all the modified files down the current directory.
+  for line in SVN.CaptureStatus(None, os.getcwd()):
     status = line[0]
     filename = line[1]
     if status[0] == "?":
       continue
     if dir_prefix:
       filename = os.path.join(dir_prefix, filename)
     change_list_name = ""
     if filename in files_in_cl:
       change_list_name = files_in_cl[filename]
     files.setdefault(change_list_name, []).append((status, filename))
@@ skipping 182 matching lines @@
       cc_list = ','.join(filter(None, [cc_list] + watchers))
     if cc_list:
       upload_arg.append("--cc=" + cc_list)
     upload_arg.append("--description_file=" + desc_file + "")
     if change_info.subject:
       upload_arg.append("--message=" + change_info.subject)
 
     if GetCodeReviewSetting("PRIVATE") == "True":
       upload_arg.append("--private")
 
+  # If we have a lot of files with long paths, then we won't be able to fit
+  # the command to "svn diff".  Instead, we generate the diff manually for
+  # each file and concatenate them before passing it to upload.py.
+  if change_info.patch is None:
+    change_info.patch = GenerateDiff(change_info.GetFileNames())
+
   # Change the current working directory before calling upload.py so that it
   # shows the correct base.
   previous_cwd = os.getcwd()
   os.chdir(change_info.GetLocalRoot())
-  # If we have a lot of files with long paths, then we won't be able to fit
-  # the command to "svn diff".  Instead, we generate the diff manually for
-  # each file and concatenate them before passing it to upload.py.
-  if change_info.patch is None:
-    change_info.patch = GenerateDiff(change_info.GetFileNames())
   try:
-    issue, patchset = upload.RealMain(upload_arg, change_info.patch)
-  except KeyboardInterrupt:
-    sys.exit(1)
-  if issue and patchset:
-    change_info.issue = int(issue)
-    change_info.patchset = int(patchset)
-    change_info.Save()
+    try:
+      issue, patchset = upload.RealMain(upload_arg, change_info.patch)
+    except KeyboardInterrupt:
+      sys.exit(1)
+    if issue and patchset:
+      change_info.issue = int(issue)
+      change_info.patchset = int(patchset)
+      change_info.Save()
 
-  if desc_file:
-    os.remove(desc_file)
-  change_info.PrimeLint()
-  os.chdir(previous_cwd)
+    if desc_file:
+      os.remove(desc_file)
+    change_info.PrimeLint()
+  finally:
+    os.chdir(previous_cwd)
   print "*** Upload does not submit a try; use gcl try to submit a try. ***"
   return 0
 
 
 @need_change_and_args
 @attrs(usage='[--upload]')
 def CMDpresubmit(change_info, args):
   """Runs presubmit checks on the change.
 
   The actual presubmit code is implemented in presubmit_support.py and looks
@@ skipping 85 matching lines @@
   os.write(handle, commit_message)
   os.close(handle)
   try:
     handle, targets_filename = tempfile.mkstemp(text=True)
     os.write(handle, "\n".join(change_info.GetFileNames()))
     os.close(handle)
     try:
       commit_cmd += ['--file=' + commit_filename]
       commit_cmd += ['--targets=' + targets_filename]
       # Change the current working directory before calling commit.
-      previous_cwd = os.getcwd()
-      os.chdir(change_info.GetLocalRoot())
       output = ''
       try:
         output = RunShell(commit_cmd, True)
       except subprocess2.CalledProcessError, e:
         ErrorExit('Commit failed.\n%s' % e)
     finally:
       os.remove(commit_filename)
   finally:
     os.remove(targets_filename)
   if output.find("Committed revision") != -1:
     change_info.Delete()
 
     if change_info.issue:
       revision = re.compile(".*?\nCommitted revision (\d+)",
                             re.DOTALL).match(output).group(1)
       viewvc_url = GetCodeReviewSetting("VIEW_VC")
       change_info.description += '\n'
       if viewvc_url:
         change_info.description += "\nCommitted: " + viewvc_url + revision
       change_info.CloseIssue()
-  os.chdir(previous_cwd)
   return 0
 
 
 def CMDchange(args):
   """Creates or edits a changelist.
 
   Only scans the current directory and subdirectories.
   """
   # Verify the user is running the change command from a read-write checkout.
   svn_info = SVN.CaptureLocalInfo([], '.')
@@ skipping 108 matching lines @@
     change_info.Save()
   return 0
 
 
 @need_change_and_args
 def CMDlint(change_info, args):
   """Runs cpplint.py on all the files in the change list.
 
   Checks all the files in the changelist for possible style violations.
   """
+  # Access to a protected member _XX of a client class
+  # pylint: disable=W0212
   try:
     import cpplint
     import cpplint_chromium
   except ImportError:
     ErrorExit("You need to install cpplint.py to lint C++ files.")
   # Change the current working directory before calling lint so that it
   # shows the correct base.
   previous_cwd = os.getcwd()
   os.chdir(change_info.GetLocalRoot())
-  # Process cpplints arguments if any.
-  filenames = cpplint.ParseArguments(args + change_info.GetFileNames())
+  try:
+    # Process cpplints arguments if any.
+    filenames = cpplint.ParseArguments(args + change_info.GetFileNames())
 
-  white_list = GetCodeReviewSetting("LINT_REGEX")
-  if not white_list:
-    white_list = DEFAULT_LINT_REGEX
-  white_regex = re.compile(white_list)
-  black_list = GetCodeReviewSetting("LINT_IGNORE_REGEX")
-  if not black_list:
-    black_list = DEFAULT_LINT_IGNORE_REGEX
-  black_regex = re.compile(black_list)
-  extra_check_functions = [cpplint_chromium.CheckPointerDeclarationWhitespace]
-  # Access to a protected member _XX of a client class
-  # pylint: disable=W0212
-  for filename in filenames:
-    if white_regex.match(filename):
-      if black_regex.match(filename):
-        print "Ignoring file %s" % filename
+    white_list = GetCodeReviewSetting("LINT_REGEX")
+    if not white_list:
+      white_list = DEFAULT_LINT_REGEX
+    white_regex = re.compile(white_list)
+    black_list = GetCodeReviewSetting("LINT_IGNORE_REGEX")
+    if not black_list:
+      black_list = DEFAULT_LINT_IGNORE_REGEX
+    black_regex = re.compile(black_list)
+    extra_check_functions = [cpplint_chromium.CheckPointerDeclarationWhitespace]
+    for filename in filenames:
+      if white_regex.match(filename):
+        if black_regex.match(filename):
+          print "Ignoring file %s" % filename
+        else:
+          cpplint.ProcessFile(filename, cpplint._cpplint_state.verbose_level,
+                              extra_check_functions)
       else:
-        cpplint.ProcessFile(filename, cpplint._cpplint_state.verbose_level,
-                            extra_check_functions)
-    else:
-      print "Skipping file %s" % filename
+        print "Skipping file %s" % filename
+  finally:
+    os.chdir(previous_cwd)
 
   print "Total errors found: %d\n" % cpplint._cpplint_state.error_count
-  os.chdir(previous_cwd)
   return 1
 
 
 def DoPresubmitChecks(change_info, committing, may_prompt):
   """Imports presubmit, then calls presubmit.DoPresubmitChecks."""
   root_presubmit = GetCachedFile('PRESUBMIT.py', use_root=True)
   change = presubmit_support.SvnChange(change_info.name,
                                        change_info.description,
                                        change_info.GetLocalRoot(),
                                        change_info.GetFiles(),
@@ skipping 239 matching lines @@
       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__":
   fix_encoding.fix_encoding()
   sys.exit(main(sys.argv[1:]))