indygreg created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers.
REVISION SUMMARY This commit fixes the last test failures when using the simple store extension! It turns out that `hg manifest --all` locks the repo and scans for revlogs. This feature was added by https://phab.mercurial-scm.org/rHG71938479eff93aabc8da2df053e77e9d8d8e1844 in 2011. I am debating changing the behavior. But that can occur in another commit. As part of debugging this, I realized that test-manifest.t is the only meaningful tester of `hg manifest --all` and that test was improperly disabled when bundlerepos aren't supported. The test is testing manifest behavior, not whether you can `hg pull` from a bundle. So I changed the test to `hg unbundle` instead. FWIW, I wasted a non-trivial amount of time tracking down this failure. I thought the issue involved Git, which is why I refactored the test to be more deterministic. Never in my mind would I have guessed that code in `hg manifest` would scan revlogs. I should have looked there to begin with. Doh. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D3118 AFFECTED FILES mercurial/commands.py tests/test-convert-git.t tests/test-manifest.t CHANGE DETAILS diff --git a/tests/test-manifest.t b/tests/test-manifest.t --- a/tests/test-manifest.t +++ b/tests/test-manifest.t @@ -1,5 +1,3 @@ -#require repobundlerepo - Source bundle was generated with the following script: # hg init @@ -12,7 +10,13 @@ # hg ci -Amb -d'1 0' $ hg init - $ hg -q pull "$TESTDIR/bundles/test-manifest.hg" + $ hg unbundle "$TESTDIR/bundles/test-manifest.hg" + adding changesets + adding manifests + adding file changes + added 2 changesets with 3 changes to 3 files + new changesets b73562a03cfe:5bdc995175ba + (run 'hg update' to get a working copy) The next call is expected to return nothing: @@ -64,9 +68,9 @@ l $ hg manifest --all - a - b/a - l + a (no-reposimplestore !) + b/a (no-reposimplestore !) + l (no-reposimplestore !) The next two calls are expected to abort: diff --git a/tests/test-convert-git.t b/tests/test-convert-git.t --- a/tests/test-convert-git.t +++ b/tests/test-convert-git.t @@ -881,7 +881,7 @@ $ hg convert -q git-repo6 no-submodules --config convert.git.skipsubmodules=True $ hg -R no-submodules manifest --all - .gitmodules-renamed + .gitmodules-renamed (no-reposimplestore !) convert using a different remote prefix $ git init git-repo7 diff --git a/mercurial/commands.py b/mercurial/commands.py --- a/mercurial/commands.py +++ b/mercurial/commands.py @@ -3492,6 +3492,8 @@ raise error.Abort(_("can't specify a revision with --all")) res = [] + # TODO this is a massive layering violation. It assumes the repo is + # backed by revlogs with a well-defined naming scheme. prefix = "data/" suffix = ".i" plen = len(prefix) 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