Mercurial > evolve
changeset 6031:c3d66af4cb07
tests: show extras that are going to change in the next patch
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Mon, 30 Aug 2021 12:55:00 +0300 |
| parents | 30cde40dcd17 |
| children | 2800aa3c3dbf |
| files | tests/test-amend-merge.t tests/test-evolve-topic.t tests/test-topic-change.t tests/test-topic-stack.t |
| diffstat | 4 files changed, 17 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-amend-merge.t Mon Aug 30 12:04:33 2021 +0300 +++ b/tests/test-amend-merge.t Mon Aug 30 12:55:00 2021 +0300 @@ -25,6 +25,8 @@ (branch merge, don't forget to commit) $ hg ci -m merge + $ hg log -r . -T '{rev}: {join(extras, " ")}\n' + 3: branch=default $ hg diff -r 'p1(.)' -r '.' diff -r 88a060ab6523 -r c20705a6a8c4 banana --- /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -41,6 +43,8 @@ amend $ hg amend -m 'merge, amend' + $ hg log -r . -T '{rev}: {join(extras, " ")}\n' + 4: amend_source=[0-9a-f]+ branch=default (re) $ hg diff -r 'p1(.)' -r '.' diff -r 88a060ab6523 -r 456753fae3cd banana --- /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -58,6 +62,8 @@ $ hg metaedit -m 'merge, metaedit' 0 files updated, 0 files merged, 0 files removed, 0 files unresolved + $ hg log -r . -T '{rev}: {join(extras, " ")}\n' + 5: amend_source=[0-9a-f]+ branch=default (re) $ hg diff -r 'p1(.)' -r '.' diff -r 88a060ab6523 -r 1528d42f3e83 banana --- /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -76,6 +82,8 @@ $ hg topics -r . foo switching to topic foo changed topic on 1 changesets to "foo" + $ hg log -r . -T '{rev}: {join(extras, " ")}\n' + 6: _rewrite_noise=[0-9a-f]+ branch=default topic=foo (re) $ hg diff -r 'p1(.)' -r '.' diff -r 88a060ab6523 -r 52150b9639f7 banana --- /dev/null Thu Jan 01 00:00:00 1970 +0000
--- a/tests/test-evolve-topic.t Mon Aug 30 12:04:33 2021 +0300 +++ b/tests/test-evolve-topic.t Mon Aug 30 12:55:00 2021 +0300 @@ -250,6 +250,8 @@ $ hg topic -r 070c5573d8f9 bar 4 new orphan changesets changed topic on 1 changesets to "bar" + $ hg log -r 18 -T '{rev}: {join(extras, " ")}\n' + 18: _rewrite_noise=[0-9a-f]+ branch=default rebase_source=[0-9a-f]+ topic=bar (re) $ hg up 16d6f664b17c switching to topic bar 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
--- a/tests/test-topic-change.t Mon Aug 30 12:04:33 2021 +0300 +++ b/tests/test-topic-change.t Mon Aug 30 12:55:00 2021 +0300 @@ -302,6 +302,8 @@ active topic 'watwat' is now empty cleared topic on 1 changesets + $ hg log -r . -T '{rev}: {join(extras, " ")}\n' + 31: _rewrite_noise=[0-9a-f]+ branch=default rebase_source=[0-9a-f]+ (re) $ hg glog @ 31:c48d6d71b2d9 {} | Added h (book) @@ -334,6 +336,8 @@ $ hg topic -r . movebook switching to topic movebook changed topic on 1 changesets to "movebook" + $ hg log -r . -T '{rev}: {join(extras, " ")}\n' + 32: _rewrite_noise=[0-9a-f]+ branch=default rebase_source=[0-9a-f]+ topic=movebook (re) $ hg glog @ 32:1b83d11095b9 {movebook} | Added h (book bookboo)
--- a/tests/test-topic-stack.t Mon Aug 30 12:04:33 2021 +0300 +++ b/tests/test-topic-stack.t Mon Aug 30 12:55:00 2021 +0300 @@ -625,6 +625,9 @@ | o 0 default {} public c_a + $ hg log -r 'desc("c_D")' -T '{rev}: {join(extras, " ")}\n' + 17: _rewrite_noise=[0-9a-f]+ branch=default topic=foobar (re) + XXX: The following should show single heads XXX: The behind count is weird, because the topic are interleaved.