Enforces using cwd in all svn calls.

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 69 matching lines @@
     home = os.getenv(home_var)
     if home != None:
       full_path = os.path.join(home, filename)
       if os.path.exists(full_path):
         return full_path
   return None
 
 
 def UnknownFiles():
   """Runs svn status and returns unknown files."""
-  return [item[1] for item in SVN.CaptureStatus([]) if item[0][0] == '?']
+  return [
+      item[1] for item in SVN.CaptureStatus([], GetRepositoryRoot())
+      if item[0][0] == '?'
+  ]
 
 
 def GetRepositoryRoot():
   """Returns the top level directory of the current repository.
 
   The directory is returned as an absolute path.
   """
   global REPOSITORY_ROOT
   if not REPOSITORY_ROOT:
     REPOSITORY_ROOT = SVN.GetCheckoutRoot(os.getcwd())
@@ skipping 30 matching lines @@
   if filename not in FILES_CACHE:
     # Don't try to look up twice.
     FILES_CACHE[filename] = None
     # First we check if we have a cached version.
     try:
       cached_file = os.path.join(GetCacheDir(), filename)
     except (gclient_utils.Error, subprocess2.CalledProcessError):
       return None
     if (not os.path.exists(cached_file) or
         (time.time() - os.stat(cached_file).st_mtime) > max_age):
-      dir_info = SVN.CaptureInfo('.')
+      dir_info = SVN.CaptureLocalInfo([], '.')
       repo_root = dir_info['Repository Root']
       if use_root:
         url_path = repo_root
       else:
         url_path = dir_info['URL']
       while True:
         # Look in the repository at the current level for the file.
         for _ in range(5):
           content = None
           try:
@@ skipping 389 matching lines @@
         values = ChangeInfo._LoadOldFormat(content)
         save = True
       except ValueError:
         ErrorExit(
             ('Changelist file %s is corrupt.\n'
             'Either run "gcl delete %s" or manually edit the file') % (
                 info_file, changename))
     files = values['files']
     if update_status:
       for item in files[:]:
-        filename = os.path.join(local_root, item[1])
-        status_result = SVN.CaptureStatus(filename)
+        status_result = SVN.CaptureStatus(item[1], local_root)
         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
           files[files.index(item)] = (status, item[1])
     change_info = ChangeInfo(
@@ skipping 108 matching lines @@
 
   # 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)
+  status_result = SVN.CaptureStatus(None, GetRepositoryRoot())
   for line in status_result:
     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]
@@ skipping 34 matching lines @@
   if (files.get('') or (show_unknown_files and len(unknown_files))):
     print "\n--- Not in any changelist:"
     for item in files.get('', []):
       print "".join(item)
     if show_unknown_files:
       for filename in unknown_files:
         print "?      %s" % filename
   return 0
 
 
-def GenerateDiff(files, root=None):
-  return SVN.GenerateDiff(files, root=root)
+def GenerateDiff(files):
+  return SVN.GenerateDiff(
+      files, GetRepositoryRoot(), full_move=False, revision=None)
 
 
 def OptionallyDoPresubmitChecks(change_info, committing, args):
   if FilterFlag(args, "--no_presubmit") or FilterFlag(args, "--force"):
     return presubmit_support.PresubmitOutput()
   return DoPresubmitChecks(change_info, committing, True)
 
 
 def defer_attributes(a, b):
   """Copy attributes from an object (like a function) to another."""
@@ skipping 282 matching lines @@
       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."""
+  Only scans the current directory and subdirectories.
+  """
+  # Verify the user is running the change command from a read-write checkout.
+  svn_info = SVN.CaptureLocalInfo([], '.')
+  if not svn_info:
+    ErrorExit("Current checkout is unversioned.  Please retry with a versioned "
+              "directory.")
+
   if len(args) == 0:
     # Generate a random changelist name.
     changename = GenerateChangeName()
   elif args[0] == '--force':
     changename = GenerateChangeName()
   else:
     changename = args[0]
   change_info = ChangeInfo.Load(changename, GetRepositoryRoot(), False, True)
 
-  # Verify the user is running the change command from a read-write checkout.
-  svn_info = SVN.CaptureInfo('.')
-  if not svn_info:
-    ErrorExit("Current checkout is unversioned.  Please retry with a versioned "
-              "directory.")
-
   if len(args) == 2:
     if not os.path.isfile(args[1]):
       ErrorExit('The change "%s" doesn\'t exist.' % args[1])
     f = open(args[1], 'rU')
     override_description = f.read()
     f.close()
   else:
     override_description = None
 
   if change_info.issue and not change_info.NeedsUpload():
@@ skipping 366 matching lines @@
       return command(argv[1:])
     # Unknown command, try to pass that to svn
     return CMDpassthru(argv)
   except (gclient_utils.Error, subprocess2.CalledProcessError), e:
     print >> sys.stderr, 'Got an exception'
     print >> sys.stderr, str(e)
     return 1
   except upload.ClientLoginError, e:
     print >> sys.stderr, 'Got an exception logging in to Rietveld'
     print >> sys.stderr, str(e)
+    return 1
   except urllib2.HTTPError, e:
     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__":
   fix_encoding.fix_encoding()
   sys.exit(main(sys.argv[1:]))