Abort `git cl push` if pushing into a local branch.

Abort `git cl push` if pushing into a local branch.

R=agable@chromium.org, szager@chromium.org
BUG=338102
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=263202

[iannucci, 2014-04-11 05:47:59]

(tiny review) PTAL for wording.

[szager1, 2014-04-11 05:50:16]

lgtm

[iannucci, 2014-04-11 05:55:16]

The CQ bit was checked by iannucci@chromium.org

[commit-bot: I haz the power, 2014-04-11 05:55:23]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/iannucci@chromium.org/224863006/20001

[commit-bot: I haz the power, 2014-04-11 05:56:59]

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

[commit-bot: I haz the power, 2014-04-11 05:56:59]

Presubmit check for 224863006-20001 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/git_cl_test.py (0.49s) failed
.ERROR:root:@10  Expected: (['git', 'rev-list', '--merges', '--grep=^SVN changes
up to revision [0-9]*$', 'refs/remotes/origin/master^!'],)   Actual: (['git',
'config', 'branch.working.merge'],)
FERROR:root:@10  Expected: (['git', 'rev-list', '--merges', '--grep=^SVN changes
up to revision [0-9]*$', 'refs/remotes/origin/master^!'],)   Actual: (['git',
'config', 'branch.working.merge'],)
F...ERROR: Gerrit commit-msg hook not available.
...........
======================================================================
FAIL: test_dcommit (__main__.TestGitCl)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "tests/git_cl_test.py", line 517, in test_dcommit
    git_cl.main(['dcommit'])
  File "/b/infra_internal/commit_queue/workdir/tools/depot_tools/git_cl.py",
line 2552, 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 2000, in CMDdcommit
    return SendUpstream(parser, args, 'dcommit')
  File "/b/infra_internal/commit_queue/workdir/tools/depot_tools/git_cl.py",
line 1783, in SendUpstream
    args = [cl.GetUpstreamBranch()]
  File "/b/infra_internal/commit_queue/workdir/tools/depot_tools/git_cl.py",
line 560, in GetUpstreamBranch
    remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
  File "/b/infra_internal/commit_queue/workdir/tools/depot_tools/git_cl.py",
line 521, in FetchUpstreamTuple
    error_ok=True).strip()
  File "/b/infra_internal/commit_queue/workdir/tools/depot_tools/git_cl.py",
line 91, in RunGit
    return RunCommand(['git'] + args, **kwargs)
  File "/b/infra_internal/commit_queue/workdir/tools/depot_tools/git_cl.py",
line 79, in RunCommand
    return subprocess2.check_output(args, shell=False, **kwargs)
  File "tests/git_cl_test.py", line 111, in _mocked_call
    self.fail(msg)
