Revert of Fix reitveld base URL for googlesource.com repos.

Revert of Fix reitveld base URL for googlesource.com repos. (patchset #2 id:20001 of https://codereview.chromium.org/652193004/)

Reason for revert:
I've verified that by updating depot_tools to be before this cl, things work again.

See the base urls and CQ landing https://codereview.chromium.org/645033006 successfully.

Original issue's description:
> Fix reitveld base URL for googlesource.com repos.
> 
> The base url was previously being generated as
> URL@BRANCH.  I'm not sure if this works anywhere
> but it certainly doesn't on googlesource.com.
> Here we want URL/+/BRANCH.
> 
> R=iannucci@chromium.org, sergeyberezin@chromium.org
> 
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=292493

TBR=iannucci@chromium.org,sergeyberezin@chromium.org,sbc@chromium.org
NOTREECHECKS=true
NOTRY=true

[jam, 2014-10-17 18:32:04]

Created Revert of Fix reitveld base URL for googlesource.com repos.

[commit-bot: I haz the power, 2014-10-17 18:32:51]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/665653002/1

[commit-bot: I haz the power, 2014-10-17 18:32:57]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-10-17 18:32:58]

Failed to apply patch for git_cl.py:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  can't find file to patch at input line 6
  Perhaps you used the wrong -p or --strip option?
  The text leading up to this was:
  --------------------------
  |Index: git_cl.py
  |diff --git a/git_cl.py b/git_cl.py
  |index
d920bce889ba31c71fe426b9e639cc00ada42597..4c5f9634c36a91d8c1690e00460286294aceec5d
100755
  |--- a/git_cl.py
  |+++ b/git_cl.py
  --------------------------
  No file to patch.  Skipping patch.
  1 out of 1 hunk ignored

Patch:       git_cl.py
Index: git_cl.py
diff --git a/git_cl.py b/git_cl.py
index
d920bce889ba31c71fe426b9e639cc00ada42597..4c5f9634c36a91d8c1690e00460286294aceec5d
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])

[iannucci, 2014-10-17 19:32:15]

On 2014/10/17 18:32:58, I haz the power (commit-bot) wrote:
> Failed to apply patch for git_cl.py:
> While running patch -p1 --forward --force --no-backup-if-mismatch;
>   can't find file to patch at input line 6
>   Perhaps you used the wrong -p or --strip option?
>   The text leading up to this was:
>   --------------------------
>   |Index: git_cl.py
>   |diff --git a/git_cl.py b/git_cl.py
>   |index
>
d920bce889ba31c71fe426b9e639cc00ada42597..4c5f9634c36a91d8c1690e00460286294aceec5d
> 100755
>   |--- a/git_cl.py
>   |+++ b/git_cl.py
>   --------------------------
>   No file to patch.  Skipping patch.
>   1 out of 1 hunk ignored
> 
> Patch:       git_cl.py
> Index: git_cl.py
> diff --git a/git_cl.py b/git_cl.py
> index
>
d920bce889ba31c71fe426b9e639cc00ada42597..4c5f9634c36a91d8c1690e00460286294aceec5d
> 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])

Heh! I knew it :). Don't poke the dragons...

[Sam Clegg, 2014-10-18 01:15:58]

lgtm