This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1415

prefetchtrees: allow only one revision to be specified as the base revision
ClosedPublic

Authored by singhsrb on Nov 14 2017, 3:43 PM.
Tags
None
Subscribers
None

Details

Reviewers
durham
Group Reviewers
Restricted Project
Commits
rFBHGXfe2f5babfe93: prefetchtrees: allow only one revision to be specified as the base revision
Summary

The prefetch command only allows for one revision to be specified as
the base revision. Eventually, we plan to merge prefetch and prefetchtrees
into a single command and therefore, this commit takes a step towards making
the interface to these commands exactly the same.

Test Plan

Ran all the tests.

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

singhsrb created this revision.Nov 14 2017, 3:43 PM
Herald added a reviewer: Restricted Project. · View Herald TranscriptNov 14 2017, 3:43 PM
singhsrb added a comment.EditedNov 14 2017, 3:49 PM

This is only an intermediate step to help out with the review. It might be useful to checkout D1417 first to get an idea of what this leads to.

durham accepted this revision.Nov 14 2017, 7:26 PM
This revision is now accepted and ready to land.Nov 14 2017, 7:26 PM
Closed by commit rFBHGXfe2f5babfe93: prefetchtrees: allow only one revision to be specified as the base revision (authored by singhsrb). · Explain WhyNov 20 2017, 9:54 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtreemanifest/__init__.py (15 lines)

Diff 3636

treemanifest/__init__.py

break break
if currcls is object: if currcls is object:
raise AttributeError(_("%s has no property '%s'") % raise AttributeError(_("%s has no property '%s'") %
(type(currcls), propname)) (type(currcls), propname))
@command('prefetchtrees', [ @command('prefetchtrees', [
('r', 'rev', '', _("revs to prefetch the trees for")), ('r', 'rev', '', _("revs to prefetch the trees for")),
('', 'base', '', _("revs that are assumed to already be local")), ('b', 'base', '', _("rev that is assumed to already be local")),
] + commands.walkopts, _('--rev REVS PATTERN..')) ] + commands.walkopts, _('--rev REVS PATTERN..'))
def prefetchtrees(ui, repo, *args, **opts): def prefetchtrees(ui, repo, *args, **opts):
revs = repo.revs(opts.get('rev')) revs = repo.revs(opts.get('rev'))
baserevs = []
if opts.get('base'):
baserevs = repo.revs(opts.get('base'))
mfnodes = set() mfnodes = set()
for rev in revs: for rev in revs:
mfnodes.add(repo[rev].manifestnode()) mfnodes.add(repo[rev].manifestnode())
basemfnodes = set() basemfnode = set()
for rev in baserevs: base = opts.get('base')
basemfnodes.add(repo[rev].manifestnode()) if base:
basemfnode.add(repo[base].manifestnode())
_prefetchtrees(repo, '', mfnodes, basemfnodes, []) _prefetchtrees(repo, '', mfnodes, basemfnode, [])
def _prefetchtrees(repo, rootdir, mfnodes, basemfnodes, directories): def _prefetchtrees(repo, rootdir, mfnodes, basemfnodes, directories):
# If possible, use remotefilelog's more expressive fallbackpath # If possible, use remotefilelog's more expressive fallbackpath
if util.safehasattr(repo, 'fallbackpath'): if util.safehasattr(repo, 'fallbackpath'):
fallbackpath = repo.fallbackpath fallbackpath = repo.fallbackpath
else: else:
fallbackpath = repo.ui.config('paths', 'default') fallbackpath = repo.ui.config('paths', 'default')