This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3909

treemanifest: adapt to Mercurial without wireproto module
ClosedPublic

Authored by martinvonz on Jul 10 2018, 5:06 PM.
Tags
None
Subscribers
None

Details

Reviewers
quark
Group Reviewers
Restricted Project
Commits
rFBHGXcbf30047d46d: treemanifest: adapt to Mercurial without wireproto module
Summary

Mercurial since b4d85bc122bd (wireproto: rename wireproto to
wireprotov1server (API), 2018-04-16) has now wireproto module. Most
pieces have been moved into other modules.

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

martinvonz created this revision.Jul 10 2018, 5:06 PM
Herald added a reviewer: Restricted Project. · View Herald TranscriptJul 10 2018, 5:06 PM
quark accepted this revision.Jul 10 2018, 5:53 PM
This revision is now accepted and ready to land.Jul 10 2018, 5:53 PM
Closed by commit rFBHGXcbf30047d46d: treemanifest: adapt to Mercurial without wireproto module (authored by martinvonz). · Explain WhyJul 10 2018, 6:46 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtreemanifest/__init__.py (37 lines)

Diff 9524

treemanifest/__init__.py

registrar, registrar,
repair, repair,
revlog, revlog,
revsetlang, revsetlang,
scmutil, scmutil,
sshserver, sshserver,
templatekw, templatekw,
util, util,
wireproto,
) )
from mercurial.i18n import _ from mercurial.i18n import _
from mercurial.node import bin, hex, nullid from mercurial.node import bin, hex, nullid
from remotefilelog import ( from remotefilelog import (
cmdtable as remotefilelogcmdtable, cmdtable as remotefilelogcmdtable,
resolveprefetchopts, resolveprefetchopts,
) )
import os import os
import shutil import shutil
import struct import struct
import time import time
osutil = policy.importmod(r'osutil') osutil = policy.importmod(r'osutil')
try:
from mercurial import wireprototypes, wireprotov1server, wireprotov1peer
wireprotov1server.commands
except ImportError, AttributeError:
from mercurial import wireproto
wireprototypes = wireprotov1server = wireprotov1peer = wireproto
cmdtable = {} cmdtable = {}
command = registrar.command(cmdtable) command = registrar.command(cmdtable)
configtable = {} configtable = {}
configitem = registrar.configitem(configtable) configitem = registrar.configitem(configtable)
configitem('treemanifest', 'sendtrees', default=False) configitem('treemanifest', 'sendtrees', default=False)
configitem('treemanifest', 'server', default=False) configitem('treemanifest', 'server', default=False)
extensions.wrapfunction(revlog.revlog, 'checkhash', _checkhash) extensions.wrapfunction(revlog.revlog, 'checkhash', _checkhash)
wrappropertycache(localrepo.localrepository, 'manifestlog', getmanifestlog) wrappropertycache(localrepo.localrepository, 'manifestlog', getmanifestlog)
extensions.wrapfunction(manifest.memmanifestctx, 'write', _writemanifest) extensions.wrapfunction(manifest.memmanifestctx, 'write', _writemanifest)
extensions.wrapcommand(commands.table, 'pull', pull) extensions.wrapcommand(commands.table, 'pull', pull)
wireproto.commands['gettreepack'] = (servergettreepack, '*') wireprotov1server.commands['gettreepack'] = (servergettreepack, '*')
wireproto.wirepeer.gettreepack = clientgettreepack wireprotov1peer.wirepeer.gettreepack = clientgettreepack
extensions.wrapfunction(repair, 'striptrees', striptrees) extensions.wrapfunction(repair, 'striptrees', striptrees)
extensions.wrapfunction(repair, '_collectmanifest', _collectmanifest) extensions.wrapfunction(repair, '_collectmanifest', _collectmanifest)
extensions.wrapfunction(repair, 'stripmanifest', stripmanifest) extensions.wrapfunction(repair, 'stripmanifest', stripmanifest)
extensions.wrapfunction(bundle2, '_addpartsfromopts', _addpartsfromopts) extensions.wrapfunction(bundle2, '_addpartsfromopts', _addpartsfromopts)
extensions.wrapfunction(bundlerepo.bundlerepository, '_handlebundle2part', extensions.wrapfunction(bundlerepo.bundlerepository, '_handlebundle2part',
_handlebundle2part) _handlebundle2part)
extensions.wrapfunction(bundle2, 'getrepocaps', getrepocaps) extensions.wrapfunction(bundle2, 'getrepocaps', getrepocaps)
extensions.wrapfunction(manifest.manifestrevlog, 'addgroup', extensions.wrapfunction(manifest.manifestrevlog, 'addgroup',
_addmanifestgroup) _addmanifestgroup)
def _capabilities(orig, repo, proto): def _capabilities(orig, repo, proto):
caps = orig(repo, proto) caps = orig(repo, proto)
caps.append('gettreepack') caps.append('gettreepack')
return caps return caps
if util.safehasattr(wireproto, '_capabilities'): if util.safehasattr(wireprotov1server, '_capabilities'):
extensions.wrapfunction(wireproto, '_capabilities', _capabilities) extensions.wrapfunction(wireprotov1server, '_capabilities',
_capabilities)
else: else:
extensions.wrapfunction(wireproto, 'capabilities', _capabilities) extensions.wrapfunction(wireprotov1server, 'capabilities',
_capabilities)
def _addmanifestgroup(*args, **kwargs): def _addmanifestgroup(*args, **kwargs):
raise error.Abort(_("cannot push commits to a treemanifest transition " raise error.Abort(_("cannot push commits to a treemanifest transition "
"server without pushrebase")) "server without pushrebase"))
def getmanifestlog(orig, self): def getmanifestlog(orig, self):
if not treeenabled(self.ui): if not treeenabled(self.ui):
return orig(self) return orig(self)
if not missing: if not missing:
return [mfnode] return [mfnode]
return [] return []
def clientgettreepack(remote, rootdir, mfnodes, basemfnodes, directories): def clientgettreepack(remote, rootdir, mfnodes, basemfnodes, directories):
opts = {} opts = {}
opts['rootdir'] = rootdir opts['rootdir'] = rootdir
opts['mfnodes'] = wireproto.encodelist(mfnodes) opts['mfnodes'] = wireprototypes.encodelist(mfnodes)
opts['basemfnodes'] = wireproto.encodelist(basemfnodes) opts['basemfnodes'] = wireprototypes.encodelist(basemfnodes)
opts['directories'] = ','.join(wireproto.escapearg(d) for d in directories) opts['directories'] = ','.join(wireprotov1peer.escapearg(d)
for d in directories)
f = remote._callcompressable("gettreepack", **opts) f = remote._callcompressable("gettreepack", **opts)
return bundle2.getunbundler(remote.ui, f) return bundle2.getunbundler(remote.ui, f)
class treememoizer(object): class treememoizer(object):
"""A class that keeps references to trees until they've been consumed the """A class that keeps references to trees until they've been consumed the
expected number of times. expected number of times.
""" """
if shallowrepo.requirement in repo.requirements: if shallowrepo.requirement in repo.requirements:
raise error.Abort(_('cannot fetch remote files from shallow repo')) raise error.Abort(_('cannot fetch remote files from shallow repo'))
if not isinstance(proto, sshserver.sshserver): if not isinstance(proto, sshserver.sshserver):
raise error.Abort(_('cannot fetch remote files over non-ssh protocol')) raise error.Abort(_('cannot fetch remote files over non-ssh protocol'))
rootdir = args['rootdir'] rootdir = args['rootdir']
# Sort to produce a consistent output # Sort to produce a consistent output
mfnodes = sorted(wireproto.decodelist(args['mfnodes'])) mfnodes = sorted(wireprototypes.decodelist(args['mfnodes']))
basemfnodes = sorted(wireproto.decodelist(args['basemfnodes'])) basemfnodes = sorted(wireprototypes.decodelist(args['basemfnodes']))
directories = sorted(list(wireproto.unescapearg(d) for d directories = sorted(list(wireprotov1peer.unescapearg(d) for d
in args['directories'].split(',') if d != '')) in args['directories'].split(',') if d != ''))
try: try:
bundler = bundle2.bundle20(repo.ui) bundler = bundle2.bundle20(repo.ui)
packstream = generatepackstream(repo, rootdir, mfnodes, packstream = generatepackstream(repo, rootdir, mfnodes,
basemfnodes, directories) basemfnodes, directories)
part = bundler.newpart(TREEGROUP_PARTTYPE2, data=packstream) part = bundler.newpart(TREEGROUP_PARTTYPE2, data=packstream)
part.addparam('version', '1') part.addparam('version', '1')
part.addparam('cache', 'True') part.addparam('cache', 'True')
part.addparam('category', PACK_CATEGORY) part.addparam('category', PACK_CATEGORY)
except error.Abort as exc: except error.Abort as exc:
# cleanly forward Abort error to the client # cleanly forward Abort error to the client
bundler = bundle2.bundle20(repo.ui) bundler = bundle2.bundle20(repo.ui)
manargs = [('message', str(exc))] manargs = [('message', str(exc))]
advargs = [] advargs = []
if exc.hint is not None: if exc.hint is not None:
advargs.append(('hint', exc.hint)) advargs.append(('hint', exc.hint))
bundler.addpart(bundle2.bundlepart('error:abort', bundler.addpart(bundle2.bundlepart('error:abort',
manargs, advargs)) manargs, advargs))
return wireproto.streamres(gen=bundler.getchunks(), v1compressible=True) return wireprototypes.streamres(gen=bundler.getchunks(),
v1compressible=True)
def generatepackstream(repo, rootdir, mfnodes, basemfnodes, directories): def generatepackstream(repo, rootdir, mfnodes, basemfnodes, directories):
""" """
All size/len/counts are network order unsigned ints. All size/len/counts are network order unsigned ints.
Request args: Request args:
`rootdir` - The directory of the tree to send (including its children) `rootdir` - The directory of the tree to send (including its children)