mirror of
https://github.com/facebook/sapling.git
synced 2024-10-10 00:45:18 +03:00
b3ac6d2456
When navigating through a patch series by qpushing and qpopping it was easy to get lost because qpop was silent. I found myself often running qnext after qpop to see which patch I just dropped - especially if I was about to qrm it. This patch makes qpop more symmetric to qpush by showing which patches are applied/"unapplied". I think it is a good change even though it changes output by adding a new line of output.
33 lines
813 B
Plaintext
33 lines
813 B
Plaintext
adding foo
|
|
% test qpush on empty series
|
|
no patches in series
|
|
popping bad-patch
|
|
popping patch2
|
|
popping patch1
|
|
patch queue now empty
|
|
applying patch1
|
|
applying patch2
|
|
applying bad-patch
|
|
transaction abort!
|
|
rollback completed
|
|
cleaning up working directory...done
|
|
abort: decoding near 'é': 'ascii' codec can't decode byte 0xe9 in position 0: ordinal not in range(128)!
|
|
changeset: 0:bbd179dfa0a7
|
|
tag: tip
|
|
user: test
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
summary: add foo
|
|
|
|
% bar should be gone; other unknown/ignored files should still be around
|
|
? untracked-file
|
|
I .hgignore
|
|
C foo
|
|
% preparing qpush of a missing patch
|
|
no patches applied
|
|
applying patch1
|
|
now at: patch1
|
|
% now we expect the push to fail, but it should NOT complain about patch1
|
|
applying patch2
|
|
unable to read patch2
|
|
now at: patch1
|