mirror of
https://github.com/facebook/sapling.git
synced 2024-10-08 15:57:43 +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.
34 lines
851 B
Plaintext
34 lines
851 B
Plaintext
% qimport non-existing-file
|
|
abort: unable to read non-existing-file
|
|
% import URL
|
|
adding url.diff to series file
|
|
url.diff
|
|
% import patch that already exists
|
|
abort: patch "url.diff" already exists
|
|
applying url.diff
|
|
now at: url.diff
|
|
foo
|
|
popping url.diff
|
|
patch queue now empty
|
|
% qimport -f
|
|
adding url.diff to series file
|
|
applying url.diff
|
|
now at: url.diff
|
|
foo2
|
|
popping url.diff
|
|
patch queue now empty
|
|
% build diff with CRLF
|
|
adding b
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
% qimport CRLF diff
|
|
adding b.diff to series file
|
|
applying b.diff
|
|
now at: b.diff
|
|
% try to import --push
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
adding another.diff to series file
|
|
applying another.diff
|
|
now at: another.diff
|
|
patch b.diff finalized without changeset message
|
|
patch another.diff finalized without changeset message
|