( )⚙ D6333 remotefilelog: move most functions in onetimeclientsetup() to top level

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6333

remotefilelog: move most functions in onetimeclientsetup() to top level
ClosedPublic

Authored by martinvonz on May 2 2019, 1:55 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG651f325e4fdd: remotefilelog: move most functions in onetimeclientsetup() to top level
Summary

This is how most extensions seem to do it. It makes sure we don't
accidentally depend on the captured ui instance.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

martinvonz created this revision.May 2 2019, 1:55 PM
pulkit accepted this revision.May 14 2019, 1:09 PM
pulkit added a comment.May 14 2019, 1:14 PM

This fails to apply cleanly on tip of default.

martinvonz updated this revision to Diff 15072.May 14 2019, 1:22 PM
martinvonz added a comment.May 14 2019, 1:22 PM
In D6333#92648, @pulkit wrote:

This fails to apply cleanly on tip of default.

Fixed

Closed by commit rHG651f325e4fdd: remotefilelog: move most functions in onetimeclientsetup() to top level (authored by martinvonz). · Explain WhyMay 14 2019, 2:05 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/remotefilelog/__init__.py (346 lines)

Diff 14986

hgext/remotefilelog/__init__.py

# Even clients get the server setup since they need to have the # Even clients get the server setup since they need to have the
# wireprotocol endpoints registered. # wireprotocol endpoints registered.
remotefilelogserver.onetimesetup(ui) remotefilelogserver.onetimesetup(ui)
onetimeclientsetup(ui) onetimeclientsetup(ui)
shallowrepo.wraprepo(repo) shallowrepo.wraprepo(repo)
repo.store = shallowstore.wrapstore(repo.store) repo.store = shallowstore.wrapstore(repo.store)
clientonetime = False
def onetimeclientsetup(ui):
global clientonetime
if clientonetime:
return
clientonetime = True
changegroup.cgpacker = shallowbundle.shallowcg1packer
extensions.wrapfunction(changegroup, '_addchangegroupfiles',
shallowbundle.addchangegroupfiles)
extensions.wrapfunction(
changegroup, 'makechangegroup', shallowbundle.makechangegroup)
def storewrapper(orig, requirements, path, vfstype): def storewrapper(orig, requirements, path, vfstype):
s = orig(requirements, path, vfstype) s = orig(requirements, path, vfstype)
if constants.SHALLOWREPO_REQUIREMENT in requirements: if constants.SHALLOWREPO_REQUIREMENT in requirements:
s = shallowstore.wrapstore(s) s = shallowstore.wrapstore(s)
return s return s
extensions.wrapfunction(localrepo, 'makestore', storewrapper)
extensions.wrapfunction(exchange, 'pull', exchangepull)
# prefetch files before update # prefetch files before update
def applyupdates(orig, repo, actions, wctx, mctx, overwrite, labels=None): def applyupdates(orig, repo, actions, wctx, mctx, overwrite, labels=None):
if isenabled(repo): if isenabled(repo):
manifest = mctx.manifest() manifest = mctx.manifest()
files = [] files = []
for f, args, msg in actions['g']: for f, args, msg in actions['g']:
files.append((f, hex(manifest[f]))) files.append((f, hex(manifest[f])))
# 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 orig(repo, actions, wctx, mctx, overwrite, labels=labels) return orig(repo, actions, wctx, mctx, overwrite, labels=labels)
extensions.wrapfunction(merge, 'applyupdates', applyupdates)
# Prefetch merge checkunknownfiles # Prefetch merge checkunknownfiles
def checkunknownfiles(orig, repo, wctx, mctx, force, actions, def checkunknownfiles(orig, repo, wctx, mctx, force, actions,
*args, **kwargs): *args, **kwargs):
if isenabled(repo): if isenabled(repo):
files = [] files = []
sparsematch = repo.maybesparsematch(mctx.rev()) sparsematch = repo.maybesparsematch(mctx.rev())
for f, (m, actionargs, msg) in actions.iteritems(): for f, (m, actionargs, msg) in actions.iteritems():
if sparsematch and not sparsematch(f): if sparsematch and not sparsematch(f):
continue continue
if m in ('c', 'dc', 'cm'): if m in ('c', 'dc', 'cm'):
files.append((f, hex(mctx.filenode(f)))) files.append((f, hex(mctx.filenode(f))))
elif m == 'dg': elif m == 'dg':
f2 = actionargs[0] f2 = actionargs[0]
files.append((f2, hex(mctx.filenode(f2)))) files.append((f2, hex(mctx.filenode(f2))))
# 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 orig(repo, wctx, mctx, force, actions, *args, **kwargs) return orig(repo, wctx, mctx, force, actions, *args, **kwargs)
extensions.wrapfunction(merge, '_checkunknownfiles', checkunknownfiles)
# Prefetch files before status attempts to look at their size and contents # Prefetch files before status attempts to look at their size and contents
def checklookup(orig, self, files): def checklookup(orig, self, files):
repo = self._repo repo = self._repo
if isenabled(repo): if isenabled(repo):
prefetchfiles = [] prefetchfiles = []
for parent in self._parents: for parent in self._parents:
for f in files: for f in files:
if f in parent: if f in parent:
prefetchfiles.append((f, hex(parent.filenode(f)))) prefetchfiles.append((f, hex(parent.filenode(f))))
# batch fetch the needed files from the server # batch fetch the needed files from the server
repo.fileservice.prefetch(prefetchfiles) repo.fileservice.prefetch(prefetchfiles)
return orig(self, files) return orig(self, files)
extensions.wrapfunction(context.workingctx, '_checklookup', checklookup)
# Prefetch the logic that compares added and removed files for renames # Prefetch the logic that compares added and removed files for renames
def findrenames(orig, repo, matcher, added, removed, *args, **kwargs): def findrenames(orig, repo, matcher, added, removed, *args, **kwargs):
if isenabled(repo): if isenabled(repo):
files = [] files = []
pmf = repo['.'].manifest() pmf = repo['.'].manifest()
for f in removed: for f in removed:
if f in pmf: if f in pmf:
files.append((f, hex(pmf[f]))) files.append((f, hex(pmf[f])))
# 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 orig(repo, matcher, added, removed, *args, **kwargs) return orig(repo, matcher, added, removed, *args, **kwargs)
extensions.wrapfunction(scmutil, '_findrenames', findrenames)
# prefetch files before mergecopies check # prefetch files before mergecopies check
def computenonoverlap(orig, repo, c1, c2, *args, **kwargs): def computenonoverlap(orig, repo, c1, c2, *args, **kwargs):
u1, u2 = orig(repo, c1, c2, *args, **kwargs) u1, u2 = orig(repo, c1, c2, *args, **kwargs)
if isenabled(repo): if isenabled(repo):
m1 = c1.manifest() m1 = c1.manifest()
m2 = c2.manifest() m2 = c2.manifest()
files = [] files = []
sparsematch1 = repo.maybesparsematch(c1.rev()) sparsematch1 = repo.maybesparsematch(c1.rev())
if sparsematch1: if sparsematch1:
sparseu1 = set() sparseu1 = set()
for f in u1: for f in u1:
if sparsematch1(f): if sparsematch1(f):
files.append((f, hex(m1[f]))) files.append((f, hex(m1[f])))
sparseu1.add(f) sparseu1.add(f)
u1 = sparseu1 u1 = sparseu1
sparsematch2 = repo.maybesparsematch(c2.rev()) sparsematch2 = repo.maybesparsematch(c2.rev())
if sparsematch2: if sparsematch2:
sparseu2 = set() sparseu2 = set()
for f in u2: for f in u2:
if sparsematch2(f): if sparsematch2(f):
files.append((f, hex(m2[f]))) files.append((f, hex(m2[f])))
sparseu2.add(f) sparseu2.add(f)
u2 = sparseu2 u2 = sparseu2
# 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 u1, u2 return u1, u2
extensions.wrapfunction(copies, '_computenonoverlap', computenonoverlap)
# prefetch files before pathcopies check # prefetch files before pathcopies check
def computeforwardmissing(orig, a, b, match=None): def computeforwardmissing(orig, a, b, match=None):
missing = orig(a, b, match=match) missing = orig(a, b, match=match)
repo = a._repo repo = a._repo
if isenabled(repo): if isenabled(repo):
mb = b.manifest() mb = b.manifest()
files = [] files = []
sparsematch = repo.maybesparsematch(b.rev()) sparsematch = repo.maybesparsematch(b.rev())
if sparsematch: if sparsematch:
sparsemissing = set() sparsemissing = set()
for f in missing: for f in missing:
if sparsematch(f): if sparsematch(f):
files.append((f, hex(mb[f]))) files.append((f, hex(mb[f])))
sparsemissing.add(f) sparsemissing.add(f)
missing = sparsemissing missing = sparsemissing
# 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
extensions.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):
fileservice = None fileservice = None
# 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 isenabled(repo): if repo and isenabled(repo):
fileservice = repo.fileservice fileservice = repo.fileservice
try: try:
return orig(lui, repo, *args, **kwargs) return orig(lui, repo, *args, **kwargs)
finally: finally:
if fileservice: if fileservice:
fileservice.close() fileservice.close()
# prevent strip from stripping remotefilelogs
def _collectbrokencsets(orig, repo, files, striprev):
if isenabled(repo):
files = list([f for f in files if not repo.shallowmatch(f)])
return orig(repo, files, striprev)
# changectx wrappers
def filectx(orig, self, path, fileid=None, filelog=None):
if fileid is None:
fileid = self.filenode(path)
if (isenabled(self._repo) and self._repo.shallowmatch(path)):
return remotefilectx.remotefilectx(self._repo, path, fileid=fileid,
changectx=self, filelog=filelog)
return orig(self, path, fileid=fileid, filelog=filelog)
def workingfilectx(orig, self, path, filelog=None):
if (isenabled(self._repo) and self._repo.shallowmatch(path)):
return remotefilectx.remoteworkingfilectx(self._repo, path,
workingctx=self,
filelog=filelog)
return orig(self, path, filelog=filelog)
# prefetch required revisions before a diff
def trydiff(orig, repo, revs, ctx1, ctx2, modified, added, removed,
copy, getfilectx, *args, **kwargs):
if isenabled(repo):
prefetch = []
mf1 = ctx1.manifest()
for fname in modified + added + removed:
if fname in mf1:
fnode = getfilectx(fname, ctx1).filenode()
# fnode can be None if it's a edited working ctx file
if fnode:
prefetch.append((fname, hex(fnode)))
if fname not in removed:
fnode = getfilectx(fname, ctx2).filenode()
if fnode:
prefetch.append((fname, hex(fnode)))
repo.fileservice.prefetch(prefetch)
return orig(repo, revs, ctx1, ctx2, modified, added, removed, copy,
getfilectx, *args, **kwargs)
# Prevent verify from processing files
# a stub for mercurial.hg.verify()
def _verify(orig, repo, level=None):
lock = repo.lock()
try:
return shallowverifier.shallowverifier(repo).verify()
finally:
lock.release()
clientonetime = False
def onetimeclientsetup(ui):
global clientonetime
if clientonetime:
return
clientonetime = True
changegroup.cgpacker = shallowbundle.shallowcg1packer
extensions.wrapfunction(changegroup, '_addchangegroupfiles',
shallowbundle.addchangegroupfiles)
extensions.wrapfunction(
changegroup, 'makechangegroup', shallowbundle.makechangegroup)
extensions.wrapfunction(localrepo, 'makestore', storewrapper)
extensions.wrapfunction(exchange, 'pull', exchangepull)
extensions.wrapfunction(merge, 'applyupdates', applyupdates)
extensions.wrapfunction(merge, '_checkunknownfiles', checkunknownfiles)
extensions.wrapfunction(context.workingctx, '_checklookup', checklookup)
extensions.wrapfunction(scmutil, '_findrenames', findrenames)
extensions.wrapfunction(copies, '_computenonoverlap', computenonoverlap)
extensions.wrapfunction(copies, '_computeforwardmissing',
computeforwardmissing)
extensions.wrapfunction(dispatch, 'runcommand', runcommand) extensions.wrapfunction(dispatch, 'runcommand', runcommand)
# disappointing hacks below # disappointing hacks below
scmutil.getrenamedfn = getrenamedfn scmutil.getrenamedfn = getrenamedfn
extensions.wrapfunction(revset, 'filelog', filelogrevset) extensions.wrapfunction(revset, 'filelog', filelogrevset)
revset.symbols['filelog'] = revset.filelog revset.symbols['filelog'] = revset.filelog
extensions.wrapfunction(cmdutil, 'walkfilerevs', walkfilerevs) extensions.wrapfunction(cmdutil, 'walkfilerevs', walkfilerevs)
# prevent strip from stripping remotefilelogs
def _collectbrokencsets(orig, repo, files, striprev):
if isenabled(repo):
files = list([f for f in files if not repo.shallowmatch(f)])
return orig(repo, files, striprev)
extensions.wrapfunction(repair, '_collectbrokencsets', _collectbrokencsets) extensions.wrapfunction(repair, '_collectbrokencsets', _collectbrokencsets)
# Don't commit filelogs until we know the commit hash, since the hash # Don't commit filelogs until we know the commit hash, since the hash
# is present in the filelog blob. # is present in the filelog blob.
# This violates Mercurial's filelog->manifest->changelog write order, # This violates Mercurial's filelog->manifest->changelog write order,
# but is generally fine for client repos. # but is generally fine for client repos.
pendingfilecommits = [] pendingfilecommits = []
def addrawrevision(orig, self, rawtext, transaction, link, p1, p2, node, def addrawrevision(orig, self, rawtext, transaction, link, p1, p2, node,
# but still do a sanity check about pending multiple revisions # but still do a sanity check about pending multiple revisions
if len(set(x[3] for x in pendingfilecommits)) > 1: if len(set(x[3] for x in pendingfilecommits)) > 1:
raise error.ProgrammingError( raise error.ProgrammingError(
'pending multiple integer revisions are not supported') 'pending multiple integer revisions are not supported')
del pendingfilecommits[:] del pendingfilecommits[:]
return node return node
extensions.wrapfunction(changelog.changelog, 'add', changelogadd) extensions.wrapfunction(changelog.changelog, 'add', changelogadd)
# changectx wrappers
def filectx(orig, self, path, fileid=None, filelog=None):
if fileid is None:
fileid = self.filenode(path)
if (isenabled(self._repo) and self._repo.shallowmatch(path)):
return remotefilectx.remotefilectx(self._repo, path,
fileid=fileid, changectx=self, filelog=filelog)
return orig(self, path, fileid=fileid, filelog=filelog)
extensions.wrapfunction(context.changectx, 'filectx', filectx) extensions.wrapfunction(context.changectx, 'filectx', filectx)
def workingfilectx(orig, self, path, filelog=None):
if (isenabled(self._repo) and self._repo.shallowmatch(path)):
return remotefilectx.remoteworkingfilectx(self._repo,
path, workingctx=self, filelog=filelog)
return orig(self, path, filelog=filelog)
extensions.wrapfunction(context.workingctx, 'filectx', workingfilectx) extensions.wrapfunction(context.workingctx, 'filectx', workingfilectx)
# prefetch required revisions before a diff
def trydiff(orig, repo, revs, ctx1, ctx2, modified, added, removed,
copy, getfilectx, *args, **kwargs):
if isenabled(repo):
prefetch = []
mf1 = ctx1.manifest()
for fname in modified + added + removed:
if fname in mf1:
fnode = getfilectx(fname, ctx1).filenode()
# fnode can be None if it's a edited working ctx file
if fnode:
prefetch.append((fname, hex(fnode)))
if fname not in removed:
fnode = getfilectx(fname, ctx2).filenode()
if fnode:
prefetch.append((fname, hex(fnode)))
repo.fileservice.prefetch(prefetch)
return orig(repo, revs, ctx1, ctx2, modified, added, removed,
copy, getfilectx, *args, **kwargs)
extensions.wrapfunction(patch, 'trydiff', trydiff) extensions.wrapfunction(patch, 'trydiff', trydiff)
# Prevent verify from processing files
# a stub for mercurial.hg.verify()
def _verify(orig, repo, level=None):
lock = repo.lock()
try:
return shallowverifier.shallowverifier(repo).verify()
finally:
lock.release()
extensions.wrapfunction(hg, 'verify', _verify) extensions.wrapfunction(hg, 'verify', _verify)
scmutil.fileprefetchhooks.add('remotefilelog', _fileprefetchhook) scmutil.fileprefetchhooks.add('remotefilelog', _fileprefetchhook)
def getrenamedfn(repo, endrev=None): def getrenamedfn(repo, endrev=None):
rcache = {} rcache = {}
def getrenamed(fn, rev): def getrenamed(fn, rev):