Warn before uploading more than one commit to Gerrit.

Warn before uploading more than one commit to Gerrit.

BUG=none

Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=267480

[Bernhard Bauer, 2014-04-24 17:44:16]

Please review. Thanks!

[Bernhard Bauer, 2014-04-28 17:14:48]

Ping? :)

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

lgtm

https://codereview.chromium.org/259523006/diff/1/git_cl.py
File git_cl.py (right):

https://codereview.chromium.org/259523006/diff/1/git_cl.py#newcode1496
git_cl.py:1496: 'to see which commits will be uploaded: ' % len(commits))
you may also want to advise the potential use of `git squash-branch`, which does
what it sounds like.

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

https://codereview.chromium.org/259523006/diff/1/git_cl.py
File git_cl.py (right):

https://codereview.chromium.org/259523006/diff/1/git_cl.py#newcode1493
git_cl.py:1493: commits = RunGit(['rev-list', '%s/%s..' % (remote,
branch)]).splitlines()
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:38]

https://codereview.chromium.org/259523006/diff/1/git_cl.py
File git_cl.py (right):

https://codereview.chromium.org/259523006/diff/1/git_cl.py#newcode1493
git_cl.py:1493: commits = RunGit(['rev-list', '%s/%s..' % (remote,
branch)]).splitlines()
On 2014/04/28 21:02:20, iannucci wrote:
> Actually, I think this should be `git_common.get_or_create_merge_base()..` .
> Does the cl object have a 'base commit' notion?

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.

https://codereview.chromium.org/259523006/diff/1/git_cl.py#newcode1496
git_cl.py:1496: 'to see which commits will be uploaded: ' % len(commits))
On 2014/04/28 20:59:19, iannucci wrote:
> you may also want to advise the potential use of `git squash-branch`, which
does
> what it sounds like.

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.

[Bernhard Bauer, 2014-05-01 08:17:42]

The CQ bit was checked by bauerb@chromium.org

[commit-bot: I haz the power, 2014-05-01 08:17:55]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/bauerb@chromium.org/259523006/20001

[commit-bot: I haz the power, 2014-05-01 08:19:31]

Change committed as 267480