Mercurial > evolve
changeset 5722:61d2f1cf90f0
branching: merge stable into default
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Fri, 22 Jan 2021 11:04:55 +0100 |
| parents | 9f8ff149f258 (current diff) ceaa85c47973 (diff) |
| children | e6b0ed34bc18 |
| files | CHANGELOG hgext3rd/evolve/evolvecmd.py hgext3rd/topic/__init__.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-evolve.t tests/test-issue-5720.t tests/test-obsolete.t tests/test-prev-next.t tests/test-prune.t tests/test-topic-rebase.t tests/test-topic.t |
| diffstat | 15 files changed, 43 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/CHANGELOG Thu Jan 21 19:05:17 2021 +0800 +++ b/CHANGELOG Fri Jan 22 11:04:55 2021 +0100 @@ -1,6 +1,15 @@ Changelog ========= +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) + 10.2.0 - in progress --------------------
--- a/hgext3rd/evolve/evolvecmd.py Thu Jan 21 19:05:17 2021 +0800 +++ b/hgext3rd/evolve/evolvecmd.py Fri Jan 22 11:04:55 2021 +0100 @@ -1588,7 +1588,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/hgext3rd/topic/__init__.py Thu Jan 21 19:05:17 2021 +0800 +++ b/hgext3rd/topic/__init__.py Fri Jan 22 11:04:55 2021 +0100 @@ -450,6 +450,12 @@ repo.ui.setconfig(b'experimental', b'thg.displaynames', b'topics', source=b'topic-extension') + # BUG: inmemory rebase drops the topic, and fails to switch to the new + # topic. Disable inmemory rebase for now. + if repo.ui.configbool(b'rebase', b'experimental.inmemory'): + repo.ui.setconfig(b'rebase', b'experimental.inmemory', b'False', + source=b'topic-extension') + class topicrepo(repo.__class__): # attribute for other code to distinct between repo with topic and repo without
--- a/tests/test-evolve-content-divergent-stack.t Thu Jan 21 19:05:17 2021 +0800 +++ b/tests/test-evolve-content-divergent-stack.t Fri Jan 22 11:04:55 2021 +0100 @@ -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 Jan 21 19:05:17 2021 +0800 +++ b/tests/test-evolve-continue.t Fri Jan 22 11:04:55 2021 +0100 @@ -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 Jan 21 19:05:17 2021 +0800 +++ b/tests/test-evolve-issue5966.t Fri Jan 22 11:04:55 2021 +0100 @@ -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 Jan 21 19:05:17 2021 +0800 +++ b/tests/test-evolve-issue5967.t Fri Jan 22 11:04:55 2021 +0100 @@ -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 Jan 21 19:05:17 2021 +0800 +++ b/tests/test-evolve-phase.t Fri Jan 22 11:04:55 2021 +0100 @@ -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 Jan 21 19:05:17 2021 +0800 +++ b/tests/test-evolve-progress.t Fri Jan 22 11:04:55 2021 +0100 @@ -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 Jan 21 19:05:17 2021 +0800 +++ b/tests/test-evolve-public-content-divergent-discard.t Fri Jan 22 11:04:55 2021 +0100 @@ -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 Jan 21 19:05:17 2021 +0800 +++ b/tests/test-evolve-public-content-divergent-main.t Fri Jan 22 11:04:55 2021 +0100 @@ -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 Jan 21 19:05:17 2021 +0800 +++ b/tests/test-evolve-stop-orphan.t Fri Jan 22 11:04:55 2021 +0100 @@ -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 Jan 21 19:05:17 2021 +0800 +++ b/tests/test-evolve-topic.t Fri Jan 22 11:04:55 2021 +0100 @@ -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 Jan 21 19:05:17 2021 +0800 +++ b/tests/test-issue-5720.t Fri Jan 22 11:04:55 2021 +0100 @@ -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}"
--- a/tests/test-topic-rebase.t Thu Jan 21 19:05:17 2021 +0800 +++ b/tests/test-topic-rebase.t Fri Jan 22 11:04:55 2021 +0100 @@ -166,3 +166,30 @@ ### target: default (branch) s1@ myotherfeature1 (current) s0^ default3 (base) + +inmemory rebase currently drops the topic. + +BUG: inmemory rebase currently drops the topic. This is the correct output +because of there's a config override. + + $ echo x > a.txt + $ hg ci -Aqm x + $ hg rebase -r . -d 3 --config rebase.experimental.inmemory=1 + rebasing 8:1323571d782d tip myotherfeature "x" + switching to topic myfeature + switching to topic myotherfeature + $ logtopic + @ 9:42f2e003a46e77e1b33da4434c2689722b976b73 + | topics: myotherfeature + | o 7:6ccb9ec4913b64f3ad719ff1ba66495a70bf35a4 + | | topics: myotherfeature + | o 6:0b124ef641a7a6f4715d962650d3b367e8c800be + | | topics: + | o 4:0cd2e1a45ac4e3f9603a05ccfa6d1c70cd759bc5 + |/ topics: + o 3:fc6593661cf3256ba165cbccd6019ead17cc3726 + | topics: myfeature + o 2:be7622a7a0f43ba713e152f56441275f8e8711ef + | topics: + o 0:3e7df3b3b17c6deb4a1c70e790782fdf17af96a7 + topics: