Mercurial > public > mercurial-scm > hg-stable
diff mercurial/repair.py @ 29464:87c184c9bfef
treemanifests: actually strip directory manifests
Stripping has only partly worked since 7cbb3a01fa38 (repair: use cg3
for treemanifests, 2016-01-19): the bundle seems to have been created
correctly, but revlog entries in subdirectory revlogs were not
stripped. This meant that e.g. "hg verify" would fail after stripping
in a tree manifest repo.
To find the revisions to strip, we simply iterate over all directories
in the repo (included in store.datafiles()). This is inefficient for
stripping few commits, but efficient for stripping many commits. To
optimize for stripping few commits, we could instead walk the tree
from the root and find modified subdirectories, just like we do in the
changegroup code. I'm leaving that for another day.
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Thu, 30 Jun 2016 13:06:19 -0700 |
| parents | 0d83ad967bf8 |
| children | d1c3721d184c |
line wrap: on
line diff
--- a/mercurial/repair.py Thu Jun 30 15:26:11 2016 +0100 +++ b/mercurial/repair.py Thu Jun 30 13:06:19 2016 -0700 @@ -167,6 +167,13 @@ tr.startgroup() cl.strip(striprev, tr) mfst.strip(striprev, tr) + if 'treemanifest' in repo.requirements: # safe but unnecessary + # otherwise + for unencoded, encoded, size in repo.store.datafiles(): + if (unencoded.startswith('meta/') and + unencoded.endswith('00manifest.i')): + dir = unencoded[5:-12] + repo.dirlog(dir).strip(striprev, tr) for fn in files: repo.file(fn).strip(striprev, tr) tr.endgroup()