This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1461

prefetch: do not attempt to prefetch trees for non-public commits
ClosedPublic

Authored by singhsrb on Nov 20 2017, 1:44 PM.
Tags
None
Subscribers
quark

Details

Reviewers
quark
Group Reviewers
Restricted Project
Commits
rFBHGX64bdb2fbbd61: prefetch: do not attempt to prefetch trees for non-public commits
Summary

This is a follow up to D1446. It extends the prefetch logic to not
download trees even for commits with secret phase. Also, it uses a better way
of dealing with revsets. Thanks @quark for this!

Test Plan

Ran all the tests.

Diff Detail

Repository
rFBHGX Facebook Mercurial Extensions
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

singhsrb created this revision.Nov 20 2017, 1:44 PM
Herald added a reviewer: Restricted Project. · View Herald TranscriptNov 20 2017, 1:44 PM
quark accepted this revision.Nov 20 2017, 3:40 PM
This revision is now accepted and ready to land.Nov 20 2017, 3:40 PM
Closed by commit rFBHGX64bdb2fbbd61: prefetch: do not attempt to prefetch trees for non-public commits (authored by singhsrb). · Explain WhyNov 21 2017, 1:55 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtreemanifest/__init__.py (9 lines)

Diff 3668

treemanifest/__init__.py

localrepo, localrepo,
manifest, manifest,
mdiff, mdiff,
phases, phases,
policy, policy,
registrar, registrar,
repair, repair,
revlog, revlog,
revsetlang,
scmutil, scmutil,
sshserver, sshserver,
templatekw, templatekw,
util, util,
wireproto, wireproto,
) )
from mercurial.i18n import _ from mercurial.i18n import _
from mercurial.node import bin, hex, nullid from mercurial.node import bin, hex, nullid
def _prefetchonlyfiles(orig, ui, repo, *pats, **opts): def _prefetchonlyfiles(orig, ui, repo, *pats, **opts):
if shallowrepo.requirement in repo.requirements: if shallowrepo.requirement in repo.requirements:
orig(ui, repo, *pats, **opts) orig(ui, repo, *pats, **opts)
def _prefetchonlytrees(repo, opts): def _prefetchonlytrees(repo, opts):
opts = resolveprefetchopts(repo.ui, opts) opts = resolveprefetchopts(repo.ui, opts)
revs = scmutil.revrange(repo, opts.get('rev')) revs = scmutil.revrange(repo, opts.get('rev'))
draftrevs = repo.revs('draft()')
mfnodes = set()
# No trees need to be downloaded for the draft commits. # No trees need to be downloaded for the non-public commits.
for rev in revs - draftrevs: spec = revsetlang.formatspec('%ld & public()', revs)
mfnodes.add(repo[rev].manifestnode()) mfnodes = set(ctx.manifestnode() for ctx in repo.set(spec))
basemfnode = set() basemfnode = set()
base = opts.get('base') base = opts.get('base')
if base is not None: if base is not None:
basemfnode.add(repo[base].manifestnode()) basemfnode.add(repo[base].manifestnode())
_prefetchtrees(repo, '', mfnodes, basemfnode, []) _prefetchtrees(repo, '', mfnodes, basemfnode, [])