git cl checkout: implement for Gerrit + add test.

git_cl.py

 #!/usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # Copyright (C) 2008 Evan Martin <martine@danga.com>
 
 """A git-command for integrating reviews on Rietveld and Gerrit."""
 
 from distutils.version import LooseVersion
@@ skipping 1350 matching lines @@
     raise NotImplementedError()
 
   def FetchDescription(self):
     """Fetches and returns description from the codereview server."""
     raise NotImplementedError()
 
   def GetCodereviewServerSetting(self):
     """Returns git config setting for the codereview server."""
     raise NotImplementedError()
 
-  @staticmethod
-  def IssueSetting(branch):
+  @classmethod
+  def IssueSetting(cls, branch):
+    return 'branch.%s.%s' % (branch, cls.IssueSettingPrefix())
+
+  @classmethod
+  def IssueSettingPrefix(cls):
     """Returns name of git config setting which stores issue number for a given
     branch."""
     raise NotImplementedError()
 
   def PatchsetSetting(self):
     """Returns name of git config setting which stores issue number."""
     raise NotImplementedError()
 
   def GetRieveldObjForPresubmit(self):
     # This is an unfortunate Rietveld-embeddedness in presubmit.
@@ skipping 186 matching lines @@
 
   def RpcServer(self):
     """Returns an upload.RpcServer() to access this review's rietveld instance.
     """
     if not self._rpc_server:
       self._rpc_server = rietveld.CachingRietveld(
           self.GetCodereviewServer(),
           self._auth_config or auth.make_auth_config())
     return self._rpc_server
 
-  @staticmethod
-  def IssueSetting(branch):
-    return 'branch.%s.rietveldissue' % branch
+  @classmethod
+  def IssueSettingPrefix(cls):
+    return 'rietveldissue'
 
   def PatchsetSetting(self):
     """Return the git setting that stores this change's most recent patchset."""
     return 'branch.%s.rietveldpatchset' % self.GetBranch()
 
   def GetCodereviewServerSetting(self):
     """Returns the git setting that stores this change's rietveld server."""
     branch = self.GetBranch()
     if branch:
       return 'branch.%s.rietveldserver' % branch
@@ skipping 118 matching lines @@
             self._gerrit_host = urlparse.urlparse(self._gerrit_server).netloc
       if not self._gerrit_server:
         # We assume repo to be hosted on Gerrit, and hence Gerrit server
         # has "-review" suffix for lowest level subdomain.
         parts = urlparse.urlparse(self.GetRemoteUrl()).netloc.split('.')
         parts[0] = parts[0] + '-review'
         self._gerrit_host = '.'.join(parts)
         self._gerrit_server = 'https://%s' % self._gerrit_host
     return self._gerrit_server
 
-  @staticmethod
-  def IssueSetting(branch):
-    return 'branch.%s.gerritissue' % branch
+  @classmethod
+  def IssueSettingPrefix(cls):
+    return 'gerritissue'
 
   def PatchsetSetting(self):
     """Return the git setting that stores this change's most recent patchset."""
     return 'branch.%s.gerritpatchset' % self.GetBranch()
 
   def GetCodereviewServerSetting(self):
     """Returns the git setting that stores this change's Gerrit server."""
     branch = self.GetBranch()
     if branch:
       return 'branch.%s.gerritserver' % branch
@@ skipping 2792 matching lines @@
     for gn_diff_file in gn_diff_files:
       stdout = RunCommand(cmd + [gn_diff_file], cwd=top_dir)
       if opts.diff:
         sys.stdout.write(stdout)
 
   return return_value
 
 
 @subcommand.usage('<codereview url or issue id>')
 def CMDcheckout(parser, args):
-  """Checks out a branch associated with a given Rietveld issue."""
-  # TODO(tandrii): consider adding this for Gerrit?
+  """Checks out a branch associated with a given Rietveld or Gerrit issue."""
   _, args = parser.parse_args(args)
 
   if len(args) != 1:
     parser.print_help()
     return 1
 
   issue_arg = ParseIssueNumberArgument(args[0])
   if not issue_arg.valid:
     parser.print_help()
     return 1
   target_issue = str(issue_arg.issue)
 
-  key_and_issues = [x.split() for x in RunGit(
-      ['config', '--local', '--get-regexp', r'branch\..*\.rietveldissue'])
-      .splitlines()]
+  def find_issues(issueprefix):
+    key_and_issues = [x.split() for x in RunGit(
+        ['config', '--local', '--get-regexp', r'branch\..*\.%s' % issueprefix])
+        .splitlines()]
+    for key, issue in key_and_issues:
+      if issue == target_issue:
+        yield re.sub(r'branch\.(.*)\.%s' % issueprefix, r'\1', key)
+
   branches = []
-  for key, issue in key_and_issues:
-    if issue == target_issue:
-      branches.append(re.sub(r'branch\.(.*)\.rietveldissue', r'\1', key))
-
+  for cls in _CODEREVIEW_IMPLEMENTATIONS.values():
+    branches.extend(find_issues(cls.IssueSettingPrefix()))
   if len(branches) == 0:
     print 'No branch found for issue %s.' % target_issue
     return 1
   if len(branches) == 1:
     RunGit(['checkout', branches[0]])
   else:
     print 'Multiple branches match issue %s:' % target_issue
     for i in range(len(branches)):
       print '%d: %s' % (i, branches[i])
     which = raw_input('Choose by index: ')
@@ skipping 61 matching lines @@
 if __name__ == '__main__':
   # These affect sys.stdout so do it outside of main() to simplify mocks in
   # unit testing.
   fix_encoding.fix_encoding()
   setup_color.init()
   try:
     sys.exit(main(sys.argv[1:]))
   except KeyboardInterrupt:
     sys.stderr.write('interrupted\n')
     sys.exit(1)