AssertionError: @10  Expected: (['git', 'rev-list', '--merges', '--grep=^SVN
changes up to revision [0-9]*$', 'refs/remotes/origin/master^!'],)   Actual:
(['git', 'config', 'branch.working.merge'],)

======================================================================
FAIL: test_dcommit_bypass_hooks (__main__.TestGitCl)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "tests/git_cl_test.py", line 524, in test_dcommit_bypass_hooks
    git_cl.main(['dcommit', '--bypass-hooks'])
  File "/b/infra_internal/commit_queue/workdir/tools/depot_tools/git_cl.py",
line 2552, 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 2000, in CMDdcommit
    return SendUpstream(parser, args, 'dcommit')
  File "/b/infra_internal/commit_queue/workdir/tools/depot_tools/git_cl.py",
line 1783, in SendUpstream
    args = [cl.GetUpstreamBranch()]
  File "/b/infra_internal/commit_queue/workdir/tools/depot_tools/git_cl.py",
line 560, in GetUpstreamBranch
    remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
  File "/b/infra_internal/commit_queue/workdir/tools/depot_tools/git_cl.py",
line 521, in FetchUpstreamTuple
    error_ok=True).strip()
  File "/b/infra_internal/commit_queue/workdir/tools/depot_tools/git_cl.py",
line 91, in RunGit
    return RunCommand(['git'] + args, **kwargs)
  File "/b/infra_internal/commit_queue/workdir/tools/depot_tools/git_cl.py",
line 79, in RunCommand
    return subprocess2.check_output(args, shell=False, **kwargs)
  File "tests/git_cl_test.py", line 111, in _mocked_call
    self.fail(msg)
AssertionError: @10  Expected: (['git', 'rev-list', '--merges', '--grep=^SVN
changes up to revision [0-9]*$', 'refs/remotes/origin/master^!'],)   Actual:
(['git', 'config', 'branch.working.merge'],)

----------------------------------------------------------------------
Ran 17 tests in 0.053s

FAILED (failures=2)
Using 50% similarity for rename/copy detection. Override with --similarity.
Using 50% similarity for rename/copy detection. Override with --similarity.
Using 50% similarity for rename/copy detection. Override with --similarity.
Using 50% similarity for rename/copy detection. Override with --similarity.
Using 50% similarity for rename/copy detection. Override with --similarity.
Using 50% similarity for rename/copy detection. Override with --similarity.
Using 50% similarity for rename/copy detection. Override with --similarity.
Note: Saving similarity of 70% in git config.
Using 70% similarity for rename/copy detection. Override with --similarity.
Using 50% similarity for rename/copy detection. Override with --similarity.
Using 50% similarity for rename/copy detection. Override with --similarity.
Using 50% similarity for rename/copy detection. Override with --similarity.
Using 50% similarity for rename/copy detection. Override with --similarity.
Using 50% similarity for rename/copy detection. Override with --similarity.
Using 50% similarity for rename/copy detection. Override with --similarity.


submit-from-new-dir.sh failed
Command
/b/infra_internal/commit_queue/workdir/tools/depot_tools/tests/submit-from-new-dir.sh
returned non-zero exit status 1 in
/b/infra_internal/commit_queue/workdir/tools/depot_tools/tests
Setting up test SVN repo...
Setting up test git-svn repo...
TESTING: upload succeeds
TESTING: git-cl dcommits ok
Using 50% similarity for rename/copy detection. Override with --similarity.

Attempting to push branch 'new' into another local branch!

Either reparent this branch on top of origin/master:
  git reparent-branch --root

OR run `git rebase-update` if you think the parent branch is already
committed.

  Current parent: 'refs/remotes/origin/trunk'
FAILURE: git-cl dcommits ok


submodule-merge-test.sh failed
Command
/b/infra_internal/commit_queue/workdir/tools/depot_tools/tests/submodule-merge-test.sh
returned non-zero exit status 1 in
/b/infra_internal/commit_queue/workdir/tools/depot_tools/tests
Setting up test SVN repo...
Setting up test remote git-svn-submodule repo...
Switched to branch 'master'
TESTING: dcommitted code
Using 50% similarity for rename/copy detection. Override with --similarity.

Attempting to push branch 'work' into another local branch!

Either reparent this branch on top of origin/master:
  git reparent-branch --root

OR run `git rebase-update` if you think the parent branch is already
committed.

  Current parent: 'refs/heads/master'
FAILURE: dcommitted code


post-dcommit-hook-test.sh failed
Command
/b/infra_internal/commit_queue/workdir/tools/depot_tools/tests/post-dcommit-hook-test.sh
returned non-zero exit status 1 in
/b/infra_internal/commit_queue/workdir/tools/depot_tools/tests
Setting up test SVN repo...
Setting up test git-svn repo...
TESTING: dcommitted code
Using 50% similarity for rename/copy detection. Override with --similarity.

Attempting to push branch 'work' into another local branch!

Either reparent this branch on top of origin/master:
  git reparent-branch --root

OR run `git rebase-update` if you think the parent branch is already
committed.

  Current parent: 'refs/heads/master'
FAILURE: dcommitted code


basic.sh failed
Command /b/infra_internal/commit_queue/workdir/tools/depot_tools/tests/basic.sh
returned non-zero exit status 1 in
/b/infra_internal/commit_queue/workdir/tools/depot_tools/tests
Setting up test SVN repo...
Setting up test git-svn 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   1832 --:--:-- --:--:-- --:--:--  1878
TESTING: git-cl dcommits ok
Using 50% similarity for rename/copy detection. Override with --similarity.

Attempting to push branch 'work' into another local branch!

Either reparent this branch on top of origin/master:
  git reparent-branch --root

OR run `git rebase-update` if you think the parent branch is already
committed.

  Current parent: 'refs/remotes/origin/trunk'
FAILURE: git-cl dcommits ok


Presubmit checks took 93.4s to calculate.

[iannucci, 2014-04-11 06:18:25]

The CQ bit was checked by iannucci@chromium.org

[commit-bot: I haz the power, 2014-04-11 06:18:32]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/iannucci@chromium.org/224863006/40001

[commit-bot: I haz the power, 2014-04-11 06:19:54]

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

[commit-bot: I haz the power, 2014-04-11 06:19:54]

Presubmit check for 224863006-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 **
submit-from-new-dir.sh failed
Command
/b/infra_internal/commit_queue/workdir/tools/depot_tools/tests/submit-from-new-dir.sh
returned non-zero exit status 1 in
/b/infra_internal/commit_queue/workdir/tools/depot_tools/tests
Setting up test SVN repo...
Setting up test git-svn repo...
fatal: Cannot update paths and switch to branch 'new' at the same time.
Did you intend to checkout 'origin/master' which can not be resolved as commit?


submodule-merge-test.sh failed
Command
/b/infra_internal/commit_queue/workdir/tools/depot_tools/tests/submodule-merge-test.sh
returned non-zero exit status 1 in
/b/infra_internal/commit_queue/workdir/tools/depot_tools/tests
Setting up test SVN repo...
Setting up test remote git-svn-submodule repo...
Switched to branch 'master'
TESTING: dcommitted code
Using 50% similarity for rename/copy detection. Override with --similarity.

Attempting to push branch 'work' into another local branch!

Either reparent this branch on top of origin/master:
  git reparent-branch --root

OR run `git rebase-update` if you think the parent branch is already
committed.

  Current parent: 'refs/heads/master'
FAILURE: dcommitted code


post-dcommit-hook-test.sh failed
Command
/b/infra_internal/commit_queue/workdir/tools/depot_tools/tests/post-dcommit-hook-test.sh
returned non-zero exit status 1 in
/b/infra_internal/commit_queue/workdir/tools/depot_tools/tests
Setting up test SVN repo...
Setting up test git-svn repo...
TESTING: dcommitted code
Using 50% similarity for rename/copy detection. Override with --similarity.

Attempting to push branch 'work' into another local branch!

Either reparent this branch on top of origin/master:
  git reparent-branch --root

OR run `git rebase-update` if you think the parent branch is already
committed.

  Current parent: 'refs/heads/master'
FAILURE: dcommitted code


basic.sh failed
Command /b/infra_internal/commit_queue/workdir/tools/depot_tools/tests/basic.sh
returned non-zero exit status 1 in
/b/infra_internal/commit_queue/workdir/tools/depot_tools/tests
Setting up test SVN repo...
Setting up test git-svn 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   1857 --:--:-- --:--:-- --:--:--  1925
TESTING: git-cl dcommits ok
Using 50% similarity for rename/copy detection. Override with --similarity.

Attempting to push branch 'work' into another local branch!

Either reparent this branch on top of origin/master:
  git reparent-branch --root

OR run `git rebase-update` if you think the parent branch is already
committed.

  Current parent: 'refs/remotes/origin/trunk'
FAILURE: git-cl dcommits ok


Presubmit checks took 79.7s to calculate.

[iannucci, 2014-04-11 09:31:15]

The CQ bit was checked by iannucci@chromium.org

[commit-bot: I haz the power, 2014-04-11 09:31:17]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/iannucci@chromium.org/224863006/60001

[commit-bot: I haz the power, 2014-04-11 09:32:57]

Change committed as 263202