Mercurial > evolve
changeset 6161:78fd24e20adc mercurial-5.5
test-compat: merge mercurial-5.6 into mercurial-5.5
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Thu, 18 Nov 2021 19:50:05 +0300 |
| parents | 34f5c849fc1d (diff) 171d13d8f0ce (current diff) |
| children | 6c207b5b1359 1567b50fa006 |
| files | tests/test-evolve.t |
| diffstat | 12 files changed, 11 insertions(+), 298 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-check-sdist.t Thu Nov 18 19:26:14 2021 +0300 +++ b/tests/test-check-sdist.t Thu Nov 18 19:50:05 2021 +0300 @@ -35,7 +35,7 @@ $ tar -tzf hg-evolve-*.tar.gz | sed 's|^hg-evolve-[^/]*/||' | sort > files $ wc -l files - 352 files + 351 files $ fgrep debian files tests/test-check-debian.t $ fgrep __init__.py files
--- a/tests/test-evolve-abort-orphan.t Thu Nov 18 19:26:14 2021 +0300 +++ b/tests/test-evolve-abort-orphan.t Thu Nov 18 19:50:05 2021 +0300 @@ -27,14 +27,6 @@ > EOF #endif -#testcases inmemory ondisk -#if inmemory - $ cat >> $HGRCPATH <<EOF - > [experimental] - > evolution.in-memory = yes - > EOF -#endif - $ hg init abortrepo $ cd abortrepo $ echo ".*\.orig" > .hgignore @@ -105,8 +97,6 @@ $ hg evolve --all move:[4] added d atop:[5] added c - merging d (inmemory !) - hit merge conflicts; retrying merge in working copy (inmemory !) merging d warning: conflicts while merging d! (edit, then use 'hg resolve --mark') unresolved merge conflicts @@ -154,8 +144,6 @@ $ hg evolve --all --update move:[4] added d atop:[5] added c - merging d (inmemory !) - hit merge conflicts; retrying merge in working copy (inmemory !) merging d warning: conflicts while merging d! (edit, then use 'hg resolve --mark') unresolved merge conflicts @@ -184,8 +172,6 @@ move:[2] added b atop:[7] added a move:[5] added c - merging c (inmemory !) - hit merge conflicts; retrying merge in working copy (inmemory !) merging c warning: conflicts while merging c! (edit, then use 'hg resolve --mark') unresolved merge conflicts @@ -298,8 +284,6 @@ atop:[7] added a move:[6] foo to a atop:[7] added a - merging a (inmemory !) - hit merge conflicts; retrying merge in working copy (inmemory !) merging a warning: conflicts while merging a! (edit, then use 'hg resolve --mark') unresolved merge conflicts @@ -365,8 +349,6 @@ atop:[7] added a move:[6] foo to a atop:[7] added a - merging a (inmemory !) - hit merge conflicts; retrying merge in working copy (inmemory !) merging a warning: conflicts while merging a! (edit, then use 'hg resolve --mark') unresolved merge conflicts @@ -445,8 +427,6 @@ atop:[9] added c move:[6] foo to a atop:[7] added a - merging a (inmemory !) - hit merge conflicts; retrying merge in working copy (inmemory !) merging a warning: conflicts while merging a! (edit, then use 'hg resolve --mark') unresolved merge conflicts @@ -523,8 +503,6 @@ move:[2] added b atop:[4] added a move:[3] added c - merging c (inmemory !) - hit merge conflicts; retrying merge in working copy (inmemory !) merging c warning: conflicts while merging c! (edit, then use 'hg resolve --mark') unresolved merge conflicts @@ -572,8 +550,6 @@ $ hg next --evolve move:[3] added c atop:[5] added b - merging c (inmemory !) - hit merge conflicts; retrying merge in working copy (inmemory !) merging c warning: conflicts while merging c! (edit, then use 'hg resolve --mark') unresolved merge conflicts
--- a/tests/test-evolve-content-divergent-corner-cases.t Thu Nov 18 19:26:14 2021 +0300 +++ b/tests/test-evolve-content-divergent-corner-cases.t Thu Nov 18 19:50:05 2021 +0300 @@ -228,10 +228,10 @@ $ cat >$TESTTMP/test_extension.py << EOF > from mercurial import merge - > origupdate = merge._update + > origupdate = merge.update > def newupdate(*args, **kwargs): > return origupdate(*args, **kwargs) - > merge._update = newupdate + > merge.update = newupdate > EOF $ cat >> $HGRCPATH << EOF > [extensions]
--- a/tests/test-evolve-continue.t Thu Nov 18 19:26:14 2021 +0300 +++ b/tests/test-evolve-continue.t Thu Nov 18 19:50:05 2021 +0300 @@ -10,14 +10,6 @@ > evolve = > EOF -#testcases inmemory ondisk -#if inmemory - $ cat >> $HGRCPATH <<EOF - > [experimental] - > evolution.in-memory = yes - > EOF -#endif - Setting up the repo $ hg init repo @@ -64,8 +56,6 @@ $ hg evolve --all move:[4] added d atop:[5] added c - merging d (inmemory !) - hit merge conflicts; retrying merge in working copy (inmemory !) merging d warning: conflicts while merging d! (edit, then use 'hg resolve --mark') unresolved merge conflicts @@ -126,8 +116,6 @@ $ hg evolve --update move:[7] added e atop:[8] added d - merging e (inmemory !) - hit merge conflicts; retrying merge in working copy (inmemory !) merging e warning: conflicts while merging e! (edit, then use 'hg resolve --mark') unresolved merge conflicts @@ -168,8 +156,6 @@ $ hg evolve --all --update move:[2] added b atop:[9] added a - merging b (inmemory !) - hit merge conflicts; retrying merge in working copy (inmemory !) merging b warning: conflicts while merging b! (edit, then use 'hg resolve --mark') unresolved merge conflicts @@ -255,8 +241,6 @@ move:[12] added d atop:[16] added c move:[13] added f - merging f (inmemory !) - hit merge conflicts; retrying merge in working copy (inmemory !) merging f warning: conflicts while merging f! (edit, then use 'hg resolve --mark') unresolved merge conflicts @@ -272,8 +256,6 @@ move:[14] added g atop:[18] added f move:[15] added h - merging h (inmemory !) - hit merge conflicts; retrying merge in working copy (inmemory !) merging h warning: conflicts while merging h! (edit, then use 'hg resolve --mark') unresolved merge conflicts @@ -321,8 +303,6 @@ move:[19] added g atop:[21] added f perform evolve? [Ny] y - merging g (inmemory !) - hit merge conflicts; retrying merge in working copy (inmemory !) merging g warning: conflicts while merging g! (edit, then use 'hg resolve --mark') unresolved merge conflicts @@ -372,8 +352,6 @@ $ hg next --evolve move:[22] added g atop:[24] added f - merging g (inmemory !) - hit merge conflicts; retrying merge in working copy (inmemory !) merging g warning: conflicts while merging g! (edit, then use 'hg resolve --mark') unresolved merge conflicts @@ -441,8 +419,6 @@ $ hg evolve move:[3] added d, modified c atop:[5] added c - merging c (inmemory !) - hit merge conflicts; retrying merge in working copy (inmemory !) merging c warning: conflicts while merging c! (edit, then use 'hg resolve --mark') unresolved merge conflicts
--- a/tests/test-evolve-inmemory.t Thu Nov 18 19:26:14 2021 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,186 +0,0 @@ -Tests running `hg evolve` with in-memory merge. - - $ . $TESTDIR/testlib/common.sh - - $ cat >> $HGRCPATH <<EOF - > [extensions] - > evolve = - > drawdag=$RUNTESTDIR/drawdag.py - > [alias] - > glog = log -G -T '{rev}:{node|short} {separate(" ", phase, tags)}\n{desc|firstline}' - > [experimental] - > evolution.in-memory = yes - > EOF - -Test evolving a single orphan - - $ hg init single-orphan - $ cd single-orphan - $ hg debugdrawdag <<'EOS' - > C # C/c = c\n - > B2 | # B2/b = b2\n - > | B # B/b = b\n - > \ / # replace: B -> B2 - > A - > EOS - 1 new orphan changesets - $ hg evolve - move:[3] C - atop:[2] B2 - $ hg glog - o 4:52da76e91abb draft tip - | C - | x 3:bc77848cde3a draft C - | | C - o | 2:377a194b9b8a draft B2 - | | B2 - | x 1:830b6315076c draft B - |/ B - o 0:426bada5c675 draft A - A - $ hg cat -r tip b c - b2 - c - $ cd .. - -Test that in-memory evolve works when there are conflicts -and after continuing. - - $ hg init conflicts - $ cd conflicts - $ hg debugdrawdag <<'EOS' - > E # E/e = e\n - > | - > D # D/b = d\n - > | - > C # C/c = c\n - > B2 | # B2/b = b2\n - > | B # B/b = b\n - > \ / # replace: B -> B2 - > A - > EOS - 3 new orphan changesets - $ hg evolve - move:[3] C - atop:[2] B2 - move:[4] D - merging b - hit merge conflicts; retrying merge in working copy - merging b - warning: conflicts while merging b! (edit, then use 'hg resolve --mark') - unresolved merge conflicts - (see 'hg help evolve.interrupted') - [1] - $ hg glog - @ 6:52da76e91abb draft tip - | C - | * 5:eae7899dd92b draft E - | | E - | % 4:57e51f6a6d36 draft D - | | D - | x 3:bc77848cde3a draft C - | | C - o | 2:377a194b9b8a draft B2 - | | B2 - | x 1:830b6315076c draft B - |/ B - o 0:426bada5c675 draft A - A - $ cat c - c - $ cat b - <<<<<<< destination: 52da76e91abb - test: C - b2 - ======= - d - >>>>>>> evolving: 57e51f6a6d36 D - test: D - $ echo d2 > b - $ hg resolve -m - (no more unresolved files) - continue: hg evolve --continue - $ hg evolve --continue - evolving 4:57e51f6a6d36 "D" - move:[5] E - atop:[7] D - $ hg glog - o 8:3c658574f8ed draft tip - | E - o 7:16e609b952e8 draft - | D - o 6:52da76e91abb draft - | C - | x 5:eae7899dd92b draft E - | | E - | x 4:57e51f6a6d36 draft D - | | D - | x 3:bc77848cde3a draft C - | | C - o | 2:377a194b9b8a draft B2 - | | B2 - | x 1:830b6315076c draft B - |/ B - o 0:426bada5c675 draft A - A - $ hg cat -r tip b c e - d2 - c - e - $ cd .. - -Test that in-memory merge is disabled if there's a precommit hook - - $ hg init precommit-hook - $ cd precommit-hook - $ hg debugdrawdag <<'EOS' - > C # C/c = c\n - > B2 | # B2/b = b2\n - > | B # B/b = b\n - > \ / # replace: B -> B2 - > A - > EOS - 1 new orphan changesets - $ cat >> .hg/hgrc <<EOF - > [hooks] - > precommit = echo "running precommit hook" - > EOF -The hook is not run with in-memory=force - $ hg co B2 - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ hg evolve --config experimental.evolution.in-memory=force --update - move:[3] C - atop:[2] B2 - working directory is now at 52da76e91abb - $ hg glog - @ 4:52da76e91abb draft tip - | C - | x 3:bc77848cde3a draft C - | | C - o | 2:377a194b9b8a draft B2 - | | B2 - | x 1:830b6315076c draft B - |/ B - o 0:426bada5c675 draft A - A - $ hg co tip^ - 0 files updated, 0 files merged, 2 files removed, 0 files unresolved - $ hg amend -m B3 - 1 new orphan changesets -The hook is run with in-memory=yes - $ hg next --config experimental.evolution.in-memory=yes - move:[4] C - atop:[5] B3 - running precommit hook - working directory is now at aeee7323c054 - $ hg glog - @ 6:aeee7323c054 draft tip - | C - o 5:908ce5f9d7eb draft - | B3 - | x 3:bc77848cde3a draft C - | | C - +---x 2:377a194b9b8a draft B2 - | | B2 - | x 1:830b6315076c draft B - |/ B - o 0:426bada5c675 draft A - A
--- a/tests/test-evolve-interrupted.t Thu Nov 18 19:26:14 2021 +0300 +++ b/tests/test-evolve-interrupted.t Thu Nov 18 19:50:05 2021 +0300 @@ -52,7 +52,7 @@ $ hg l @ 2 apricot and blueberry - * 1 banana + % 1 banana | x 0 apricot @@ -80,7 +80,7 @@ $ hg l @ 2 apricot and blueberry - * 1 banana + % 1 banana | x 0 apricot
--- a/tests/test-evolve-phase.t Thu Nov 18 19:26:14 2021 +0300 +++ b/tests/test-evolve-phase.t Thu Nov 18 19:50:05 2021 +0300 @@ -9,14 +9,6 @@ > EOF $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH -#testcases inmemory ondisk -#if inmemory - $ cat >> $HGRCPATH <<EOF - > [experimental] - > evolution.in-memory = yes - > EOF -#endif - Testing when there are no conflicts during evolve $ hg init noconflict @@ -91,8 +83,6 @@ $ hg evolve move:[2] c atop:[3] b - merging a (inmemory !) - hit merge conflicts; retrying merge in working copy (inmemory !) merging a warning: conflicts while merging a! (edit, then use 'hg resolve --mark') unresolved merge conflicts
--- a/tests/test-evolve-progress.t Thu Nov 18 19:26:14 2021 +0300 +++ b/tests/test-evolve-progress.t Thu Nov 18 19:50:05 2021 +0300 @@ -33,7 +33,7 @@ ancestor: a87874c6ec31, local: fd0a2402f834+, remote: 4f60c78b6d58 a: remote is newer -> g getting a - updating: a 1/1 files (100.00%) + updating: a 1/2 files (50.00%) committing files: a committing manifest @@ -61,7 +61,7 @@ ancestor: 769574b07a96, local: 53c0008d98a0+, remote: 22782fddc0ab b: remote is newer -> g getting b - updating: b 1/1 files (100.00%) + updating: b 1/2 files (50.00%) committing files: b committing manifest @@ -94,7 +94,7 @@ ancestor: fd0a2402f834, local: 152c368c622b+, remote: 5f16d91ecde0 a: remote is newer -> g getting a - updating: a 1/1 files (100.00%) + updating: a 1/2 files (50.00%) committing files: a committing manifest @@ -171,7 +171,7 @@ ancestor: 53c0008d98a0, local: b2de95304e32+, remote: 385376d04062 b: remote is newer -> g getting b - updating: b 1/1 files (100.00%) + updating: b 1/2 files (50.00%) committing files: b committing manifest
--- a/tests/test-evolve-stop-orphan.t Thu Nov 18 19:26:14 2021 +0300 +++ b/tests/test-evolve-stop-orphan.t Thu Nov 18 19:50:05 2021 +0300 @@ -16,14 +16,6 @@ > evolve = > EOF -#testcases inmemory ondisk -#if inmemory - $ cat >> $HGRCPATH <<EOF - > [experimental] - > evolution.in-memory = yes - > EOF -#endif - $ hg init stoprepo $ cd stoprepo $ echo ".*\.orig" > .hgignore @@ -96,8 +88,6 @@ $ hg evolve move:[4] added d atop:[5] added c - merging d (inmemory !) - hit merge conflicts; retrying merge in working copy (inmemory !) merging d warning: conflicts while merging d! (edit, then use 'hg resolve --mark') unresolved merge conflicts @@ -144,8 +134,6 @@ $ hg next --evolve move:[4] added d atop:[5] added c - merging d (inmemory !) - hit merge conflicts; retrying merge in working copy (inmemory !) merging d warning: conflicts while merging d! (edit, then use 'hg resolve --mark') unresolved merge conflicts @@ -207,8 +195,6 @@ $ hg evolve --update move:[4] added d atop:[5] added c - merging d (inmemory !) - hit merge conflicts; retrying merge in working copy (inmemory !) merging d warning: conflicts while merging d! (edit, then use 'hg resolve --mark') unresolved merge conflicts @@ -259,8 +245,6 @@ atop:[7] added hgignore move:[2] added b move:[5] added c - merging c (inmemory !) - hit merge conflicts; retrying merge in working copy (inmemory !) merging c warning: conflicts while merging c! (edit, then use 'hg resolve --mark') unresolved merge conflicts @@ -299,8 +283,6 @@ $ hg evolve --all move:[5] added c atop:[9] added b - merging c (inmemory !) - hit merge conflicts; retrying merge in working copy (inmemory !) merging c warning: conflicts while merging c! (edit, then use 'hg resolve --mark') unresolved merge conflicts @@ -376,8 +358,6 @@ move:[9] added b atop:[12] added a move:[10] added c - merging c (inmemory !) - hit merge conflicts; retrying merge in working copy (inmemory !) merging c warning: conflicts while merging c! (edit, then use 'hg resolve --mark') unresolved merge conflicts
--- a/tests/test-evolve-templates.t Thu Nov 18 19:26:14 2021 +0300 +++ b/tests/test-evolve-templates.t Thu Nov 18 19:50:05 2021 +0300 @@ -158,11 +158,11 @@ $ hg log -GT '{successors|json}\n' - o [] + o "" | | @ [["d004c8f274b9ec480a47a93c10dac5eee63adb78"]] |/ - o [] + o "" $ hg up 'desc(A1)' --hidden
--- a/tests/test-evolve.t Thu Nov 18 19:26:14 2021 +0300 +++ b/tests/test-evolve.t Thu Nov 18 19:50:05 2021 +0300 @@ -10,14 +10,6 @@ > EOF $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH -#testcases inmemory ondisk -#if inmemory - $ cat >> $HGRCPATH <<EOF - > [experimental] - > evolution.in-memory = yes - > EOF -#endif - $ mkcommit() { > echo "$1" > "$1" > hg add "$1" @@ -1400,8 +1392,6 @@ move:[30] will be evolved safely atop:[32] amended move:[31] will cause conflict at evolve - merging newfile (inmemory !) - hit merge conflicts; retrying merge in working copy (inmemory !) merging newfile warning: conflicts while merging newfile! (edit, then use 'hg resolve --mark') unresolved merge conflicts
--- a/tests/test-stabilize-order.t Thu Nov 18 19:26:14 2021 +0300 +++ b/tests/test-stabilize-order.t Thu Nov 18 19:50:05 2021 +0300 @@ -3,14 +3,6 @@ > EOF $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH -#testcases inmemory ondisk -#if inmemory - $ cat >> $HGRCPATH <<EOF - > [experimental] - > evolution.in-memory = yes - > EOF -#endif - $ glog() { > hg log -G --template '{rev}:{node|short}@{branch}({phase}) {desc|firstline}\n' "$@" > } @@ -109,9 +101,6 @@ c committing manifest committing changelog - resolving manifests (inmemory !) - getting b (inmemory !) - getting c (inmemory !) working directory is now at 0f691739f917 $ hg debugobsolete > successors.new $ diff -u successors.old successors.new @@ -175,8 +164,6 @@ c committing manifest committing changelog - resolving manifests (inmemory !) - getting b (inmemory !) working directory is now at 2256dae6521f $ glog @ 9:2256dae6521f@default(draft) addc