##// END OF EJS Templates
crecord: call prevsibling() and nextsibling() directly...
crecord: call prevsibling() and nextsibling() directly The 3 classes for items used in crecord (uiheader, uihunk, uihunkline) all have prevsibling() and nextsibling() methods. The two methods are used to get the previous/next item of the same type of the same parent element as the current one: when `a` is a uihunkline instance, a.nextsibling() returns the next line in this hunk (or None, if `a` is the last line). There are also two similar methods: previtem() and nextitem(). When called with constrainlevel=True (the default) they simply returned the result of prevsibling()/nextsibling(). Only when called with constrainlevel=False they did something different: they returned previous/next item regardless of its type (so if `a` is the last line in a hunk, a.nextitem(constrainlevel=False) could return the next hunk or the next file -- something that is not a line). Let's simplify this logic and make code call -sibling() methods when only siblings are needed and -item() methods when any item would do, and then remove the constrainlevel argument from previtem() and nextitem().

File last commit:

r28883:032c4c2f default
r29130:ed2a3818 default
Show More
bundle2.py
1608 lines | 57.7 KiB | text/x-python | PythonLexer
Pierre-Yves David
bundle2: very first version of a bundle2 bundler...
r20801 # bundle2.py - generic container format to transmit arbitrary data.
#
# Copyright 2013 Facebook, Inc.
#
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version.
"""Handling of the new bundle2 format
The goal of bundle2 is to act as an atomically packet to transmit a set of
payloads in an application agnostic way. It consist in a sequence of "parts"
that will be handed to and processed by the application layer.
General format architecture
===========================
The format is architectured as follow
- magic string
- stream level parameters
- payload parts (any number)
- end of stream marker.
Pierre-Yves David
bundle2: support bundling of empty part (with a type)...
r20856 the Binary format
Pierre-Yves David
bundle2: very first version of a bundle2 bundler...
r20801 ============================
Mads Kiilerich
spelling: fixes from spell checker
r21024 All numbers are unsigned and big-endian.
Pierre-Yves David
bundle2: very first version of a bundle2 bundler...
r20801
stream level parameters
------------------------
Binary format is as follow
Pierre-Yves David
bundle2: change header size and make them signed (new format)...
r23009 :params size: int32
Pierre-Yves David
bundle2: very first version of a bundle2 bundler...
r20801
The total number of Bytes used by the parameters
:params value: arbitrary number of Bytes
A blob of `params size` containing the serialized version of all stream level
parameters.
Mads Kiilerich
spelling: fixes from spell checker
r21024 The blob contains a space separated list of parameters. Parameters with value
Pierre-Yves David
bundle2: urlquote stream parameter name and value...
r20811 are stored in the form `<name>=<value>`. Both name and value are urlquoted.
Pierre-Yves David
bundle2: support bundling simple parameter...
r20804
Pierre-Yves David
bundle2: refuse empty parameter name...
r20813 Empty name are obviously forbidden.
Pierre-Yves David
bundle2: implement the mandatory/advisory logic for parameter...
r20844 Name MUST start with a letter. If this first letter is lower case, the
Mads Kiilerich
spelling: fixes from spell checker
r21024 parameter is advisory and can be safely ignored. However when the first
Pierre-Yves David
bundle2: implement the mandatory/advisory logic for parameter...
r20844 letter is capital, the parameter is mandatory and the bundling process MUST
stop if he is not able to proceed it.
Pierre-Yves David
bundle2: force the first char of parameter to be an letter....
r20814
Pierre-Yves David
bundle2: clarify stream parameter design in the documentation...
r20808 Stream parameters use a simple textual format for two main reasons:
Pierre-Yves David
bundle2: support bundling simple parameter...
r20804
Mads Kiilerich
spelling: fixes from spell checker
r21024 - Stream level parameters should remain simple and we want to discourage any
Pierre-Yves David
bundle2: clarify stream parameter design in the documentation...
r20808 crazy usage.
Mads Kiilerich
spelling: fixes from spell checker
r21024 - Textual data allow easy human inspection of a bundle2 header in case of
Pierre-Yves David
bundle2: clarify stream parameter design in the documentation...
r20808 troubles.
Any Applicative level options MUST go into a bundle2 part instead.
Pierre-Yves David
bundle2: very first version of a bundle2 bundler...
r20801
Payload part
------------------------
Binary format is as follow
Pierre-Yves David
bundle2: change header size and make them signed (new format)...
r23009 :header size: int32
Pierre-Yves David
bundle2: very first version of a bundle2 bundler...
r20801
Martin von Zweigbergk
bundle2: clarify in docstring that header size is for a single header...
r25507 The total number of Bytes used by the part header. When the header is empty
Pierre-Yves David
bundle2: very first version of a bundle2 bundler...
r20801 (size = 0) this is interpreted as the end of stream marker.
Pierre-Yves David
bundle2: support bundling of empty part (with a type)...
r20856 :header:
The header defines how to interpret the part. It contains two piece of
data: the part type, and the part parameters.
The part type is used to route an application level handler, that can
interpret payload.
Part parameters are passed to the application level handler. They are
meant to convey information that will help the application level object to
interpret the part payload.
The binary format of the header is has follow
:typesize: (one byte)
Pierre-Yves David
bundle2: part params
r20877
Matt Mackall
bundle2: fix parttype enforcement...
r23916 :parttype: alphanumerical part name (restricted to [a-zA-Z0-9_:-]*)
Pierre-Yves David
bundle2: part params
r20877
Pierre-Yves David
bundle2: add an integer id to part...
r20995 :partid: A 32bits integer (unique in the bundle) that can be used to refer
to this part.
Pierre-Yves David
bundle2: part params
r20877 :parameters:
Mads Kiilerich
spelling: fixes from spell checker
r21024 Part's parameter may have arbitrary content, the binary structure is::
Pierre-Yves David
bundle2: part params
r20877
<mandatory-count><advisory-count><param-sizes><param-data>
:mandatory-count: 1 byte, number of mandatory parameters
:advisory-count: 1 byte, number of advisory parameters
:param-sizes:
N couple of bytes, where N is the total number of parameters. Each
couple contains (<size-of-key>, <size-of-value) for one parameter.
:param-data:
A blob of bytes from which each parameter key and value can be
retrieved using the list of size couples stored in the previous
field.
Mandatory parameters comes first, then the advisory ones.
Pierre-Yves David
bundle2: support bundling of empty part (with a type)...
r20856
Pierre-Yves David
bundle2: forbid duplicate parameter keys...
r21607 Each parameter's key MUST be unique within the part.
Pierre-Yves David
bundle2: support bundling of empty part (with a type)...
r20856 :payload:
Pierre-Yves David
bundle2: support for bundling and unbundling payload...
r20876 payload is a series of `<chunksize><chunkdata>`.
Pierre-Yves David
bundle2: change header size and make them signed (new format)...
r23009 `chunksize` is an int32, `chunkdata` are plain bytes (as much as
Pierre-Yves David
bundle2: support for bundling and unbundling payload...
r20876 `chunksize` says)` The payload part is concluded by a zero size chunk.
The current implementation always produces either zero or one chunk.
Mads Kiilerich
spelling: fixes from spell checker
r21024 This is an implementation limitation that will ultimately be lifted.
Pierre-Yves David
bundle2: add some distinction between mandatory and advisory part...
r20891
Pierre-Yves David
bundle2: change header size and make them signed (new format)...
r23009 `chunksize` can be negative to trigger special case processing. No such
processing is in place yet.
Pierre-Yves David
bundle2: add some distinction between mandatory and advisory part...
r20891 Bundle processing
============================
Each part is processed in order using a "part handler". Handler are registered
for a certain part type.
The matching of a part to its handler is case insensitive. The case of the
part type is used to know if a part is mandatory or advisory. If the Part type
contains any uppercase char it is considered mandatory. When no handler is
known for a Mandatory part, the process is aborted and an exception is raised.
Pierre-Yves David
bundle2: read the whole bundle from stream on abort...
r20892 If the part is advisory and no handler is known, the part is ignored. When the
process is aborted, the full bundle is still read from the stream to keep the
channel usable. But none of the part read from an abort are processed. In the
future, dropping the stream may become an option for channel we do not care to
preserve.
Pierre-Yves David
bundle2: very first version of a bundle2 bundler...
r20801 """
Gregory Szorc
bundle2: use absolute_import
r25919 from __future__ import absolute_import
Eric Sumner
bundle2.unpackermixin: control for underlying file descriptor...
r24026 import errno
Gregory Szorc
bundle2: use absolute_import
r25919 import re
Pierre-Yves David
bundle2: force the first char of parameter to be an letter....
r20814 import string
Gregory Szorc
bundle2: use absolute_import
r25919 import struct
import sys
Pierre-Yves David
bundle2: support bundling simple parameter...
r20804
Gregory Szorc
bundle2: use absolute_import
r25919 from .i18n import _
from . import (
changegroup,
error,
obsolete,
pushkey,
tags,
url,
util,
)
Pierre-Yves David
bundle2: a very first version of bundle2 unbundler...
r20802
timeless
pycompat: switch to util.urlreq/util.urlerr for py3 compat
r28883 urlerr = util.urlerr
urlreq = util.urlreq
Pierre-Yves David
bundle2: support bundling simple parameter...
r20804 _pack = struct.pack
_unpack = struct.unpack
Pierre-Yves David
bundle2: change header size and make them signed (new format)...
r23009 _fstreamparamsize = '>i'
_fpartheadersize = '>i'
Pierre-Yves David
bundle2: support bundling of empty part (with a type)...
r20856 _fparttypesize = '>B'
Pierre-Yves David
bundle2: add an integer id to part...
r20995 _fpartid = '>I'
Pierre-Yves David
bundle2: change header size and make them signed (new format)...
r23009 _fpayloadsize = '>i'
Pierre-Yves David
bundle2: part params
r20877 _fpartparamcount = '>BB'
Pierre-Yves David
bundle2: support chunk iterator as part data...
r21001 preferedchunksize = 4096
Pierre-Yves David
bundle2: enforce parttype as alphanumerical...
r23868 _parttypeforbidden = re.compile('[^a-zA-Z0-9_:-]')
Pierre-Yves David
bundle2: introduce a specific function for bundling debug message...
r25313 def outdebug(ui, message):
"""debug regarding output stream (bundling)"""
Pierre-Yves David
bundle2: hide bundle2 stream debug under a config flag...
r25336 if ui.configbool('devel', 'bundle2.debug', False):
ui.debug('bundle2-output: %s\n' % message)
Pierre-Yves David
bundle2: introduce a specific function for bundling debug message...
r25313
Pierre-Yves David
bundle2: introduce a specific function for debug messages while unbundling...
r25318 def indebug(ui, message):
"""debug on input stream (unbundling)"""
Pierre-Yves David
bundle2: hide bundle2 stream debug under a config flag...
r25336 if ui.configbool('devel', 'bundle2.debug', False):
ui.debug('bundle2-input: %s\n' % message)
Pierre-Yves David
bundle2: introduce a specific function for debug messages while unbundling...
r25318
Pierre-Yves David
bundle2: enforce parttype as alphanumerical...
r23868 def validateparttype(parttype):
"""raise ValueError if a parttype contains invalid character"""
Matt Mackall
bundle2: fix parttype enforcement...
r23916 if _parttypeforbidden.search(parttype):
Pierre-Yves David
bundle2: enforce parttype as alphanumerical...
r23868 raise ValueError(parttype)
Pierre-Yves David
bundle2: part params
r20877 def _makefpartparamsizes(nbparams):
"""return a struct format to read part parameter sizes
The number parameters is variable so we need to build that format
dynamically.
"""
return '>'+('BB'*nbparams)
Pierre-Yves David
bundle2: support bundling simple parameter...
r20804
Pierre-Yves David
bundle2: introduce a `parthandler` decorator...
r20890 parthandlermapping = {}
Pierre-Yves David
bundle2: first version of a bundle processing...
r20889
Pierre-Yves David
bundle2: make it possible to declare params handled by a part handler...
r21623 def parthandler(parttype, params=()):
Pierre-Yves David
bundle2: introduce a `parthandler` decorator...
r20890 """decorator that register a function as a bundle2 part handler
eg::
Pierre-Yves David
bundle2: declare supported parameters for all handlers...
r21624 @parthandler('myparttype', ('mandatory', 'param', 'handled'))
Pierre-Yves David
bundle2: introduce a `parthandler` decorator...
r20890 def myparttypehandler(...):
'''process a part of type "my part".'''
...
"""
Pierre-Yves David
bundle2: enforce parttype as alphanumerical...
r23868 validateparttype(parttype)
Pierre-Yves David
bundle2: introduce a `parthandler` decorator...
r20890 def _decorator(func):
Pierre-Yves David
bundle2: add some distinction between mandatory and advisory part...
r20891 lparttype = parttype.lower() # enforce lower case matching.
assert lparttype not in parthandlermapping
parthandlermapping[lparttype] = func
Pierre-Yves David
bundle2: make it possible to declare params handled by a part handler...
r21623 func.params = frozenset(params)
Pierre-Yves David
bundle2: introduce a `parthandler` decorator...
r20890 return func
return _decorator
Pierre-Yves David
bundle2: first version of a bundle processing...
r20889
Pierre-Yves David
bundle2: record processing results in the bundleoperation object...
r20949 class unbundlerecords(object):
"""keep record of what happens during and unbundle
New records are added using `records.add('cat', obj)`. Where 'cat' is a
Mads Kiilerich
spelling: fixes from spell checker
r21024 category of record and obj is an arbitrary object.
Pierre-Yves David
bundle2: record processing results in the bundleoperation object...
r20949
`records['cat']` will return all entries of this category 'cat'.
Iterating on the object itself will yield `('category', obj)` tuples
for all entries.
All iterations happens in chronological order.
"""
def __init__(self):
self._categories = {}
self._sequences = []
Pierre-Yves David
bundle2: add reply awareness to unbundlerecords...
r20996 self._replies = {}
Pierre-Yves David
bundle2: record processing results in the bundleoperation object...
r20949
Pierre-Yves David
bundle2: add reply awareness to unbundlerecords...
r20996 def add(self, category, entry, inreplyto=None):
Pierre-Yves David
bundle2: record processing results in the bundleoperation object...
r20949 """add a new record of a given category.
The entry can then be retrieved in the list returned by
self['category']."""
self._categories.setdefault(category, []).append(entry)
self._sequences.append((category, entry))
Pierre-Yves David
bundle2: add reply awareness to unbundlerecords...
r20996 if inreplyto is not None:
self.getreplies(inreplyto).add(category, entry)
def getreplies(self, partid):
Mads Kiilerich
spelling: fixes from proofreading of spell checker issues
r23139 """get the records that are replies to a specific part"""
Pierre-Yves David
bundle2: add reply awareness to unbundlerecords...
r20996 return self._replies.setdefault(partid, unbundlerecords())
Pierre-Yves David
bundle2: record processing results in the bundleoperation object...
r20949
def __getitem__(self, cat):
return tuple(self._categories.get(cat, ()))
def __iter__(self):
return iter(self._sequences)
def __len__(self):
return len(self._sequences)
def __nonzero__(self):
return bool(self._sequences)
Pierre-Yves David
bundle2: introduce a bundleoperation object...
r20948 class bundleoperation(object):
"""an object that represents a single bundling process
Its purpose is to carry unbundle-related objects and states.
A new object should be created at the beginning of each bundle processing.
The object is to be returned by the processing function.
The object has very little content now it will ultimately contain:
* an access to the repo the bundle is applied to,
* a ui object,
* a way to retrieve a transaction to add changes to the repo,
* a way to record the result of processing each part,
* a way to construct a bundle response when applicable.
"""
Pierre-Yves David
bundle2: disable ouput capture unless we use http (issue4613 issue4615)...
r24878 def __init__(self, repo, transactiongetter, captureoutput=True):
Pierre-Yves David
bundle2: introduce a bundleoperation object...
r20948 self.repo = repo
self.ui = repo.ui
Pierre-Yves David
bundle2: record processing results in the bundleoperation object...
r20949 self.records = unbundlerecords()
Pierre-Yves David
bundle2: make it possible have a global transaction for the unbundling...
r20952 self.gettransaction = transactiongetter
Pierre-Yves David
bundle2: produce a bundle2 reply...
r20997 self.reply = None
Pierre-Yves David
bundle2: disable ouput capture unless we use http (issue4613 issue4615)...
r24878 self.captureoutput = captureoutput
Pierre-Yves David
bundle2: introduce a bundleoperation object...
r20948
Pierre-Yves David
bundle2: make it possible have a global transaction for the unbundling...
r20952 class TransactionUnavailable(RuntimeError):
pass
def _notransaction():
"""default method to get a transaction while processing a bundle
Raise an exception to highlight the fact that no transaction was expected
to be created"""
raise TransactionUnavailable()
Pierre-Yves David
applybundle: take url as argument...
r26795 def applybundle(repo, unbundler, tr, source=None, url=None, op=None):
Pierre-Yves David
bundle2: introduce an "applybundle" function...
r26790 # transform me into unbundler.apply() as soon as the freeze is lifted
Pierre-Yves David
applybundle: set 'bundle2=1' env for all transaction...
r26792 tr.hookargs['bundle2'] = '1'
Pierre-Yves David
applybundle: take source as argument...
r26793 if source is not None and 'source' not in tr.hookargs:
tr.hookargs['source'] = source
Pierre-Yves David
applybundle: take url as argument...
r26795 if url is not None and 'url' not in tr.hookargs:
tr.hookargs['url'] = url
Pierre-Yves David
bundle2: introduce an "applybundle" function...
r26790 return processbundle(repo, unbundler, lambda: tr, op=op)
Pierre-Yves David
bundle2: also save output when error happens during part processing...
r24851 def processbundle(repo, unbundler, transactiongetter=None, op=None):
Pierre-Yves David
bundle2: first version of a bundle processing...
r20889 """This function process a bundle, apply effect to/from a repo
Pierre-Yves David
bundle2: feed a unbundle20 to the `processbundle` function...
r20947 It iterates over each part then searches for and uses the proper handling
code to process the part. Parts are processed in order.
Pierre-Yves David
bundle2: first version of a bundle processing...
r20889
This is very early version of this function that will be strongly reworked
before final usage.
Pierre-Yves David
bundle2: add some distinction between mandatory and advisory part...
r20891 Unknown Mandatory part will abort the process.
Pierre-Yves David
bundle2: also save output when error happens during part processing...
r24851
It is temporarily possible to provide a prebuilt bundleoperation to the
function. This is used to ensure output is properly propagated in case of
an error during the unbundling. This output capturing part will likely be
reworked and this ability will probably go away in the process.
Pierre-Yves David
bundle2: first version of a bundle processing...
r20889 """
Pierre-Yves David
bundle2: also save output when error happens during part processing...
r24851 if op is None:
if transactiongetter is None:
transactiongetter = _notransaction
op = bundleoperation(repo, transactiongetter)
Pierre-Yves David
bundle2: first version of a bundle processing...
r20889 # todo:
# - replace this is a init function soon.
# - exception catching
unbundler.params
Pierre-Yves David
bundle2: add generic debug output regarding processed bundle...
r25331 if repo.ui.debugflag:
msg = ['bundle2-input-bundle:']
if unbundler.params:
msg.append(' %i params')
if op.gettransaction is None:
msg.append(' no-transaction')
else:
msg.append(' with-transaction')
msg.append('\n')
repo.ui.debug(''.join(msg))
Pierre-Yves David
bundle2: add generic debug output at the end of bundle processing...
r25332 iterparts = enumerate(unbundler.iterparts())
Pierre-Yves David
bundle2: lazy unbundle of part payload...
r21019 part = None
Pierre-Yves David
bundle2: add generic debug output at the end of bundle processing...
r25332 nbpart = 0
Pierre-Yves David
bundle2: read the whole bundle from stream on abort...
r20892 try:
Pierre-Yves David
bundle2: add generic debug output at the end of bundle processing...
r25332 for nbpart, part in iterparts:
Pierre-Yves David
bundle2: extract processing of part into its own function...
r23008 _processpart(op, part)
Gregory Szorc
global: mass rewrite to use modern exception syntax...
r25660 except BaseException as exc:
Pierre-Yves David
bundle2: add generic debug output at the end of bundle processing...
r25332 for nbpart, part in iterparts:
Pierre-Yves David
bundle2: lazy unbundle of part payload...
r21019 # consume the bundle content
Eric Sumner
bundle2: now that we have a seek implementation, use it...
r24047 part.seek(0, 2)
Pierre-Yves David
bundle2: decorate exception raised during bundle processing...
r21176 # Small hack to let caller code distinguish exceptions from bundle2
Mads Kiilerich
spelling: fixes from proofreading of spell checker issues
r23139 # processing from processing the old format. This is mostly
Pierre-Yves David
bundle2: decorate exception raised during bundle processing...
r21176 # needed to handle different return codes to unbundle according to the
# type of bundle. We should probably clean up or drop this return code
# craziness in a future version.
exc.duringunbundle2 = True
Pierre-Yves David
bundle2: store the salvaged output on the exception object...
r24795 salvaged = []
Pierre-Yves David
bundle2: also capture reply capability on failure...
r25492 replycaps = None
Pierre-Yves David
bundle2: store the salvaged output on the exception object...
r24795 if op.reply is not None:
salvaged = op.reply.salvageoutput()
Pierre-Yves David
bundle2: also capture reply capability on failure...
r25492 replycaps = op.reply.capabilities
exc._replycaps = replycaps
Pierre-Yves David
bundle2: store the salvaged output on the exception object...
r24795 exc._bundle2salvagedoutput = salvaged
Pierre-Yves David
bundle2: read the whole bundle from stream on abort...
r20892 raise
Pierre-Yves David
bundle2: add generic debug output at the end of bundle processing...
r25332 finally:
repo.ui.debug('bundle2-input-bundle: %i parts total\n' % nbpart)
Pierre-Yves David
bundle2: record processing results in the bundleoperation object...
r20949 return op
Pierre-Yves David
bundle2: first version of a bundle processing...
r20889
Pierre-Yves David
bundle2: extract processing of part into its own function...
r23008 def _processpart(op, part):
"""process a single part from a bundle
The part is guaranteed to have been fully consumed when the function exits
(even if an exception is raised)."""
Pierre-Yves David
bundle2: add generic debug output regarding processed part...
r25333 status = 'unknown' # used by debug output
Pierre-Yves David
bundle2: extract processing of part into its own function...
r23008 try:
try:
Eric Sumner
bundle2._processpart: forcing lower-case compare is no longer necessary...
r23586 handler = parthandlermapping.get(part.type)
Pierre-Yves David
bundle2: extract processing of part into its own function...
r23008 if handler is None:
Pierre-Yves David
bundle2: add generic debug output regarding processed part...
r25333 status = 'unsupported-type'
Pierre-Yves David
bundle2: rename error exception class for unsupported feature...
r26393 raise error.BundleUnknownFeatureError(parttype=part.type)
Pierre-Yves David
bundle2: handle new line in 'indebug' function...
r25320 indebug(op.ui, 'found a handler for part %r' % part.type)
Pierre-Yves David
bundle2: extract processing of part into its own function...
r23008 unknownparams = part.mandatorykeys - handler.params
if unknownparams:
unknownparams = list(unknownparams)
unknownparams.sort()
Pierre-Yves David
bundle2: add generic debug output regarding processed part...
r25333 status = 'unsupported-params (%s)' % unknownparams
Pierre-Yves David
bundle2: rename error exception class for unsupported feature...
r26393 raise error.BundleUnknownFeatureError(parttype=part.type,
params=unknownparams)
Pierre-Yves David
bundle2: add generic debug output regarding processed part...
r25333 status = 'supported'
Pierre-Yves David
bundle2: rename error exception class for unsupported feature...
r26393 except error.BundleUnknownFeatureError as exc:
Eric Sumner
bundle2.unbundlepart: decouple mandatory from parttype...
r23585 if part.mandatory: # mandatory parts
Pierre-Yves David
bundle2: extract processing of part into its own function...
r23008 raise
Pierre-Yves David
bundle2: handle new line in 'indebug' function...
r25320 indebug(op.ui, 'ignoring unsupported advisory part %s' % exc)
Pierre-Yves David
bundle2: extract processing of part into its own function...
r23008 return # skip to part processing
Pierre-Yves David
bundle2: add generic debug output regarding processed part...
r25333 finally:
if op.ui.debugflag:
msg = ['bundle2-input-part: "%s"' % part.type]
if not part.mandatory:
msg.append(' (advisory)')
nbmp = len(part.mandatorykeys)
nbap = len(part.params) - nbmp
if nbmp or nbap:
msg.append(' (params:')
if nbmp:
msg.append(' %i mandatory' % nbmp)
if nbap:
msg.append(' %i advisory' % nbmp)
msg.append(')')
msg.append(' %s\n' % status)
op.ui.debug(''.join(msg))
Pierre-Yves David
bundle2: extract processing of part into its own function...
r23008
# handler is called outside the above try block so that we don't
# risk catching KeyErrors from anything other than the
# parthandlermapping lookup (any KeyError raised by handler()
# itself represents a defect of a different variety).
output = None
Pierre-Yves David
bundle2: disable ouput capture unless we use http (issue4613 issue4615)...
r24878 if op.captureoutput and op.reply is not None:
Pierre-Yves David
bundle2: also capture hook output during processing...
r24849 op.ui.pushbuffer(error=True, subproc=True)
Pierre-Yves David
bundle2: extract processing of part into its own function...
r23008 output = ''
try:
handler(op, part)
finally:
if output is not None:
output = op.ui.popbuffer()
Pierre-Yves David
bundle2: flush output in a part in all cases...
r24743 if output:
outpart = op.reply.newpart('output', data=output,
mandatory=False)
outpart.addparam('in-reply-to', str(part.id), mandatory=False)
Pierre-Yves David
bundle2: extract processing of part into its own function...
r23008 finally:
# consume the part content to not corrupt the stream.
Eric Sumner
bundle2: now that we have a seek implementation, use it...
r24047 part.seek(0, 2)
Pierre-Yves David
bundle2: extract processing of part into its own function...
r23008
Pierre-Yves David
bundle2: extract capabilities decoding...
r21138 def decodecaps(blob):
Mads Kiilerich
spelling: fixes from proofreading of spell checker issues
r23139 """decode a bundle2 caps bytes blob into a dictionary
Pierre-Yves David
bundle2: extract capabilities decoding...
r21138
The blob is a list of capabilities (one per line)
Capabilities may have values using a line of the form::
capability=value1,value2,value3
The values are always a list."""
caps = {}
for line in blob.splitlines():
if not line:
continue
if '=' not in line:
key, vals = line, ()
else:
key, vals = line.split('=', 1)
vals = vals.split(',')
timeless
pycompat: switch to util.urlreq/util.urlerr for py3 compat
r28883 key = urlreq.unquote(key)
vals = [urlreq.unquote(v) for v in vals]
Pierre-Yves David
bundle2: extract capabilities decoding...
r21138 caps[key] = vals
return caps
Pierre-Yves David
bundle2: capabilities encoding
r21139 def encodecaps(caps):
"""encode a bundle2 caps dictionary into a bytes blob"""
chunks = []
for ca in sorted(caps):
vals = caps[ca]
timeless
pycompat: switch to util.urlreq/util.urlerr for py3 compat
r28883 ca = urlreq.quote(ca)
vals = [urlreq.quote(v) for v in vals]
Pierre-Yves David
bundle2: capabilities encoding
r21139 if vals:
ca = "%s=%s" % (ca, ','.join(vals))
chunks.append(ca)
return '\n'.join(chunks)
Martin von Zweigbergk
bundle: move writebundle() from changegroup.py to bundle2.py (API)...
r28666 bundletypes = {
"": ("", None), # only when using unbundle on ssh and old http servers
# since the unification ssh accepts a header but there
# is no capability signaling it.
"HG20": (), # special-cased below
"HG10UN": ("HG10UN", None),
"HG10BZ": ("HG10", 'BZ'),
"HG10GZ": ("HG10GZ", 'GZ'),
}
# hgweb uses this list to communicate its preferred type
bundlepriority = ['HG10GZ', 'HG10BZ', 'HG10UN']
Pierre-Yves David
bundle2: very first version of a bundle2 bundler...
r20801 class bundle20(object):
"""represent an outgoing bundle2 container
Pierre-Yves David
bundle2: have ``newpart`` automatically add the part to the bundle...
r21599 Use the `addparam` method to add stream level parameter. and `newpart` to
Pierre-Yves David
bundle2: support bundling of empty part (with a type)...
r20856 populate it. Then call `getchunks` to retrieve all the binary chunks of
Mads Kiilerich
spelling: fixes from spell checker
r21024 data that compose the bundle2 container."""
Pierre-Yves David
bundle2: very first version of a bundle2 bundler...
r20801
Pierre-Yves David
bundle2: rename format, parts and config to final names...
r24686 _magicstring = 'HG20'
Pierre-Yves David
bundle20: move magic string into the class...
r24640
Pierre-Yves David
bundle2: adds a capabilities attribute on bundler20...
r21134 def __init__(self, ui, capabilities=()):
Pierre-Yves David
bundle2: print debug information during bundling...
r20842 self.ui = ui
Pierre-Yves David
bundle2: very first version of a bundle2 bundler...
r20801 self._params = []
self._parts = []
Pierre-Yves David
bundle2: support for capabilities with values...
r21136 self.capabilities = dict(capabilities)
Pierre-Yves David
bundle2: allow compressed bundle...
r26404 self._compressor = util.compressors[None]()
def setcompression(self, alg):
"""setup core part compression to <alg>"""
if alg is None:
return
assert not any(n.lower() == 'Compression' for n, v in self._params)
self.addparam('Compression', alg)
self._compressor = util.compressors[alg]()
Pierre-Yves David
bundle2: very first version of a bundle2 bundler...
r20801
Pierre-Yves David
bundle2: add a ``bundle20.nbparts`` property...
r21900 @property
def nbparts(self):
"""total number of parts added to the bundler"""
return len(self._parts)
Pierre-Yves David
bundle2: small doc update on the bundler...
r21597 # methods used to defines the bundle2 content
Pierre-Yves David
bundle2: support bundling simple parameter...
r20804 def addparam(self, name, value=None):
"""add a stream level parameter"""
Pierre-Yves David
bundle2: refuse empty parameter name...
r20813 if not name:
raise ValueError('empty parameter name')
Pierre-Yves David
bundle2: force the first char of parameter to be an letter....
r20814 if name[0] not in string.letters:
raise ValueError('non letter first character: %r' % name)
Pierre-Yves David
bundle2: support bundling simple parameter...
r20804 self._params.append((name, value))
Pierre-Yves David
bundle2: support bundling of empty part (with a type)...
r20856 def addpart(self, part):
"""add a new part to the bundle2 container
Mads Kiilerich
spelling: fixes from spell checker
r21024 Parts contains the actual applicative payload."""
Pierre-Yves David
bundle2: add an integer id to part...
r20995 assert part.id is None
part.id = len(self._parts) # very cheap counter
Pierre-Yves David
bundle2: support bundling of empty part (with a type)...
r20856 self._parts.append(part)
Pierre-Yves David
bundle2: add a ``newpart`` method to ``bundle20``...
r21598 def newpart(self, typeid, *args, **kwargs):
Pierre-Yves David
bundle2: warn about error during initialization in ``newpart`` docstring...
r21602 """create a new part and add it to the containers
As the part is directly added to the containers. For now, this means
that any failure to properly initialize the part after calling
``newpart`` should result in a failure of the whole bundling process.
You can still fall back to manually create and add if you need better
control."""
Pierre-Yves David
bundle2: add a ``newpart`` method to ``bundle20``...
r21598 part = bundlepart(typeid, *args, **kwargs)
Pierre-Yves David
bundle2: have ``newpart`` automatically add the part to the bundle...
r21599 self.addpart(part)
Pierre-Yves David
bundle2: add a ``newpart`` method to ``bundle20``...
r21598 return part
Pierre-Yves David
bundle2: small doc update on the bundler...
r21597 # methods used to generate the bundle2 stream
Pierre-Yves David
bundle2: very first version of a bundle2 bundler...
r20801 def getchunks(self):
Pierre-Yves David
bundle2: add generic debug output regarding generated bundle...
r25322 if self.ui.debugflag:
msg = ['bundle2-output-bundle: "%s",' % self._magicstring]
if self._params:
msg.append(' (%i params)' % len(self._params))
msg.append(' %i parts total\n' % len(self._parts))
self.ui.debug(''.join(msg))
Pierre-Yves David
bundle2: handle new line in 'outdebug' function...
r25315 outdebug(self.ui, 'start emission of %s stream' % self._magicstring)
Pierre-Yves David
bundle20: move magic string into the class...
r24640 yield self._magicstring
Pierre-Yves David
bundle2: support bundling simple parameter...
r20804 param = self._paramchunk()
Pierre-Yves David
bundle2: handle new line in 'outdebug' function...
r25315 outdebug(self.ui, 'bundle parameter: %s' % param)
Pierre-Yves David
bundle2: support bundling simple parameter...
r20804 yield _pack(_fstreamparamsize, len(param))
if param:
yield param
Pierre-Yves David
bundle2: allow compressed bundle...
r26404 # starting compression
Pierre-Yves David
bundle20: extract core payload generation in its own function...
r26396 for chunk in self._getcorechunk():
Pierre-Yves David
bundle2: allow compressed bundle...
r26404 yield self._compressor.compress(chunk)
yield self._compressor.flush()
Pierre-Yves David
bundle2: a very first version of bundle2 unbundler...
r20802
Pierre-Yves David
bundle2: support bundling simple parameter...
r20804 def _paramchunk(self):
"""return a encoded version of all stream parameters"""
blocks = []
Pierre-Yves David
bundle2: support for bundling parameter value...
r20809 for par, value in self._params:
timeless
pycompat: switch to util.urlreq/util.urlerr for py3 compat
r28883 par = urlreq.quote(par)
Pierre-Yves David
bundle2: support for bundling parameter value...
r20809 if value is not None:
timeless
pycompat: switch to util.urlreq/util.urlerr for py3 compat
r28883 value = urlreq.quote(value)
Pierre-Yves David
bundle2: support for bundling parameter value...
r20809 par = '%s=%s' % (par, value)
blocks.append(par)
Pierre-Yves David
bundle2: support bundling simple parameter...
r20804 return ' '.join(blocks)
Pierre-Yves David
bundle20: extract core payload generation in its own function...
r26396 def _getcorechunk(self):
"""yield chunk for the core part of the bundle
(all but headers and parameters)"""
outdebug(self.ui, 'start of parts')
for part in self._parts:
outdebug(self.ui, 'bundle part: "%s"' % part.type)
for chunk in part.getchunks(ui=self.ui):
yield chunk
outdebug(self.ui, 'end of bundle')
yield _pack(_fpartheadersize, 0)
Pierre-Yves David
bundle2: add a 'salvageoutput' method on bundle20...
r24794 def salvageoutput(self):
"""return a list with a copy of all output parts in the bundle
This is meant to be used during error handling to make sure we preserve
server output"""
salvaged = []
for part in self._parts:
if part.type.startswith('output'):
salvaged.append(part.copy())
return salvaged
Pierre-Yves David
bundle2: extract stream/unpack logic in an unpackermixin...
r21013 class unpackermixin(object):
"""A mixin to extract bytes and struct data from a stream"""
Pierre-Yves David
bundle2: a very first version of bundle2 unbundler...
r20802
Pierre-Yves David
bundle2: extract stream/unpack logic in an unpackermixin...
r21013 def __init__(self, fp):
Pierre-Yves David
bundle2: a very first version of bundle2 unbundler...
r20802 self._fp = fp
Eric Sumner
bundle2.unpackermixin: control for underlying file descriptor...
r24026 self._seekable = (util.safehasattr(fp, 'seek') and
util.safehasattr(fp, 'tell'))
Pierre-Yves David
bundle2: a very first version of bundle2 unbundler...
r20802
def _unpack(self, format):
"""unpack this struct format from the stream"""
data = self._readexact(struct.calcsize(format))
return _unpack(format, data)
def _readexact(self, size):
"""read exactly <size> bytes from the stream"""
return changegroup.readexactly(self._fp, size)
Eric Sumner
bundle2.unpackermixin: default value for seek() whence parameter...
r24070 def seek(self, offset, whence=0):
Eric Sumner
bundle2.unpackermixin: control for underlying file descriptor...
r24026 """move the underlying file pointer"""
if self._seekable:
return self._fp.seek(offset, whence)
else:
raise NotImplementedError(_('File pointer is not seekable'))
def tell(self):
"""return the file offset, or None if file is not seekable"""
if self._seekable:
try:
return self._fp.tell()
Gregory Szorc
global: mass rewrite to use modern exception syntax...
r25660 except IOError as e:
Eric Sumner
bundle2.unpackermixin: control for underlying file descriptor...
r24026 if e.errno == errno.ESPIPE:
self._seekable = False
else:
raise
return None
def close(self):
"""close underlying file"""
if util.safehasattr(self._fp, 'close'):
return self._fp.close()
Pierre-Yves David
bundle2: extract stream/unpack logic in an unpackermixin...
r21013
Pierre-Yves David
bundle2.getunbundler: rename "header" to "magicstring"...
r25640 def getunbundler(ui, fp, magicstring=None):
"""return a valid unbundler object for a given magicstring"""
if magicstring is None:
magicstring = changegroup.readexactly(fp, 4)
magic, version = magicstring[0:2], magicstring[2:4]
Pierre-Yves David
unbundle20: allow generic dispatch between unbundlers...
r24648 if magic != 'HG':
Pierre-Yves David
error: get Abort from 'error' instead of 'util'...
r26587 raise error.Abort(_('not a Mercurial bundle'))
Pierre-Yves David
unbundle20: allow generic dispatch between unbundlers...
r24648 unbundlerclass = formatmap.get(version)
if unbundlerclass is None:
Pierre-Yves David
error: get Abort from 'error' instead of 'util'...
r26587 raise error.Abort(_('unknown bundle version %s') % version)
Pierre-Yves David
unbundle20: allow generic dispatch between unbundlers...
r24648 unbundler = unbundlerclass(ui, fp)
Pierre-Yves David
bundle2.getunbundler: rename "header" to "magicstring"...
r25640 indebug(ui, 'start processing of %s stream' % magicstring)
Pierre-Yves David
unbundle20: move header parsing into the 'getunbundler' function...
r24642 return unbundler
Pierre-Yves David
unbundle20: retrieve unbundler instances through a factory function...
r24641
Pierre-Yves David
bundle2: extract stream/unpack logic in an unpackermixin...
r21013 class unbundle20(unpackermixin):
"""interpret a bundle2 stream
Pierre-Yves David
bundle2: use an official iterparts method to unbundle parts...
r21129 This class is fed with a binary stream and yields parts through its
`iterparts` methods."""
Pierre-Yves David
bundle2: extract stream/unpack logic in an unpackermixin...
r21013
Pierre-Yves David
bundle2: add a way to just forward the bundle2 stream to another user...
r26542 _magicstring = 'HG20'
Pierre-Yves David
unbundle20: move header parsing into the 'getunbundler' function...
r24642 def __init__(self, ui, fp):
Pierre-Yves David
bundle2: make header reading optional...
r21066 """If header is specified, we do not read it out of the stream."""
Pierre-Yves David
bundle2: extract stream/unpack logic in an unpackermixin...
r21013 self.ui = ui
Pierre-Yves David
bundle2: allow compressed bundle...
r26404 self._decompressor = util.decompressors[None]
Pierre-Yves David
bundle2: make unbundle.compressed return True when compressed...
r26802 self._compressed = None
Pierre-Yves David
bundle2: extract stream/unpack logic in an unpackermixin...
r21013 super(unbundle20, self).__init__(fp)
Pierre-Yves David
bundle2: a very first version of bundle2 unbundler...
r20802 @util.propertycache
def params(self):
Mads Kiilerich
spelling: fixes from spell checker
r21024 """dictionary of stream level parameters"""
Pierre-Yves David
bundle2: handle new line in 'indebug' function...
r25320 indebug(self.ui, 'reading bundle2 stream parameters')
Pierre-Yves David
bundle2: support for unbundling simple parameter...
r20805 params = {}
paramssize = self._unpack(_fstreamparamsize)[0]
Pierre-Yves David
bundle2: detect and disallow a negative chunk size...
r23011 if paramssize < 0:
raise error.BundleValueError('negative bundle param size: %i'
% paramssize)
Pierre-Yves David
bundle2: support for unbundling simple parameter...
r20805 if paramssize:
Pierre-Yves David
bundle2: split parameter retrieval and processing...
r26541 params = self._readexact(paramssize)
params = self._processallparams(params)
Pierre-Yves David
bundle2: support for unbundling simple parameter...
r20805 return params
Pierre-Yves David
bundle2: a very first version of bundle2 unbundler...
r20802
Pierre-Yves David
bundle2: split parameter retrieval and processing...
r26541 def _processallparams(self, paramsblock):
""""""
params = {}
for p in paramsblock.split(' '):
p = p.split('=', 1)
timeless
pycompat: switch to util.urlreq/util.urlerr for py3 compat
r28883 p = [urlreq.unquote(i) for i in p]
Pierre-Yves David
bundle2: split parameter retrieval and processing...
r26541 if len(p) < 2:
p.append(None)
self._processparam(*p)
params[p[0]] = p[1]
return params
Pierre-Yves David
bundle2: implement the mandatory/advisory logic for parameter...
r20844 def _processparam(self, name, value):
"""process a parameter, applying its effect if needed
Parameter starting with a lower case letter are advisory and will be
ignored when unknown. Those starting with an upper case letter are
mandatory and will this function will raise a KeyError when unknown.
Note: no option are currently supported. Any input will be either
ignored or failing.
"""
if not name:
raise ValueError('empty parameter name')
if name[0] not in string.letters:
raise ValueError('non letter first character: %r' % name)
Pierre-Yves David
unbundle20: allow registering handlers for stream level parameters...
r26395 try:
handler = b2streamparamsmap[name.lower()]
except KeyError:
if name[0].islower():
indebug(self.ui, "ignoring unknown parameter %r" % name)
else:
raise error.BundleUnknownFeatureError(params=(name,))
Pierre-Yves David
bundle2: implement the mandatory/advisory logic for parameter...
r20844 else:
Pierre-Yves David
unbundle20: allow registering handlers for stream level parameters...
r26395 handler(self, name, value)
Pierre-Yves David
bundle2: implement the mandatory/advisory logic for parameter...
r20844
Pierre-Yves David
bundle2: add a way to just forward the bundle2 stream to another user...
r26542 def _forwardchunks(self):
"""utility to transfer a bundle2 as binary
This is made necessary by the fact the 'getbundle' command over 'ssh'
have no way to know then the reply end, relying on the bundle to be
interpreted to know its end. This is terrible and we are sorry, but we
needed to move forward to get general delta enabled.
"""
yield self._magicstring
assert 'params' not in vars(self)
paramssize = self._unpack(_fstreamparamsize)[0]
if paramssize < 0:
raise error.BundleValueError('negative bundle param size: %i'
% paramssize)
yield _pack(_fstreamparamsize, paramssize)
if paramssize:
params = self._readexact(paramssize)
self._processallparams(params)
yield params
assert self._decompressor is util.decompressors[None]
# From there, payload might need to be decompressed
self._fp = self._decompressor(self._fp)
emptycount = 0
while emptycount < 2:
# so we can brainlessly loop
assert _fpartheadersize == _fpayloadsize
size = self._unpack(_fpartheadersize)[0]
yield _pack(_fpartheadersize, size)
if size:
emptycount = 0
else:
emptycount += 1
continue
if size == flaginterrupt:
continue
elif size < 0:
raise error.BundleValueError('negative chunk size: %i')
yield self._readexact(size)
Pierre-Yves David
bundle2: use an official iterparts method to unbundle parts...
r21129 def iterparts(self):
Pierre-Yves David
bundle2: a very first version of bundle2 unbundler...
r20802 """yield all parts contained in the stream"""
# make sure param have been loaded
self.params
Pierre-Yves David
bundle2: allow compressed bundle...
r26404 # From there, payload need to be decompressed
self._fp = self._decompressor(self._fp)
Pierre-Yves David
bundle2: handle new line in 'indebug' function...
r25320 indebug(self.ui, 'start extraction of bundle2 parts')
Pierre-Yves David
bundle2: add an unbundle part responsible from unbundling part...
r21014 headerblock = self._readpartheader()
while headerblock is not None:
part = unbundlepart(self.ui, headerblock, self._fp)
Pierre-Yves David
bundle2: a very first version of bundle2 unbundler...
r20802 yield part
Eric Sumner
bundle2: seek in part iterator...
r24048 part.seek(0, 2)
Pierre-Yves David
bundle2: add an unbundle part responsible from unbundling part...
r21014 headerblock = self._readpartheader()
Pierre-Yves David
bundle2: handle new line in 'indebug' function...
r25320 indebug(self.ui, 'end of bundle2 stream')
Pierre-Yves David
bundle2: a very first version of bundle2 unbundler...
r20802
Pierre-Yves David
bundle2: add an unbundle part responsible from unbundling part...
r21014 def _readpartheader(self):
"""reads a part header size and return the bytes blob
Pierre-Yves David
bundle2: support unbundling empty part...
r20864
Pierre-Yves David
bundle2: add an unbundle part responsible from unbundling part...
r21014 returns None if empty"""
Pierre-Yves David
bundle2: support unbundling empty part...
r20864 headersize = self._unpack(_fpartheadersize)[0]
Pierre-Yves David
bundle2: detect and disallow a negative chunk size...
r23011 if headersize < 0:
raise error.BundleValueError('negative part header size: %i'
% headersize)
Pierre-Yves David
bundle2: handle new line in 'indebug' function...
r25320 indebug(self.ui, 'part header size: %i' % headersize)
Pierre-Yves David
bundle2: add an unbundle part responsible from unbundling part...
r21014 if headersize:
return self._readexact(headersize)
return None
Pierre-Yves David
bundle2: support unbundling empty part...
r20864
Eric Sumner
bundle2.unbundle20: add compressed() method...
r24071 def compressed(self):
Pierre-Yves David
bundle2: make unbundle.compressed return True when compressed...
r26802 self.params # load params
return self._compressed
Pierre-Yves David
bundle2: a very first version of bundle2 unbundler...
r20802
Pierre-Yves David
bundle2: rename format, parts and config to final names...
r24686 formatmap = {'20': unbundle20}
Pierre-Yves David
unbundle20: allow generic dispatch between unbundlers...
r24648
Pierre-Yves David
unbundle20: allow registering handlers for stream level parameters...
r26395 b2streamparamsmap = {}
def b2streamparamhandler(name):
"""register a handler for a stream level parameter"""
def decorator(func):
assert name not in formatmap
b2streamparamsmap[name] = func
return func
return decorator
Pierre-Yves David
bundle2: allow compressed bundle...
r26404 @b2streamparamhandler('compression')
def processcompression(unbundler, param, value):
"""read compression parameter and install payload decompression"""
if value not in util.decompressors:
raise error.BundleUnknownFeatureError(params=(param,),
values=(value,))
unbundler._decompressor = util.decompressors[value]
Pierre-Yves David
bundle2: make unbundle.compressed return True when compressed...
r26802 if value is not None:
unbundler._compressed = True
Pierre-Yves David
bundle2: allow compressed bundle...
r26404
Pierre-Yves David
bundle2: rename part to bundlepart...
r21005 class bundlepart(object):
Pierre-Yves David
bundle2: support bundling of empty part (with a type)...
r20856 """A bundle2 part contains application level payload
The part `type` is used to route the part to the application level
handler.
Pierre-Yves David
bundle2: the ability to set ``data`` attribute of the part is now official...
r21604
The part payload is contained in ``part.data``. It could be raw bytes or a
Pierre-Yves David
bundle2: introduce a ``addparam`` method on part...
r21605 generator of byte chunks.
You can add parameters to the part using the ``addparam`` method.
Parameters can be either mandatory (default) or advisory. Remote side
should be able to safely ignore the advisory ones.
Both data and parameters cannot be modified after the generation has begun.
Pierre-Yves David
bundle2: support bundling of empty part (with a type)...
r20856 """
Pierre-Yves David
bundle2: part params
r20877 def __init__(self, parttype, mandatoryparams=(), advisoryparams=(),
Eric Sumner
bundle2.bundlepart: make mandatory part flag explicit in API...
r23590 data='', mandatory=True):
Pierre-Yves David
bundle2: enforce parttype as alphanumerical...
r23868 validateparttype(parttype)
Pierre-Yves David
bundle2: add an integer id to part...
r20995 self.id = None
Pierre-Yves David
bundle2: support bundling of empty part (with a type)...
r20856 self.type = parttype
Pierre-Yves David
bundle2: the ability to set ``data`` attribute of the part is now official...
r21604 self._data = data
Pierre-Yves David
bundle2: introduce a ``addparam`` method on part...
r21605 self._mandatoryparams = list(mandatoryparams)
self._advisoryparams = list(advisoryparams)
Pierre-Yves David
bundle2: forbid duplicate parameter keys...
r21607 # checking for duplicated entries
self._seenparams = set()
for pname, __ in self._mandatoryparams + self._advisoryparams:
if pname in self._seenparams:
raise RuntimeError('duplicated params: %s' % pname)
self._seenparams.add(pname)
Pierre-Yves David
bundle2: track life cycle of parts...
r21601 # status of the part's generation:
# - None: not started,
# - False: currently generated,
# - True: generation done.
self._generated = None
Eric Sumner
bundle2.bundlepart: make mandatory part flag explicit in API...
r23590 self.mandatory = mandatory
Pierre-Yves David
bundle2: support bundling of empty part (with a type)...
r20856
Pierre-Yves David
bundle2: add a 'copy' method on parts...
r24793 def copy(self):
"""return a copy of the part
The new part have the very same content but no partid assigned yet.
Parts with generated data cannot be copied."""
assert not util.safehasattr(self.data, 'next')
return self.__class__(self.type, self._mandatoryparams,
self._advisoryparams, self._data, self.mandatory)
Pierre-Yves David
bundle2: the ability to set ``data`` attribute of the part is now official...
r21604 # methods used to defines the part content
Augie Fackler
cleanup: use modern @property/@foo.setter property specification...
r27879 @property
def data(self):
return self._data
@data.setter
def data(self, data):
Pierre-Yves David
bundle2: the ability to set ``data`` attribute of the part is now official...
r21604 if self._generated is not None:
Pierre-Yves David
bundle2: move exception classes into the error module...
r21618 raise error.ReadOnlyPartError('part is being generated')
Pierre-Yves David
bundle2: the ability to set ``data`` attribute of the part is now official...
r21604 self._data = data
Pierre-Yves David
bundle2: introduce a ``addparam`` method on part...
r21605 @property
def mandatoryparams(self):
# make it an immutable tuple to force people through ``addparam``
return tuple(self._mandatoryparams)
@property
def advisoryparams(self):
# make it an immutable tuple to force people through ``addparam``
return tuple(self._advisoryparams)
def addparam(self, name, value='', mandatory=True):
if self._generated is not None:
Pierre-Yves David
bundle2: move exception classes into the error module...
r21618 raise error.ReadOnlyPartError('part is being generated')
Pierre-Yves David
bundle2: forbid duplicate parameter keys...
r21607 if name in self._seenparams:
raise ValueError('duplicated params: %s' % name)
self._seenparams.add(name)
Pierre-Yves David
bundle2: introduce a ``addparam`` method on part...
r21605 params = self._advisoryparams
if mandatory:
params = self._mandatoryparams
params.append((name, value))
Pierre-Yves David
bundle2: track life cycle of parts...
r21601 # methods used to generates the bundle2 stream
Pierre-Yves David
bundle2: add debug output for part generation...
r25321 def getchunks(self, ui):
Pierre-Yves David
bundle2: track life cycle of parts...
r21601 if self._generated is not None:
raise RuntimeError('part can only be consumed once')
self._generated = False
Pierre-Yves David
bundle2: add generic debug output regarding generated parts...
r25323
if ui.debugflag:
msg = ['bundle2-output-part: "%s"' % self.type]
if not self.mandatory:
msg.append(' (advisory)')
nbmp = len(self.mandatoryparams)
nbap = len(self.advisoryparams)
if nbmp or nbap:
msg.append(' (params:')
if nbmp:
msg.append(' %i mandatory' % nbmp)
if nbap:
msg.append(' %i advisory' % nbmp)
msg.append(')')
if not self.data:
msg.append(' empty payload')
elif util.safehasattr(self.data, 'next'):
msg.append(' streamed payload')
else:
msg.append(' %i bytes payload' % len(self.data))
msg.append('\n')
ui.debug(''.join(msg))
Pierre-Yves David
bundle2: part params
r20877 #### header
Eric Sumner
bundle2.bundlepart: make mandatory part flag explicit in API...
r23590 if self.mandatory:
parttype = self.type.upper()
else:
parttype = self.type.lower()
Pierre-Yves David
bundle2: add debug output for part generation...
r25321 outdebug(ui, 'part %s: "%s"' % (self.id, parttype))
Pierre-Yves David
bundle2: part params
r20877 ## parttype
Eric Sumner
bundle2.bundlepart: make mandatory part flag explicit in API...
r23590 header = [_pack(_fparttypesize, len(parttype)),
parttype, _pack(_fpartid, self.id),
Pierre-Yves David
bundle2: support bundling of empty part (with a type)...
r20856 ]
Pierre-Yves David
bundle2: part params
r20877 ## parameters
# count
manpar = self.mandatoryparams
advpar = self.advisoryparams
header.append(_pack(_fpartparamcount, len(manpar), len(advpar)))
# size
parsizes = []
for key, value in manpar:
parsizes.append(len(key))
parsizes.append(len(value))
for key, value in advpar:
parsizes.append(len(key))
parsizes.append(len(value))
paramsizes = _pack(_makefpartparamsizes(len(parsizes) / 2), *parsizes)
header.append(paramsizes)
# key, value
for key, value in manpar:
header.append(key)
header.append(value)
for key, value in advpar:
header.append(key)
header.append(value)
## finalize header
Pierre-Yves David
bundle2: support bundling of empty part (with a type)...
r20856 headerchunk = ''.join(header)
Pierre-Yves David
bundle2: add debug output for part generation...
r25321 outdebug(ui, 'header chunk size: %i' % len(headerchunk))
Pierre-Yves David
bundle2: support bundling of empty part (with a type)...
r20856 yield _pack(_fpartheadersize, len(headerchunk))
yield headerchunk
Pierre-Yves David
bundle2: part params
r20877 ## payload
Pierre-Yves David
bundle2: transmit exception during part generation...
r23067 try:
for chunk in self._payloadchunks():
Pierre-Yves David
bundle2: add debug output for part generation...
r25321 outdebug(ui, 'payload chunk size: %i' % len(chunk))
Pierre-Yves David
bundle2: transmit exception during part generation...
r23067 yield _pack(_fpayloadsize, len(chunk))
yield chunk
Augie Fackler
bundle2: don't try to recover from a GeneratorExit (issue4785)...
r26144 except GeneratorExit:
# GeneratorExit means that nobody is listening for our
# results anyway, so just bail quickly rather than trying
# to produce an error part.
ui.debug('bundle2-generatorexit\n')
raise
Gregory Szorc
global: mass rewrite to use modern exception syntax...
r25660 except BaseException as exc:
Pierre-Yves David
bundle2: transmit exception during part generation...
r23067 # backup exception data for later
Pierre-Yves David
bundle2: add generic debug output regarding generated interruption...
r25324 ui.debug('bundle2-input-stream-interrupt: encoding exception %s'
% exc)
Pierre-Yves David
bundle2: transmit exception during part generation...
r23067 exc_info = sys.exc_info()
msg = 'unexpected error: %s' % exc
Pierre-Yves David
bundle2: rename format, parts and config to final names...
r24686 interpart = bundlepart('error:abort', [('message', msg)],
Eric Sumner
bundle2.bundlepart: make mandatory part flag explicit in API...
r23590 mandatory=False)
Pierre-Yves David
bundle2: transmit exception during part generation...
r23067 interpart.id = 0
yield _pack(_fpayloadsize, -1)
Pierre-Yves David
bundle2: add debug output for part generation...
r25321 for chunk in interpart.getchunks(ui=ui):
Pierre-Yves David
bundle2: transmit exception during part generation...
r23067 yield chunk
Pierre-Yves David
bundle2: add debug output for part generation...
r25321 outdebug(ui, 'closing payload chunk')
Pierre-Yves David
bundle2: transmit exception during part generation...
r23067 # abort current part payload
yield _pack(_fpayloadsize, 0)
raise exc_info[0], exc_info[1], exc_info[2]
Pierre-Yves David
bundle2: extract a _payloadchunks method for part...
r21000 # end of payload
Pierre-Yves David
bundle2: add debug output for part generation...
r25321 outdebug(ui, 'closing payload chunk')
Pierre-Yves David
bundle2: extract a _payloadchunks method for part...
r21000 yield _pack(_fpayloadsize, 0)
Pierre-Yves David
bundle2: track life cycle of parts...
r21601 self._generated = True
Pierre-Yves David
bundle2: extract a _payloadchunks method for part...
r21000
def _payloadchunks(self):
"""yield chunks of a the part payload
Exists to handle the different methods to provide data to a part."""
Pierre-Yves David
bundle2: support for bundling and unbundling payload...
r20876 # we only support fixed size data now.
# This will be improved in the future.
Pierre-Yves David
bundle2: support chunk iterator as part data...
r21001 if util.safehasattr(self.data, 'next'):
buff = util.chunkbuffer(self.data)
chunk = buff.read(preferedchunksize)
while chunk:
yield chunk
chunk = buff.read(preferedchunksize)
elif len(self.data):
Pierre-Yves David
bundle2: support for bundling and unbundling payload...
r20876 yield self.data
Pierre-Yves David
bundle2: a very first version of bundle2 unbundler...
r20802
Pierre-Yves David
bundle2: add a interrupt mechanism...
r23066
flaginterrupt = -1
class interrupthandler(unpackermixin):
"""read one part and process it with restricted capability
This allows to transmit exception raised on the producer size during part
iteration while the consumer is reading a part.
Part processed in this manner only have access to a ui object,"""
def __init__(self, ui, fp):
super(interrupthandler, self).__init__(fp)
self.ui = ui
def _readpartheader(self):
"""reads a part header size and return the bytes blob
returns None if empty"""
headersize = self._unpack(_fpartheadersize)[0]
if headersize < 0:
raise error.BundleValueError('negative part header size: %i'
% headersize)
Pierre-Yves David
bundle2: introduce a specific function for debug messages while unbundling...
r25318 indebug(self.ui, 'part header size: %i\n' % headersize)
Pierre-Yves David
bundle2: add a interrupt mechanism...
r23066 if headersize:
return self._readexact(headersize)
return None
def __call__(self):
Pierre-Yves David
bundle2: add generic debug output regarding processed interruption...
r25335
self.ui.debug('bundle2-input-stream-interrupt:'
' opening out of band context\n')
Pierre-Yves David
bundle2: handle new line in 'indebug' function...
r25320 indebug(self.ui, 'bundle2 stream interruption, looking for a part.')
Pierre-Yves David
bundle2: add a interrupt mechanism...
r23066 headerblock = self._readpartheader()
if headerblock is None:
Pierre-Yves David
bundle2: handle new line in 'indebug' function...
r25320 indebug(self.ui, 'no part found during interruption.')
Pierre-Yves David
bundle2: add a interrupt mechanism...
r23066 return
part = unbundlepart(self.ui, headerblock, self._fp)
op = interruptoperation(self.ui)
_processpart(op, part)
Pierre-Yves David
bundle2: add generic debug output regarding processed interruption...
r25335 self.ui.debug('bundle2-input-stream-interrupt:'
' closing out of band context\n')
Pierre-Yves David
bundle2: add a interrupt mechanism...
r23066
class interruptoperation(object):
"""A limited operation to be use by part handler during interruption
It only have access to an ui object.
"""
def __init__(self, ui):
self.ui = ui
self.reply = None
Pierre-Yves David
bundle2: disable ouput capture unless we use http (issue4613 issue4615)...
r24878 self.captureoutput = False
Pierre-Yves David
bundle2: add a interrupt mechanism...
r23066
@property
def repo(self):
raise RuntimeError('no repo access from stream interruption')
def gettransaction(self):
raise TransactionUnavailable('no repo access from stream interruption')
Pierre-Yves David
bundle2: add an unbundle part responsible from unbundling part...
r21014 class unbundlepart(unpackermixin):
"""a bundle part read from a bundle"""
def __init__(self, ui, header, fp):
super(unbundlepart, self).__init__(fp)
self.ui = ui
# unbundle state attr
self._headerdata = header
Pierre-Yves David
bundle2: move the fromheader closure into the class itself...
r21015 self._headeroffset = 0
Pierre-Yves David
bundle2: lazy unbundle of part payload...
r21019 self._initialized = False
self.consumed = False
Pierre-Yves David
bundle2: add an unbundle part responsible from unbundling part...
r21014 # part data
self.id = None
self.type = None
self.mandatoryparams = None
self.advisoryparams = None
Pierre-Yves David
bundle2: introduce a ``params`` dictionary on unbundled parts...
r21610 self.params = None
Pierre-Yves David
bundle2: expose mandatory params in a mandatorykeys attribute...
r21612 self.mandatorykeys = ()
Pierre-Yves David
bundle2: lazy unbundle of part payload...
r21019 self._payloadstream = None
self._readheader()
Eric Sumner
bundle2.unbundlepart: decouple mandatory from parttype...
r23585 self._mandatory = None
Eric Sumner
bundle2.unbundlepart: keep an index of chunks and their locations...
r24035 self._chunkindex = [] #(payload, file) position tuples for chunk starts
Eric Sumner
bundle2.unbundlepart: tell() implementation...
r24036 self._pos = 0
Pierre-Yves David
bundle2: add an unbundle part responsible from unbundling part...
r21014
Pierre-Yves David
bundle2: move the fromheader closure into the class itself...
r21015 def _fromheader(self, size):
"""return the next <size> byte from the header"""
offset = self._headeroffset
data = self._headerdata[offset:(offset + size)]
Pierre-Yves David
bundle2: lazy unbundle of part payload...
r21019 self._headeroffset = offset + size
Pierre-Yves David
bundle2: move the fromheader closure into the class itself...
r21015 return data
Pierre-Yves David
bundle2: move unpackheader closure into the class...
r21016 def _unpackheader(self, format):
"""read given format from header
This automatically compute the size of the format to read."""
data = self._fromheader(struct.calcsize(format))
return _unpack(format, data)
Pierre-Yves David
bundle2: introduce an ``_initparams`` method...
r21608 def _initparams(self, mandatoryparams, advisoryparams):
"""internal function to setup all logic related parameters"""
Pierre-Yves David
bundle2: make sure unbundled part param are read-only...
r21609 # make it read only to prevent people touching it by mistake.
self.mandatoryparams = tuple(mandatoryparams)
self.advisoryparams = tuple(advisoryparams)
Pierre-Yves David
bundle2: introduce a ``params`` dictionary on unbundled parts...
r21610 # user friendly UI
self.params = dict(self.mandatoryparams)
self.params.update(dict(self.advisoryparams))
Pierre-Yves David
bundle2: expose mandatory params in a mandatorykeys attribute...
r21612 self.mandatorykeys = frozenset(p[0] for p in mandatoryparams)
Pierre-Yves David
bundle2: introduce an ``_initparams`` method...
r21608
Eric Sumner
bundle2.unbundlepart: keep an index of chunks and their locations...
r24035 def _payloadchunks(self, chunknum=0):
'''seek to specified chunk and start yielding data'''
if len(self._chunkindex) == 0:
assert chunknum == 0, 'Must start with chunk 0'
self._chunkindex.append((0, super(unbundlepart, self).tell()))
else:
assert chunknum < len(self._chunkindex), \
'Unknown chunk %d' % chunknum
super(unbundlepart, self).seek(self._chunkindex[chunknum][1])
pos = self._chunkindex[chunknum][0]
Eric Sumner
bundle2.unbundlepart: raise payloadchunks from a closure to a method...
r24034 payloadsize = self._unpack(_fpayloadsize)[0]
Pierre-Yves David
bundle2: handle new line in 'indebug' function...
r25320 indebug(self.ui, 'payload chunk size: %i' % payloadsize)
Eric Sumner
bundle2.unbundlepart: raise payloadchunks from a closure to a method...
r24034 while payloadsize:
if payloadsize == flaginterrupt:
# interruption detection, the handler will now read a
# single part and process it.
interrupthandler(self.ui, self._fp)()
elif payloadsize < 0:
msg = 'negative payload chunk size: %i' % payloadsize
raise error.BundleValueError(msg)
else:
Eric Sumner
bundle2.unbundlepart: keep an index of chunks and their locations...
r24035 result = self._readexact(payloadsize)
chunknum += 1
pos += payloadsize
if chunknum == len(self._chunkindex):
self._chunkindex.append((pos,
super(unbundlepart, self).tell()))
yield result
Eric Sumner
bundle2.unbundlepart: raise payloadchunks from a closure to a method...
r24034 payloadsize = self._unpack(_fpayloadsize)[0]
Pierre-Yves David
bundle2: handle new line in 'indebug' function...
r25320 indebug(self.ui, 'payload chunk size: %i' % payloadsize)
Eric Sumner
bundle2.unbundlepart: raise payloadchunks from a closure to a method...
r24034
Eric Sumner
bundle2.unbundlepart: implement seek()...
r24037 def _findchunk(self, pos):
'''for a given payload position, return a chunk number and offset'''
for chunk, (ppos, fpos) in enumerate(self._chunkindex):
if ppos == pos:
return chunk, 0
elif ppos > pos:
return chunk - 1, pos - self._chunkindex[chunk - 1][0]
raise ValueError('Unknown chunk')
Pierre-Yves David
bundle2: lazy unbundle of part payload...
r21019 def _readheader(self):
Pierre-Yves David
bundle2: add an unbundle part responsible from unbundling part...
r21014 """read the header and setup the object"""
Pierre-Yves David
bundle2: move unpackheader closure into the class...
r21016 typesize = self._unpackheader(_fparttypesize)[0]
Pierre-Yves David
bundle2: move the fromheader closure into the class itself...
r21015 self.type = self._fromheader(typesize)
Pierre-Yves David
bundle2: handle new line in 'indebug' function...
r25320 indebug(self.ui, 'part type: "%s"' % self.type)
Pierre-Yves David
bundle2: move unpackheader closure into the class...
r21016 self.id = self._unpackheader(_fpartid)[0]
Pierre-Yves David
bundle2: handle new line in 'indebug' function...
r25320 indebug(self.ui, 'part id: "%s"' % self.id)
Eric Sumner
bundle2.unbundlepart: decouple mandatory from parttype...
r23585 # extract mandatory bit from type
self.mandatory = (self.type != self.type.lower())
self.type = self.type.lower()
Pierre-Yves David
bundle2: add an unbundle part responsible from unbundling part...
r21014 ## reading parameters
# param count
Pierre-Yves David
bundle2: move unpackheader closure into the class...
r21016 mancount, advcount = self._unpackheader(_fpartparamcount)
Pierre-Yves David
bundle2: handle new line in 'indebug' function...
r25320 indebug(self.ui, 'part parameters: %i' % (mancount + advcount))
Pierre-Yves David
bundle2: add an unbundle part responsible from unbundling part...
r21014 # param size
Pierre-Yves David
bundle2: move unpackheader closure into the class...
r21016 fparamsizes = _makefpartparamsizes(mancount + advcount)
paramsizes = self._unpackheader(fparamsizes)
Pierre-Yves David
bundle2: add an unbundle part responsible from unbundling part...
r21014 # make it a list of couple again
paramsizes = zip(paramsizes[::2], paramsizes[1::2])
# split mandatory from advisory
mansizes = paramsizes[:mancount]
advsizes = paramsizes[mancount:]
Mads Kiilerich
spelling: fixes from proofreading of spell checker issues
r23139 # retrieve param value
Pierre-Yves David
bundle2: add an unbundle part responsible from unbundling part...
r21014 manparams = []
for key, value in mansizes:
Pierre-Yves David
bundle2: move the fromheader closure into the class itself...
r21015 manparams.append((self._fromheader(key), self._fromheader(value)))
Pierre-Yves David
bundle2: add an unbundle part responsible from unbundling part...
r21014 advparams = []
for key, value in advsizes:
Pierre-Yves David
bundle2: move the fromheader closure into the class itself...
r21015 advparams.append((self._fromheader(key), self._fromheader(value)))
Pierre-Yves David
bundle2: introduce an ``_initparams`` method...
r21608 self._initparams(manparams, advparams)
Pierre-Yves David
bundle2: add an unbundle part responsible from unbundling part...
r21014 ## part payload
Eric Sumner
bundle2.unbundlepart: raise payloadchunks from a closure to a method...
r24034 self._payloadstream = util.chunkbuffer(self._payloadchunks())
Pierre-Yves David
bundle2: lazy unbundle of part payload...
r21019 # we read the data, tell it
self._initialized = True
def read(self, size=None):
"""read payload data"""
if not self._initialized:
self._readheader()
if size is None:
data = self._payloadstream.read()
else:
data = self._payloadstream.read(size)
Pierre-Yves David
bundle2: add generic debug output regarding processed part payload...
r25334 self._pos += len(data)
Pierre-Yves David
bundle2: lazy unbundle of part payload...
r21019 if size is None or len(data) < size:
Pierre-Yves David
bundle2: add generic debug output regarding processed part payload...
r25334 if not self.consumed and self._pos:
self.ui.debug('bundle2-input-part: total payload size %i\n'
% self._pos)
Pierre-Yves David
bundle2: lazy unbundle of part payload...
r21019 self.consumed = True
return data
Eric Sumner
bundle2.unbundlepart: tell() implementation...
r24036 def tell(self):
return self._pos
Eric Sumner
bundle2.unbundlepart: implement seek()...
r24037 def seek(self, offset, whence=0):
if whence == 0:
newpos = offset
elif whence == 1:
newpos = self._pos + offset
elif whence == 2:
if not self.consumed:
self.read()
newpos = self._chunkindex[-1][0] - offset
else:
raise ValueError('Unknown whence value: %r' % (whence,))
if newpos > self._chunkindex[-1][0] and not self.consumed:
self.read()
if not 0 <= newpos <= self._chunkindex[-1][0]:
raise ValueError('Offset out of range')
if self._pos != newpos:
chunk, internaloffset = self._findchunk(newpos)
self._payloadstream = util.chunkbuffer(self._payloadchunks(chunk))
adjust = self.read(internaloffset)
if len(adjust) != internaloffset:
Pierre-Yves David
error: get Abort from 'error' instead of 'util'...
r26587 raise error.Abort(_('Seek failed\n'))
Eric Sumner
bundle2.unbundlepart: implement seek()...
r24037 self._pos = newpos
Pierre-Yves David
bundle2: add an informative comment to the capability dict...
r25317 # These are only the static capabilities.
# Check the 'getrepocaps' function for the rest.
Pierre-Yves David
bundle2: rename format, parts and config to final names...
r24686 capabilities = {'HG20': (),
Pierre-Yves David
bundle2: convey PushkeyFailed error over the wire...
r25493 'error': ('abort', 'unsupportedcontent', 'pushraced',
'pushkey'),
Pierre-Yves David
bundle2: rename format, parts and config to final names...
r24686 'listkeys': (),
'pushkey': (),
Mike Hommey
bundle2: client side support for a part to import external bundles...
r23029 'digests': tuple(sorted(util.DIGESTS.keys())),
Pierre-Yves David
bundle2: rename format, parts and config to final names...
r24686 'remote-changegroup': ('http', 'https'),
Gregory Szorc
bundle2: part handler for processing .hgtags fnodes mappings...
r25401 'hgtagsfnodes': (),
Pierre-Yves David
obsmarker: move bundle2caps from the localrepo class to the bundle2 module...
r22341 }
Eric Sumner
bundle2-push: provide transaction to reply unbundler...
r23439 def getrepocaps(repo, allowpushback=False):
Pierre-Yves David
bundle2: introduce a `getrepocaps` to retrieve the bundle2 caps of a repo...
r22342 """return the bundle2 capabilities for a given repo
Pierre-Yves David
bundle2: advertise the obsmarker part in bundle2 capabilities
r22343 Exists to allow extensions (like evolution) to mutate the capabilities.
Pierre-Yves David
bundle2: introduce a `getrepocaps` to retrieve the bundle2 caps of a repo...
r22342 """
Pierre-Yves David
bundle2: advertise the obsmarker part in bundle2 capabilities
r22343 caps = capabilities.copy()
Martin von Zweigbergk
changegroup: fix pulling to treemanifest repo from flat repo (issue5066)...
r27953 caps['changegroup'] = tuple(sorted(
changegroup.supportedincomingversions(repo)))
Durham Goode
obsolete: add exchange option...
r22953 if obsolete.isenabled(repo, obsolete.exchangeopt):
Pierre-Yves David
bundle2: advertise the obsmarker part in bundle2 capabilities
r22343 supportedformat = tuple('V%i' % v for v in obsolete.formats)
Pierre-Yves David
bundle2: rename format, parts and config to final names...
r24686 caps['obsmarkers'] = supportedformat
Eric Sumner
bundle2-push: provide transaction to reply unbundler...
r23439 if allowpushback:
Pierre-Yves David
bundle2: rename format, parts and config to final names...
r24686 caps['pushback'] = ()
Pierre-Yves David
bundle2: advertise the obsmarker part in bundle2 capabilities
r22343 return caps
Pierre-Yves David
bundle2: introduce a `getrepocaps` to retrieve the bundle2 caps of a repo...
r22342
Pierre-Yves David
bundle2: introduce a bundle2caps function...
r21644 def bundle2caps(remote):
Mads Kiilerich
spelling: fixes from proofreading of spell checker issues
r23139 """return the bundle capabilities of a peer as dict"""
Pierre-Yves David
bundle2: rename format, parts and config to final names...
r24686 raw = remote.capable('bundle2')
Pierre-Yves David
bundle2: introduce a bundle2caps function...
r21644 if not raw and raw != '':
return {}
timeless
pycompat: switch to util.urlreq/util.urlerr for py3 compat
r28883 capsblob = urlreq.unquote(remote.capable('bundle2'))
Pierre-Yves David
bundle2: introduce a bundle2caps function...
r21644 return decodecaps(capsblob)
Pierre-Yves David
bundle2: add an unbundle part responsible from unbundling part...
r21014
Pierre-Yves David
bundle2: add a `obsmarkersversion` function to extract supported version...
r22344 def obsmarkersversion(caps):
"""extract the list of supported obsmarkers versions from a bundle2caps dict
"""
Pierre-Yves David
bundle2: rename format, parts and config to final names...
r24686 obscaps = caps.get('obsmarkers', ())
Pierre-Yves David
bundle2: add a `obsmarkersversion` function to extract supported version...
r22344 return [int(c[1:]) for c in obscaps if c.startswith('V')]
Martin von Zweigbergk
bundle: move writebundle() from changegroup.py to bundle2.py (API)...
r28666 def writebundle(ui, cg, filename, bundletype, vfs=None, compression=None):
"""Write a bundle file and return its filename.
Existing files will not be overwritten.
If no filename is specified, a temporary file is created.
bz2 compression can be turned off.
The bundle file will be deleted in case of errors.
"""
if bundletype == "HG20":
bundle = bundle20(ui)
bundle.setcompression(compression)
part = bundle.newpart('changegroup', data=cg.getchunks())
part.addparam('version', cg.version)
chunkiter = bundle.getchunks()
else:
# compression argument is only for the bundle2 case
assert compression is None
if cg.version != '01':
raise error.Abort(_('old bundle types only supports v1 '
'changegroups'))
header, comp = bundletypes[bundletype]
if comp not in util.compressors:
raise error.Abort(_('unknown stream compression type: %s')
% comp)
z = util.compressors[comp]()
subchunkiter = cg.getchunks()
def chunkiter():
yield header
for chunk in subchunkiter:
yield z.compress(chunk)
yield z.flush()
chunkiter = chunkiter()
# parse the changegroup data, otherwise we will block
# in case of sshrepo because we don't know the end of the stream
return changegroup.writechunks(ui, chunkiter, filename, vfs=vfs)
Martin von Zweigbergk
treemanifests: set bundle2 part parameter indicating treemanifest...
r27734 @parthandler('changegroup', ('version', 'nbchanges', 'treemanifest'))
Pierre-Yves David
bundle2: use reply part to return result of addchangegroup...
r20998 def handlechangegroup(op, inpart):
Pierre-Yves David
bundle2: first crude version of bundling changeset with bundle2...
r20950 """apply a changegroup part on the repo
This is a very early implementation that will massive rework before being
inflicted to any end-user.
"""
Pierre-Yves David
bundle2: make it possible have a global transaction for the unbundling...
r20952 # Make sure we trigger a transaction creation
#
# The addchangegroup function will get a transaction object by itself, but
# we need to make sure we trigger the creation of a transaction object used
# for the whole processing scope.
op.gettransaction()
Pierre-Yves David
bundle2: support a "version" argument in `changegroup` part...
r23170 unpackerversion = inpart.params.get('version', '01')
# We should raise an appropriate exception here
Martin von Zweigbergk
changegroup: hide packermap behind methods...
r27751 cg = changegroup.getunbundler(unpackerversion, inpart, None)
Pierre-Yves David
bundle2: add a comment about addchangegroup source and url
r23001 # the source and url passed here are overwritten by the one contained in
# the transaction.hookargs argument. So 'bundle2' is a placeholder
Pierre-Yves David
bundle2: provide number of changesets information to 'addchangegroup'...
r25518 nbchangesets = None
if 'nbchanges' in inpart.params:
nbchangesets = int(inpart.params.get('nbchanges'))
Martin von Zweigbergk
treemanifests: set bundle2 part parameter indicating treemanifest...
r27734 if ('treemanifest' in inpart.params and
'treemanifest' not in op.repo.requirements):
if len(op.repo.changelog) != 0:
raise error.Abort(_(
"bundle contains tree manifests, but local repo is "
"non-empty and does not use tree manifests"))
op.repo.requirements.add('treemanifest')
op.repo._applyopenerreqs()
op.repo._writerequirements()
Augie Fackler
bundle2: use cg?unpacker.apply() instead of changegroup.addchangegroup()
r26698 ret = cg.apply(op.repo, 'bundle2', 'bundle2', expectedtotal=nbchangesets)
Pierre-Yves David
bundle2: first crude version of bundling changeset with bundle2...
r20950 op.records.add('changegroup', {'return': ret})
Pierre-Yves David
bundle2: use reply part to return result of addchangegroup...
r20998 if op.reply is not None:
Mads Kiilerich
spelling: fixes from proofreading of spell checker issues
r23139 # This is definitely not the final form of this
Pierre-Yves David
bundle2: use reply part to return result of addchangegroup...
r20998 # return. But one need to start somewhere.
Pierre-Yves David
bundle2: rename format, parts and config to final names...
r24686 part = op.reply.newpart('reply:changegroup', mandatory=False)
Pierre-Yves David
bundle2: update part creators to ``addparam`` when relevant...
r21606 part.addparam('in-reply-to', str(inpart.id), mandatory=False)
part.addparam('return', '%i' % ret, mandatory=False)
Pierre-Yves David
bundle2: lazy unbundle of part payload...
r21019 assert not inpart.read()
Pierre-Yves David
bundle2: first crude version of bundling changeset with bundle2...
r20950
Mike Hommey
bundle2: client side support for a part to import external bundles...
r23029 _remotechangegroupparams = tuple(['url', 'size', 'digests'] +
['digest:%s' % k for k in util.DIGESTS.keys()])
Pierre-Yves David
bundle2: rename format, parts and config to final names...
r24686 @parthandler('remote-changegroup', _remotechangegroupparams)
Mike Hommey
bundle2: client side support for a part to import external bundles...
r23029 def handleremotechangegroup(op, inpart):
"""apply a bundle10 on the repo, given an url and validation information
All the information about the remote bundle to import are given as
parameters. The parameters include:
- url: the url to the bundle10.
- size: the bundle10 file size. It is used to validate what was
retrieved by the client matches the server knowledge about the bundle.
- digests: a space separated list of the digest types provided as
parameters.
- digest:<digest-type>: the hexadecimal representation of the digest with
that name. Like the size, it is used to validate what was retrieved by
the client matches what the server knows about the bundle.
When multiple digest types are given, all of them are checked.
"""
try:
raw_url = inpart.params['url']
except KeyError:
Pierre-Yves David
error: get Abort from 'error' instead of 'util'...
r26587 raise error.Abort(_('remote-changegroup: missing "%s" param') % 'url')
Mike Hommey
bundle2: client side support for a part to import external bundles...
r23029 parsed_url = util.url(raw_url)
Pierre-Yves David
bundle2: rename format, parts and config to final names...
r24686 if parsed_url.scheme not in capabilities['remote-changegroup']:
Pierre-Yves David
error: get Abort from 'error' instead of 'util'...
r26587 raise error.Abort(_('remote-changegroup does not support %s urls') %
Mike Hommey
bundle2: client side support for a part to import external bundles...
r23029 parsed_url.scheme)
try:
size = int(inpart.params['size'])
except ValueError:
Pierre-Yves David
error: get Abort from 'error' instead of 'util'...
r26587 raise error.Abort(_('remote-changegroup: invalid value for param "%s"')
Mike Hommey
bundle2: client side support for a part to import external bundles...
r23029 % 'size')
except KeyError:
Pierre-Yves David
error: get Abort from 'error' instead of 'util'...
r26587 raise error.Abort(_('remote-changegroup: missing "%s" param') % 'size')
Mike Hommey
bundle2: client side support for a part to import external bundles...
r23029
digests = {}
for typ in inpart.params.get('digests', '').split():
param = 'digest:%s' % typ
try:
value = inpart.params[param]
except KeyError:
Pierre-Yves David
error: get Abort from 'error' instead of 'util'...
r26587 raise error.Abort(_('remote-changegroup: missing "%s" param') %
Mike Hommey
bundle2: client side support for a part to import external bundles...
r23029 param)
digests[typ] = value
real_part = util.digestchecker(url.open(op.ui, raw_url), size, digests)
# Make sure we trigger a transaction creation
#
# The addchangegroup function will get a transaction object by itself, but
# we need to make sure we trigger the creation of a transaction object used
# for the whole processing scope.
op.gettransaction()
Gregory Szorc
bundle2: use absolute_import
r25919 from . import exchange
Mike Hommey
bundle2: client side support for a part to import external bundles...
r23029 cg = exchange.readbundle(op.repo.ui, real_part, raw_url)
if not isinstance(cg, changegroup.cg1unpacker):
Pierre-Yves David
error: get Abort from 'error' instead of 'util'...
r26587 raise error.Abort(_('%s: not a bundle version 1.0') %
Mike Hommey
bundle2: client side support for a part to import external bundles...
r23029 util.hidepassword(raw_url))
Augie Fackler
bundle2: use cg?unpacker.apply() instead of changegroup.addchangegroup()
r26698 ret = cg.apply(op.repo, 'bundle2', 'bundle2')
Mike Hommey
bundle2: client side support for a part to import external bundles...
r23029 op.records.add('changegroup', {'return': ret})
if op.reply is not None:
Mads Kiilerich
spelling: fixes from proofreading of spell checker issues
r23139 # This is definitely not the final form of this
Mike Hommey
bundle2: client side support for a part to import external bundles...
r23029 # return. But one need to start somewhere.
Pierre-Yves David
bundle2: rename format, parts and config to final names...
r24686 part = op.reply.newpart('reply:changegroup')
Mike Hommey
bundle2: client side support for a part to import external bundles...
r23029 part.addparam('in-reply-to', str(inpart.id), mandatory=False)
part.addparam('return', '%i' % ret, mandatory=False)
try:
real_part.validate()
Pierre-Yves David
error: get Abort from 'error' instead of 'util'...
r26587 except error.Abort as e:
raise error.Abort(_('bundle at %s is corrupted:\n%s') %
Mike Hommey
bundle2: client side support for a part to import external bundles...
r23029 (util.hidepassword(raw_url), str(e)))
assert not inpart.read()
Pierre-Yves David
bundle2: rename format, parts and config to final names...
r24686 @parthandler('reply:changegroup', ('return', 'in-reply-to'))
Mike Hommey
bundle2: rename functions that have the same name
r22548 def handlereplychangegroup(op, inpart):
Pierre-Yves David
bundle2: use the new ``part.params`` dictionary...
r21611 ret = int(inpart.params['return'])
replyto = int(inpart.params['in-reply-to'])
op.records.add('changegroup', {'return': ret}, replyto)
Pierre-Yves David
bundle2: first crude version of bundling changeset with bundle2...
r20950
Pierre-Yves David
bundle2: rename format, parts and config to final names...
r24686 @parthandler('check:heads')
Mike Hommey
bundle2: rename functions that have the same name
r22548 def handlecheckheads(op, inpart):
Pierre-Yves David
bundle2: add a "check:heads" handler...
r21060 """check that head of the repo did not change
This is used to detect a push race when using unbundle.
This replaces the "heads" argument of unbundle."""
h = inpart.read(20)
heads = []
while len(h) == 20:
heads.append(h)
h = inpart.read(20)
assert not h
Durham Goode
bundle2: add op.gettransaction() to handlers that need the lock...
r26565 # Trigger a transaction so that we are guaranteed to have the lock now.
if op.ui.configbool('experimental', 'bundle2lazylocking'):
op.gettransaction()
Pierre-Yves David
bundle2: add a "check:heads" handler...
r21060 if heads != op.repo.heads():
Pierre-Yves David
bundle2: add an error message to push race error...
r21185 raise error.PushRaced('repository changed while pushing - '
'please try again')
Pierre-Yves David
bundle2: introduce `replycaps` part for on-demand reply...
r21130
Pierre-Yves David
bundle2: rename format, parts and config to final names...
r24686 @parthandler('output')
Pierre-Yves David
bundle2: capture remote stdout while unbundling...
r21131 def handleoutput(op, inpart):
"""forward output captured on the server to the client"""
for line in inpart.read().splitlines():
Pierre-Yves David
bundle2: issue remote output as "status" (issue4612)...
r24846 op.ui.status(('remote: %s\n' % line))
Pierre-Yves David
bundle2: capture remote stdout while unbundling...
r21131
Pierre-Yves David
bundle2: rename format, parts and config to final names...
r24686 @parthandler('replycaps')
Pierre-Yves David
bundle2: introduce `replycaps` part for on-demand reply...
r21130 def handlereplycaps(op, inpart):
"""Notify that a reply bundle should be created
Pierre-Yves David
bundle2: extract capabilities decoding...
r21138 The payload contains the capabilities information for the reply"""
caps = decodecaps(inpart.read())
Pierre-Yves David
bundle2: introduce `replycaps` part for on-demand reply...
r21130 if op.reply is None:
Pierre-Yves David
bundle2: add capabilities support in `replycaps` part...
r21135 op.reply = bundle20(op.ui, caps)
Pierre-Yves David
bundle2: capture remote stdout while unbundling...
r21131
Gregory Szorc
bundle2: attribute remote failures to remote (issue4788)...
r26829 class AbortFromPart(error.Abort):
"""Sub-class of Abort that denotes an error from a bundle2 part."""
Pierre-Yves David
bundle2: rename format, parts and config to final names...
r24686 @parthandler('error:abort', ('message', 'hint'))
Pierre-Yves David
bundle2: fix names for error part handler...
r24741 def handleerrorabort(op, inpart):
Pierre-Yves David
bundle2: gracefully handle abort during unbundle...
r21177 """Used to transmit abort error over the wire"""
Gregory Szorc
bundle2: attribute remote failures to remote (issue4788)...
r26829 raise AbortFromPart(inpart.params['message'],
hint=inpart.params.get('hint'))
Pierre-Yves David
bundle2: gracefully handle UnknownPartError during unbundle...
r21183
Pierre-Yves David
bundle2: convey PushkeyFailed error over the wire...
r25493 @parthandler('error:pushkey', ('namespace', 'key', 'new', 'old', 'ret',
'in-reply-to'))
def handleerrorpushkey(op, inpart):
"""Used to transmit failure of a mandatory pushkey over the wire"""
kwargs = {}
for name in ('namespace', 'key', 'new', 'old', 'ret'):
value = inpart.params.get(name)
if value is not None:
kwargs[name] = value
raise error.PushkeyFailed(inpart.params['in-reply-to'], **kwargs)
Pierre-Yves David
bundle2: rename format, parts and config to final names...
r24686 @parthandler('error:unsupportedcontent', ('parttype', 'params'))
Pierre-Yves David
bundle2: fix names for error part handler...
r24741 def handleerrorunsupportedcontent(op, inpart):
Pierre-Yves David
bundle2: rename b2x:error:unknownpart to b2x:error:unsupportedcontent...
r21619 """Used to transmit unknown content error over the wire"""
Pierre-Yves David
bundle2: support transmission of params error over the wire...
r21622 kwargs = {}
Pierre-Yves David
bundle2: support None parttype in BundleValueError...
r21627 parttype = inpart.params.get('parttype')
if parttype is not None:
kwargs['parttype'] = parttype
Pierre-Yves David
bundle2: support transmission of params error over the wire...
r21622 params = inpart.params.get('params')
if params is not None:
kwargs['params'] = params.split('\0')
Pierre-Yves David
bundle2: rename error exception class for unsupported feature...
r26393 raise error.BundleUnknownFeatureError(**kwargs)
Pierre-Yves David
bundle2: gracefully handle PushRaced error during unbundle...
r21186
Pierre-Yves David
bundle2: rename format, parts and config to final names...
r24686 @parthandler('error:pushraced', ('message',))
Pierre-Yves David
bundle2: fix names for error part handler...
r24741 def handleerrorpushraced(op, inpart):
Pierre-Yves David
bundle2: gracefully handle PushRaced error during unbundle...
r21186 """Used to transmit push race error over the wire"""
Pierre-Yves David
bundle2: use the new ``part.params`` dictionary...
r21611 raise error.ResponseError(_('push failed:'), inpart.params['message'])
Pierre-Yves David
bundle: introduce a listkey handler...
r21655
Pierre-Yves David
bundle2: rename format, parts and config to final names...
r24686 @parthandler('listkeys', ('namespace',))
Pierre-Yves David
bundle: introduce a listkey handler...
r21655 def handlelistkeys(op, inpart):
"""retrieve pushkey namespace content stored in a bundle2"""
namespace = inpart.params['namespace']
r = pushkey.decodekeys(inpart.read())
op.records.add('listkeys', (namespace, r))
Pierre-Yves David
bundle2: add ``pushkey`` support...
r21660
Pierre-Yves David
bundle2: rename format, parts and config to final names...
r24686 @parthandler('pushkey', ('namespace', 'key', 'old', 'new'))
Pierre-Yves David
bundle2: add ``pushkey`` support...
r21660 def handlepushkey(op, inpart):
"""process a pushkey request"""
dec = pushkey.decode
namespace = dec(inpart.params['namespace'])
key = dec(inpart.params['key'])
old = dec(inpart.params['old'])
new = dec(inpart.params['new'])
Durham Goode
bundle2: add op.gettransaction() to handlers that need the lock...
r26565 # Grab the transaction to ensure that we have the lock before performing the
# pushkey.
if op.ui.configbool('experimental', 'bundle2lazylocking'):
op.gettransaction()
Pierre-Yves David
bundle2: add ``pushkey`` support...
r21660 ret = op.repo.pushkey(namespace, key, old, new)
record = {'namespace': namespace,
'key': key,
'old': old,
'new': new}
op.records.add('pushkey', record)
if op.reply is not None:
Pierre-Yves David
bundle2: rename format, parts and config to final names...
r24686 rpart = op.reply.newpart('reply:pushkey')
Pierre-Yves David
bundle2: add ``pushkey`` support...
r21660 rpart.addparam('in-reply-to', str(inpart.id), mandatory=False)
rpart.addparam('return', '%i' % ret, mandatory=False)
Pierre-Yves David
bundle2: abort when a mandatory pushkey part fails...
r25481 if inpart.mandatory and not ret:
Pierre-Yves David
bundle2: introduce a PushkeyFail error to abort unbundle on pushkey error...
r25484 kwargs = {}
for key in ('namespace', 'key', 'new', 'old', 'ret'):
if key in inpart.params:
kwargs[key] = inpart.params[key]
raise error.PushkeyFailed(partid=str(inpart.id), **kwargs)
Pierre-Yves David
bundle2: add ``pushkey`` support...
r21660
Pierre-Yves David
bundle2: rename format, parts and config to final names...
r24686 @parthandler('reply:pushkey', ('return', 'in-reply-to'))
Pierre-Yves David
bundle2: add ``pushkey`` support...
r21660 def handlepushkeyreply(op, inpart):
"""retrieve the result of a pushkey request"""
ret = int(inpart.params['return'])
partid = int(inpart.params['in-reply-to'])
op.records.add('pushkey', {'return': ret}, partid)
Pierre-Yves David
bundle2: add an obsmarkers part handler...
r22336
Pierre-Yves David
bundle2: rename format, parts and config to final names...
r24686 @parthandler('obsmarkers')
Pierre-Yves David
bundle2: add an obsmarkers part handler...
r22336 def handleobsmarker(op, inpart):
"""add a stream of obsmarkers to the repo"""
tr = op.gettransaction()
Pierre-Yves David
obsolete: experimental flag to get debug about obsmarkers exchange...
r24733 markerdata = inpart.read()
if op.ui.config('experimental', 'obsmarkers-exchange-debug', False):
op.ui.write(('obsmarker-exchange: %i bytes received\n')
% len(markerdata))
Pierre-Yves David
bundle2: gracefully skip 'obsmarkers' part if evolution is disabled...
r26685 # The mergemarkers call will crash if marker creation is not enabled.
# we want to avoid this if the part is advisory.
if not inpart.mandatory and op.repo.obsstore.readonly:
op.repo.ui.debug('ignoring obsolescence markers, feature not enabled')
return
Pierre-Yves David
obsolete: experimental flag to get debug about obsmarkers exchange...
r24733 new = op.repo.obsstore.mergemarkers(tr, markerdata)
Pierre-Yves David
obsmarker: write a message with the number of markers added through bundle2
r22337 if new:
op.repo.ui.status(_('%i new obsolescence markers\n') % new)
Pierre-Yves David
obssmarker: add a bundle2 record with the number of markers added
r22338 op.records.add('obsmarkers', {'new': new})
Pierre-Yves David
obsmarker: produce a reply part for markers received through bundle2
r22340 if op.reply is not None:
Pierre-Yves David
bundle2: rename format, parts and config to final names...
r24686 rpart = op.reply.newpart('reply:obsmarkers')
Pierre-Yves David
obsmarker: produce a reply part for markers received through bundle2
r22340 rpart.addparam('in-reply-to', str(inpart.id), mandatory=False)
rpart.addparam('new', '%i' % new, mandatory=False)
Pierre-Yves David
bundle2: rename format, parts and config to final names...
r24686 @parthandler('reply:obsmarkers', ('new', 'in-reply-to'))
Martin von Zweigbergk
bundle2: rename duplicate handlepushkeyreply to handleobsmarkerreply...
r25506 def handleobsmarkerreply(op, inpart):
Pierre-Yves David
obsmarker: produce a reply part for markers received through bundle2
r22340 """retrieve the result of a pushkey request"""
ret = int(inpart.params['new'])
partid = int(inpart.params['in-reply-to'])
op.records.add('obsmarkers', {'new': ret}, partid)
Gregory Szorc
bundle2: part handler for processing .hgtags fnodes mappings...
r25401
@parthandler('hgtagsfnodes')
def handlehgtagsfnodes(op, inpart):
"""Applies .hgtags fnodes cache entries to the local repo.
Payload is pairs of 20 byte changeset nodes and filenodes.
"""
Durham Goode
bundle2: add op.gettransaction() to handlers that need the lock...
r26565 # Grab the transaction so we ensure that we have the lock at this point.
if op.ui.configbool('experimental', 'bundle2lazylocking'):
op.gettransaction()
Gregory Szorc
bundle2: part handler for processing .hgtags fnodes mappings...
r25401 cache = tags.hgtagsfnodescache(op.repo.unfiltered())
count = 0
while True:
node = inpart.read(20)
fnode = inpart.read(20)
if len(node) < 20 or len(fnode) < 20:
Gregory Szorc
bundle2: reword debug message for invalid .hgtags data...
r25641 op.ui.debug('ignoring incomplete received .hgtags fnodes data\n')
Gregory Szorc
bundle2: part handler for processing .hgtags fnodes mappings...
r25401 break
cache.setfnode(node, fnode)
count += 1
cache.write()
op.ui.debug('applied %i hgtags fnodes cache entries\n' % count)