D3106: tests: conditionalize test-bundle.t
This revision was automatically updated to reflect the committed changes. Closed by commit rHG09907cd7a17a: tests: conditionalize test-bundle.t (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D3106?vs=7688&id=7832 REVISION DETAIL https://phab.mercurial-scm.org/D3106 AFFECTED FILES tests/test-bundle.t CHANGE DETAILS diff --git a/tests/test-bundle.t b/tests/test-bundle.t --- a/tests/test-bundle.t +++ b/tests/test-bundle.t @@ -77,6 +77,8 @@ checking files 0 files, 0 changesets, 0 total revisions +#if repobundlerepo + Pull full.hg into test (using --cwd) $ hg --cwd test pull ../full.hg @@ -257,6 +259,8 @@ changegroup hook: HG_HOOKNAME=changegroup HG_HOOKTYPE=changegroup HG_NODE=f9ee2f85a263049e9ae6d37a0e67e96194ffb735 HG_NODE_LAST=aa35859c02ea8bd48da5da68cd2740ac71afcbaf HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_URL=bundle:empty+full.hg (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 @@ -266,6 +270,8 @@ packed1 is produced properly +#if reporevlogstore + $ hg -R test debugcreatestreamclonebundle packed.hg writing 2664 bytes for 6 files bundle requirements: generaldelta, revlogv1 @@ -377,6 +383,8 @@ abort: cannot apply stream clone bundle on non-empty repo [255] +#endif + Create partial clones $ rm -r empty @@ -394,6 +402,8 @@ 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 @@ -528,13 +538,18 @@ $ hg -R bundle://../does-not-exist.hg outgoing ../partial2 abort: *../does-not-exist.hg* (glob) [255] + +#endif + $ cd .. hide outer repo $ hg init Direct clone from bundle (all-history) +#if repobundlerepo + $ hg clone full.hg full-clone requesting all changes adding changesets @@ -616,7 +631,7 @@ $ cd .. -test for 540d1059c802 +#endif test for 540d1059c802 @@ -638,7 +653,10 @@ searching for changes 1 changesets found - $ cd ../orig + $ cd .. + +#if repobundlerepo + $ cd orig $ hg incoming ../bundle.hg comparing with ../bundle.hg searching for changes @@ -667,6 +685,8 @@ [255] $ cd .. +#endif + test to bundle revisions on the newly created branch (issue3828): $ hg -q clone -U test test-clone @@ -677,8 +697,10 @@ $ 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 .. @@ -694,9 +716,11 @@ 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 @@ -707,6 +731,7 @@ checking files 2 files, 2 changesets, 2 total revisions +#if repobundlerepo diff against bundle $ hg init b @@ -721,6 +746,7 @@ -2 -3 $ cd .. +#endif bundle single branch @@ -779,6 +805,7 @@ bundling: x 3/3 files (100.00%) bundle2-output-part: "cache:rev-branch-cache" streamed payload +#if repobundlerepo == Test for issue3441 $ hg clone -q -r0 . part2 @@ -789,6 +816,7 @@ crosschecking files in changesets and manifests checking files 4 files, 3 changesets, 5 total revisions +#endif == Test bundling no commits @@ -848,6 +876,8 @@ date:Thu Jan 01 00:00:00 1970 + summary: 0 + +#if repobundlerepo $ hg bundle --base 1 -r 3 ../update2bundled.hg 1 changesets found $ hg strip -r 3 @@ -869,3 +899,4 @@ $ hg update -R ../update2bundled.hg -r 0 0 files updated, 0 files merged, 2 files removed, 0 files unresolved +#endif To: indygreg, #hg-reviewers, durin42 Cc: mercurial-devel ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
D3106: tests: conditionalize test-bundle.t
indygreg created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This test is massive and could probably be split up. This change essentially requires the revlog store for stream clone tests and support for bundlerepos for various tests operating on bundle files. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D3106 AFFECTED FILES tests/test-bundle.t CHANGE DETAILS diff --git a/tests/test-bundle.t b/tests/test-bundle.t --- a/tests/test-bundle.t +++ b/tests/test-bundle.t @@ -77,6 +77,8 @@ checking files 0 files, 0 changesets, 0 total revisions +#if repobundlerepo + Pull full.hg into test (using --cwd) $ hg --cwd test pull ../full.hg @@ -257,6 +259,8 @@ changegroup hook: HG_HOOKNAME=changegroup HG_HOOKTYPE=changegroup HG_NODE=f9ee2f85a263049e9ae6d37a0e67e96194ffb735 HG_NODE_LAST=aa35859c02ea8bd48da5da68cd2740ac71afcbaf HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_URL=bundle:empty+full.hg (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 @@ -266,6 +270,8 @@ packed1 is produced properly +#if reporevlogstore + $ hg -R test debugcreatestreamclonebundle packed.hg writing 2664 bytes for 6 files bundle requirements: generaldelta, revlogv1 @@ -377,6 +383,8 @@ abort: cannot apply stream clone bundle on non-empty repo [255] +#endif + Create partial clones $ rm -r empty @@ -394,6 +402,8 @@ 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 @@ -528,13 +538,18 @@ $ hg -R bundle://../does-not-exist.hg outgoing ../partial2 abort: *../does-not-exist.hg* (glob) [255] + +#endif + $ cd .. hide outer repo $ hg init Direct clone from bundle (all-history) +#if repobundlerepo + $ hg clone full.hg full-clone requesting all changes adding changesets @@ -616,7 +631,7 @@ $ cd .. -test for 540d1059c802 +#endif test for 540d1059c802 @@ -638,7 +653,10 @@ searching for changes 1 changesets found - $ cd ../orig + $ cd .. + +#if repobundlerepo + $ cd orig $ hg incoming ../bundle.hg comparing with ../bundle.hg searching for changes @@ -667,6 +685,8 @@ [255] $ cd .. +#endif + test to bundle revisions on the newly created branch (issue3828): $ hg -q clone -U test test-clone @@ -677,8 +697,10 @@ $ 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 .. @@ -694,9 +716,11 @@ 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 @@ -707,6 +731,7 @@ checking files 2 files, 2 changesets, 2 total revisions +#if repobundlerepo diff against bundle $ hg init b @@ -721,6 +746,7 @@ -2 -3 $ cd .. +#endif bundle single branch @@ -779,6 +805,7 @@ bundling: x 3/3 files (100.00%) bundle2-output-part: "cache:rev-branch-cache" streamed payload +#if repobundlerepo == Test for issue3441 $ hg clone -q -r0 . part2 @@ -789,6 +816,7 @@ crosschecking files in changesets and manifests checking files 4 files, 3 changesets, 5 total revisions +#endif == Test bundling no commits @@ -848,6 +876,8 @@ date:Thu Jan 01 00:00:00 1970 + summary: 0 + +#if repobundlerepo $ hg bundle --base 1 -r 3 ../update2bundled.hg 1 changesets found $ hg strip -r 3 @@ -869,3 +899,4 @@ $ hg update -R ../update2bundled.hg -r 0 0 files updated, 0 files merged, 2 files removed, 0 files unresolved +#endif To: indygreg, #hg-reviewers Cc: mercurial-devel ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel