Warn when git cl upload might be overwriting a newer patchset.

Warn when git cl upload might be overwriting a newer patchset.


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

[koz (OOO until 15th September), 2013-03-15 03:37:07]

jeremya@ and I thought this might be useful for people working on multiple
machines.

[M-A Ruel, 2013-03-18 18:15:41]

Like the idea.

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

https://codereview.chromium.org/12646011/diff/1/git_cl.py#newcode1292
git_cl.py:1292: print 'The last upload made from this repository was patchset
#%d but ' \
Use () instead of \

[koz (OOO until 15th September), 2013-03-18 23:23:55]

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

https://codereview.chromium.org/12646011/diff/1/git_cl.py#newcode1292
git_cl.py:1292: print 'The last upload made from this repository was patchset
#%d but ' \
On 2013/03/18 18:15:41, Marc-Antoine Ruel wrote:
> Use () instead of \

Done.

[M-A Ruel, 2013-03-19 01:26:45]

https://codereview.chromium.org/12646011/diff/5001/git_cl.py
File git_cl.py (right):

https://codereview.chromium.org/12646011/diff/5001/git_cl.py#newcode1291
git_cl.py:1291: if local_patchset < latest_patchset:
The problem here is that you are comparing patchset ids and not patchset
numbers, and the ids are not guaranteed to be monotonically increasing.

[koz (OOO until 15th September), 2013-03-19 01:29:16]

https://codereview.chromium.org/12646011/diff/5001/git_cl.py
File git_cl.py (right):

https://codereview.chromium.org/12646011/diff/5001/git_cl.py#newcode1291
git_cl.py:1291: if local_patchset < latest_patchset:
On 2013/03/19 01:26:45, Marc-Antoine Ruel wrote:
> The problem here is that you are comparing patchset ids and not patchset
> numbers, and the ids are not guaranteed to be monotonically increasing.

Oh, they aren't? What if we change '<' to '!=' then, so the warning becomes
about uploading a change to an issue that has been uploaded to from somewhere
else (which is probably basically the same warning).

[M-A Ruel, 2013-04-02 20:08:54]

https://codereview.chromium.org/12646011/diff/5001/git_cl.py
File git_cl.py (right):

https://codereview.chromium.org/12646011/diff/5001/git_cl.py#newcode1291
git_cl.py:1291: if local_patchset < latest_patchset:
On 2013/03/19 01:29:16, koz wrote:
> On 2013/03/19 01:26:45, Marc-Antoine Ruel wrote:
> > The problem here is that you are comparing patchset ids and not patchset
> > numbers, and the ids are not guaranteed to be monotonically increasing.
> 
> Oh, they aren't? What if we change '<' to '!=' then, so the warning becomes
> about uploading a change to an issue that has been uploaded to from somewhere
> else (which is probably basically the same warning).

Yes please do.

[koz (OOO until 15th September), 2013-04-02 20:40:04]

https://codereview.chromium.org/12646011/diff/5001/git_cl.py
File git_cl.py (right):

https://codereview.chromium.org/12646011/diff/5001/git_cl.py#newcode1291
git_cl.py:1291: if local_patchset < latest_patchset:
On 2013/04/02 20:08:54, Marc-Antoine Ruel wrote:
> On 2013/03/19 01:29:16, koz wrote:
> > On 2013/03/19 01:26:45, Marc-Antoine Ruel wrote:
> > > The problem here is that you are comparing patchset ids and not patchset
> > > numbers, and the ids are not guaranteed to be monotonically increasing.
> > 
> > Oh, they aren't? What if we change '<' to '!=' then, so the warning becomes
> > about uploading a change to an issue that has been uploaded to from
somewhere
> > else (which is probably basically the same warning).
> 
> Yes please do.

Done.

[M-A Ruel, 2013-04-02 20:41:05]

lgtm

[commit-bot: I haz the power, 2013-04-02 20:48:14]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/koz@chromium.org/12646011/12001

[commit-bot: I haz the power, 2013-04-02 20:50:41]

Change committed as 191895

[falken, 2013-04-03 09:29:07]

On 2013/04/02 20:50:41, I haz the power (commit-bot) wrote:
> Change committed as 191895

I got an error when trying to run git-cl upload:

Traceback (most recent call last):
 File "/work/depot_tools/git_cl.py", line 1910, in <module>
   sys.exit(main(sys.argv[1:]))
 File "/work/depot_tools/git_cl.py", line 1895, in main
   return command(parser, argv[1:])
 File "/work/depot_tools/git_cl.py", line 1299, in CMDupload
   % (local_patchset, latest_patchset))
TypeError: %d format: a number is required, not NoneType

It turned out that local_patchset was None. I was working on a new branch on the
same Rietveld issue as an older branch.

[koz (OOO until 15th September), 2013-04-03 15:09:36]

On 2013/04/03 09:29:07, falken wrote:
> On 2013/04/02 20:50:41, I haz the power (commit-bot) wrote:
> > Change committed as 191895
> 
> I got an error when trying to run git-cl upload:
> 
> Traceback (most recent call last):
>  File "/work/depot_tools/git_cl.py", line 1910, in <module>
>    sys.exit(main(sys.argv[1:]))
>  File "/work/depot_tools/git_cl.py", line 1895, in main
>    return command(parser, argv[1:])
>  File "/work/depot_tools/git_cl.py", line 1299, in CMDupload
>    % (local_patchset, latest_patchset))
> TypeError: %d format: a number is required, not NoneType
> 
> It turned out that local_patchset was None. I was working on a new branch on
the
> same Rietveld issue as an older branch.

Yes, sorry about that. This has been fixed by dmikurube@ in r192050.