( )⚙ D1367 shallowrepo: refactor prefetch to exclude the repack option

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1367

shallowrepo: refactor prefetch to exclude the repack option
ClosedPublic

Authored by singhsrb on Nov 10 2017, 5:18 PM.
Tags
None
Subscribers
None

Details

Reviewers
durham
Group Reviewers
Restricted Project
Commits
rFBHGXb992a7a164fd: shallowrepo: refactor prefetch to exclude the repack option
Summary

Let the prefetch command be responsible for the repacking.

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 10 2017, 5:18 PM
Herald added a reviewer: Restricted Project. · View Herald TranscriptNov 10 2017, 5:18 PM
durham accepted this revision.Nov 14 2017, 7:12 PM
This revision is now accepted and ready to land.Nov 14 2017, 7:12 PM
Closed by commit rFBHGXb992a7a164fd: shallowrepo: refactor prefetch to exclude the repack option (authored by singhsrb). · Explain WhyNov 20 2017, 9:54 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 3409

remotefilelog/__init__.py

# update a revset with a date limit # update a revset with a date limit
revset = revdatelimit(ui, revset) revset = revdatelimit(ui, revset)
opts['rev'] = [revset] opts['rev'] = [revset]
revs = scmutil.revrange(repo, opts.get('rev')) revs = scmutil.revrange(repo, opts.get('rev'))
repo.prefetch(revs, repack=opts.get('repack'), pats=pats, opts=opts) repo.prefetch(revs, pats=pats, opts=opts)
# Run repack in background
if opts.get('repack'):
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),
], _('hg repack [OPTIONS]')) ], _('hg repack [OPTIONS]'))
def repack(ui, repo, *pats, **opts): def repack(ui, repo, *pats, **opts):
if opts.get('background'): if opts.get('background'):
repackmod.backgroundrepack(repo, incremental=opts.get('incremental')) repackmod.backgroundrepack(repo, incremental=opts.get('incremental'))
return return
if opts.get('incremental'): if opts.get('incremental'):
repackmod.incrementalrepack(repo) repackmod.incrementalrepack(repo)
else: else:
repackmod.fullrepack(repo) repackmod.fullrepack(repo)

remotefilelog/shallowrepo.py

# shallowrepo.py - shallow repository that uses remote filelogs # shallowrepo.py - shallow repository that uses remote filelogs
# #
# Copyright 2013 Facebook, Inc. # Copyright 2013 Facebook, Inc.
# #
# This software may be used and distributed according to the terms of the # This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version. # GNU General Public License version 2 or any later version.
from hgext3rd.extutil import runshellcommand from hgext3rd.extutil import runshellcommand
from mercurial.i18n import _ from mercurial.i18n import _
from mercurial.node import hex, nullid, nullrev from mercurial.node import hex, nullid, nullrev
from mercurial import error, localrepo, util, match, scmutil from mercurial import error, localrepo, util, match, scmutil
from . import remotefilelog, remotefilectx, fileserverclient from . import remotefilelog, remotefilectx, fileserverclient
import repack as repackmod
import constants, shallowutil import constants, shallowutil
from contentstore import remotefilelogcontentstore, unioncontentstore from contentstore import remotefilelogcontentstore, unioncontentstore
from contentstore import remotecontentstore from contentstore import remotecontentstore
from metadatastore import remotefilelogmetadatastore, unionmetadatastore from metadatastore import remotefilelogmetadatastore, unionmetadatastore
from metadatastore import remotemetadatastore from metadatastore import remotemetadatastore
from datapack import datapackstore from datapack import datapackstore
from historypack import historypackstore from historypack import historypackstore
if repack: if repack:
cmd.append('--repack') cmd.append('--repack')
if revs: if revs:
cmd += ['-r', revs] cmd += ['-r', revs]
cmd = ' '.join(map(util.shellquote, cmd)) cmd = ' '.join(map(util.shellquote, cmd))
runshellcommand(cmd, os.environ) runshellcommand(cmd, os.environ)
def prefetch(self, revs, base=None, repack=False, pats=None, opts=None): def prefetch(self, revs, base=None, pats=None, opts=None):
"""Prefetches all the necessary file revisions for the given revs """Prefetches all the necessary file revisions for the given revs
Optionally runs repack in background Optionally runs repack in background
""" """
with repo._lock(repo.svfs, 'prefetchlock', True, None, None, with repo._lock(repo.svfs, 'prefetchlock', True, None, None,
_('prefetching in %s') % repo.origroot): _('prefetching in %s') % repo.origroot):
self._prefetch(revs, base, repack, pats, opts) self._prefetch(revs, base, pats, opts)
# Run repack in background def _prefetch(self, revs, base=None, pats=None, opts=None):
if repack:
repackmod.backgroundrepack(repo, incremental=True)
def _prefetch(self, revs, base=None, repack=False, pats=None,
opts=None):
fallbackpath = self.fallbackpath fallbackpath = self.fallbackpath
if fallbackpath: if fallbackpath:
# If we know a rev is on the server, we should fetch the server # If we know a rev is on the server, we should fetch the server
# version of those files, since our local file versions might # version of those files, since our local file versions might
# become obsolete if the local commits are stripped. # become obsolete if the local commits are stripped.
localrevs = repo.revs('outgoing(%s)', fallbackpath) localrevs = repo.revs('outgoing(%s)', fallbackpath)
if base is not None and base != nullrev: if base is not None and base != nullrev:
serverbase = list(repo.revs('first(reverse(::%s) - %ld)', serverbase = list(repo.revs('first(reverse(::%s) - %ld)',