Set cwd to the root of the git checkout when running git svn info.

git_cl/git_cl.py

 #!/usr/bin/python
 # git-cl -- a git-command for integrating reviews on Rietveld
 # Copyright (C) 2008 Evan Martin <martine@danga.com>
 
 import errno
 import logging
 import optparse
 import os
 import re
 import subprocess
@@ skipping 36 matching lines @@
   except OSError, e:
     if e.errno == errno.EAGAIN and sys.platform == 'cygwin':
       DieWithError(
           'Visit '
           'http://code.google.com/p/chromium/wiki/CygwinDllRemappingFailure to '
           'learn how to fix this error; you need to rebase your cygwin dlls')
     raise
 
 
 def RunCommand(cmd, error_ok=False, error_message=None,
-               redirect_stdout=True, swallow_stderr=False):
+               redirect_stdout=True, swallow_stderr=False, **kwargs):
   if redirect_stdout:
     stdout = subprocess.PIPE
   else:
     stdout = None
   if swallow_stderr:
     stderr = subprocess.PIPE
   else:
     stderr = None
-  proc = Popen(cmd, stdout=stdout, stderr=stderr)
+  proc = Popen(cmd, stdout=stdout, stderr=stderr, **kwargs)
   output = proc.communicate()[0]
   if not error_ok and proc.returncode != 0:
     DieWithError('Command "%s" failed.\n' % (' '.join(cmd)) +
                  (error_message or output or ''))
   return output
 
 
 def RunGit(args, **kwargs):
   cmd = ['git'] + args
   return RunCommand(cmd, **kwargs)
@@ skipping 724 matching lines @@
     upload_args.extend(['--message', subject])
     upload_args.extend(['--description', change_desc])
     cc = ','.join(filter(None, (settings.GetCCList(), options.cc)))
     if cc:
       upload_args.extend(['--cc', cc])
 
   # Include the upstream repo's URL in the change -- this is useful for
   # projects that have their source spread across multiple repos.
   remote_url = None
   if settings.GetIsGitSvn():
-    data = RunGit(['svn', 'info'])
+    # URL is dependent on the current directory.
+    data = RunGit(['svn', 'info'], cwd=settings.GetRoot())
     if data:
       keys = dict(line.split(': ', 1) for line in data.splitlines()
                   if ': ' in line)
       remote_url = keys.get('URL', None)

[Evan Martin, 2011/03/03 19:50:34]

FYI, I just learned that "git svn info --url" does this more simply.  (You
shouldn't do this as part of this change, just thought you'd like to know.)

   else:
     if cl.GetRemoteUrl() and '/' in cl.GetUpstreamBranch():
       remote_url = (cl.GetRemoteUrl() + '@'
                     + cl.GetUpstreamBranch().split('/')[-1])
   if remote_url:
     upload_args.extend(['--base_url', remote_url])
 
   try:
     issue, patchset = upload.RealMain(['upload'] + upload_args + args)
   except:
@@ skipping 452 matching lines @@
             ('AppEngine is misbehaving and returned HTTP %d, again. Keep faith '
              'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
 
   # Not a known command. Default to help.
   GenUsage(parser, 'help')
   return CMDhelp(parser, argv)
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv[1:]))