Stop defaulting unrecognized branches to master except for handful of special refs

Stop defaulting unrecognized branches to master except for handful of special refs.

Context:
In https://codereview.chromium.org/781523002/ I added the ability for target_ref to be set to any branch name. Eg: For Skia a ref of 'refs/remotes/origin/chrome/m42' would be correctly set to 'refs/heads/chrome/m42'.

But in https://codereview.chromium.org/822503005/ this was changed to treat any branch that did not start with 'refs/remotes/branch-heads' or 'refs/remotes/origin/refs' to be 'refs/remotes/origin/master'.
This makes it very chromium specific, there are plenty of other projects that use depot_tools that does not work like this.
For Skia 'refs/remotes/origin/chrome/m42' would now change to 'refs/remotes/origin/master' which is wrong.

The default behavior should be to preserve the original ref not to override it to master.

I handled 'lkgr' and 'lkcr' as special cases in this CL because many developers track it and would like it to land in master by default.

BUG=chromium:463109
NOPRESUBMIT=true

Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=294303

[rmistry, 2015-03-02 14:29:31]

rmistry@google.com changed reviewers:
+ agable@chromium.org

[agable, 2015-03-02 23:11:34]

LGTM modulo thinking about my comment.

https://codereview.chromium.org/967453004/diff/1/git_cl.py
File git_cl.py (right):

https://codereview.chromium.org/967453004/diff/1/git_cl.py#newcode59
git_cl.py:59: REFS_THAT_DEFAULT_TO_MASTER = ('refs/remotes/origin/lkgr',
It might make more sense to have a REFS_THAT_ALIAS_TO_OTHER_REFS map, which maps
lkgr and lkcr to master. Not sure if you want to go the general route for
forwards-compatibility, or use this highly specific route to prevent other
people from abusing the mechanism. Either is fine by me.

[rmistry, 2015-03-03 12:25:57]

Patchset #2 (id:20001) has been deleted

[rmistry, 2015-03-03 12:26:23]

https://codereview.chromium.org/967453004/diff/1/git_cl.py
File git_cl.py (right):

https://codereview.chromium.org/967453004/diff/1/git_cl.py#newcode59
git_cl.py:59: REFS_THAT_DEFAULT_TO_MASTER = ('refs/remotes/origin/lkgr',
On 2015/03/02 23:11:34, agable wrote:
> It might make more sense to have a REFS_THAT_ALIAS_TO_OTHER_REFS map, which
maps
> lkgr and lkcr to master. Not sure if you want to go the general route for
> forwards-compatibility, or use this highly specific route to prevent other
> people from abusing the mechanism. Either is fine by me.

Lets try the general route for forwards-compatibility. Done.

[rmistry, 2015-03-03 12:26:29]

The CQ bit was checked by rmistry@google.com

[rmistry, 2015-03-03 12:26:29]

The patchset sent to the CQ was uploaded after l-g-t-m from agable@chromium.org
Link to the patchset: https://codereview.chromium.org/967453004/#ps40001 (title:
"Create an alias map")

[commit-bot: I haz the power, 2015-03-03 12:29:24]

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

[commit-bot: I haz the power, 2015-03-03 12:32:33]

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

[commit-bot: I haz the power, 2015-03-03 12:32:35]

Presubmit check for 967453004-40001 failed and returned exit status 1.

Running presubmit commit checks ...
Checking out rietveld...
Running save-description-on-failure.sh
Running push-basic.sh
Running upstream.sh
Running submit-from-new-dir.sh
Running abandon.sh
Running submodule-merge-test.sh
Running upload-local-tracking-branch.sh
Running hooks.sh
Running post-dcommit-hook-test.sh
Running upload-stale.sh
Running patch.sh
Running basic.sh

** Presubmit ERRORS **
push-basic.sh failed
Command
/b/infra_internal/commit_queue/workdir/tools/depot_tools/tests/push-basic.sh
returned non-zero exit status 1 in
/b/infra_internal/commit_queue/workdir/tools/depot_tools/tests
Setting up test upstream git repo...
Setting up test git repo...
TESTING: git-cl upload wants a server
TESTING: git-cl status has no issue
TESTING: upload succeeds (needs a server running on localhost)
TESTING: git-cl status now knows the issue
  % Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
                                 Dload  Upload   Total   Spent    Left  Speed

  0     0    0     0    0     0      0      0 --:--:-- --:--:-- --:--:--    
0
100    77    0     0  100    77      0   1483 --:--:-- --:--:-- --:--:--  1509
TESTING: Base URL contains branch name
TESTING: git-cl land ok
Using 50% similarity for rename/copy detection. Override with --similarity.
Loaded authentication cookies from /home/chrome-bot/.codereview_upload_cookies
Running presubmit commit checks ...

Presubmit checks passed.
Description:
foo-quux

Review URL: http://localhost:10000/5629499534213120
Closing issue (you may be prompted for your codereview password)...
Traceback (most recent call last):
  File "/b/infra_internal/commit_queue/workdir/tools/depot_tools/git_cl.py",
line 3103, in <module>
    sys.exit(main(sys.argv[1:]))
  File "/b/infra_internal/commit_queue/workdir/tools/depot_tools/git_cl.py",
line 3087, in main
    return dispatcher.execute(OptionParser(), argv)
  File "/b/infra_internal/commit_queue/workdir/tools/depot_tools/subcommand.py",
line 245, in execute
    return command(parser, args[1:])
  File "/b/infra_internal/commit_queue/workdir/tools/depot_tools/git_cl.py",
line 2471, in CMDland
    return SendUpstream(parser, args, 'land')
  File "/b/infra_internal/commit_queue/workdir/tools/depot_tools/git_cl.py",
line 2339, in SendUpstream
    cl.RpcServer().add_comment(cl.GetIssue(), comment)
  File "/b/infra_internal/commit_queue/workdir/tools/depot_tools/rietveld.py",
line 262, in add_comment
    ('no_redirect', 'True')])
  File "/b/infra_internal/commit_queue/workdir/tools/depot_tools/rietveld.py",
