commit 80c51aefb8d94d1695baaccc9c2d8bffc3c2bb3d
author jam@chromium.org <jam@chromium.org> Fri Oct 17 18:43:02 2014 +0000
committer jam@chromium.org <jam@chromium.org> Fri Oct 17 18:43:02 2014 +0000
tree 6c1fb01e35504992193d77cad85bb3d30a5b0bb1
parent 82549e0c42b9ebd23e8b4067f363172699451b0b

Revert 292493 since it broke CQ

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@292513 0039d316-1c4b-4281-b951-d872f2087c98

git_cl.py

diff --git a/git_cl.py b/git_cl.py
index d920bce..4c5f963 100755
--- a/git_cl.py
+++ b/git_cl.py
@@ -1698,13 +1698,9 @@
                     if ': ' in line)
         remote_url = keys.get('URL', None)
     else:
-      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]
+      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])