diff --git a/mercurial/repair.py b/mercurial/repair.py index ca2a0a654f54c3f790582c1a9eac60e0fc03382b_bWVyY3VyaWFsL3JlcGFpci5weQ==..6f248ba853092fa90998f4c87374b9272c8371fe_bWVyY3VyaWFsL3JlcGFpci5weQ== 100644 --- a/mercurial/repair.py +++ b/mercurial/repair.py @@ -273,7 +273,7 @@ ui.progress(_('changeset'), None) - if 'treemanifest' in repo: # safe but unnecessary otherwise + if 'treemanifest' in repo.requirements: # safe but unnecessary otherwise for dir in util.dirs(seenfiles): i = 'meta/%s/00manifest.i' % dir d = 'meta/%s/00manifest.d' % dir diff --git a/tests/test-treemanifest.t b/tests/test-treemanifest.t index ca2a0a654f54c3f790582c1a9eac60e0fc03382b_dGVzdHMvdGVzdC10cmVlbWFuaWZlc3QudA==..6f248ba853092fa90998f4c87374b9272c8371fe_dGVzdHMvdGVzdC10cmVlbWFuaWZlc3QudA== 100644 --- a/tests/test-treemanifest.t +++ b/tests/test-treemanifest.t @@ -465,6 +465,39 @@ $ echo troz >> b/bar/orange/fly/gnat.py $ hg ci -m troz +Verify works + $ hg verify + checking changesets + checking manifests + crosschecking files in changesets and manifests + checking files + 8 files, 3 changesets, 10 total revisions + +Dirlogs are included in fncache + $ grep meta/.A/00manifest.i .hg/store/fncache + meta/.A/00manifest.i + +Rebuilt fncache includes dirlogs + $ rm .hg/store/fncache + $ hg debugrebuildfncache + adding data/.A/one.txt.i + adding data/.A/two.txt.i + adding data/b/bar/fruits.txt.i + adding data/b/bar/orange/fly/gnat.py.i + adding data/b/bar/orange/fly/housefly.txt.i + adding data/b/foo/apple/bees/flower.py.i + adding data/c.txt.i + adding data/d.py.i + adding meta/.A/00manifest.i + adding meta/b/00manifest.i + adding meta/b/bar/00manifest.i + adding meta/b/bar/orange/00manifest.i + adding meta/b/bar/orange/fly/00manifest.i + adding meta/b/foo/00manifest.i + adding meta/b/foo/apple/00manifest.i + adding meta/b/foo/apple/bees/00manifest.i + 16 items added, 0 removed from fncache + Test cloning a treemanifest repo over http. $ hg serve -p $HGPORT2 -d --pid-file=hg.pid --errorlog=errors.log $ cat hg.pid >> $DAEMON_PIDS