commit 81db1d50324a9f2df87c05ff7cc6d082b27db242
author Andrii Shyshkalov <tandrii@chromium.org> Thu Aug 23 02:17:41 2018 +0000
committer Commit Bot <commit-bot@chromium.org> Thu Aug 23 02:17:41 2018 +0000
tree 69fc06fa6d2cd5c7da30a1a4d1fa2389c3598703
parent 0ec9d15571fb274b817e3f0336a78bfd35b75e50

git cl: cache GetRemoteUrl result.

Sadly, this makes maintaining one test handling covering
exceptional circumstance very complex, so it was removed.

I've decoupled test that ensures that GetRemoteUrl works from
upload codepath.

R=ehmaldonado@chromium.org

Bug: 876910
Change-Id: I39de410c72d893e73492d5c3fc8f60a6ebc4f11f
Reviewed-on: https://chromium-review.googlesource.com/1186142
Reviewed-by: Ryan Tseng <hinoka@chromium.org>
Commit-Queue: Andrii Shyshkalov <tandrii@chromium.org>

git_cl.py

diff --git a/git_cl.py b/git_cl.py
index 1d29047..7ca2eb4 100755
--- a/git_cl.py
+++ b/git_cl.py
@@ -1114,6 +1114,7 @@
     self.cc = None
     self.more_cc = []
     self._remote = None
+    self._cached_remote_url = (False, None)  # (is_cached, value)
 
     self._codereview_impl = None
     self._codereview = None
@@ -1343,6 +1344,10 @@
 
     Returns None if there is no remote.
     """
+    is_cached, value = self._cached_remote_url
+    if is_cached:
+      return value
+
     remote, _ = self.GetRemoteBranch()
     url = RunGit(['config', 'remote.%s.url' % remote], error_ok=True).strip()
 
@@ -1351,6 +1356,7 @@
       url = RunGit(['config', 'remote.%s.url' % remote],
                    error_ok=True,
                    cwd=url).strip()
+    self._cached_remote_url = (True, url)
     return url
 
   def GetIssue(self):
@@ -3084,13 +3090,9 @@
           'spaces not allowed in refspec: "%s"' % refspec_suffix)
     refspec = '%s:refs/for/%s%s' % (ref_to_push, branch, refspec_suffix)
 
-    # TODO(tandrii): hack to avoid messing with tests while resolving
-    # https://crbug.com/876910. Instead, remote_url should be cached inside this
-    # class, just like GetIssue caches issue.
-    remote_url = self.GetRemoteUrl()
     try:
       push_stdout = gclient_utils.CheckCallAndFilter(
-          ['git', 'push', remote_url, refspec],
+          ['git', 'push', self.GetRemoteUrl(), refspec],
           print_stdout=True,
           # Flush after every line: useful for seeing progress when running as
           # recipe.
@@ -3134,7 +3136,7 @@
       gerrit_util.AddReviewers(
           self._GetGerritHost(),
           gerrit_util.ChangeIdentifier(
-              self._GetGerritProject(remote_url), self.GetIssue()),
+              self._GetGerritProject(), self.GetIssue()),
           reviewers, cc,
           notify=bool(options.send_mail))
 
@@ -3147,7 +3149,7 @@
       gerrit_util.SetReview(
           self._GetGerritHost(),
           gerrit_util.ChangeIdentifier(
-              self._GetGerritProject(remote_url), self.GetIssue()),
+              self._GetGerritProject(), self.GetIssue()),
           msg='Self-approving for TBR',
           labels={'Code-Review': score})