Add minimal Gerrit support to 'git cl config' and 'git cl upload'

git_cl.py

 #!/usr/bin/env python
 # Copyright (c) 2011 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."""
 
 import logging
@@ skipping 29 matching lines @@
 import rietveld
 import scm
 import subprocess2
 import watchlists
 
 
 DEFAULT_SERVER = 'http://codereview.appspot.com'
 POSTUPSTREAM_HOOK_PATTERN = '.git/hooks/post-cl-%s'
 DESCRIPTION_BACKUP_FILE = '~/.git_cl_description_backup'
 
+GERRIT_FETCH_URL = 'http://git.chromium.org'

[M-A Ruel, 2011/12/07 19:21:28]

No, don't hard code them. If you look again, there is nothing chromium specific
in that file.

+# Note these are assuming users have set up ~/.ssh/config stanzas
+# as recommended so that no port numbers are required.
+GERRIT_PUSH_URL = 'ssh://gerrit.chromium.org'
+GERRIT_COMMIT_HOOK = 'gerrit.chromium.org:hooks/commit-msg'
+
 
 # Initialized in main()
 settings = None
 
 
 def DieWithError(message):
   print >> sys.stderr, message
   sys.exit(1)
 
 
@@ skipping 664 matching lines @@
   SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True)
 
   if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals:
     #should be of the form
     #PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof
     #ORIGIN_URL_CONFIG: http://src.chromium.org/git
     RunGit(['config', keyvals['PUSH_URL_CONFIG'],
             keyvals['ORIGIN_URL_CONFIG']])
 
 
+def GerritConfig(options, args):
+  """Set up git config for use with Gerrit."""
+
+  # Install the standard commit-msg hook.
+  RunCommand(['scp', '-p', GERRIT_COMMIT_HOOK,
+              os.path.join('.git', 'hooks', 'commit-msg')])
+
+  # Set the standard URL mapping.
+  RunGit(['config',
+          'url.' + GERRIT_PUSH_URL + '.pushinsteadof', GERRIT_FETCH_URL])
+
+
 @usage('[repo root containing codereview.settings]')
 def CMDconfig(parser, args):
   """edit configuration for this tree"""
+  parser.add_option('-g', '--gerrit', action='store_true',

[M-A Ruel, 2011/12/07 19:21:28]

It should be automatic, no need for flags.

+                    help='Configure for Gerrit rather than Rietveld')
+  options, args = parser.parse_args(args)
 
-  _, args = parser.parse_args(args)
+  if options.gerrit:
+    return GerritConfig(options, args)
+
   if len(args) == 0:
     GetCodereviewSettingsInteractively()
     return 0
 
   url = args[0]
   if not url.endswith('codereview.settings'):
     url = os.path.join(url, 'codereview.settings')
 
   # Load code review settings and download hooks (if available).
   LoadCodereviewSettingsFromFile(urllib2.urlopen(url))
@@ skipping 107 matching lines @@
   else:
     # Default to diffing against the "upstream" branch.
     base_branch = cl.GetUpstreamBranch()
 
   cl.RunHook(committing=not options.upload, upstream_branch=base_branch,
              may_prompt=False, verbose=options.verbose,
              author=None)
   return 0
 
 
+def GerritUpload(options, args):
+  # We assume the remote called "origin" is the one we want.
+  # It's probably not worthwhile to support different workflows.

[M-A Ruel, 2011/12/07 19:21:28]

It is.

+  remote = 'origin'
+
+  branch = 'master'
+  if options.for_branch is not None:
+    branch = options.for_branch
+
+  receive_options = []
+
+  if options.cc is not None:
+    receive_options += ['--cc=' + email for email in
+                        options.cc.split(',')]
+  if options.reviewers is not None:
+    receive_options += ['--reviewer=' + email for email in
+                        options.reviewers.split(',')]
+
+  git_command = ['push']
+  if receive_options:
+    git_command.append('--receive-pack=git receive-pack ' +
+                       ' '.join(receive_options))
+  git_command += [remote, 'HEAD:refs/for/' + branch]
+
+  RunGit(git_command)
+  return 0
+
+
 @usage('[args to "git diff"]')
 def CMDupload(parser, args):
   """upload the current changelist to codereview"""
   parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
                     help='bypass upload presubmit hook')
   parser.add_option('-f', action='store_true', dest='force',
                     help="force yes to questions (don't prompt)")
   parser.add_option('-m', dest='message', help='message for patch')
   parser.add_option('-r', '--reviewers',
                     help='reviewer email addresses')
   parser.add_option('--cc',
                     help='cc email addresses')
   parser.add_option('--send-mail', action='store_true',
                     help='send email to reviewer immediately')
   parser.add_option("--emulate_svn_auto_props", action="store_true",
                     dest="emulate_svn_auto_props",
                     help="Emulate Subversion's auto properties feature.")
   parser.add_option("--desc_from_logs", action="store_true",
                     dest="from_logs",
                     help="""Squashes git commit logs into change description and
                             uses message as subject""")
   parser.add_option('-c', '--use-commit-queue', action='store_true',
                     help='tell the commit queue to commit this patchset')
+  parser.add_option('-g', '--gerrit', action='store_true',
+                    help='Send change to Gerrit rather than Rietveld')
+  parser.add_option('-b', '--for-branch',
+                    help='Gerrit branch to send change to')
   (options, args) = parser.parse_args(args)
 
+  # TODO(mcgrathr): Perhaps look at some git-config variable stored
+  # by GerritConfig to default to gerrit mode?
+  if options.gerrit and (options.bypass_hooks or
+                         options.message or
+                         options.from_logs or
+                         options.use_commit_queue):
+    print 'The --gerrit (-g) option is incompatible with most other options.'
+    return 1
+
   # Make sure index is up-to-date before running diff-index.
   RunGit(['update-index', '--refresh', '-q'], error_ok=True)
   if RunGit(['diff-index', 'HEAD']):
     print 'Cannot upload with a dirty tree.  You must commit locally first.'
     return 1
 
+  if options.gerrit:
+    return GerritUpload(options, args)
+
   cl = Changelist()
   if args:
     base_branch = args[0]
   else:
     # Default to diffing against the "upstream" branch.
     base_branch = cl.GetUpstreamBranch()
     args = [base_branch + "..."]
 
   if not options.bypass_hooks and not options.force:
     hook_results = cl.RunHook(committing=False, upstream_branch=base_branch,
@@ skipping 509 matching lines @@
              'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
 
   # Not a known command. Default to help.
   GenUsage(parser, 'help')
   return CMDhelp(parser, argv)
 
 
 if __name__ == '__main__':
   fix_encoding.fix_encoding()
   sys.exit(main(sys.argv[1:]))