##// END OF EJS Templates
widening: duplicate generateellipsesbundle2() for widening...
widening: duplicate generateellipsesbundle2() for widening The widening and the non-widening code are quite different. It will be clearer to have them as sepearate functions. To start with, I've just copied it exactly, so it's clearer over the next few patches how they're different. The new function should gradually become more similar to bundle2.widen_bundle(), and should perhaps eventually be merged with that function. However, I've left it in narrowbundle2.py for now since it still depends on constants like _KILLNODESIGNAL there. Differential Revision: https://phab.mercurial-scm.org/D7092

File last commit:

r43517:db07f7fb default
r43517:db07f7fb default
Show More
narrowwirepeer.py
160 lines | 4.8 KiB | text/x-python | PythonLexer
Augie Fackler
narrow: import experimental extension from narrowhg revision cb51d673e9c5...
r36096 # narrowwirepeer.py - passes narrow spec with unbundle command
#
# Copyright 2017 Google, Inc.
#
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version.
from __future__ import absolute_import
from mercurial import (
Pulkit Goyal
narrow: the first version of narrow_widen wireprotocol command...
r40106 bundle2,
error,
Augie Fackler
narrow: import experimental extension from narrowhg revision cb51d673e9c5...
r36096 extensions,
hg,
Pulkit Goyal
narrow: the first version of narrow_widen wireprotocol command...
r40106 narrowspec,
pycompat,
wireprototypes,
wireprotov1peer,
Pulkit Goyal
narrow: add narrow and ellipses as server capabilities...
r39559 wireprotov1server,
Augie Fackler
narrow: import experimental extension from narrowhg revision cb51d673e9c5...
r36096 )
Pulkit Goyal
narrow: use narrow_widen wireproto command to widen in case of ellipses...
r42605 from . import narrowbundle2
Augie Fackler
formatting: blacken the codebase...
r43346
Augie Fackler
narrow: import experimental extension from narrowhg revision cb51d673e9c5...
r36096 def uisetup():
Pulkit Goyal
narrow: the first version of narrow_widen wireprotocol command...
r40106 wireprotov1peer.wirepeer.narrow_widen = peernarrowwiden
Pulkit Goyal
narrow: add narrow and ellipses as server capabilities...
r39559
Augie Fackler
formatting: blacken the codebase...
r43346
Augie Fackler
narrow: import experimental extension from narrowhg revision cb51d673e9c5...
r36096 def reposetup(repo):
def wirereposetup(ui, peer):
def wrapped(orig, cmd, *args, **kwargs):
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 if cmd == b'unbundle':
Augie Fackler
narrowwirepeer: add TODO about how we add wireproto args to unbundle :(...
r36119 # TODO: don't blindly add include/exclude wireproto
# arguments to unbundle.
Augie Fackler
narrow: import experimental extension from narrowhg revision cb51d673e9c5...
r36096 include, exclude = repo.narrowpats
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 kwargs[r"includepats"] = b','.join(include)
kwargs[r"excludepats"] = b','.join(exclude)
Augie Fackler
narrow: import experimental extension from narrowhg revision cb51d673e9c5...
r36096 return orig(cmd, *args, **kwargs)
Augie Fackler
formatting: blacken the codebase...
r43346
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 extensions.wrapfunction(peer, b'_calltwowaystream', wrapped)
Augie Fackler
formatting: blacken the codebase...
r43346
Augie Fackler
narrow: import experimental extension from narrowhg revision cb51d673e9c5...
r36096 hg.wirepeersetupfuncs.append(wirereposetup)
Pulkit Goyal
narrow: the first version of narrow_widen wireprotocol command...
r40106
Augie Fackler
formatting: blacken the codebase...
r43346
@wireprotov1server.wireprotocommand(
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 b'narrow_widen',
b'oldincludes oldexcludes'
b' newincludes newexcludes'
b' commonheads cgversion'
b' known ellipses',
permission=b'pull',
Augie Fackler
formatting: blacken the codebase...
r43346 )
def narrow_widen(
repo,
proto,
oldincludes,
oldexcludes,
newincludes,
newexcludes,
commonheads,
cgversion,
known,
ellipses,
):
Pulkit Goyal
narrow: the first version of narrow_widen wireprotocol command...
r40106 """wireprotocol command to send data when a narrow clone is widen. We will
be sending a changegroup here.
The current set of arguments which are required:
oldincludes: the old includes of the narrow copy
oldexcludes: the old excludes of the narrow copy
newincludes: the new includes of the narrow copy
newexcludes: the new excludes of the narrow copy
commonheads: list of heads which are common between the server and client
cgversion(maybe): the changegroup version to produce
known: list of nodes which are known on the client (used in ellipses cases)
ellipses: whether to send ellipses data or not
"""
Pulkit Goyal
narrow: don't compress the bundle2 when sending 'error:abort'...
r40183 preferuncompressed = False
Pulkit Goyal
narrow: the first version of narrow_widen wireprotocol command...
r40106 try:
Augie Fackler
formatting: blacken the codebase...
r43346
Martin von Zweigbergk
narrow: don't hexify paths and double-hexify known nodes on wire (BC)...
r43214 def splitpaths(data):
# work around ''.split(',') => ['']
return data.split(b',') if data else []
Augie Fackler
formatting: blacken the codebase...
r43346
Martin von Zweigbergk
narrow: don't hexify paths and double-hexify known nodes on wire (BC)...
r43214 oldincludes = splitpaths(oldincludes)
newincludes = splitpaths(newincludes)
oldexcludes = splitpaths(oldexcludes)
newexcludes = splitpaths(newexcludes)
Pulkit Goyal
narrow: the first version of narrow_widen wireprotocol command...
r40106 # validate the patterns
narrowspec.validatepatterns(set(oldincludes))
narrowspec.validatepatterns(set(newincludes))
narrowspec.validatepatterns(set(oldexcludes))
narrowspec.validatepatterns(set(newexcludes))
common = wireprototypes.decodelist(commonheads)
Pulkit Goyal
narrow: use narrow_widen wireproto command to widen in case of ellipses...
r42605 known = wireprototypes.decodelist(known)
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 if ellipses == b'0':
Pulkit Goyal
narrow: the first version of narrow_widen wireprotocol command...
r40106 ellipses = False
else:
ellipses = bool(ellipses)
cgversion = cgversion
Pulkit Goyal
narrow: pass the bundle to bundle2.widen_bundle() instead of generating there...
r42607 bundler = bundle2.bundle20(repo.ui)
Pulkit Goyal
narrow: use narrow_widen wireproto command to widen in case of ellipses...
r42605 if not ellipses:
Augie Fackler
formatting: blacken the codebase...
r43346 newmatch = narrowspec.match(
repo.root, include=newincludes, exclude=newexcludes
)
oldmatch = narrowspec.match(
repo.root, include=oldincludes, exclude=oldexcludes
)
bundle2.widen_bundle(
bundler,
repo,
oldmatch,
newmatch,
common,
known,
cgversion,
ellipses,
)
Pulkit Goyal
narrow: use narrow_widen wireproto command to widen in case of ellipses...
r42605 else:
Martin von Zweigbergk
widening: duplicate generateellipsesbundle2() for widening...
r43517 narrowbundle2.generate_ellipses_bundle2_for_widening(
Augie Fackler
formatting: blacken the codebase...
r43346 bundler,
repo,
oldincludes,
oldexcludes,
newincludes,
newexcludes,
cgversion,
common,
list(common),
known,
None,
)
Pulkit Goyal
narrow: the first version of narrow_widen wireprotocol command...
r40106 except error.Abort as exc:
Pulkit Goyal
narrow: start returning bundle2 from widen_bundle()...
r40107 bundler = bundle2.bundle20(repo.ui)
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 manargs = [(b'message', pycompat.bytestr(exc))]
Pulkit Goyal
narrow: the first version of narrow_widen wireprotocol command...
r40106 advargs = []
if exc.hint is not None:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 advargs.append((b'hint', exc.hint))
bundler.addpart(bundle2.bundlepart(b'error:abort', manargs, advargs))
Pulkit Goyal
narrow: don't compress the bundle2 when sending 'error:abort'...
r40183 preferuncompressed = True
Pulkit Goyal
narrow: the first version of narrow_widen wireprotocol command...
r40106
chunks = bundler.getchunks()
Augie Fackler
formatting: blacken the codebase...
r43346 return wireprototypes.streamres(
gen=chunks, prefer_uncompressed=preferuncompressed
)
Pulkit Goyal
narrow: the first version of narrow_widen wireprotocol command...
r40106
def peernarrowwiden(remote, **kwargs):
Martin von Zweigbergk
narrow: don't hexify paths and double-hexify known nodes on wire (BC)...
r43214 for ch in (r'commonheads', r'known'):
Pulkit Goyal
narrow: the first version of narrow_widen wireprotocol command...
r40106 kwargs[ch] = wireprototypes.encodelist(kwargs[ch])
Martin von Zweigbergk
narrow: don't hexify paths and double-hexify known nodes on wire (BC)...
r43214 for ch in (r'oldincludes', r'newincludes', r'oldexcludes', r'newexcludes'):
kwargs[ch] = b','.join(kwargs[ch])
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 kwargs[r'ellipses'] = b'%i' % bool(kwargs[r'ellipses'])
f = remote._callcompressable(b'narrow_widen', **kwargs)
Pulkit Goyal
narrow: the first version of narrow_widen wireprotocol command...
r40106 return bundle2.getunbundler(remote.ui, f)