git cl diff: fix regression.

git cl diff: fix regression.

Reported in https://codereview.chromium.org/1852803002/#msg5.
Also some cleanup in nearby code AND fix of the git cl diff's previous behavior that actually updated local branch config with latest *uploaded* CL values. 

BUG=579182
R=machenbach@chromium.org,andybons@chromium.org
CC=servolk@chromium.org

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

[tandrii(chromium), 2016-04-07 09:13:41]

PTAL && (if lg-tm, then CQ)

[tandrii(chromium), 2016-04-07 09:16:25]

Description was changed from

==========
git cl diff: fix regression.

BUG=579182
R=machenbach@chromium.org,andybons@chromium.org
CC=servolk@chromium.org
==========

to

==========
git cl diff: fix regression.

Reported in https://codereview.chromium.org/1852803002/#msg5.
Also some cleanup in nearby code AND fix of the git cl diff's previous behavior
that actually updated local branch config with latest *uploaded* CL values. 

BUG=579182
R=machenbach@chromium.org,andybons@chromium.org
CC=servolk@chromium.org
==========

[Michael Achenbach, 2016-04-07 09:35:53]

lgtm

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

https://codereview.chromium.org/1871463003/diff/1/git_cl.py#newcode4320
git_cl.py:4320: # Update the cached branch in cl instance, to avoid overwriting
original
This could do some more information hiding.

[Michael Achenbach, 2016-04-07 09:36:46]

Test doesn't need to express this? Maybe a new test?

[Michael Achenbach, 2016-04-07 09:36:55]

The CQ bit was checked by machenbach@chromium.org

[commit-bot: I haz the power, 2016-04-07 09:37:04]

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

[commit-bot: I haz the power, 2016-04-07 09:39:40]

Description was changed from

==========
git cl diff: fix regression.

Reported in https://codereview.chromium.org/1852803002/#msg5.
Also some cleanup in nearby code AND fix of the git cl diff's previous behavior
that actually updated local branch config with latest *uploaded* CL values. 

BUG=579182
R=machenbach@chromium.org,andybons@chromium.org
CC=servolk@chromium.org
==========

to

==========
git cl diff: fix regression.

Reported in https://codereview.chromium.org/1852803002/#msg5.
Also some cleanup in nearby code AND fix of the git cl diff's previous behavior
that actually updated local branch config with latest *uploaded* CL values. 

BUG=579182
R=machenbach@chromium.org,andybons@chromium.org
CC=servolk@chromium.org

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

[commit-bot: I haz the power, 2016-04-07 09:39:41]

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