Mercurial > evolve
changeset 5691:6eb9f82b43ba stable
evolve: remove spurious "working directory is now at ..." messages
The `startnode` variable was sometimes a context, which made the
comparison with `repo[b'.'].node()` in `_cleanup()` fail. This patch
fixes that by making sure that `startnode` is always a (binary)
nodeid.
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Tue, 24 Nov 2020 18:04:40 -0800 |
| parents | 35b0f8f45250 |
| children | 59b2be90e9fd |
| files | CHANGELOG hgext3rd/evolve/evolvecmd.py tests/test-evolve-content-divergent-stack.t tests/test-evolve-continue.t tests/test-evolve-issue5966.t tests/test-evolve-issue5967.t tests/test-evolve-phase.t tests/test-evolve-progress.t tests/test-evolve-public-content-divergent-discard.t tests/test-evolve-public-content-divergent-main.t tests/test-evolve-stop-orphan.t tests/test-evolve-topic.t tests/test-issue-5720.t |
| diffstat | 13 files changed, 3 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/CHANGELOG Thu Dec 24 00:52:06 2020 +0100 +++ b/CHANGELOG Tue Nov 24 18:04:40 2020 -0800 @@ -4,6 +4,8 @@ 10.1.1 -- in progress --------------------- + * evolve: remove spurious "working directory is now at ..." messages + topic: * rebase: prevent in-memory rebase to silently drop topic (by disable the feature)
--- a/hgext3rd/evolve/evolvecmd.py Thu Dec 24 00:52:06 2020 +0100 +++ b/hgext3rd/evolve/evolvecmd.py Tue Nov 24 18:04:40 2020 -0800 @@ -1592,7 +1592,7 @@ if evolvestate[b'command'] != b'evolve': evolvestate.delete() return - startnode = repo.unfiltered()[evolvestate[b'startnode']] + startnode = evolvestate[b'startnode'] if b'update' in evolvestate: shouldupdate = evolvestate[b'update'] evolvestate.delete()
--- a/tests/test-evolve-content-divergent-stack.t Thu Dec 24 00:52:06 2020 +0100 +++ b/tests/test-evolve-content-divergent-stack.t Tue Nov 24 18:04:40 2020 -0800 @@ -576,7 +576,6 @@ rebasing "divergent" content-divergent changeset c72d2885eb51 on 6c228f1e5409 rebasing "other" content-divergent changeset d45f050514c2 on 6c228f1e5409 0 files updated, 0 files merged, 0 files removed, 0 files unresolved - working directory is now at c758af982013 $ hg glog o 25:957008d45543 added d | () [default] draft
--- a/tests/test-evolve-continue.t Thu Dec 24 00:52:06 2020 +0100 +++ b/tests/test-evolve-continue.t Tue Nov 24 18:04:40 2020 -0800 @@ -69,7 +69,6 @@ $ hg evolve --continue evolving 4:c41c793e0ef1 "added d" - working directory is now at cb6a2ab625bb $ hg glog o 6:2a4e03d422e2 added d @@ -132,7 +131,6 @@ $ hg evolve --continue evolving 7:ad0a59d83efe "added e" evolution of 7:ad0a59d83efe created no changes to commit - working directory is now at 00a5c774cc37 $ hg glog @ 8:00a5c774cc37 added d
--- a/tests/test-evolve-issue5966.t Thu Dec 24 00:52:06 2020 +0100 +++ b/tests/test-evolve-issue5966.t Tue Nov 24 18:04:40 2020 -0800 @@ -92,7 +92,6 @@ R a $ hg evolve --continue evolving 2:34a690fcf6ab "banana" - working directory is now at 581a2bb4704c $ hg resolve --list evolve the rest of the stack
--- a/tests/test-evolve-issue5967.t Thu Dec 24 00:52:06 2020 +0100 +++ b/tests/test-evolve-issue5967.t Tue Nov 24 18:04:40 2020 -0800 @@ -55,7 +55,6 @@ $ hg evolve --continue evolving 1:dd9b5dd30cd6 "banana" evolution of 1:dd9b5dd30cd6 created no changes to commit - working directory is now at 4d6fec23dcc4 $ hg glog @ 2: apricot
--- a/tests/test-evolve-phase.t Thu Dec 24 00:52:06 2020 +0100 +++ b/tests/test-evolve-phase.t Tue Nov 24 18:04:40 2020 -0800 @@ -116,7 +116,6 @@ continue: hg evolve --continue $ hg evolve -c evolving 2:13833940840c "c" - working directory is now at 87495ea7c9ec $ hg glog o 4 - 3d2080c198e5 c (secret)
--- a/tests/test-evolve-progress.t Thu Dec 24 00:52:06 2020 +0100 +++ b/tests/test-evolve-progress.t Tue Nov 24 18:04:40 2020 -0800 @@ -188,6 +188,5 @@ a: remote is newer -> g getting a updating: a 2/2 files (100.00%) - working directory is now at f8d7d38c0a88 $ cd ..
--- a/tests/test-evolve-public-content-divergent-discard.t Thu Dec 24 00:52:06 2020 +0100 +++ b/tests/test-evolve-public-content-divergent-discard.t Tue Nov 24 18:04:40 2020 -0800 @@ -293,7 +293,6 @@ $ hg evolve --continue other divergent changeset 229da2719b19 has same content as local f7c1071f1e7c and differs by "description" only, discarding 229da2719b19 - working directory is now at f7c1071f1e7c $ hg evolve -l @@ -399,7 +398,6 @@ evolving 4:f89a8e2f86ac "added dh" 0 files updated, 0 files merged, 0 files removed, 0 files unresolved other divergent changeset bc309da55b88 has same content as local e800202333a4 and differs by "description" only, discarding bc309da55b88 - working directory is now at e800202333a4 $ hg evolve -l @@ -503,7 +501,6 @@ $ hg evolve --continue other divergent changeset a5bbf2042450 has same content as local e800202333a4 and differs by "description" only, discarding a5bbf2042450 - working directory is now at e800202333a4 $ hg evolve -l @@ -621,7 +618,6 @@ $ hg evolve --continue other divergent changeset 09054d1f3c97 has same content as local e800202333a4 and differs by "description" only, discarding 09054d1f3c97 - working directory is now at e800202333a4 $ hg evolve -l
--- a/tests/test-evolve-public-content-divergent-main.t Thu Dec 24 00:52:06 2020 +0100 +++ b/tests/test-evolve-public-content-divergent-main.t Tue Nov 24 18:04:40 2020 -0800 @@ -501,7 +501,6 @@ $ hg evolve --continue committed as d87a8f56f14a - working directory is now at 93cd84bbdaca $ hg evolve -l $ cd .. @@ -629,7 +628,6 @@ $ hg evolve --continue committed as ba823b8ff683 - working directory is now at 93cd84bbdaca $ hg evolve -l $ cd ..
--- a/tests/test-evolve-stop-orphan.t Thu Dec 24 00:52:06 2020 +0100 +++ b/tests/test-evolve-stop-orphan.t Tue Nov 24 18:04:40 2020 -0800 @@ -298,7 +298,6 @@ evolving 5:cb6a2ab625bb "added c" move:[6] added d atop:[10] added c - working directory is now at aec285328e90 $ hg glog o 11:cd0909a30222 added d | () draft
--- a/tests/test-evolve-topic.t Thu Dec 24 00:52:06 2020 +0100 +++ b/tests/test-evolve-topic.t Tue Nov 24 18:04:40 2020 -0800 @@ -438,7 +438,6 @@ move:[s4] add iii atop:[s3] add hhh move:[s5] add jjj - working directory is now at 2c295936ac04 Test to make sure that evolve don't crash with FilteredRepoLookupError when obsolete revs are in play: ------------------------------------------------------------------------------------------------------
--- a/tests/test-issue-5720.t Thu Dec 24 00:52:06 2020 +0100 +++ b/tests/test-issue-5720.t Tue Nov 24 18:04:40 2020 -0800 @@ -74,7 +74,6 @@ Continue the evolution $ hg evolve --continue evolving 2:13833940840c "c" - working directory is now at 87495ea7c9ec Tip should stay in secret phase $ hg log -G -T "{rev}: {phase}"