Warn before uploading more than one commit to Gerrit.

git_cl.py

Index: git_cl.py
diff --git a/git_cl.py b/git_cl.py
index f2f3434e3b8a8557589def595d07e6a8a826fd42..f87566246655dd4d02511adc091f71b69734961f 100755
--- a/git_cl.py
+++ b/git_cl.py
@@ -1489,6 +1489,14 @@ def GerritUpload(options, args, cl):
     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)