Allow branch name to be the same as directory name for "git cl diff"

Allow branch name to be the same as directory name for "git cl diff"

Remove the ambiguity between revision and filename (or directory name)
when using command "git cl diff".

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

[wychen, 2015-01-31 01:11:31]

wychen@chromium.org changed reviewers:
+ sbc@chromium.org

[wychen, 2015-01-31 01:11:31]

PTAL

[Sam Clegg, 2015-01-31 01:13:33]

lgtm

[wychen, 2015-02-02 15:04:37]

wychen@chromium.org changed reviewers:
+ dpranke+depot_tools@chromium.org

[wychen, 2015-02-02 15:04:37]

Minor change to fit coding style. PTAL.

[iannucci, 2015-02-02 15:54:51]

iannucci@chromium.org changed reviewers:
+ iannucci@chromium.org

[iannucci, 2015-02-02 15:54:52]

lgtm

https://codereview.chromium.org/889093002/diff/20001/git_cl.py
File git_cl.py (right):

https://codereview.chromium.org/889093002/diff/20001/git_cl.py#newcode2788
git_cl.py:2788: # Switch back to starting brand and diff against the temporary
could you fix s/brand/branch too?

[wychen, 2015-02-02 16:27:32]

Fixed spelling. Will be landed soon.

https://codereview.chromium.org/889093002/diff/20001/git_cl.py
File git_cl.py (right):

https://codereview.chromium.org/889093002/diff/20001/git_cl.py#newcode2788
git_cl.py:2788: # Switch back to starting brand and diff against the temporary
On 2015/02/02 15:54:52, iannucci wrote:
> could you fix s/brand/branch too?

Done.

[wychen, 2015-02-02 17:18:53]

The "follow coding convention of the file" part of the change is actually wrong.
My bad. I've reverted that part.

[wychen, 2015-02-02 18:46:16]

The CQ bit was checked by wychen@chromium.org

[commit-bot: I haz the power, 2015-02-02 18:46:52]

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

[commit-bot: I haz the power, 2015-02-02 18:49:51]

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

[commit-bot: I haz the power, 2015-02-02 18:49:51]

Presubmit check for 889093002-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 (113 files) (132.45s) failed
************* Module gclient_test
W:997, 6: Redundant use of assertFalse with constant value 'unreachable code'
(redundant-unittest-assert)
W:1022, 6: Redundant use of assertFalse with constant value 'unreachable code'
(redundant-unittest-assert)


Presubmit checks took 175.1s to calculate.

[wychen, 2015-02-03 02:01:17]

The CQ bit was checked by wychen@chromium.org

[commit-bot: I haz the power, 2015-02-03 02:02:19]

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

[wychen, 2015-02-03 02:04:20]

The CQ bit was unchecked by wychen@chromium.org

[commit-bot: I haz the power, 2015-02-03 02:05:17]

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

[wychen, 2015-02-03 02:07:51]

The CQ bit was checked by wychen@chromium.org

[commit-bot: I haz the power, 2015-02-03 02:08:28]

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

[commit-bot: I haz the power, 2015-02-03 02:11:30]

Committed patchset #4 (id:60001) as
http://src.chromium.org/viewvc/chrome?view=rev&revision=293914