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

Review-Url: https://codereview.chromium.org/1847693004

git-svn-id: fd409f4bdeea2bb50a5d34bb4d4bfc2046a5a3dd@300369 0039d316-1c4b-4281-b951-d872f2087c98

primiano/depot_tools,CoherentLabs/depot_tools,primiano/depot_tools,CoherentLabs/depot_tools,primiano/depot_tools