line 396, in post
    return self._send(request_path, payload=body, content_type=ctype, **kwargs)
  File "/b/infra_internal/commit_queue/workdir/tools/depot_tools/rietveld.py",
line 421, in _send
    result = self.rpc_server.Send(request_path, **kwargs)
  File
"/b/infra_internal/commit_queue/workdir/tools/depot_tools/third_party/upload.py",
line 460, in Send
    f = self.opener.open(req, timeout=70)
  File "/usr/lib/python2.7/urllib2.py", line 410, in open
    response = meth(req, response)
  File "/usr/lib/python2.7/urllib2.py", line 523, in http_response
    'http', request, response, code, msg, hdrs)
  File "/usr/lib/python2.7/urllib2.py", line 448, in error
    return self._call_chain(*args)
  File "/usr/lib/python2.7/urllib2.py", line 382, in _call_chain
    result = func(*args)
  File "/usr/lib/python2.7/urllib2.py", line 531, in http_error_default
    raise HTTPError(req.get_full_url(), code, msg, hdrs, fp)
urllib2.HTTPError: HTTP Error 403: Forbidden
Sending crash report ...
  args: ['/b/infra_internal/commit_queue/workdir/tools/depot_tools/git_cl.py',
'land', '-f']
  cwd: /b/infra_internal/commit_queue/workdir/tools/depot
  exception: HTTP Error 403: Forbidden
Headers: content-type: t
  host: cq.golo.chromium.org
  stack:   File "/b/infra_internal/commit_queue/workdir/too
  user: chrome-bot
  version: 2.7.6 (default, Mar 22 2014, 22:59:56) 
