This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1600

prefetch: fix the hg executable location for background prefetch
ClosedPublic

Authored by singhsrb on Dec 5 2017, 5:17 PM.
Tags
None
Subscribers
akushner

Details

Reviewers
durham
Group Reviewers
Restricted Project
Commits
rFBHGX6e975e37404d: prefetch: fix the hg executable location for background prefetch
Summary

The background prefetch uses the incorrect executable while running
the prefetch command due to which there are no logs for the background
prefetch. This commit fixes that by specifying the correct executable.

Test Plan
  • Ran all the tests.
  • Tested the output of util.hgexecutable() with system hg and chg, and verified that it returns the correct path. As expected, util.hgcmd() returns the corresponding path for hg and chg in this case.

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.Dec 5 2017, 5:17 PM
Herald added a reviewer: Restricted Project. · View Herald TranscriptDec 5 2017, 5:17 PM
singhsrb added a comment.Dec 5 2017, 5:21 PM

Basically the same issue as D1221. I am not even sure if this is used anywhere but I guess no harm in fixing it.

durham accepted this revision.Dec 5 2017, 5:24 PM
This revision is now accepted and ready to land.Dec 5 2017, 5:24 PM
Closed by commit rFBHGX6e975e37404d: prefetch: fix the hg executable location for background prefetch (authored by singhsrb). · Explain WhyDec 12 2017, 7:25 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mremotefilelog/shallowrepo.py (2 lines)

Diff 4404

remotefilelog/shallowrepo.py

self.fileservice.prefetch(files) self.fileservice.prefetch(files)
return super(shallowrepository, self).commitctx(ctx, return super(shallowrepository, self).commitctx(ctx,
error=error) error=error)
def backgroundprefetch(self, revs, base=None, repack=False, pats=None, def backgroundprefetch(self, revs, base=None, repack=False, pats=None,
opts=None): opts=None):
"""Runs prefetch in background with optional repack """Runs prefetch in background with optional repack
""" """
cmd = util.hgcmd() + ['-R', repo.origroot, 'prefetch'] cmd = [util.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]
cmd = ' '.join(map(util.shellquote, cmd)) cmd = ' '.join(map(util.shellquote, cmd))
runshellcommand(cmd, os.environ) runshellcommand(cmd, os.environ)