Revert of git cl: refactor Changelist codereview detection. (patchset #4 id:60001 of https://codereview.chromium.org/1830923002/ )
Reason for revert:
broke presubmit
Original issue's description:
> git cl: refactor Changelist codereview detection.
>
> BUG=579160
>
> Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=299464
TBR=sergiyb@chromium.org,machenbach@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=579160,597638
Review URL: https://codereview.chromium.org/1826203003
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@299475 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/git_cl.py b/git_cl.py
index 15f44a9..98a2f01 100755
--- a/git_cl.py
+++ b/git_cl.py
@@ -894,22 +894,27 @@
assert codereview in ('rietveld', 'gerrit')
return
- # Automatic selection based on issue number set for a current branch.
- # Rietveld takes precedence over Gerrit.
+ # Automatic selection.
assert not self.issue
- # Whether we find issue or not, we are doing the lookup.
- self.lookedup_issue = True
- for cls in [_RietveldChangelistImpl, _GerritChangelistImpl]:
- setting = cls.IssueSetting(self.GetBranch())
- issue = RunGit(['config', setting], error_ok=True).strip()
- if issue:
- self._codereview_impl = cls(self, **kwargs)
- self.issue = int(issue)
- return
+ # Check if this branch is associated with Rietveld => Rieveld.
+ self._codereview_impl = _RietveldChangelistImpl(self, **kwargs)
+ if self.GetIssue(force_lookup=True):
+ return
- # No issue is set for this branch, so decide based on repo-wide settings.
- return self._load_codereview_impl(
- codereview='gerrit' if settings.GetIsGerrit() else 'rietveld')
+ tmp_rietveld = self._codereview_impl # Save Rietveld object.
+
+ # Check if this branch has Gerrit issue associated => Gerrit.
+ self._codereview_impl = _GerritChangelistImpl(self, **kwargs)
+ if self.GetIssue(force_lookup=True):
+ return
+
+ # OK, no issue is set for this branch.
+ # If Gerrit is set repo-wide => Gerrit.
+ if settings.GetIsGerrit():
+ return
+
+ self._codereview_impl = tmp_rietveld
+ return
def GetCCList(self):
@@ -1126,11 +1131,10 @@
cwd=url).strip()
return url
- def GetIssue(self):
+ def GetIssue(self, force_lookup=False):
"""Returns the issue number as a int or None if not set."""
- if self.issue is None and not self.lookedup_issue:
- issue = RunGit(['config',
- self._codereview_impl.IssueSetting(self.GetBranch())],
+ if force_lookup or (self.issue is None and not self.lookedup_issue):
+ issue = RunGit(['config', self._codereview_impl.IssueSetting()],
error_ok=True).strip()
self.issue = int(issue) or None if issue else None
self.lookedup_issue = True
@@ -1176,7 +1180,7 @@
def SetIssue(self, issue=None):
"""Set this branch's issue. If issue isn't given, clears the issue."""
- issue_setting = self._codereview_impl.IssueSetting(self.GetBranch())
+ issue_setting = self._codereview_impl.IssueSetting()
codereview_setting = self._codereview_impl.GetCodereviewServerSetting()
if issue:
self.issue = issue
@@ -1308,10 +1312,8 @@
"""Returns git config setting for the codereview server."""
raise NotImplementedError()
- @staticmethod
- def IssueSetting(branch):
- """Returns name of git config setting which stores issue number for a given
- branch."""
+ def IssueSetting(self):
+ """Returns name of git config setting which stores issue number."""
raise NotImplementedError()
def PatchsetSetting(self):
@@ -1496,9 +1498,9 @@
self._auth_config or auth.make_auth_config())
return self._rpc_server
- @staticmethod
- def IssueSetting(branch):
- return 'branch.%s.rietveldissue' % branch
+ def IssueSetting(self):
+ """Return the git setting that stores this change's issue."""
+ return 'branch.%s.rietveldissue' % self.GetBranch()
def PatchsetSetting(self):
"""Return the git setting that stores this change's most recent patchset."""
@@ -1548,9 +1550,9 @@
self._gerrit_server = 'https://%s' % self._gerrit_host
return self._gerrit_server
- @staticmethod
- def IssueSetting(branch):
- return 'branch.%s.gerritissue' % branch
+ def IssueSetting(self):
+ """Return the git setting that stores this change's issue."""
+ return 'branch.%s.gerritissue' % self.GetBranch()
def PatchsetSetting(self):
"""Return the git setting that stores this change's most recent patchset."""