# HG changeset patch # User Anton Shestakov # Date 1697227093 10800 # Node ID b1712eeb97c6cc4fd3e5e257cd62bcb7e4a79cf1 # Parent cc688e806f5639c9004ea44a16f3a02be0bce347# Parent a906d7980a164c64f39f4fde17401dd1a5ec1e59 test-compat: merge mercurial-6.0 into mercurial-5.9 diff -r cc688e806f56 -r b1712eeb97c6 hgext3rd/evolve/__init__.py diff -r cc688e806f56 -r b1712eeb97c6 hgext3rd/evolve/metadata.py diff -r cc688e806f56 -r b1712eeb97c6 hgext3rd/topic/__init__.py diff -r cc688e806f56 -r b1712eeb97c6 tests/test-evolve-obshistory-amend-then-fold.t --- a/tests/test-evolve-obshistory-amend-then-fold.t Fri Oct 13 16:44:02 2023 -0300 +++ b/tests/test-evolve-obshistory-amend-then-fold.t Fri Oct 13 16:58:13 2023 -0300 @@ -354,7 +354,7 @@ $ hg update 471f378eab4c abort: hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192 (use --hidden to access hidden revisions) - [10] + [255] $ hg update --hidden 'desc(A0)' 0 files updated, 0 files merged, 1 files removed, 0 files unresolved updated to hidden changeset 471f378eab4c diff -r cc688e806f56 -r b1712eeb97c6 tests/test-evolve-obshistory-amend.t --- a/tests/test-evolve-obshistory-amend.t Fri Oct 13 16:44:02 2023 -0300 +++ b/tests/test-evolve-obshistory-amend.t Fri Oct 13 16:58:13 2023 -0300 @@ -205,7 +205,7 @@ $ hg update 471f378eab4c abort: hidden revision '471f378eab4c' was rewritten as: 4ae3a4151de9 (use --hidden to access hidden revisions) - [10] + [255] $ hg update --hidden "desc(A0)" 1 files updated, 0 files merged, 0 files removed, 0 files unresolved updated to hidden changeset 471f378eab4c diff -r cc688e806f56 -r b1712eeb97c6 tests/test-evolve-obshistory-content-divergent.t --- a/tests/test-evolve-obshistory-content-divergent.t Fri Oct 13 16:44:02 2023 -0300 +++ b/tests/test-evolve-obshistory-content-divergent.t Fri Oct 13 16:58:13 2023 -0300 @@ -441,7 +441,7 @@ $ hg update 471f378eab4c abort: hidden revision '471f378eab4c' has diverged (use --hidden to access hidden revisions) - [10] + [255] $ hg update --hidden 'desc(A0)' 0 files updated, 0 files merged, 0 files removed, 0 files unresolved updated to hidden changeset 471f378eab4c diff -r cc688e806f56 -r b1712eeb97c6 tests/test-evolve-obshistory-fold.t --- a/tests/test-evolve-obshistory-fold.t Fri Oct 13 16:44:02 2023 -0300 +++ b/tests/test-evolve-obshistory-fold.t Fri Oct 13 16:58:13 2023 -0300 @@ -291,7 +291,7 @@ $ hg update 471f378eab4c abort: hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192 (use --hidden to access hidden revisions) - [10] + [255] $ hg update --hidden 'desc(A0)' 0 files updated, 0 files merged, 1 files removed, 0 files unresolved updated to hidden changeset 471f378eab4c @@ -301,7 +301,7 @@ $ hg update 0dec01379d3b abort: hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192 (use --hidden to access hidden revisions) - [10] + [255] $ hg update --hidden 'desc(B0)' 1 files updated, 0 files merged, 0 files removed, 0 files unresolved updated to hidden changeset 0dec01379d3b diff -r cc688e806f56 -r b1712eeb97c6 tests/test-evolve-obshistory-lots-of-splits.t --- a/tests/test-evolve-obshistory-lots-of-splits.t Fri Oct 13 16:44:02 2023 -0300 +++ b/tests/test-evolve-obshistory-lots-of-splits.t Fri Oct 13 16:58:13 2023 -0300 @@ -446,7 +446,7 @@ $ hg update de7290d8b885 abort: hidden revision 'de7290d8b885' was split as: 337fec4d2edc, f257fde29c7a and 2 more (use --hidden to access hidden revisions) - [10] + [255] $ hg update --hidden 'min(desc(A0))' 0 files updated, 0 files merged, 0 files removed, 0 files unresolved updated to hidden changeset de7290d8b885 diff -r cc688e806f56 -r b1712eeb97c6 tests/test-evolve-obshistory-prune.t --- a/tests/test-evolve-obshistory-prune.t Fri Oct 13 16:44:02 2023 -0300 +++ b/tests/test-evolve-obshistory-prune.t Fri Oct 13 16:58:13 2023 -0300 @@ -107,7 +107,7 @@ $ hg up 0dec01379d3b abort: hidden revision '0dec01379d3b' is pruned (use --hidden to access hidden revisions) - [10] + [255] $ hg up --hidden -r 'desc(B0)' 1 files updated, 0 files merged, 0 files removed, 0 files unresolved updated to hidden changeset 0dec01379d3b diff -r cc688e806f56 -r b1712eeb97c6 tests/test-evolve-obshistory-split.t --- a/tests/test-evolve-obshistory-split.t Fri Oct 13 16:44:02 2023 -0300 +++ b/tests/test-evolve-obshistory-split.t Fri Oct 13 16:58:13 2023 -0300 @@ -258,7 +258,7 @@ $ hg update 471597cad322 abort: hidden revision '471597cad322' was split as: 337fec4d2edc, f257fde29c7a (use --hidden to access hidden revisions) - [10] + [255] $ hg update --hidden 'min(desc(A0))' 0 files updated, 0 files merged, 0 files removed, 0 files unresolved updated to hidden changeset 471597cad322 diff -r cc688e806f56 -r b1712eeb97c6 tests/test-namespaces.t --- a/tests/test-namespaces.t Fri Oct 13 16:44:02 2023 -0300 +++ b/tests/test-namespaces.t Fri Oct 13 16:58:13 2023 -0300 @@ -87,7 +87,7 @@ $ hg up alice abort: unknown revision 'alice' - [10] + [255] Export/import of topic namespaces @@ -226,12 +226,12 @@ 0: alice $ nslog 'topicnamespace(nonsense)' abort: unknown revision 'nonsense' - [10] + [255] $ nslog 'topicnamespace("re:nonsense")' $ nslog 'topicnamespace("literal:nonsense")' abort: topic namespace 'nonsense' does not exist - [10] + [255] Parsing diff -r cc688e806f56 -r b1712eeb97c6 tests/test-prev-next.t diff -r cc688e806f56 -r b1712eeb97c6 tests/test-prune.t --- a/tests/test-prune.t Fri Oct 13 16:44:02 2023 -0300 +++ b/tests/test-prune.t Fri Oct 13 16:58:13 2023 -0300 @@ -306,7 +306,7 @@ $ hg id -ir dcbb326fdec2 abort: hidden revision 'dcbb326fdec2' is pruned (use --hidden to access hidden revisions) - [10] + [255] $ hg id -ir d62d843c9a01 d62d843c9a01 $ hg bookmarks @@ -340,7 +340,7 @@ $ hg id -ir 6:2702dd0c91e7 abort: hidden revision '6' is pruned (use --hidden to access hidden revisions) - [10] + [255] $ hg debugobsstorestat markers total: 7 diff -r cc688e806f56 -r b1712eeb97c6 tests/test-topic.t --- a/tests/test-topic.t Fri Oct 13 16:44:02 2023 -0300 +++ b/tests/test-topic.t Fri Oct 13 16:58:13 2023 -0300 @@ -840,13 +840,13 @@ 9: fran $ tlog 'topic(nonsense)' abort: unknown revision 'nonsense' - [10] + [255] Pattern matching in topic() revset $ tlog 'topic("re:nonsense")' $ tlog 'topic("literal:nonsense")' abort: topic 'nonsense' does not exist - [10] + [255] Sanity checks for topicnamespace() revset diff -r cc688e806f56 -r b1712eeb97c6 tests/test-userguide.t --- a/tests/test-userguide.t Fri Oct 13 16:44:02 2023 -0300 +++ b/tests/test-userguide.t Fri Oct 13 16:58:13 2023 -0300 @@ -21,7 +21,7 @@ saved backup bundle to $TESTTMP/t/.hg/strip-backup/6e725fd2be6f-42cc74d4-amend.hg (glob) $ hg log -r 23fe4ac6d3f1 abort: unknown revision '23fe4ac6d3f1' - [10] + [255] $ hg identify -in fe0ecd3bd2a4 1 @@ -40,7 +40,7 @@ $ hg shortlog -q -r fe0ecd3bd2a4 abort: hidden revision 'fe0ecd3bd2a4' was rewritten as: 934359450037 (use --hidden to access hidden revisions) - [10] + [255] $ hg --hidden shortlog -G @ 2:934359450037 draft implement feature Y |