This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3647

prefetch: use scmutil.fileprefetchhooks if cmdutil._revertprefetch unavailable
ClosedPublic

Authored by spectral on May 22 2018, 6:38 PM.
Tags
None
Subscribers
quark

Details

Reviewers
quark
Group Reviewers
Restricted Project
Commits
rFBHGX45d384548b12: prefetch: use scmutil.fileprefetchhooks if cmdutil._revertprefetch unavailable
Summary

Mercurial commit f1f8b655da32 removed cmdutil._revertprefetch, preferring
scmutil.fileprefetchhooks instead. This commit only uses fileprefetchhooks if
cmdutil._revertprefetch is not available, preferring the more focused mechanism
to attempt to reduce potential duplicate effort.

Diff Detail

Repository
rFBHGX Facebook Mercurial Extensions
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

spectral created this revision.May 22 2018, 6:38 PM
Herald added a reviewer: Restricted Project. · View Herald TranscriptMay 22 2018, 6:38 PM
quark accepted this revision.May 31 2018, 4:46 PM
quark added a subscriber: quark.

Pushed. Thanks!

This revision is now accepted and ready to land.May 31 2018, 4:46 PM
Closed by commit rFBHGX45d384548b12: prefetch: use scmutil.fileprefetchhooks if cmdutil._revertprefetch unavailable (authored by spectral). · Explain WhyMay 31 2018, 6:35 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mremotefilelog/__init__.py (24 lines)

Diff 8943

remotefilelog/__init__.py

dispatch, dispatch,
error, error,
exchange, exchange,
extensions, extensions,
hg, hg,
localrepo, localrepo,
match, match,
merge, merge,
node as nodemod,
patch, patch,
registrar, registrar,
repair, repair,
repoview, repoview,
revset, revset,
scmutil, scmutil,
smartset, smartset,
store, store,
try: try:
return shallowverifier.shallowverifier(repo).verify() return shallowverifier.shallowverifier(repo).verify()
finally: finally:
lock.release() lock.release()
wrapfunction(hg, 'verify', _verify) wrapfunction(hg, 'verify', _verify)
if util.safehasattr(cmdutil, '_revertprefetch'): if util.safehasattr(cmdutil, '_revertprefetch'):
# This mechanism was removed in f1f8b655da32, but is more focused than
# the _fileprefetchhook mechanism, so we prefer it for now.
wrapfunction(cmdutil, '_revertprefetch', _revertprefetch) wrapfunction(cmdutil, '_revertprefetch', _revertprefetch)
elif util.safehasattr(scmutil, 'fileprefetchhooks'):
# This mechanism may overlap some of the other prefetch mechanisms we
# established earlier, performing duplicate or extraneous work, but it
# works after f1f8b655da32.
scmutil.fileprefetchhooks.add('remotefilelog', _fileprefetchhook)
else: else:
wrapfunction(cmdutil, 'revert', revert) wrapfunction(cmdutil, 'revert', revert)
def getrenamedfn(repo, endrev=None): def getrenamedfn(repo, endrev=None):
rcache = {} rcache = {}
def getrenamed(fn, rev): def getrenamed(fn, rev):
'''looks up all renames for a file (up to endrev) the first '''looks up all renames for a file (up to endrev) the first
for path in ctx.walk(m): for path in ctx.walk(m):
files.append((path, hex(mf[path]))) files.append((path, hex(mf[path])))
repo.fileservice.prefetch(files) repo.fileservice.prefetch(files)
return orig(ui, repo, ctx, parents, *pats, **opts) return orig(ui, repo, ctx, parents, *pats, **opts)
def _revertprefetch(orig, repo, ctx, *files): def _revertprefetch(orig, repo, ctx, *files):
# prefetch data that needs to be reverted # prefetch data that needs to be reverted
# used for new mercurial version # used for new mercurial version up until f1f8b655da32
if shallowrepo.requirement in repo.requirements: if shallowrepo.requirement in repo.requirements:
allfiles = [] allfiles = []
mf = ctx.manifest() mf = ctx.manifest()
sparsematch = repo.maybesparsematch(ctx.rev()) sparsematch = repo.maybesparsematch(ctx.rev())
for f in files: for f in files:
for path in f: for path in f:
if (not sparsematch or sparsematch(path)) and path in mf: if (not sparsematch or sparsematch(path)) and path in mf:
allfiles.append((path, hex(mf[path]))) allfiles.append((path, hex(mf[path])))
repo.fileservice.prefetch(allfiles) repo.fileservice.prefetch(allfiles)
return orig(repo, ctx, *files) return orig(repo, ctx, *files)
def _fileprefetchhook(repo, revs, match):
if shallowrepo.requirement in repo.requirements:
allfiles = []
for rev in revs:
if rev == nodemod.wdirrev or rev is None:
continue
ctx = repo[rev]
mf = ctx.manifest()
sparsematch = repo.maybesparsematch(ctx.rev())
for path in ctx.walk(match):
if (not sparsematch or sparsematch(path)) and path in mf:
allfiles.append((path, hex(mf[path])))
repo.fileservice.prefetch(allfiles)
@command('debugremotefilelog', [ @command('debugremotefilelog', [
('d', 'decompress', None, _('decompress the filelog first')), ('d', 'decompress', None, _('decompress the filelog first')),
], _('hg debugremotefilelog <path>'), norepo=True) ], _('hg debugremotefilelog <path>'), norepo=True)
def debugremotefilelog(ui, path, **opts): def debugremotefilelog(ui, path, **opts):
return debugcommands.debugremotefilelog(ui, path, **opts) return debugcommands.debugremotefilelog(ui, path, **opts)
@command('verifyremotefilelog', [ @command('verifyremotefilelog', [
('d', 'decompress', None, _('decompress the filelogs first')), ('d', 'decompress', None, _('decompress the filelogs first')),