( )⚙ D6334 remotefilelog: move most setup from onetimesetup() to uisetup()

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6334

remotefilelog: move most setup from onetimesetup() to uisetup()
ClosedPublic

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

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG8a0e03f7baf4: remotefilelog: move most setup from onetimesetup() to uisetup()
Summary

All the wrappers moved in this patch check if remotefilelog is enabled
before they change behavior, so it's safe to always wrap.

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

martinvonz created this revision.May 2 2019, 1:55 PM
pulkit accepted this revision.May 14 2019, 1:11 PM
martinvonz updated this revision to Diff 15073.May 14 2019, 1:22 PM
Closed by commit rHG8a0e03f7baf4: remotefilelog: move most setup from onetimesetup() to uisetup() (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 (71 lines)

Diff 15078

hgext/remotefilelog/__init__.py

if lfsmod: if lfsmod:
lfsmod.wrapfilelog(remotefilelog.remotefilelog) lfsmod.wrapfilelog(remotefilelog.remotefilelog)
fileserverclient._lfsmod = lfsmod fileserverclient._lfsmod = lfsmod
extensions.afterloaded('lfs', _lfsloaded) extensions.afterloaded('lfs', _lfsloaded)
# debugdata needs remotefilelog.len to work # debugdata needs remotefilelog.len to work
extensions.wrapcommand(commands.table, 'debugdata', debugdatashallow) extensions.wrapcommand(commands.table, 'debugdata', debugdatashallow)
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, '_computeforwardmissing',
computeforwardmissing)
extensions.wrapfunction(dispatch, 'runcommand', runcommand)
extensions.wrapfunction(repair, '_collectbrokencsets', _collectbrokencsets)
extensions.wrapfunction(context.changectx, 'filectx', filectx)
extensions.wrapfunction(context.workingctx, 'filectx', workingfilectx)
extensions.wrapfunction(patch, 'trydiff', trydiff)
extensions.wrapfunction(hg, 'verify', _verify)
scmutil.fileprefetchhooks.add('remotefilelog', _fileprefetchhook)
# disappointing hacks below
scmutil.getrenamedfn = getrenamedfn
extensions.wrapfunction(revset, 'filelog', filelogrevset)
revset.symbols['filelog'] = revset.filelog
extensions.wrapfunction(cmdutil, 'walkfilerevs', walkfilerevs)
def cloneshallow(orig, ui, repo, *args, **opts): def cloneshallow(orig, ui, repo, *args, **opts):
if opts.get(r'shallow'): if opts.get(r'shallow'):
repos = [] repos = []
def pull_shallow(orig, self, *args, **kwargs): def pull_shallow(orig, self, *args, **kwargs):
if not isenabled(self): if not isenabled(self):
repos.append(self.unfiltered()) repos.append(self.unfiltered())
# set up the client hooks so the post-clone update works # set up the client hooks so the post-clone update works
setupclient(self.ui, self.unfiltered()) setupclient(self.ui, self.unfiltered())
clientonetime = False clientonetime = False
def onetimeclientsetup(ui): def onetimeclientsetup(ui):
global clientonetime global clientonetime
if clientonetime: if clientonetime:
return return
clientonetime = True 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, '_computeforwardmissing',
computeforwardmissing)
extensions.wrapfunction(dispatch, 'runcommand', runcommand)
# disappointing hacks below
scmutil.getrenamedfn = getrenamedfn
extensions.wrapfunction(revset, 'filelog', filelogrevset)
revset.symbols['filelog'] = revset.filelog
extensions.wrapfunction(cmdutil, 'walkfilerevs', walkfilerevs)
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,
flags, cachedelta=None, _metatuple=None): flags, cachedelta=None, _metatuple=None):
if isinstance(link, int): if isinstance(link, int):
# 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)
extensions.wrapfunction(context.changectx, 'filectx', filectx)
extensions.wrapfunction(context.workingctx, 'filectx', workingfilectx)
extensions.wrapfunction(patch, 'trydiff', trydiff)
extensions.wrapfunction(hg, 'verify', _verify)
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):
'''looks up all renames for a file (up to endrev) the first '''looks up all renames for a file (up to endrev) the first
time the file is given. It indexes on the changerev and only time the file is given. It indexes on the changerev and only
parses the manifest if linkrev != changerev. parses the manifest if linkrev != changerev.
Returns rename info for fn at changerev rev.''' Returns rename info for fn at changerev rev.'''