mirror of
https://github.com/facebook/sapling.git
synced 2024-10-07 15:27:13 +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.
58 lines
1.3 KiB
Plaintext
58 lines
1.3 KiB
Plaintext
# mq patch on an empty repo
|
|
tip: 0
|
|
No branch cache
|
|
tip: 0
|
|
No branch cache
|
|
|
|
# some regular revisions
|
|
popping p1
|
|
patch queue now empty
|
|
tip: 1
|
|
3f910abad313ff802d3a23a7529433872df9b3ae 1
|
|
3f910abad313ff802d3a23a7529433872df9b3ae bar
|
|
9539f35bdc80732cc9a3f84e46508f1ed1ec8cff foo
|
|
|
|
# add some mq patches
|
|
applying p1
|
|
now at: p1
|
|
tip: 2
|
|
3f910abad313ff802d3a23a7529433872df9b3ae 1
|
|
3f910abad313ff802d3a23a7529433872df9b3ae bar
|
|
9539f35bdc80732cc9a3f84e46508f1ed1ec8cff foo
|
|
tip: 3
|
|
3f910abad313ff802d3a23a7529433872df9b3ae 1
|
|
3f910abad313ff802d3a23a7529433872df9b3ae bar
|
|
9539f35bdc80732cc9a3f84e46508f1ed1ec8cff foo
|
|
branch foo: 3
|
|
branch bar: 2
|
|
|
|
# removing the cache
|
|
tip: 3
|
|
3f910abad313ff802d3a23a7529433872df9b3ae 1
|
|
3f910abad313ff802d3a23a7529433872df9b3ae bar
|
|
9539f35bdc80732cc9a3f84e46508f1ed1ec8cff foo
|
|
branch foo: 3
|
|
branch bar: 2
|
|
|
|
# importing rev 1 (the cache now ends in one of the patches)
|
|
tip: 3
|
|
3f910abad313ff802d3a23a7529433872df9b3ae 1
|
|
3f910abad313ff802d3a23a7529433872df9b3ae bar
|
|
9539f35bdc80732cc9a3f84e46508f1ed1ec8cff foo
|
|
branch foo: 3
|
|
branch bar: 2
|
|
qbase: 1
|
|
|
|
# detect an invalid cache
|
|
popping p2
|
|
popping p1
|
|
popping p0
|
|
patch queue now empty
|
|
applying p0
|
|
applying p1
|
|
applying p2
|
|
now at: p2
|
|
tip: 3
|
|
9539f35bdc80732cc9a3f84e46508f1ed1ec8cff 0
|
|
9539f35bdc80732cc9a3f84e46508f1ed1ec8cff foo
|