Fix reitveld base URL for googlesource.com repos.

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."""
 
 from distutils.version import LooseVersion
@@ skipping 1680 matching lines @@
   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():

[Sam Clegg, 2014/10/14 22:45:49]

'/' seems to always be in the branch name even for local branches where it is
(refs/branches/foo).

-        remote_url = (cl.GetRemoteUrl() + '@'
-                      + cl.GetUpstreamBranch().split('/')[-1])
+      remote = cl.GetRemoteUrl()
+      branch = cl.GetUpstreamBranch()
+      if remote and branch:
+        if 'googlesource' in remote:
+          remote_url = remote + '/+/' + branch.split('/')[-1]
+        else:
+          remote_url = remote + '@' + branch.split('/')[-1]

[Sam Clegg, 2014/10/14 22:45:49]

Should we leave '@' as the default?  I guess it makes some sense even though it
doesn't work in the URL bar.  Is there some other meaning of '@' that I don't
know know about?

   if remote_url:
     upload_args.extend(['--base_url', remote_url])
 
   project = settings.GetProject()
   if project:
     upload_args.extend(['--project', project])
 
   try:
     upload_args = ['upload'] + upload_args + args
     logging.info('upload.RealMain(%s)', upload_args)
@@ skipping 1160 matching lines @@
         ('AppEngine is misbehaving and returned HTTP %d, again. Keep faith '
           'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
 
 
 if __name__ == '__main__':
   # These affect sys.stdout so do it outside of main() to simplify mocks in
   # unit testing.
   fix_encoding.fix_encoding()
   colorama.init()
   sys.exit(main(sys.argv[1:]))