This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1414

prefetch: refactor out resolving opts
ClosedPublic

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

Details

Reviewers
durham
Group Reviewers
Restricted Project
Commits
rFBHGX2ea43d4c7b5b: prefetch: refactor out resolving opts
Summary

The prefetch command performs a preprocessing of the options before
doing the actual work. This commit just separates out that logic.

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:50 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:21 PM
durham added a subscriber: durham.
durham added inline comments.
remotefilelog/__init__.py
955

Maybe add a comment describing what this function does, since it's not clear from the name and the contents are a little dense.

This revision is now accepted and ready to land.Nov 14 2017, 7:21 PM
Closed by commit rFBHGX2ea43d4c7b5b: prefetch: refactor out resolving opts (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
Mremotefilelog/__init__.py (46 lines)

Diff 3635

remotefilelog/__init__.py

def debugwaitonrepack(ui, repo, **opts): def debugwaitonrepack(ui, repo, **opts):
return debugcommands.debugwaitonrepack(repo) return debugcommands.debugwaitonrepack(repo)
@command('debugwaitonprefetch', [ @command('debugwaitonprefetch', [
], _('hg debugwaitonprefetch')) ], _('hg debugwaitonprefetch'))
def debugwaitonprefetch(ui, repo, **opts): def debugwaitonprefetch(ui, repo, **opts):
return debugcommands.debugwaitonprefetch(repo) return debugcommands.debugwaitonprefetch(repo)
def resolveprefetchopts(ui, opts):
durhamUnsubmitted
Not Done

Maybe add a comment describing what this function does, since it's not clear from the name and the contents are a little dense.

durham: Maybe add a comment describing what this function does, since it's not clear from the name and…
if not opts.get('rev'):
revset = ['.', 'draft()']
prefetchrevset = ui.config('remotefilelog', 'pullprefetch', None)
if prefetchrevset:
revset.append('(%s)' % prefetchrevset)
bgprefetchrevs = ui.config('remotefilelog', 'bgprefetchrevs', None)
if bgprefetchrevs:
revset.append('(%s)' % bgprefetchrevs)
revset = '+'.join(revset)
# update a revset with a date limit
revset = revdatelimit(ui, revset)
opts['rev'] = [revset]
if not opts.get('base'):
opts['base'] = None
return opts
@command('prefetch', [ @command('prefetch', [
('r', 'rev', [], _('prefetch the specified revisions'), _('REV')), ('r', 'rev', [], _('prefetch the specified revisions'), _('REV')),
('', 'repack', False, _('run repack after prefetch')), ('', 'repack', False, _('run repack after prefetch')),
('b', 'base', '', _("rev that is assumed to already be local")), ('b', 'base', '', _("rev that is assumed to already be local")),
] + commands.walkopts, _('hg prefetch [OPTIONS] [FILE...]')) ] + commands.walkopts, _('hg prefetch [OPTIONS] [FILE...]'))
def prefetch(ui, repo, *pats, **opts): def prefetch(ui, repo, *pats, **opts):
"""prefetch file revisions from the server """prefetch file revisions from the server
Prefetchs file revisions for the specified revs and stores them in the Prefetchs file revisions for the specified revs and stores them in the
local remotefilelog cache. If no rev is specified, the default rev is local remotefilelog cache. If no rev is specified, the default rev is
used which is the union of dot, draft, pullprefetch and bgprefetchrev. used which is the union of dot, draft, pullprefetch and bgprefetchrev.
File names or patterns can be used to limit which files are downloaded. File names or patterns can be used to limit which files are downloaded.
Return 0 on success. Return 0 on success.
""" """
if not shallowrepo.requirement in repo.requirements: if not shallowrepo.requirement in repo.requirements:
raise error.Abort(_("repo is not shallow")) raise error.Abort(_("repo is not shallow"))
if not opts.get('rev'): opts = resolveprefetchopts(ui, opts)
revset = ['.', 'draft()']
prefetchrevset = ui.config('remotefilelog', 'pullprefetch', None)
if prefetchrevset:
revset.append('(%s)' % prefetchrevset)
bgprefetchrevs = ui.config('remotefilelog', 'bgprefetchrevs', None)
if bgprefetchrevs:
revset.append('(%s)' % bgprefetchrevs)
revset = '+'.join(revset)
# update a revset with a date limit
revset = revdatelimit(ui, revset)
opts['rev'] = [revset]
revs = scmutil.revrange(repo, opts.get('rev')) revs = scmutil.revrange(repo, opts.get('rev'))
repo.prefetch(revs, opts.get('base'), pats, opts)
base = opts.get('base')
if not base:
base = None
repo.prefetch(revs, base, pats, opts)
# Run repack in background # Run repack in background
if opts.get('repack'): if opts.get('repack'):
repackmod.backgroundrepack(repo, incremental=True) repackmod.backgroundrepack(repo, incremental=True)
@command('repack', [ @command('repack', [
('', 'background', None, _('run in a background process'), None), ('', 'background', None, _('run in a background process'), None),
('', 'incremental', None, _('do an incremental repack'), None), ('', 'incremental', None, _('do an incremental repack'), None),