This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6539

remotefilelog: tell runbgcommand to not block on child process startup
ClosedPublic

Authored by durin42 on Jun 18 2019, 10:00 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGdf1419c5756a: remotefilelog: tell runbgcommand to not block on child process startup
Summary

These two invocations will always find a binary because they're
re-running hg. As a result, we can skip waiting for the subprocess to
start running and save a little bit of wall-time.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

durin42 created this revision.Jun 18 2019, 10:00 AM
pulkit accepted this revision.Jun 18 2019, 11:33 AM
This revision is now accepted and ready to land.Jun 18 2019, 11:33 AM

Revision Contents
Changeset List

Diff 15578

hgext/remotefilelog/repack.py

cmd = [procutil.hgexecutable(), '-R', repo.origroot, 'repack'] cmd = [procutil.hgexecutable(), '-R', repo.origroot, 'repack']
msg = _("(running background repack)\n") msg = _("(running background repack)\n")
if incremental: if incremental:
cmd.append('--incremental') cmd.append('--incremental')
msg = _("(running background incremental repack)\n") msg = _("(running background incremental repack)\n")
if packsonly: if packsonly:
cmd.append('--packsonly') cmd.append('--packsonly')
repo.ui.warn(msg) repo.ui.warn(msg)
procutil.runbgcommand(cmd, encoding.environ) # We know this command will find a binary, so don't block on it starting.
procutil.runbgcommand(cmd, encoding.environ, ensurestart=False)
def fullrepack(repo, options=None): def fullrepack(repo, options=None):
"""If ``packsonly`` is True, stores creating only loose objects are skipped. """If ``packsonly`` is True, stores creating only loose objects are skipped.
""" """
if util.safehasattr(repo, 'shareddatastores'): if util.safehasattr(repo, 'shareddatastores'):
datasource = contentstore.unioncontentstore( datasource = contentstore.unioncontentstore(
*repo.shareddatastores) *repo.shareddatastores)
historysource = metadatastore.unionmetadatastore( historysource = metadatastore.unionmetadatastore(

hgext/remotefilelog/shallowrepo.py

opts=None): opts=None):
"""Runs prefetch in background with optional repack """Runs prefetch in background with optional repack
""" """
cmd = [procutil.hgexecutable(), '-R', repo.origroot, 'prefetch'] cmd = [procutil.hgexecutable(), '-R', repo.origroot, 'prefetch']
if repack: if repack:
cmd.append('--repack') cmd.append('--repack')
if revs: if revs:
cmd += ['-r', revs] cmd += ['-r', revs]
procutil.runbgcommand(cmd, encoding.environ) # We know this command will find a binary, so don't block
# on it starting.
procutil.runbgcommand(cmd, encoding.environ, ensurestart=False)
def prefetch(self, revs, base=None, 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, pats, opts) self._prefetch(revs, base, pats, opts)