Warn before uploading more than one commit to Gerrit.

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 1471 matching lines @@
   if options.target_branch:
     branch = options.target_branch
 
   change_desc = ChangeDescription(
       options.message or CreateDescriptionFromLog(args))
   if not change_desc.description:
     print "Description is empty; aborting."
     return 1
   if CHANGE_ID not in change_desc.description:
     AddChangeIdToCommitMessage(options, args)
+
+  commits = RunGit(['rev-list', '%s/%s..' % (remote, branch)]).splitlines()

[iannucci, 2014/04/28 21:02:20]

Actually, I think this should be `git_common.get_or_create_merge_base()..` .
Does the cl object have a 'base commit' notion?

[Bernhard Bauer, 2014/04/29 08:35:39]

The problem is that Gerrit does not know about the configured merge base when it
processes the pushed commit; it will always look at the "real" merge base. I
should probably use ... though, in case upstream has additional changes not
merged in yet.

+  if len(commits) > 1:
+    print('WARNING: This will upload %d commits. Run the following command '
+          'to see which commits will be uploaded: ' % len(commits))

[iannucci, 2014/04/28 20:59:19]

you may also want to advise the potential use of `git squash-branch`, which does
what it sounds like.

[Bernhard Bauer, 2014/04/29 08:35:39]

Done.

FYI, I also have a local patch that will squash to a hidden branch and then
upload that (so you can keep the non-squashed version around). It just needs
some tests, then I'll upload it for review.

+    print('git log %s/%s..' % (remote, branch))
+    ask_for_data('About to upload; enter to confirm.')
+
   if options.reviewers:
     change_desc.update_reviewers(options.reviewers)
 
   receive_options = []
   cc = cl.GetCCList().split(',')
   if options.cc:
     cc.extend(options.cc)
   cc = filter(None, cc)
   if cc:
     receive_options += ['--cc=' + email for email in cc]
@@ skipping 1055 matching lines @@
         ('AppEngine is misbehaving and returned HTTP %d, again. Keep faith '
           'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
 
 
 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()
   sys.exit(main(sys.argv[1:]))