Mercurial > hg
diff tests/test-transaction-safety.t @ 47241:2219853a1503
revlogv2: track pending write in the docket and expose it to hooks
The docket is now able to write pending data. We could have used a distinct
intermediate files, however keeping everything in the same file will make it
simpler to keep track of the various involved files if necessary.
However it might prove more complicated for streaming clone. This will be dealt
with later.
Note that we lifted the stderr redirection in the test since we no longer suffer
from "unkown working directory parent" message.
Differential Revision: https://phab.mercurial-scm.org/D10631
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Mon, 03 May 2021 12:35:25 +0200 |
parents | 682f09857d69 |
children | 6c84fc9c9a90 |
line wrap: on
line diff
--- a/tests/test-transaction-safety.t Mon May 03 12:35:14 2021 +0200 +++ b/tests/test-transaction-safety.t Mon May 03 12:35:25 2021 +0200 @@ -46,13 +46,13 @@ $ cat << EOF > script/external.sh > #!/bin/sh > $RUNTESTDIR/testlib/wait-on-file 5 $HG_TEST_FILE_EXT_UNLOCK $HG_TEST_FILE_EXT_WAITING - > hg log --rev 'tip' -T 'external: {rev} {desc}\n' > $TESTTMP/output/external.out 2>/dev/null + > hg log --rev 'tip' -T 'external: {rev} {desc}\n' > $TESTTMP/output/external.out > touch $HG_TEST_FILE_EXT_DONE > EOF $ chmod +x script/external.sh $ cat << EOF > script/internal.sh > #!/bin/sh - > hg log --rev 'tip' -T 'internal: {rev} {desc}\n' > $TESTTMP/output/internal.out 2>/dev/null + > hg log --rev 'tip' -T 'internal: {rev} {desc}\n' > $TESTTMP/output/internal.out > $RUNTESTDIR/testlib/wait-on-file 5 $HG_TEST_FILE_EXT_DONE $HG_TEST_FILE_EXT_UNLOCK > EOF $ chmod +x script/internal.sh @@ -124,8 +124,7 @@ $ make_one_commit first pre-commit: -1 external: -1 - internal: 0 first (revlogv1 !) - internal: -1 (revlogv2 known-bad-output !) + internal: 0 first post-tr: 0 first #if revlogv1 @@ -150,8 +149,7 @@ $ make_one_commit second pre-commit: 0 first external: 0 first - internal: 1 second (revlogv1 !) - internal: 0 first (revlogv2 known-bad-output !) + internal: 1 second post-tr: 1 second #if revlogv1 @@ -177,8 +175,7 @@ pre-commit: 1 second warning: repository is unrelated external: 1 second - internal: 5 r3 (revlogv1 !) - internal: 1 second (revlogv2 known-bad-output !) + internal: 5 r3 post-tr: 5 r3 #if revlogv1 @@ -203,8 +200,7 @@ $ make_one_pull 400 pre-commit: 5 r3 external: 5 r3 - internal: 402 r400 (revlogv1 !) - internal: 5 r3 (revlogv2 known-bad-output !) + internal: 402 r400 post-tr: 402 r400 #if revlogv1 @@ -229,8 +225,7 @@ $ make_one_commit third pre-commit: 402 r400 external: 402 r400 - internal: 403 third (revlogv1 !) - internal: 402 r400 (revlogv2 known-bad-output !) + internal: 403 third post-tr: 403 third #if revlogv1 @@ -256,8 +251,7 @@ $ make_one_pull tip pre-commit: 403 third external: 403 third - internal: 503 r500 (revlogv1 !) - internal: 403 third (revlogv2 known-bad-output !) + internal: 503 r500 post-tr: 503 r500 #if revlogv1