This is an archive of the discontinued Mercurial Phabricator instance.

Differential D292

repair: move manifest strip to a separate function
ClosedPublic

Authored by durham on Aug 8 2017, 8:33 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG86ea201eaeb9: repair: move manifest strip to a separate function
Summary

This moves manifest stripping to a separate function so implementations of the
manifest that don't support stripping can replace this function with a no-op.

I considered adding a strip api to the manifestlog, so other implementations
could make it a no-op there, but it seems like strip might be unique to the
revlog implementation, and therefore shouldn't be present on the generic api.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

durham created this revision.Aug 8 2017, 8:33 PM
Closed by commit rHG86ea201eaeb9: repair: move manifest strip to a separate function (authored by durham). · Explain WhyAug 9 2017, 11:36 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/repair.py (10 lines)

Diff 662

mercurial/repair.py

# #
# We do not include obsolescence, it might re-introduce prune markers # We do not include obsolescence, it might re-introduce prune markers
# we are trying to strip. This is harmless since the stripped markers # we are trying to strip. This is harmless since the stripped markers
# are already backed up and we did not touched the markers for the # are already backed up and we did not touched the markers for the
# saved changesets. # saved changesets.
tmpbundlefile = _bundle(repo, savebases, saveheads, node, 'temp', tmpbundlefile = _bundle(repo, savebases, saveheads, node, 'temp',
compress=False, obsolescence=False) compress=False, obsolescence=False)
mfst = repo.manifestlog._revlog
try: try:
with repo.transaction("strip") as tr: with repo.transaction("strip") as tr:
offset = len(tr.entries) offset = len(tr.entries)
tr.startgroup() tr.startgroup()
cl.strip(striprev, tr) cl.strip(striprev, tr)
mfst.strip(striprev, tr) stripmanifest(repo, striprev, tr, files)
striptrees(repo, tr, striprev, files)
for fn in files: for fn in files:
repo.file(fn).strip(striprev, tr) repo.file(fn).strip(striprev, tr)
tr.endgroup() tr.endgroup()
for i in xrange(offset, len(tr.entries)): for i in xrange(offset, len(tr.entries)):
file, troffset, ignore = tr.entries[i] file, troffset, ignore = tr.entries[i]
with repo.svfs(file, 'a', checkambig=True) as fp: with repo.svfs(file, 'a', checkambig=True) as fp:
callback = tr.getpostclose('\xffstrip') callback = tr.getpostclose('\xffstrip')
if callback is None: if callback is None:
callback = stripcallback(ui, repo, True, topic) callback = stripcallback(ui, repo, True, topic)
tr.addpostclose('\xffstrip', callback) tr.addpostclose('\xffstrip', callback)
if topic: if topic:
callback.topic = topic callback.topic = topic
callback.addnodes(nodelist) callback.addnodes(nodelist)
def stripmanifest(repo, striprev, tr, files):
revlog = repo.manifestlog._revlog
revlog.strip(striprev, tr)
striptrees(repo, tr, striprev, files)
def striptrees(repo, tr, striprev, files): def striptrees(repo, tr, striprev, files):
if 'treemanifest' in repo.requirements: # safe but unnecessary if 'treemanifest' in repo.requirements: # safe but unnecessary
# otherwise # otherwise
for unencoded, encoded, size in repo.store.datafiles(): for unencoded, encoded, size in repo.store.datafiles():
if (unencoded.startswith('meta/') and if (unencoded.startswith('meta/') and
unencoded.endswith('00manifest.i')): unencoded.endswith('00manifest.i')):
dir = unencoded[5:-12] dir = unencoded[5:-12]
repo.manifestlog._revlog.dirlog(dir).strip(striprev, tr) repo.manifestlog._revlog.dirlog(dir).strip(striprev, tr)