Allow overriding base-url in git-cl.

git_cl.py

 #!/usr/bin/env python
 # Copyright (c) 2012 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.
 
 # Copyright (C) 2008 Evan Martin <martine@danga.com>
 
 """A git-command for integrating reviews on Rietveld."""
 
 import logging
@@ skipping 393 matching lines @@
                           'by running "git svn info" as documented here:  %s',
                           self._remote,
                           GIT_INSTRUCTIONS_URL)
         else:
           logging.warn('Could not determine which remote this change is '
                        'associated with.  You may prevent this message by '
                        'running "git svn info" as documented here:  %s',
                        GIT_INSTRUCTIONS_URL)
     return self._remote
 
+  def GetGitBaseUrlFromConfig(self):
+    """Return the configured base URL from branch.<branchname>.baseurl.
+
+    Returns None if it is not set.
+    """
+    return RunGit(['config', 'branch.%s.base-url' % self.GetBranch()],
+                  error_ok=True).strip()
 
   def GetRemoteUrl(self):
     """Return the configured remote URL, e.g. 'git://example.org/foo.git/'.
 
     Returns None if there is no remote.
     """
     remote = self.GetRemote()
     return RunGit(['config', 'remote.%s.url' % remote], error_ok=True).strip()
 
   def GetIssue(self):
@@ skipping 356 matching lines @@
   url = args[0]
   if not url.endswith('codereview.settings'):
     url = os.path.join(url, 'codereview.settings')
 
   # Load code review settings and download hooks (if available).
   LoadCodereviewSettingsFromFile(urllib2.urlopen(url))
   DownloadHooks(True)
   return 0
 
 
+def CMDbaseurl(parser, args):
+  """get or set base-url for this branch"""
+  branchref = RunGit(['symbolic-ref', 'HEAD']).strip()
+  branch = ShortBranchName(branchref)
+  _, args = parser.parse_args(args)
+  if not args:
+    print("Current base-url:")
+    return RunGit(['config', 'branch.%s.base-url' % branch],

[M-A Ruel, 2012/04/03 15:29:58]

Won't this crash if the value is not present?

[kalmard, 2012/04/03 15:37:42]

It returns a valid error. I don't think that's a problem, as this command is
only called manually.

+                  error_ok=False).strip()
+  else:
+    print("Setting base-url to %s" % args[0])
+    return RunGit(['config', 'branch.%s.base-url' % branch, args[0]],

[M-A Ruel, 2012/04/03 15:29:58]

Also, isn't this annoying to have this per branch with no default fallback?

[kalmard, 2012/04/03 15:37:42]

I figured it made sense to make this per-branch since most (all?) other git-cl
information is stored per-branch. This can be changed of course if you wish.

As for the default fallback: there are already several fallbacks (svn remote,
git remote, git origin) if this override is not set, but again, I can change
this if you think it's necessary.

+                  error_ok=False).strip()
+
+
 def CMDstatus(parser, args):
   """show status of changelists"""
   parser.add_option('--field',
                     help='print only specific field (desc|id|patch|url)')
   (options, args) = parser.parse_args(args)
 
   # TODO: maybe make show_branches a flag if necessary.
   show_branches = not options.field
 
   if show_branches:
@@ skipping 175 matching lines @@
     if options.send_mail:
       if not change_desc.reviewers:
         DieWithError("Must specify reviewers to send email.")
       upload_args.append('--send_mail')
     cc = ','.join(filter(None, (cl.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():
-    # 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)
-  else:
-    if cl.GetRemoteUrl() and '/' in cl.GetUpstreamBranch():
-      remote_url = (cl.GetRemoteUrl() + '@'
-                    + cl.GetUpstreamBranch().split('/')[-1])
+  remote_url = cl.GetGitBaseUrlFromConfig()
+  if not remote_url:
+    if settings.GetIsGitSvn():
+      # 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)
+    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 KeyboardInterrupt:
     sys.exit(1)
   except:
     # If we got an exception after the user typed a description for their
     # change, back up the description before re-raising.
@@ skipping 514 matching lines @@
              '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__':
   fix_encoding.fix_encoding()
   sys.exit(main(sys.argv[1:]))