Fix hanging issue with git map-branches.

Fix hanging issue with git map-branches.

This CL fixes an issue where map branches would hang when trying to
retrieve a deleted issue due to a long timeout. This has been fixed by
reducing the timeout.

This CL also fixes a small issue where {NO_UPSTREAM} would show the
current branch's codereview URL.

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

[calamity, 2016-03-31 03:21:22]

calamity@chromium.org changed reviewers:
+ mgiuca@chromium.org

[Matt Giuca, 2016-03-31 03:27:20]

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

https://codereview.chromium.org/1847693004/diff/1/git_cl.py#newcode1701
git_cl.py:1701: def get_cl_statuses(
Is this only used by git-map-branches? I'm a bit concerned about changing the
behaviour for other commands (reducing the timeout could mean other things that
used to work but take awhile now don't work).

If it's just map-branches then it's fine.

https://codereview.chromium.org/1847693004/diff/1/git_cl.py#newcode1703
git_cl.py:1703: """Returns a blocking iterable of (branch, issue, color) for
given branches.
Is 'color' a string containing a code like "waiting" or "error"? That's what it
looks like from the code below. That should probably be renamed from 'color' to
'status' and give a brief description of what 'status' could be. 'color' is a
presentation detail.

https://codereview.chromium.org/1847693004/diff/1/git_cl.py#newcode1719
git_cl.py:1719: def fetch(branch):
This should be at the top of the function (style).

https://codereview.chromium.org/1847693004/diff/1/git_cl.py#newcode1721
git_cl.py:1721: return None
Blank line after return.

[calamity, 2016-04-01 03:42:24]

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

https://codereview.chromium.org/1847693004/diff/1/git_cl.py#newcode1701
git_cl.py:1701: def get_cl_statuses(
On 2016/03/31 03:27:20, Matt Giuca wrote:
> Is this only used by git-map-branches? I'm a bit concerned about changing the
> behaviour for other commands (reducing the timeout could mean other things
that
> used to work but take awhile now don't work).
> 
> If it's just map-branches then it's fine.

It's just map-branches.

https://codereview.chromium.org/1847693004/diff/1/git_cl.py#newcode1703
git_cl.py:1703: """Returns a blocking iterable of (branch, issue, color) for
given branches.
On 2016/03/31 03:27:20, Matt Giuca wrote:
> Is 'color' a string containing a code like "waiting" or "error"? That's what
it
> looks like from the code below. That should probably be renamed from 'color'
to
> 'status' and give a brief description of what 'status' could be. 'color' is a
> presentation detail.

Yeah, it's actually a status. It's documented in GetStatus.

https://codereview.chromium.org/1847693004/diff/1/git_cl.py#newcode1719
git_cl.py:1719: def fetch(branch):
On 2016/03/31 03:27:20, Matt Giuca wrote:
> This should be at the top of the function (style).

I miss the lambda already.

https://codereview.chromium.org/1847693004/diff/1/git_cl.py#newcode1721
git_cl.py:1721: return None
On 2016/03/31 03:27:20, Matt Giuca wrote:
> Blank line after return.

Done.

[Matt Giuca, 2016-04-01 03:52:04]

lgtm with a final nit.

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

https://codereview.chromium.org/1847693004/diff/20001/git_cl.py#newcode1741
git_cl.py:1741: fetched_branches.add(row[0])
Move the last two lines out of the try block.

[calamity, 2016-04-28 21:43:47]

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

[calamity, 2016-04-28 21:43:48]

+iannucci for OWNERS.

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

https://codereview.chromium.org/1847693004/diff/20001/git_cl.py#newcode1741
git_cl.py:1741: fetched_branches.add(row[0])
On 2016/04/01 03:52:04, Matt Giuca wrote:
> Move the last two lines out of the try block.

Done.

[iannucci, 2016-04-29 19:04:36]

lgtm

[calamity, 2016-04-29 20:13:07]

The CQ bit was checked by calamity@chromium.org

[calamity, 2016-04-29 20:13:07]

The patchset sent to the CQ was uploaded after l-g-t-m from mgiuca@chromium.org
Link to the patchset: https://codereview.chromium.org/1847693004/#ps40001
(title: "address comment")

[commit-bot: I haz the power, 2016-04-29 20:13:13]

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

[commit-bot: I haz the power, 2016-04-29 20:15:54]

Description was changed from

==========
Fix hanging issue with git map-branches.

This CL fixes an issue where map branches would hang when trying to
retrieve a deleted issue due to a long timeout. This has been fixed by
reducing the timeout.

This CL also fixes a small issue where {NO_UPSTREAM} would show the
current branch's codereview URL.

BUG=470765
==========

to

==========
Fix hanging issue with git map-branches.

This CL fixes an issue where map branches would hang when trying to
retrieve a deleted issue due to a long timeout. This has been fixed by
reducing the timeout.

This CL also fixes a small issue where {NO_UPSTREAM} would show the
current branch's codereview URL.

BUG=470765

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

[commit-bot: I haz the power, 2016-04-29 20:15:55]

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