Mercurial > public > mercurial-scm > hg-stable
changeset 53009:86764cd60c4a
cleanup: remove usage of `repobundlerepo` in tests
Same rational as the parent changeset.
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Fri, 21 Feb 2025 22:20:39 -0500 |
| parents | 4d2b496cb7b8 |
| children | d3425a2c146c |
| files | tests/test-bundle.t tests/test-flagprocessor.t tests/test-hgweb-bundle.t tests/test-mq-pull-from-bundle.t tests/test-narrow-strip.t tests/test-obsolete.t tests/test-phases-exchange.t tests/test-shelve2.t tests/test-strip.t tests/test-treemanifest.t |
| diffstat | 10 files changed, 1 insertions(+), 50 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-bundle.t Fri Feb 21 22:16:48 2025 -0500 +++ b/tests/test-bundle.t Fri Feb 21 22:20:39 2025 -0500 @@ -67,8 +67,6 @@ [1] $ hg -R empty verify -q -#if repobundlerepo - Pull full.hg into test (using --cwd) $ hg --cwd test pull ../full.hg @@ -271,8 +269,6 @@ (run 'hg heads' to see heads, 'hg merge' to merge) -#endif - Cannot produce streaming clone bundles with "hg bundle" $ hg -R test bundle -t packed1 packed.hg @@ -520,8 +516,6 @@ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ cd partial -#if repobundlerepo - Log -R full.hg in partial $ hg -R bundle://../full.hg log -T phases @@ -657,8 +651,6 @@ abort: *../does-not-exist.hg* (glob) [255] -#endif - $ cd .. hide outer repo @@ -666,8 +658,6 @@ Direct clone from bundle (all-history) -#if repobundlerepo - $ hg clone full.hg full-clone requesting all changes adding changesets @@ -749,8 +739,6 @@ $ cd .. -#endif - test for 540d1059c802 $ hg init orig @@ -773,7 +761,6 @@ $ cd .. -#if repobundlerepo $ cd orig $ hg incoming ../bundle.hg comparing with ../bundle.hg @@ -803,8 +790,6 @@ [255] $ cd .. -#endif - test to bundle revisions on the newly created branch (issue3828): $ hg -q clone -U test test-clone @@ -815,10 +800,8 @@ $ hg -q outgoing ../test-clone 9:b4f5acb1ee27 $ hg -q bundle --branch foo foo.hg ../test-clone -#if repobundlerepo $ hg -R foo.hg -q log -r "bundle()" 9:b4f5acb1ee27 -#endif $ cd .. @@ -834,17 +817,14 @@ full history bundle, refuses to verify non-local repo -#if repobundlerepo $ hg -R all.hg verify abort: cannot verify bundle or remote repos [255] -#endif but, regular verify must continue to work $ hg -R orig verify -q -#if repobundlerepo diff against bundle $ hg init b @@ -859,7 +839,6 @@ -2 -3 $ cd .. -#endif bundle single branch @@ -918,13 +897,11 @@ files: x 3/3 files (100.00%) bundle2-output-part: "cache:rev-branch-cache" (advisory) streamed payload -#if repobundlerepo == Test for issue3441 $ hg clone -q -r0 . part2 $ hg -q -R part2 pull bundle.hg $ hg -R part2 verify -q -#endif == Test bundling no commits @@ -984,8 +961,6 @@ date: Thu Jan 01 00:00:00 1970 +0000 summary: 0 - -#if repobundlerepo $ hg bundle --base 1 -r 3 ../update2bundled.hg 1 changesets found $ hg strip -r 3 @@ -1007,7 +982,6 @@ $ hg update -R ../update2bundled.hg -r 0 0 files updated, 0 files merged, 2 files removed, 0 files unresolved -#endif Test the option that create slim bundle
--- a/tests/test-flagprocessor.t Fri Feb 21 22:16:48 2025 -0500 +++ b/tests/test-flagprocessor.t Fri Feb 21 22:20:39 2025 -0500 @@ -233,7 +233,6 @@ $ echo '[BASE64]a-bit-longer-branching' > base64 $ hg commit -q -m branching -#if repobundlerepo $ hg bundle --base 1 bundle.hg 4 changesets found $ hg --config extensions.strip= strip -r 2 --no-backup --force -q @@ -290,7 +289,6 @@ 1 files changed, 1 insertions(+), 0 deletions(-) $ rm bundle.hg bundle-again.hg -#endif # TEST: hg status
--- a/tests/test-hgweb-bundle.t Fri Feb 21 22:16:48 2025 -0500 +++ b/tests/test-hgweb-bundle.t Fri Feb 21 22:20:39 2025 -0500 @@ -1,4 +1,4 @@ -#require serve repobundlerepo +#require serve $ hg init server $ cd server
--- a/tests/test-mq-pull-from-bundle.t Fri Feb 21 22:16:48 2025 -0500 +++ b/tests/test-mq-pull-from-bundle.t Fri Feb 21 22:20:39 2025 -0500 @@ -1,5 +1,3 @@ -#require repobundlerepo - $ cat <<EOF >> $HGRCPATH > [extensions] > mq=
--- a/tests/test-narrow-strip.t Fri Feb 21 22:16:48 2025 -0500 +++ b/tests/test-narrow-strip.t Fri Feb 21 22:20:39 2025 -0500 @@ -124,7 +124,6 @@ $ hg strip . 1 files updated, 0 files merged, 0 files removed, 0 files unresolved saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-backup.hg (glob) -#if repobundlerepo $ hg pull .hg/strip-backup/*-backup.hg pulling from .hg/strip-backup/*-backup.hg (glob) searching for changes @@ -171,4 +170,3 @@ added 3 changesets with 2 changes to 1 files (+1 heads) new changesets *:* (glob) (run 'hg heads' to see heads, 'hg merge' to merge) -#endif
--- a/tests/test-obsolete.t Fri Feb 21 22:16:48 2025 -0500 +++ b/tests/test-obsolete.t Fri Feb 21 22:20:39 2025 -0500 @@ -1406,7 +1406,6 @@ o 0:4b34ecfb0d56 (draft) [ ] A -#if repobundlerepo $ hg incoming ../repo-bundleoverlay --bundle ../bundleoverlay.hg comparing with ../repo-bundleoverlay searching for changes @@ -1419,7 +1418,6 @@ |/ o 0:4b34ecfb0d56 (draft) [ ] A -#endif #if serve @@ -1606,12 +1604,10 @@ phase-heads -- {} (mandatory: True) e008cf2834908e5d6b0f792a9d4b0e2272260fb8 draft -#if repobundlerepo $ hg pull .hg/strip-backup/e008cf283490-*-backup.hg pulling from .hg/strip-backup/e008cf283490-ede36964-backup.hg searching for changes no changes found -#endif $ hg debugobsolete e008cf2834908e5d6b0f792a9d4b0e2272260fb8 b0551702f918510f01ae838ab03a463054c67b46 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'} $ hg log -G
--- a/tests/test-phases-exchange.t Fri Feb 21 22:16:48 2025 -0500 +++ b/tests/test-phases-exchange.t Fri Feb 21 22:20:39 2025 -0500 @@ -548,7 +548,6 @@ Pulling from bundle does not alter phases of changeset not present in the bundle -#if repobundlerepo $ hg bundle --base 1 -r 6 -r 3 ../partial-bundle.hg 5 changesets found $ hg pull ../partial-bundle.hg @@ -578,7 +577,6 @@ | o 0 public a-A - 054250a37db4 -#endif Pushing to Publish=False (unknown changeset)
--- a/tests/test-shelve2.t Fri Feb 21 22:16:48 2025 -0500 +++ b/tests/test-shelve2.t Fri Feb 21 22:20:39 2025 -0500 @@ -207,12 +207,10 @@ $ hg shelve shelved as default 0 files updated, 0 files merged, 1 files removed, 0 files unresolved -#if repobundlerepo $ hg log -G --template '{rev} {desc|firstline} {author}' -R bundle://.hg/shelved/default.hg -r 'bundle()' --hidden o [48] changes to: commit stuff shelve@localhost (re) | ~ -#endif $ hg log -G --template '{rev} {desc|firstline} {author}' @ [37] commit stuff test (re) |
--- a/tests/test-strip.t Fri Feb 21 22:16:48 2025 -0500 +++ b/tests/test-strip.t Fri Feb 21 22:20:39 2025 -0500 @@ -799,14 +799,12 @@ saved backup bundle to $TESTTMP/doublebundle/.hg/strip-backup/3903775176ed-e68910bd-backup.hg $ ls .hg/strip-backup 3903775176ed-e68910bd-backup.hg -#if repobundlerepo $ hg pull -q -r 3903775176ed .hg/strip-backup/3903775176ed-e68910bd-backup.hg $ hg strip -r 0 saved backup bundle to $TESTTMP/doublebundle/.hg/strip-backup/3903775176ed-54390173-backup.hg $ ls .hg/strip-backup 3903775176ed-54390173-backup.hg 3903775176ed-e68910bd-backup.hg -#endif $ cd .. Test that we only bundle the stripped changesets (issue4736) @@ -872,7 +870,6 @@ $ hg bundle -r 'desc(mergeCD)' --base 'desc(commitC)' ../issue4736.hg 2 changesets found -#if repobundlerepo $ hg log -r 'bundle()' -R ../issue4736.hg changeset: 3:6625a5168474 parent: 1:eca11cf91c71 @@ -888,7 +885,6 @@ date: Thu Jan 01 00:00:00 1970 +0000 summary: mergeCD -#endif check strip behavior @@ -934,7 +930,6 @@ strip backup content -#if repobundlerepo $ hg log -r 'bundle()' -R .hg/strip-backup/6625a5168474-*-backup.hg changeset: 3:6625a5168474 parent: 1:eca11cf91c71 @@ -951,8 +946,6 @@ summary: mergeCD -#endif - Check that the phase cache is properly invalidated after a strip with bookmark. $ cat > ../stripstalephasecache.py << EOF
--- a/tests/test-treemanifest.t Fri Feb 21 22:16:48 2025 -0500 +++ b/tests/test-treemanifest.t Fri Feb 21 22:20:39 2025 -0500 @@ -322,7 +322,6 @@ 0 4 064927a0648a 000000000000 000000000000 1 5 25ecb8cb8618 000000000000 000000000000 -#if repobundlerepo $ hg incoming .hg/strip-backup/* comparing with .hg/strip-backup/*-backup.hg (glob) searching for changes @@ -332,7 +331,6 @@ date: Thu Jan 01 00:00:00 1970 +0000 summary: modify dir1/a -#endif $ hg unbundle .hg/strip-backup/* adding changesets