( )⚙ D3902 prefetch: do not attempt to prefetch treemanifests as files

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3902

prefetch: do not attempt to prefetch treemanifests as files
ClosedPublic

Authored by spectral on Jul 10 2018, 2:39 PM.
Tags
None
Subscribers
None

Details

Reviewers
quark
Group Reviewers
Restricted Project
Commits
rFBHGXe8f6b8b0388a: prefetch: do not attempt to prefetch treemanifests as files
Summary

When using narrow, we get entries from ctx.walk() that aren't files, they're the
roots of ignored/excluded trees. These paths end with a /, so just skip them
when doing the walk.

Example narrowspec:

[include]
path:foo/bar
[exclude]

Example repo:

foo/bar/file1.txt
foo/baz/file2.txt

When walking, we'll see:

foo/bar/file1.txt
foo/baz/

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.Jul 10 2018, 2:39 PM
Herald added a reviewer: Restricted Project. · View Herald TranscriptJul 10 2018, 2:39 PM
quark accepted this revision.Jul 10 2018, 5:53 PM
This revision is now accepted and ready to land.Jul 10 2018, 5:53 PM
Closed by commit rFBHGXe8f6b8b0388a: prefetch: do not attempt to prefetch treemanifests as files (authored by spectral). · Explain WhyJul 10 2018, 6:45 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mremotefilelog/__init__.py (3 lines)

Diff 9517

remotefilelog/__init__.py

allfiles = [] allfiles = []
for rev in revs: for rev in revs:
if rev == nodemod.wdirrev or rev is None: if rev == nodemod.wdirrev or rev is None:
continue continue
ctx = repo[rev] ctx = repo[rev]
mf = ctx.manifest() mf = ctx.manifest()
sparsematch = repo.maybesparsematch(ctx.rev()) sparsematch = repo.maybesparsematch(ctx.rev())
for path in ctx.walk(match): for path in ctx.walk(match):
if path.endswith('/'):
# Tree manifest that's being excluded as part of narrow
continue
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)
@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):