Add a setting to squash Gerrit uploads by default, and a --no-squash command line option to overrid…

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."""
 
 from distutils.version import LooseVersion
@@ skipping 415 matching lines @@
   def __init__(self):
     self.default_server = None
     self.cc = None
     self.root = None
     self.is_git_svn = None
     self.svn_branch = None
     self.tree_status_url = None
     self.viewvc_url = None
     self.updated = False
     self.is_gerrit = None
+    self.squash_gerrit_uploads = None
     self.git_editor = None
     self.project = None
     self.force_https_commit_url = None
     self.pending_ref_prefix = None
 
   def LazyUpdateIfNeeded(self):
     """Updates the settings from a codereview.settings file, if available."""
     if not self.updated:
       # The only value that actually changes the behavior is
       # autoupdate = "false". Everything else means "true".
@@ skipping 145 matching lines @@
 
   def GetDefaultPrivateFlag(self):
     return self._GetRietveldConfig('private', error_ok=True)
 
   def GetIsGerrit(self):
     """Return true if this repo is assosiated with gerrit code review system."""
     if self.is_gerrit is None:
       self.is_gerrit = self._GetConfig('gerrit.host', error_ok=True)
     return self.is_gerrit
 
+  def GetSquashGerritUploads(self):
+    """Return true if uploads to Gerrit should be squashed by default."""
+    if self.squash_gerrit_uploads is None:
+      self.squash_gerrit_uploads = (
+          RunGit(['config', '--bool', 'gerrit.squash-uploads'],
+                 error_ok=True).strip() == 'true')
+    return self.squash_gerrit_uploads
+
   def GetGitEditor(self):
     """Return the editor specified in the git config, or None if none is."""
     if self.git_editor is None:
       self.git_editor = self._GetConfig('core.editor', error_ok=True)
     return self.git_editor or None
 
   def GetLintRegex(self):
     return (self._GetRietveldConfig('cpplint-regex', error_ok=True) or
             DEFAULT_LINT_REGEX)
 
@@ skipping 768 matching lines @@
               unset_error_ok=True)
   SetProperty('cpplint-ignore-regex', 'LINT_IGNORE_REGEX', unset_error_ok=True)
   SetProperty('project', 'PROJECT', unset_error_ok=True)
   SetProperty('pending-ref-prefix', 'PENDING_REF_PREFIX', unset_error_ok=True)
   SetProperty('run-post-upload-hook', 'RUN_POST_UPLOAD_HOOK',
               unset_error_ok=True)
 
   if 'GERRIT_HOST' in keyvals:
     RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']])
 
+  if 'GERRIT_SQUASH_UPLOADS' in keyvals:
+    RunGit(['config', 'gerrit.squash-uploads',
+            keyvals['GERRIT_SQUASH_UPLOADS']])
+
   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 urlretrieve(source, destination):
   """urllib is broken for SSL connections via a proxy therefore we
@@ skipping 947 matching lines @@
                     help='tell the commit queue to commit this patchset')
   parser.add_option('--private', action='store_true',
                     help='set the review private (rietveld only)')
   parser.add_option('--target_branch',
                     '--target-branch',
                     metavar='TARGET',
                     help='Apply CL to remote ref TARGET.  ' +
                          'Default: remote branch head, or master')
   parser.add_option('--squash', action='store_true',
                     help='Squash multiple commits into one (Gerrit only)')
+  parser.add_option('--no-squash', action='store_true',
+                    help='Don\'t squash multiple commits into one ' +
+                         '(Gerrit only)')
   parser.add_option('--email', default=None,
                     help='email address to use to connect to Rietveld')
   parser.add_option('--tbr-owners', dest='tbr_owners', action='store_true',
                     help='add a set of OWNERS to TBR')
   parser.add_option('-d', '--cq-dry-run', dest='cq_dry_run',
                     action='store_true',
                     help='Send the patchset to do a CQ dry run right after '
                          'upload.')
   parser.add_option('--dependencies', action='store_true',
                     help='Uploads CLs of all the local branches that depend on '
@@ skipping 63 matching lines @@
       print ('The last upload made from this repository was patchset #%d but '
             'the most recent patchset on the server is #%d.'
             % (local_patchset, latest_patchset))
       print ('Uploading will still work, but if you\'ve uploaded to this issue '
             'from another machine or branch the patch you\'re uploading now '
             'might not include those changes.')
       ask_for_data('About to upload; enter to confirm.')
 
   print_stats(options.similarity, options.find_copies, args)
   if settings.GetIsGerrit():
+    if options.squash and options.no_squash:
+      DieWithError('Can only use one of --squash or --no-squash')
+
+    options.squash = ((settings.GetSquashGerritUploads() or options.squash) and
+                      not options.no_squash)
+
     return GerritUpload(options, args, cl, change)
   ret = RietveldUpload(options, args, cl, change)
   if not ret:
     git_set_branch_value('last-upload-hash',
                          RunGit(['rev-parse', 'HEAD']).strip())
     # Run post upload hooks, if specified.
     if settings.GetRunPostUploadHook():
       presubmit_support.DoPostUploadExecuter(
           change,
           cl,
@@ skipping 1223 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()
   colorama.init()
   try:
     sys.exit(main(sys.argv[1:]))
   except KeyboardInterrupt:
     sys.stderr.write('interrupted\n')
     sys.exit(1)