This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5246

remotefilelog: avoid accessing repo instance after dispatch
ClosedPublic

Authored by martinvonz on Nov 9 2018, 1:39 AM.
Tags
None
Subscribers
None

Details

Reviewers
None
Group Reviewers
Restricted Project
Commits
rFBHGX05ed5d06b353: remotefilelog: avoid accessing repo instance after dispatch
Summary

Upstream commit c5e6c1ba1c79 (hg: don't reuse repo instance after
unshare(), 2018-09-12) poisoned the repo instance after
unshare(). That made hg unshare fail with remotefilelog because we
tried to close the fileserverclient after dispatch by accessing it via
the repo. This patch fixes that by storing the reference to the
fileserverclient at the beginning of dispatch.

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.

Revision Contents
Changeset List

PathPackages
Mremotefilelog/__init__.py (13 lines)

Diff 12497

remotefilelog/__init__.py

# batch fetch the needed files from the server # batch fetch the needed files from the server
repo.fileservice.prefetch(files) repo.fileservice.prefetch(files)
return missing return missing
wrapfunction(copies, '_computeforwardmissing', computeforwardmissing) wrapfunction(copies, '_computeforwardmissing', computeforwardmissing)
# close cache miss server connection after the command has finished # close cache miss server connection after the command has finished
def runcommand(orig, lui, repo, *args, **kwargs): def runcommand(orig, lui, repo, *args, **kwargs):
try: fileservice = None
return orig(lui, repo, *args, **kwargs)
finally:
# repo can be None when running in chg: # repo can be None when running in chg:
# - at startup, reposetup was called because serve is not norepo # - at startup, reposetup was called because serve is not norepo
# - a norepo command like "help" is called # - a norepo command like "help" is called
if repo and shallowrepo.requirement in repo.requirements: if repo and shallowrepo.requirement in repo.requirements:
repo.fileservice.close() fileservice = repo.fileservice
try:
return orig(lui, repo, *args, **kwargs)
finally:
if fileservice:
fileservice.close()
wrapfunction(dispatch, 'runcommand', runcommand) wrapfunction(dispatch, 'runcommand', runcommand)
# disappointing hacks below # disappointing hacks below
templatekw.getrenamedfn = getrenamedfn templatekw.getrenamedfn = getrenamedfn
wrapfunction(revset, 'filelog', filelogrevset) wrapfunction(revset, 'filelog', filelogrevset)
revset.symbols['filelog'] = revset.filelog revset.symbols['filelog'] = revset.filelog
wrapfunction(cmdutil, 'walkfilerevs', walkfilerevs) wrapfunction(cmdutil, 'walkfilerevs', walkfilerevs)