Fix gclient branch ref mangling and allow --force branch switches.

Fix gclient branch ref mangling and allow --force branch switches.

R=iannucci@chromium.org, maruel@chromium.org
BUG=410959
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=291883

[iannucci, 2014-09-06 20:01:29]

lgtm

https://codereview.chromium.org/549733002/diff/1/gclient_scm.py
File gclient_scm.py (right):

https://codereview.chromium.org/549733002/diff/1/gclient_scm.py#newcode570
gclient_scm.py:570: pass
pass not needed?

https://codereview.chromium.org/549733002/diff/1/gclient_scm.py#newcode573
gclient_scm.py:573: raise gclient_utils.Error(switch_error)
why not raise this directly in the else case above?

https://codereview.chromium.org/549733002/diff/1/scm.py
File scm.py (right):

https://codereview.chromium.org/549733002/diff/1/scm.py#newcode366
scm.py:366: # from the git config).
one thing we should /seriously/ consider in gclient 2.0 world is using a refspec
like

+refs/heads/*:refs/remotes/origin/heads/*
+refs/tags/*:refs/remotes/origin/tags/*

(or even +refs/*:refs/remotes/origin/*)

which would let us end this insanity. Especially since we already do weird stuff
with branch-heads.

[Michael Moss, 2014-09-08 23:58:43]

Updated tests. PTAL.

https://codereview.chromium.org/549733002/diff/1/gclient_scm.py
File gclient_scm.py (right):

https://codereview.chromium.org/549733002/diff/1/gclient_scm.py#newcode570
gclient_scm.py:570: pass
On 2014/09/06 20:01:29, iannucci wrote:
> pass not needed?

Done.

https://codereview.chromium.org/549733002/diff/1/gclient_scm.py#newcode573
gclient_scm.py:573: raise gclient_utils.Error(switch_error)
On 2014/09/06 20:01:29, iannucci wrote:
> why not raise this directly in the else case above?

That's in the options.force block, so it would never be seen without --force.

[iannucci, 2014-09-09 01:13:55]

lgtm

[Michael Moss, 2014-09-09 17:06:56]

The CQ bit was checked by mmoss@chromium.org

[commit-bot: I haz the power, 2014-09-09 17:07:29]

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

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

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

[commit-bot: I haz the power, 2014-09-09 17:09:12]

Presubmit check for 549733002-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 (20.15s) failed
..['RefToRemoteRef']
F...............
======================================================================
FAIL: testMembersChanged (__main__.GitWrapperTestCase)
----------------------------------------------------------------------
Traceback (most recent call last):
  File
"/b/infra_internal/commit_queue/workdir/tools/depot_tools/third_party/pymox/mox.py",
line 1618, in new_method
    func(self, *args, **kwargs)
  File "tests/scm_unittest.py", line 104, in testMembersChanged
    self.compareMembers(scm.GIT, members)
  File
"/b/infra_internal/commit_queue/workdir/tools/depot_tools/testing_support/super_mox.py",
line 78, in compareMembers
    self.assertEqual(actual_members, expected_members)
AssertionError: Lists differ: ['ApplyEnvVars', 'AssertVersio... !=
['ApplyEnvVars', 'AssertVersio...

First differing element 24:
RefToRemoteRef
ShortBranchName

First list contains 1 additional elements.
First extra element 26:
current_version

  ['ApplyEnvVars',
   'AssertVersion',
   'Capture',
   'CaptureStatus',
   'FetchUpstreamTuple',
   'GenerateDiff',
   'GetBlessedSha1ForSvnRev',
   'GetBranch',
   'GetBranchRef',
   'GetCheckoutRoot',
   'GetDifferentFiles',
   'GetEmail',
   'GetGitDir',
   'GetGitSvnHeadRev',
   'GetPatchName',
   'GetSVNBranch',
   'GetSha1ForSvnRev',
   'GetUpstreamBranch',
   'IsGitSvn',
   'IsInsideWorkTree',
   'IsValidRevision',
   'IsWorkTreeDirty',
   'MatchSvnGlob',
   'ParseGitSvnSha1',
-  'RefToRemoteRef',
   'ShortBranchName',
   'current_version']

----------------------------------------------------------------------
Ran 18 tests in 19.911s

FAILED (failures=1)


Presubmit checks took 99.0s to calculate.

[Michael Moss, 2014-09-09 18:07:50]

The CQ bit was checked by mmoss@chromium.org

[commit-bot: I haz the power, 2014-09-09 18:08:42]

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

[commit-bot: I haz the power, 2014-09-09 18:10:26]

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

[commit-bot: I haz the power, 2014-09-09 18:10:27]

Presubmit check for 549733002-60001 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 **
Pylint (103 files) (29.65s) failed
************* Module
/b/infra_internal/commit_queue/workdir/tools/depot_tools/tests/scm_unittest.py
C0301:138,0: Line too long (82/80)
C0301:155,0: Line too long (83/80)


Presubmit checks took 99.1s to calculate.

[Michael Moss, 2014-09-09 18:21:24]

The CQ bit was checked by mmoss@chromium.org

[commit-bot: I haz the power, 2014-09-09 18:21:50]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/mmoss@chromium.org/549733002/80001

[commit-bot: I haz the power, 2014-09-09 18:23:42]

Committed patchset #5 (id:80001) as 291883