This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3118

commands: document the layering violation in `manifest --all`
ClosedPublic

Authored by indygreg on Apr 5 2018, 12:39 AM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHG814e080a1215: commands: document the layering violation in `manifest --all`
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 71938479eff9 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.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

indygreg created this revision.Apr 5 2018, 12:39 AM
durin42 accepted this revision.Apr 6 2018, 8:46 PM
This revision is now accepted and ready to land.Apr 6 2018, 8:46 PM
Closed by commit rHG814e080a1215: commands: document the layering violation in `manifest --all` (authored by indygreg). · Explain WhyApr 6 2018, 9:22 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/commands.py (2 lines)
Mtests/test-convert-git.t (2 lines)
Mtests/test-manifest.t (16 lines)

Diff 7700

mercurial/commands.py

opts = pycompat.byteskwargs(opts) opts = pycompat.byteskwargs(opts)
fm = ui.formatter('manifest', opts) fm = ui.formatter('manifest', opts)
if opts.get('all'): if opts.get('all'):
if rev or node: if rev or node:
raise error.Abort(_("can't specify a revision with --all")) raise error.Abort(_("can't specify a revision with --all"))
res = [] res = []
# TODO this is a massive layering violation. It assumes the repo is
# backed by revlogs with a well-defined naming scheme.
prefix = "data/" prefix = "data/"
suffix = ".i" suffix = ".i"
plen = len(prefix) plen = len(prefix)
slen = len(suffix) slen = len(suffix)
with repo.lock(): with repo.lock():
for fn, b, size in repo.store.datafiles(): for fn, b, size in repo.store.datafiles():
if size != 0 and fn[-slen:] == suffix and fn[:plen] == prefix: if size != 0 and fn[-slen:] == suffix and fn[:plen] == prefix:
res.append(fn[plen:-slen]) res.append(fn[plen:-slen])

tests/test-convert-git.t

remove .gitmodules and submodule git-repo5 remove .gitmodules and submodule git-repo5
$ hg -R git-repo6-hg tip -T "{file_dels}\n" $ hg -R git-repo6-hg tip -T "{file_dels}\n"
.hgsub .hgsubstate .hgsub .hgsubstate
skip submodules in the conversion skip submodules in the conversion
$ hg convert -q git-repo6 no-submodules --config convert.git.skipsubmodules=True $ hg convert -q git-repo6 no-submodules --config convert.git.skipsubmodules=True
$ hg -R no-submodules manifest --all $ hg -R no-submodules manifest --all
.gitmodules-renamed .gitmodules-renamed (no-reposimplestore !)
convert using a different remote prefix convert using a different remote prefix
$ git init git-repo7 $ git init git-repo7
Initialized empty Git repository in $TESTTMP/git-repo7/.git/ Initialized empty Git repository in $TESTTMP/git-repo7/.git/
$ cd git-repo7 $ cd git-repo7
$ touch a && git add a && commit -am "commit a" $ touch a && git add a && commit -am "commit a"
$ git rev-parse HEAD $ git rev-parse HEAD
b77d4d3dca7949aa425aba5d218042a385065923 b77d4d3dca7949aa425aba5d218042a385065923

tests/test-manifest.t

#require repobundlerepo
Source bundle was generated with the following script: Source bundle was generated with the following script:
# hg init # hg init
# echo a > a # echo a > a
# ln -s a l # ln -s a l
# hg ci -Ama -d'0 0' # hg ci -Ama -d'0 0'
# mkdir b # mkdir b
# echo a > b/a # echo a > b/a
# chmod +x b/a # chmod +x b/a
# hg ci -Amb -d'1 0' # hg ci -Amb -d'1 0'
$ hg init $ 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: The next call is expected to return nothing:
$ hg manifest $ hg manifest
$ hg co $ hg co
3 files updated, 0 files merged, 0 files removed, 0 files unresolved 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
l l
$ hg manifest tip $ hg manifest tip
a a
b/a b/a
l l
$ hg manifest --all $ hg manifest --all
a a (no-reposimplestore !)
b/a b/a (no-reposimplestore !)
l l (no-reposimplestore !)
The next two calls are expected to abort: The next two calls are expected to abort:
$ hg manifest -r 2 $ hg manifest -r 2
abort: unknown revision '2'! abort: unknown revision '2'!
[255] [255]
$ hg manifest -r tip tip $ hg manifest -r tip tip
abort: please specify just one revision abort: please specify just one revision
[255] [255]