From 80c51aefb8d94d1695baaccc9c2d8bffc3c2bb3d Mon Sep 17 00:00:00 2001 From: "jam@chromium.org" Date: Fri, 17 Oct 2014 18:43:02 +0000 Subject: [PATCH] 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 | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/git_cl.py b/git_cl.py index d920bce88..4c5f9634c 100755 --- a/git_cl.py +++ b/git_cl.py @@ -1698,13 +1698,9 @@ def RietveldUpload(options, args, cl, change): 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])