[GCC 4.8.2
A stack trace has been sent to the maintainers.
FAILURE: git-cl land ok


Presubmit checks took 185.0s to calculate.

[rmistry, 2015-03-03 12:34:49]

The CQ bit was checked by rmistry@google.com

[commit-bot: I haz the power, 2015-03-03 12:35:06]

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

[commit-bot: I haz the power, 2015-03-03 12:38:03]

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

[commit-bot: I haz the power, 2015-03-03 12:38:04]

Presubmit check for 967453004-40001 failed and returned exit status 1.

Running presubmit commit checks ...
Checking out rietveld...
Running save-description-on-failure.sh
Running push-basic.sh
Running upstream.sh
Running submit-from-new-dir.sh
Running abandon.sh
Running submodule-merge-test.sh
Running upload-local-tracking-branch.sh
Running hooks.sh
Running post-dcommit-hook-test.sh
Running upload-stale.sh
Running patch.sh
Running basic.sh

** Presubmit ERRORS **
tests/scm_unittest.py (0.90s) failed
.....EEEEE.........
======================================================================
ERROR: testGetGetSha1ForSvnRev (__main__.RealGitSvnTest)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "tests/scm_unittest.py", line 195, in setUp
    self.enabled = self.FAKE_REPOS.set_up_git() and self.FAKE_REPOS.set_up_svn()
  File
"/b/infra_internal/commit_queue/workdir/tools/depot_tools/testing_support/fake_repos.py",
line 382, in set_up_git
    self.check_port_is_free(self.git_port)
  File
"/b/infra_internal/commit_queue/workdir/tools/depot_tools/testing_support/fake_repos.py",
line 427, in check_port_is_free
    assert False, '%d shouldn\'t be bound' % port
AssertionError: 20000 shouldn't be bound

======================================================================
ERROR: testGetGitSvnHeadRev (__main__.RealGitSvnTest)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "tests/scm_unittest.py", line 195, in setUp
    self.enabled = self.FAKE_REPOS.set_up_git() and self.FAKE_REPOS.set_up_svn()
  File
"/b/infra_internal/commit_queue/workdir/tools/depot_tools/testing_support/fake_repos.py",
line 362, in set_up_git
    assert self.git_pid_file == None
AssertionError

======================================================================
ERROR: testIsGitSvn (__main__.RealGitSvnTest)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "tests/scm_unittest.py", line 195, in setUp
    self.enabled = self.FAKE_REPOS.set_up_git() and self.FAKE_REPOS.set_up_svn()
  File
"/b/infra_internal/commit_queue/workdir/tools/depot_tools/testing_support/fake_repos.py",
line 362, in set_up_git
    assert self.git_pid_file == None
AssertionError

======================================================================
ERROR: testParseGitSvnSha1 (__main__.RealGitSvnTest)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "tests/scm_unittest.py", line 195, in setUp
    self.enabled = self.FAKE_REPOS.set_up_git() and self.FAKE_REPOS.set_up_svn()
  File
"/b/infra_internal/commit_queue/workdir/tools/depot_tools/testing_support/fake_repos.py",
line 362, in set_up_git
    assert self.git_pid_file == None
AssertionError

======================================================================
ERROR: testIsValidRevision (__main__.RealGitTest)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "tests/scm_unittest.py", line 176, in setUp
    self.enabled = self.FAKE_REPOS.set_up_git()
  File
"/b/infra_internal/commit_queue/workdir/tools/depot_tools/testing_support/fake_repos.py",
line 362, in set_up_git
    assert self.git_pid_file == None
AssertionError

----------------------------------------------------------------------
Ran 19 tests in 0.671s

FAILED (errors=5)


push-basic.sh failed
Command
/b/infra_internal/commit_queue/workdir/tools/depot_tools/tests/push-basic.sh
returned non-zero exit status 1 in
/b/infra_internal/commit_queue/workdir/tools/depot_tools/tests
Setting up test upstream git repo...
Setting up test git repo...
TESTING: git-cl upload wants a server
TESTING: git-cl status has no issue
TESTING: upload succeeds (needs a server running on localhost)
TESTING: git-cl status now knows the issue
  % Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
                                 Dload  Upload   Total   Spent    Left  Speed

  0     0    0     0    0     0      0      0 --:--:-- --:--:-- --:--:--    
0
100    77    0     0  100    77      0   1527 --:--:-- --:--:-- --:--:--  1540
TESTING: Base URL contains branch name
TESTING: git-cl land ok
Using 50% similarity for rename/copy detection. Override with --similarity.
Loaded authentication cookies from /home/chrome-bot/.codereview_upload_cookies
Running presubmit commit checks ...

Presubmit checks passed.
Description:
foo-quux

Review URL: http://localhost:10000/5629499534213120
Closing issue (you may be prompted for your codereview password)...
Traceback (most recent call last):
  File "/b/infra_internal/commit_queue/workdir/tools/depot_tools/git_cl.py",
line 3103, in <module>
    sys.exit(main(sys.argv[1:]))
  File "/b/infra_internal/commit_queue/workdir/tools/depot_tools/git_cl.py",
line 3087, in main
    return dispatcher.execute(OptionParser(), argv)
  File "/b/infra_internal/commit_queue/workdir/tools/depot_tools/subcommand.py",
line 245, in execute
    return command(parser, args[1:])
  File "/b/infra_internal/commit_queue/workdir/tools/depot_tools/git_cl.py",
line 2471, in CMDland
    return SendUpstream(parser, args, 'land')
  File "/b/infra_internal/commit_queue/workdir/tools/depot_tools/git_cl.py",
line 2339, in SendUpstream
    cl.RpcServer().add_comment(cl.GetIssue(), comment)
  File "/b/infra_internal/commit_queue/workdir/tools/depot_tools/rietveld.py",
line 262, in add_comment
    ('no_redirect', 'True')])
  File "/b/infra_internal/commit_queue/workdir/tools/depot_tools/rietveld.py",
