diff --git a/mercurial/repair.py b/mercurial/repair.py --- a/mercurial/repair.py +++ b/mercurial/repair.py @@ -364,8 +364,9 @@ striptrees(repo, tr, striprev, files) def striptrees(repo, tr, striprev, files): - if 'treemanifest' in repo.requirements: # safe but unnecessary - # otherwise + if 'treemanifest' in repo.requirements: + # This logic is safe if treemanifest isn't enabled, but also + # pointless, so we skip it if treemanifest isn't enabled. for unencoded, encoded, size in repo.store.datafiles(): if (unencoded.startswith('meta/') and unencoded.endswith('00manifest.i')): @@ -416,7 +417,10 @@ progress.complete() - if 'treemanifest' in repo.requirements: # safe but unnecessary otherwise + if 'treemanifest' in repo.requirements: + # otherwise This logic is safe if treemanifest isn't in + # use, but it's also not required so we skip it if it's + # not needed. for dir in util.dirs(seenfiles): i = 'meta/%s/00manifest.i' % dir d = 'meta/%s/00manifest.d' % dir