line 396, in post
    return self._send(request_path, payload=body, content_type=ctype, **kwargs)
  File "/b/infra_internal/commit_queue/workdir/tools/depot_tools/rietveld.py",
line 421, in _send
    result = self.rpc_server.Send(request_path, **kwargs)
  File
"/b/infra_internal/commit_queue/workdir/tools/depot_tools/third_party/upload.py",
line 460, in Send
    f = self.opener.open(req, timeout=70)
  File "/usr/lib/python2.7/urllib2.py", line 410, in open
    response = meth(req, response)
  File "/usr/lib/python2.7/urllib2.py", line 523, in http_response
    'http', request, response, code, msg, hdrs)
  File "/usr/lib/python2.7/urllib2.py", line 448, in error
    return self._call_chain(*args)
  File "/usr/lib/python2.7/urllib2.py", line 382, in _call_chain
    result = func(*args)
  File "/usr/lib/python2.7/urllib2.py", line 531, in http_error_default
    raise HTTPError(req.get_full_url(), code, msg, hdrs, fp)
urllib2.HTTPError: HTTP Error 403: Forbidden
Sending crash report ...
  args: ['/b/infra_internal/commit_queue/workdir/tools/depot_tools/git_cl.py',
'land', '-f']
  cwd: /b/infra_internal/commit_queue/workdir/tools/depot
  exception: HTTP Error 403: Forbidden
Headers: content-type: t
  host: cq.golo.chromium.org
  stack:   File "/b/infra_internal/commit_queue/workdir/too
  user: chrome-bot
  version: 2.7.6 (default, Mar 22 2014, 22:59:56) 
[GCC 4.8.2
A stack trace has been sent to the maintainers.
FAILURE: git-cl land ok


Presubmit checks took 172.7s to calculate.

[rmistry, 2015-03-03 12:39:09]

These presubmit errors seem unrelated. Landing manually.

[rmistry, 2015-03-03 12:46:35]

The CQ bit was checked by rmistry@google.com

[commit-bot: I haz the power, 2015-03-03 12:47:53]

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

[commit-bot: I haz the power, 2015-03-03 12:48:09]

Committed patchset #2 (id:40001) as
http://src.chromium.org/viewvc/chrome?view=rev&revision=294303