##// END OF EJS Templates
bundle2: add a way to just forward the bundle2 stream to another user...
Pierre-Yves David -
r26542:b87e4638 default
parent child Browse files
Show More
@@ -1,1471 +1,1513
1 # bundle2.py - generic container format to transmit arbitrary data.
1 # bundle2.py - generic container format to transmit arbitrary data.
2 #
2 #
3 # Copyright 2013 Facebook, Inc.
3 # Copyright 2013 Facebook, Inc.
4 #
4 #
5 # This software may be used and distributed according to the terms of the
5 # This software may be used and distributed according to the terms of the
6 # GNU General Public License version 2 or any later version.
6 # GNU General Public License version 2 or any later version.
7 """Handling of the new bundle2 format
7 """Handling of the new bundle2 format
8
8
9 The goal of bundle2 is to act as an atomically packet to transmit a set of
9 The goal of bundle2 is to act as an atomically packet to transmit a set of
10 payloads in an application agnostic way. It consist in a sequence of "parts"
10 payloads in an application agnostic way. It consist in a sequence of "parts"
11 that will be handed to and processed by the application layer.
11 that will be handed to and processed by the application layer.
12
12
13
13
14 General format architecture
14 General format architecture
15 ===========================
15 ===========================
16
16
17 The format is architectured as follow
17 The format is architectured as follow
18
18
19 - magic string
19 - magic string
20 - stream level parameters
20 - stream level parameters
21 - payload parts (any number)
21 - payload parts (any number)
22 - end of stream marker.
22 - end of stream marker.
23
23
24 the Binary format
24 the Binary format
25 ============================
25 ============================
26
26
27 All numbers are unsigned and big-endian.
27 All numbers are unsigned and big-endian.
28
28
29 stream level parameters
29 stream level parameters
30 ------------------------
30 ------------------------
31
31
32 Binary format is as follow
32 Binary format is as follow
33
33
34 :params size: int32
34 :params size: int32
35
35
36 The total number of Bytes used by the parameters
36 The total number of Bytes used by the parameters
37
37
38 :params value: arbitrary number of Bytes
38 :params value: arbitrary number of Bytes
39
39
40 A blob of `params size` containing the serialized version of all stream level
40 A blob of `params size` containing the serialized version of all stream level
41 parameters.
41 parameters.
42
42
43 The blob contains a space separated list of parameters. Parameters with value
43 The blob contains a space separated list of parameters. Parameters with value
44 are stored in the form `<name>=<value>`. Both name and value are urlquoted.
44 are stored in the form `<name>=<value>`. Both name and value are urlquoted.
45
45
46 Empty name are obviously forbidden.
46 Empty name are obviously forbidden.
47
47
48 Name MUST start with a letter. If this first letter is lower case, the
48 Name MUST start with a letter. If this first letter is lower case, the
49 parameter is advisory and can be safely ignored. However when the first
49 parameter is advisory and can be safely ignored. However when the first
50 letter is capital, the parameter is mandatory and the bundling process MUST
50 letter is capital, the parameter is mandatory and the bundling process MUST
51 stop if he is not able to proceed it.
51 stop if he is not able to proceed it.
52
52
53 Stream parameters use a simple textual format for two main reasons:
53 Stream parameters use a simple textual format for two main reasons:
54
54
55 - Stream level parameters should remain simple and we want to discourage any
55 - Stream level parameters should remain simple and we want to discourage any
56 crazy usage.
56 crazy usage.
57 - Textual data allow easy human inspection of a bundle2 header in case of
57 - Textual data allow easy human inspection of a bundle2 header in case of
58 troubles.
58 troubles.
59
59
60 Any Applicative level options MUST go into a bundle2 part instead.
60 Any Applicative level options MUST go into a bundle2 part instead.
61
61
62 Payload part
62 Payload part
63 ------------------------
63 ------------------------
64
64
65 Binary format is as follow
65 Binary format is as follow
66
66
67 :header size: int32
67 :header size: int32
68
68
69 The total number of Bytes used by the part header. When the header is empty
69 The total number of Bytes used by the part header. When the header is empty
70 (size = 0) this is interpreted as the end of stream marker.
70 (size = 0) this is interpreted as the end of stream marker.
71
71
72 :header:
72 :header:
73
73
74 The header defines how to interpret the part. It contains two piece of
74 The header defines how to interpret the part. It contains two piece of
75 data: the part type, and the part parameters.
75 data: the part type, and the part parameters.
76
76
77 The part type is used to route an application level handler, that can
77 The part type is used to route an application level handler, that can
78 interpret payload.
78 interpret payload.
79
79
80 Part parameters are passed to the application level handler. They are
80 Part parameters are passed to the application level handler. They are
81 meant to convey information that will help the application level object to
81 meant to convey information that will help the application level object to
82 interpret the part payload.
82 interpret the part payload.
83
83
84 The binary format of the header is has follow
84 The binary format of the header is has follow
85
85
86 :typesize: (one byte)
86 :typesize: (one byte)
87
87
88 :parttype: alphanumerical part name (restricted to [a-zA-Z0-9_:-]*)
88 :parttype: alphanumerical part name (restricted to [a-zA-Z0-9_:-]*)
89
89
90 :partid: A 32bits integer (unique in the bundle) that can be used to refer
90 :partid: A 32bits integer (unique in the bundle) that can be used to refer
91 to this part.
91 to this part.
92
92
93 :parameters:
93 :parameters:
94
94
95 Part's parameter may have arbitrary content, the binary structure is::
95 Part's parameter may have arbitrary content, the binary structure is::
96
96
97 <mandatory-count><advisory-count><param-sizes><param-data>
97 <mandatory-count><advisory-count><param-sizes><param-data>
98
98
99 :mandatory-count: 1 byte, number of mandatory parameters
99 :mandatory-count: 1 byte, number of mandatory parameters
100
100
101 :advisory-count: 1 byte, number of advisory parameters
101 :advisory-count: 1 byte, number of advisory parameters
102
102
103 :param-sizes:
103 :param-sizes:
104
104
105 N couple of bytes, where N is the total number of parameters. Each
105 N couple of bytes, where N is the total number of parameters. Each
106 couple contains (<size-of-key>, <size-of-value) for one parameter.
106 couple contains (<size-of-key>, <size-of-value) for one parameter.
107
107
108 :param-data:
108 :param-data:
109
109
110 A blob of bytes from which each parameter key and value can be
110 A blob of bytes from which each parameter key and value can be
111 retrieved using the list of size couples stored in the previous
111 retrieved using the list of size couples stored in the previous
112 field.
112 field.
113
113
114 Mandatory parameters comes first, then the advisory ones.
114 Mandatory parameters comes first, then the advisory ones.
115
115
116 Each parameter's key MUST be unique within the part.
116 Each parameter's key MUST be unique within the part.
117
117
118 :payload:
118 :payload:
119
119
120 payload is a series of `<chunksize><chunkdata>`.
120 payload is a series of `<chunksize><chunkdata>`.
121
121
122 `chunksize` is an int32, `chunkdata` are plain bytes (as much as
122 `chunksize` is an int32, `chunkdata` are plain bytes (as much as
123 `chunksize` says)` The payload part is concluded by a zero size chunk.
123 `chunksize` says)` The payload part is concluded by a zero size chunk.
124
124
125 The current implementation always produces either zero or one chunk.
125 The current implementation always produces either zero or one chunk.
126 This is an implementation limitation that will ultimately be lifted.
126 This is an implementation limitation that will ultimately be lifted.
127
127
128 `chunksize` can be negative to trigger special case processing. No such
128 `chunksize` can be negative to trigger special case processing. No such
129 processing is in place yet.
129 processing is in place yet.
130
130
131 Bundle processing
131 Bundle processing
132 ============================
132 ============================
133
133
134 Each part is processed in order using a "part handler". Handler are registered
134 Each part is processed in order using a "part handler". Handler are registered
135 for a certain part type.
135 for a certain part type.
136
136
137 The matching of a part to its handler is case insensitive. The case of the
137 The matching of a part to its handler is case insensitive. The case of the
138 part type is used to know if a part is mandatory or advisory. If the Part type
138 part type is used to know if a part is mandatory or advisory. If the Part type
139 contains any uppercase char it is considered mandatory. When no handler is
139 contains any uppercase char it is considered mandatory. When no handler is
140 known for a Mandatory part, the process is aborted and an exception is raised.
140 known for a Mandatory part, the process is aborted and an exception is raised.
141 If the part is advisory and no handler is known, the part is ignored. When the
141 If the part is advisory and no handler is known, the part is ignored. When the
142 process is aborted, the full bundle is still read from the stream to keep the
142 process is aborted, the full bundle is still read from the stream to keep the
143 channel usable. But none of the part read from an abort are processed. In the
143 channel usable. But none of the part read from an abort are processed. In the
144 future, dropping the stream may become an option for channel we do not care to
144 future, dropping the stream may become an option for channel we do not care to
145 preserve.
145 preserve.
146 """
146 """
147
147
148 from __future__ import absolute_import
148 from __future__ import absolute_import
149
149
150 import errno
150 import errno
151 import re
151 import re
152 import string
152 import string
153 import struct
153 import struct
154 import sys
154 import sys
155 import urllib
155 import urllib
156
156
157 from .i18n import _
157 from .i18n import _
158 from . import (
158 from . import (
159 changegroup,
159 changegroup,
160 error,
160 error,
161 obsolete,
161 obsolete,
162 pushkey,
162 pushkey,
163 tags,
163 tags,
164 url,
164 url,
165 util,
165 util,
166 )
166 )
167
167
168 _pack = struct.pack
168 _pack = struct.pack
169 _unpack = struct.unpack
169 _unpack = struct.unpack
170
170
171 _fstreamparamsize = '>i'
171 _fstreamparamsize = '>i'
172 _fpartheadersize = '>i'
172 _fpartheadersize = '>i'
173 _fparttypesize = '>B'
173 _fparttypesize = '>B'
174 _fpartid = '>I'
174 _fpartid = '>I'
175 _fpayloadsize = '>i'
175 _fpayloadsize = '>i'
176 _fpartparamcount = '>BB'
176 _fpartparamcount = '>BB'
177
177
178 preferedchunksize = 4096
178 preferedchunksize = 4096
179
179
180 _parttypeforbidden = re.compile('[^a-zA-Z0-9_:-]')
180 _parttypeforbidden = re.compile('[^a-zA-Z0-9_:-]')
181
181
182 def outdebug(ui, message):
182 def outdebug(ui, message):
183 """debug regarding output stream (bundling)"""
183 """debug regarding output stream (bundling)"""
184 if ui.configbool('devel', 'bundle2.debug', False):
184 if ui.configbool('devel', 'bundle2.debug', False):
185 ui.debug('bundle2-output: %s\n' % message)
185 ui.debug('bundle2-output: %s\n' % message)
186
186
187 def indebug(ui, message):
187 def indebug(ui, message):
188 """debug on input stream (unbundling)"""
188 """debug on input stream (unbundling)"""
189 if ui.configbool('devel', 'bundle2.debug', False):
189 if ui.configbool('devel', 'bundle2.debug', False):
190 ui.debug('bundle2-input: %s\n' % message)
190 ui.debug('bundle2-input: %s\n' % message)
191
191
192 def validateparttype(parttype):
192 def validateparttype(parttype):
193 """raise ValueError if a parttype contains invalid character"""
193 """raise ValueError if a parttype contains invalid character"""
194 if _parttypeforbidden.search(parttype):
194 if _parttypeforbidden.search(parttype):
195 raise ValueError(parttype)
195 raise ValueError(parttype)
196
196
197 def _makefpartparamsizes(nbparams):
197 def _makefpartparamsizes(nbparams):
198 """return a struct format to read part parameter sizes
198 """return a struct format to read part parameter sizes
199
199
200 The number parameters is variable so we need to build that format
200 The number parameters is variable so we need to build that format
201 dynamically.
201 dynamically.
202 """
202 """
203 return '>'+('BB'*nbparams)
203 return '>'+('BB'*nbparams)
204
204
205 parthandlermapping = {}
205 parthandlermapping = {}
206
206
207 def parthandler(parttype, params=()):
207 def parthandler(parttype, params=()):
208 """decorator that register a function as a bundle2 part handler
208 """decorator that register a function as a bundle2 part handler
209
209
210 eg::
210 eg::
211
211
212 @parthandler('myparttype', ('mandatory', 'param', 'handled'))
212 @parthandler('myparttype', ('mandatory', 'param', 'handled'))
213 def myparttypehandler(...):
213 def myparttypehandler(...):
214 '''process a part of type "my part".'''
214 '''process a part of type "my part".'''
215 ...
215 ...
216 """
216 """
217 validateparttype(parttype)
217 validateparttype(parttype)
218 def _decorator(func):
218 def _decorator(func):
219 lparttype = parttype.lower() # enforce lower case matching.
219 lparttype = parttype.lower() # enforce lower case matching.
220 assert lparttype not in parthandlermapping
220 assert lparttype not in parthandlermapping
221 parthandlermapping[lparttype] = func
221 parthandlermapping[lparttype] = func
222 func.params = frozenset(params)
222 func.params = frozenset(params)
223 return func
223 return func
224 return _decorator
224 return _decorator
225
225
226 class unbundlerecords(object):
226 class unbundlerecords(object):
227 """keep record of what happens during and unbundle
227 """keep record of what happens during and unbundle
228
228
229 New records are added using `records.add('cat', obj)`. Where 'cat' is a
229 New records are added using `records.add('cat', obj)`. Where 'cat' is a
230 category of record and obj is an arbitrary object.
230 category of record and obj is an arbitrary object.
231
231
232 `records['cat']` will return all entries of this category 'cat'.
232 `records['cat']` will return all entries of this category 'cat'.
233
233
234 Iterating on the object itself will yield `('category', obj)` tuples
234 Iterating on the object itself will yield `('category', obj)` tuples
235 for all entries.
235 for all entries.
236
236
237 All iterations happens in chronological order.
237 All iterations happens in chronological order.
238 """
238 """
239
239
240 def __init__(self):
240 def __init__(self):
241 self._categories = {}
241 self._categories = {}
242 self._sequences = []
242 self._sequences = []
243 self._replies = {}
243 self._replies = {}
244
244
245 def add(self, category, entry, inreplyto=None):
245 def add(self, category, entry, inreplyto=None):
246 """add a new record of a given category.
246 """add a new record of a given category.
247
247
248 The entry can then be retrieved in the list returned by
248 The entry can then be retrieved in the list returned by
249 self['category']."""
249 self['category']."""
250 self._categories.setdefault(category, []).append(entry)
250 self._categories.setdefault(category, []).append(entry)
251 self._sequences.append((category, entry))
251 self._sequences.append((category, entry))
252 if inreplyto is not None:
252 if inreplyto is not None:
253 self.getreplies(inreplyto).add(category, entry)
253 self.getreplies(inreplyto).add(category, entry)
254
254
255 def getreplies(self, partid):
255 def getreplies(self, partid):
256 """get the records that are replies to a specific part"""
256 """get the records that are replies to a specific part"""
257 return self._replies.setdefault(partid, unbundlerecords())
257 return self._replies.setdefault(partid, unbundlerecords())
258
258
259 def __getitem__(self, cat):
259 def __getitem__(self, cat):
260 return tuple(self._categories.get(cat, ()))
260 return tuple(self._categories.get(cat, ()))
261
261
262 def __iter__(self):
262 def __iter__(self):
263 return iter(self._sequences)
263 return iter(self._sequences)
264
264
265 def __len__(self):
265 def __len__(self):
266 return len(self._sequences)
266 return len(self._sequences)
267
267
268 def __nonzero__(self):
268 def __nonzero__(self):
269 return bool(self._sequences)
269 return bool(self._sequences)
270
270
271 class bundleoperation(object):
271 class bundleoperation(object):
272 """an object that represents a single bundling process
272 """an object that represents a single bundling process
273
273
274 Its purpose is to carry unbundle-related objects and states.
274 Its purpose is to carry unbundle-related objects and states.
275
275
276 A new object should be created at the beginning of each bundle processing.
276 A new object should be created at the beginning of each bundle processing.
277 The object is to be returned by the processing function.
277 The object is to be returned by the processing function.
278
278
279 The object has very little content now it will ultimately contain:
279 The object has very little content now it will ultimately contain:
280 * an access to the repo the bundle is applied to,
280 * an access to the repo the bundle is applied to,
281 * a ui object,
281 * a ui object,
282 * a way to retrieve a transaction to add changes to the repo,
282 * a way to retrieve a transaction to add changes to the repo,
283 * a way to record the result of processing each part,
283 * a way to record the result of processing each part,
284 * a way to construct a bundle response when applicable.
284 * a way to construct a bundle response when applicable.
285 """
285 """
286
286
287 def __init__(self, repo, transactiongetter, captureoutput=True):
287 def __init__(self, repo, transactiongetter, captureoutput=True):
288 self.repo = repo
288 self.repo = repo
289 self.ui = repo.ui
289 self.ui = repo.ui
290 self.records = unbundlerecords()
290 self.records = unbundlerecords()
291 self.gettransaction = transactiongetter
291 self.gettransaction = transactiongetter
292 self.reply = None
292 self.reply = None
293 self.captureoutput = captureoutput
293 self.captureoutput = captureoutput
294
294
295 class TransactionUnavailable(RuntimeError):
295 class TransactionUnavailable(RuntimeError):
296 pass
296 pass
297
297
298 def _notransaction():
298 def _notransaction():
299 """default method to get a transaction while processing a bundle
299 """default method to get a transaction while processing a bundle
300
300
301 Raise an exception to highlight the fact that no transaction was expected
301 Raise an exception to highlight the fact that no transaction was expected
302 to be created"""
302 to be created"""
303 raise TransactionUnavailable()
303 raise TransactionUnavailable()
304
304
305 def processbundle(repo, unbundler, transactiongetter=None, op=None):
305 def processbundle(repo, unbundler, transactiongetter=None, op=None):
306 """This function process a bundle, apply effect to/from a repo
306 """This function process a bundle, apply effect to/from a repo
307
307
308 It iterates over each part then searches for and uses the proper handling
308 It iterates over each part then searches for and uses the proper handling
309 code to process the part. Parts are processed in order.
309 code to process the part. Parts are processed in order.
310
310
311 This is very early version of this function that will be strongly reworked
311 This is very early version of this function that will be strongly reworked
312 before final usage.
312 before final usage.
313
313
314 Unknown Mandatory part will abort the process.
314 Unknown Mandatory part will abort the process.
315
315
316 It is temporarily possible to provide a prebuilt bundleoperation to the
316 It is temporarily possible to provide a prebuilt bundleoperation to the
317 function. This is used to ensure output is properly propagated in case of
317 function. This is used to ensure output is properly propagated in case of
318 an error during the unbundling. This output capturing part will likely be
318 an error during the unbundling. This output capturing part will likely be
319 reworked and this ability will probably go away in the process.
319 reworked and this ability will probably go away in the process.
320 """
320 """
321 if op is None:
321 if op is None:
322 if transactiongetter is None:
322 if transactiongetter is None:
323 transactiongetter = _notransaction
323 transactiongetter = _notransaction
324 op = bundleoperation(repo, transactiongetter)
324 op = bundleoperation(repo, transactiongetter)
325 # todo:
325 # todo:
326 # - replace this is a init function soon.
326 # - replace this is a init function soon.
327 # - exception catching
327 # - exception catching
328 unbundler.params
328 unbundler.params
329 if repo.ui.debugflag:
329 if repo.ui.debugflag:
330 msg = ['bundle2-input-bundle:']
330 msg = ['bundle2-input-bundle:']
331 if unbundler.params:
331 if unbundler.params:
332 msg.append(' %i params')
332 msg.append(' %i params')
333 if op.gettransaction is None:
333 if op.gettransaction is None:
334 msg.append(' no-transaction')
334 msg.append(' no-transaction')
335 else:
335 else:
336 msg.append(' with-transaction')
336 msg.append(' with-transaction')
337 msg.append('\n')
337 msg.append('\n')
338 repo.ui.debug(''.join(msg))
338 repo.ui.debug(''.join(msg))
339 iterparts = enumerate(unbundler.iterparts())
339 iterparts = enumerate(unbundler.iterparts())
340 part = None
340 part = None
341 nbpart = 0
341 nbpart = 0
342 try:
342 try:
343 for nbpart, part in iterparts:
343 for nbpart, part in iterparts:
344 _processpart(op, part)
344 _processpart(op, part)
345 except BaseException as exc:
345 except BaseException as exc:
346 for nbpart, part in iterparts:
346 for nbpart, part in iterparts:
347 # consume the bundle content
347 # consume the bundle content
348 part.seek(0, 2)
348 part.seek(0, 2)
349 # Small hack to let caller code distinguish exceptions from bundle2
349 # Small hack to let caller code distinguish exceptions from bundle2
350 # processing from processing the old format. This is mostly
350 # processing from processing the old format. This is mostly
351 # needed to handle different return codes to unbundle according to the
351 # needed to handle different return codes to unbundle according to the
352 # type of bundle. We should probably clean up or drop this return code
352 # type of bundle. We should probably clean up or drop this return code
353 # craziness in a future version.
353 # craziness in a future version.
354 exc.duringunbundle2 = True
354 exc.duringunbundle2 = True
355 salvaged = []
355 salvaged = []
356 replycaps = None
356 replycaps = None
357 if op.reply is not None:
357 if op.reply is not None:
358 salvaged = op.reply.salvageoutput()
358 salvaged = op.reply.salvageoutput()
359 replycaps = op.reply.capabilities
359 replycaps = op.reply.capabilities
360 exc._replycaps = replycaps
360 exc._replycaps = replycaps
361 exc._bundle2salvagedoutput = salvaged
361 exc._bundle2salvagedoutput = salvaged
362 raise
362 raise
363 finally:
363 finally:
364 repo.ui.debug('bundle2-input-bundle: %i parts total\n' % nbpart)
364 repo.ui.debug('bundle2-input-bundle: %i parts total\n' % nbpart)
365
365
366 return op
366 return op
367
367
368 def _processpart(op, part):
368 def _processpart(op, part):
369 """process a single part from a bundle
369 """process a single part from a bundle
370
370
371 The part is guaranteed to have been fully consumed when the function exits
371 The part is guaranteed to have been fully consumed when the function exits
372 (even if an exception is raised)."""
372 (even if an exception is raised)."""
373 status = 'unknown' # used by debug output
373 status = 'unknown' # used by debug output
374 try:
374 try:
375 try:
375 try:
376 handler = parthandlermapping.get(part.type)
376 handler = parthandlermapping.get(part.type)
377 if handler is None:
377 if handler is None:
378 status = 'unsupported-type'
378 status = 'unsupported-type'
379 raise error.BundleUnknownFeatureError(parttype=part.type)
379 raise error.BundleUnknownFeatureError(parttype=part.type)
380 indebug(op.ui, 'found a handler for part %r' % part.type)
380 indebug(op.ui, 'found a handler for part %r' % part.type)
381 unknownparams = part.mandatorykeys - handler.params
381 unknownparams = part.mandatorykeys - handler.params
382 if unknownparams:
382 if unknownparams:
383 unknownparams = list(unknownparams)
383 unknownparams = list(unknownparams)
384 unknownparams.sort()
384 unknownparams.sort()
385 status = 'unsupported-params (%s)' % unknownparams
385 status = 'unsupported-params (%s)' % unknownparams
386 raise error.BundleUnknownFeatureError(parttype=part.type,
386 raise error.BundleUnknownFeatureError(parttype=part.type,
387 params=unknownparams)
387 params=unknownparams)
388 status = 'supported'
388 status = 'supported'
389 except error.BundleUnknownFeatureError as exc:
389 except error.BundleUnknownFeatureError as exc:
390 if part.mandatory: # mandatory parts
390 if part.mandatory: # mandatory parts
391 raise
391 raise
392 indebug(op.ui, 'ignoring unsupported advisory part %s' % exc)
392 indebug(op.ui, 'ignoring unsupported advisory part %s' % exc)
393 return # skip to part processing
393 return # skip to part processing
394 finally:
394 finally:
395 if op.ui.debugflag:
395 if op.ui.debugflag:
396 msg = ['bundle2-input-part: "%s"' % part.type]
396 msg = ['bundle2-input-part: "%s"' % part.type]
397 if not part.mandatory:
397 if not part.mandatory:
398 msg.append(' (advisory)')
398 msg.append(' (advisory)')
399 nbmp = len(part.mandatorykeys)
399 nbmp = len(part.mandatorykeys)
400 nbap = len(part.params) - nbmp
400 nbap = len(part.params) - nbmp
401 if nbmp or nbap:
401 if nbmp or nbap:
402 msg.append(' (params:')
402 msg.append(' (params:')
403 if nbmp:
403 if nbmp:
404 msg.append(' %i mandatory' % nbmp)
404 msg.append(' %i mandatory' % nbmp)
405 if nbap:
405 if nbap:
406 msg.append(' %i advisory' % nbmp)
406 msg.append(' %i advisory' % nbmp)
407 msg.append(')')
407 msg.append(')')
408 msg.append(' %s\n' % status)
408 msg.append(' %s\n' % status)
409 op.ui.debug(''.join(msg))
409 op.ui.debug(''.join(msg))
410
410
411 # handler is called outside the above try block so that we don't
411 # handler is called outside the above try block so that we don't
412 # risk catching KeyErrors from anything other than the
412 # risk catching KeyErrors from anything other than the
413 # parthandlermapping lookup (any KeyError raised by handler()
413 # parthandlermapping lookup (any KeyError raised by handler()
414 # itself represents a defect of a different variety).
414 # itself represents a defect of a different variety).
415 output = None
415 output = None
416 if op.captureoutput and op.reply is not None:
416 if op.captureoutput and op.reply is not None:
417 op.ui.pushbuffer(error=True, subproc=True)
417 op.ui.pushbuffer(error=True, subproc=True)
418 output = ''
418 output = ''
419 try:
419 try:
420 handler(op, part)
420 handler(op, part)
421 finally:
421 finally:
422 if output is not None:
422 if output is not None:
423 output = op.ui.popbuffer()
423 output = op.ui.popbuffer()
424 if output:
424 if output:
425 outpart = op.reply.newpart('output', data=output,
425 outpart = op.reply.newpart('output', data=output,
426 mandatory=False)
426 mandatory=False)
427 outpart.addparam('in-reply-to', str(part.id), mandatory=False)
427 outpart.addparam('in-reply-to', str(part.id), mandatory=False)
428 finally:
428 finally:
429 # consume the part content to not corrupt the stream.
429 # consume the part content to not corrupt the stream.
430 part.seek(0, 2)
430 part.seek(0, 2)
431
431
432
432
433 def decodecaps(blob):
433 def decodecaps(blob):
434 """decode a bundle2 caps bytes blob into a dictionary
434 """decode a bundle2 caps bytes blob into a dictionary
435
435
436 The blob is a list of capabilities (one per line)
436 The blob is a list of capabilities (one per line)
437 Capabilities may have values using a line of the form::
437 Capabilities may have values using a line of the form::
438
438
439 capability=value1,value2,value3
439 capability=value1,value2,value3
440
440
441 The values are always a list."""
441 The values are always a list."""
442 caps = {}
442 caps = {}
443 for line in blob.splitlines():
443 for line in blob.splitlines():
444 if not line:
444 if not line:
445 continue
445 continue
446 if '=' not in line:
446 if '=' not in line:
447 key, vals = line, ()
447 key, vals = line, ()
448 else:
448 else:
449 key, vals = line.split('=', 1)
449 key, vals = line.split('=', 1)
450 vals = vals.split(',')
450 vals = vals.split(',')
451 key = urllib.unquote(key)
451 key = urllib.unquote(key)
452 vals = [urllib.unquote(v) for v in vals]
452 vals = [urllib.unquote(v) for v in vals]
453 caps[key] = vals
453 caps[key] = vals
454 return caps
454 return caps
455
455
456 def encodecaps(caps):
456 def encodecaps(caps):
457 """encode a bundle2 caps dictionary into a bytes blob"""
457 """encode a bundle2 caps dictionary into a bytes blob"""
458 chunks = []
458 chunks = []
459 for ca in sorted(caps):
459 for ca in sorted(caps):
460 vals = caps[ca]
460 vals = caps[ca]
461 ca = urllib.quote(ca)
461 ca = urllib.quote(ca)
462 vals = [urllib.quote(v) for v in vals]
462 vals = [urllib.quote(v) for v in vals]
463 if vals:
463 if vals:
464 ca = "%s=%s" % (ca, ','.join(vals))
464 ca = "%s=%s" % (ca, ','.join(vals))
465 chunks.append(ca)
465 chunks.append(ca)
466 return '\n'.join(chunks)
466 return '\n'.join(chunks)
467
467
468 class bundle20(object):
468 class bundle20(object):
469 """represent an outgoing bundle2 container
469 """represent an outgoing bundle2 container
470
470
471 Use the `addparam` method to add stream level parameter. and `newpart` to
471 Use the `addparam` method to add stream level parameter. and `newpart` to
472 populate it. Then call `getchunks` to retrieve all the binary chunks of
472 populate it. Then call `getchunks` to retrieve all the binary chunks of
473 data that compose the bundle2 container."""
473 data that compose the bundle2 container."""
474
474
475 _magicstring = 'HG20'
475 _magicstring = 'HG20'
476
476
477 def __init__(self, ui, capabilities=()):
477 def __init__(self, ui, capabilities=()):
478 self.ui = ui
478 self.ui = ui
479 self._params = []
479 self._params = []
480 self._parts = []
480 self._parts = []
481 self.capabilities = dict(capabilities)
481 self.capabilities = dict(capabilities)
482 self._compressor = util.compressors[None]()
482 self._compressor = util.compressors[None]()
483
483
484 def setcompression(self, alg):
484 def setcompression(self, alg):
485 """setup core part compression to <alg>"""
485 """setup core part compression to <alg>"""
486 if alg is None:
486 if alg is None:
487 return
487 return
488 assert not any(n.lower() == 'Compression' for n, v in self._params)
488 assert not any(n.lower() == 'Compression' for n, v in self._params)
489 self.addparam('Compression', alg)
489 self.addparam('Compression', alg)
490 self._compressor = util.compressors[alg]()
490 self._compressor = util.compressors[alg]()
491
491
492 @property
492 @property
493 def nbparts(self):
493 def nbparts(self):
494 """total number of parts added to the bundler"""
494 """total number of parts added to the bundler"""
495 return len(self._parts)
495 return len(self._parts)
496
496
497 # methods used to defines the bundle2 content
497 # methods used to defines the bundle2 content
498 def addparam(self, name, value=None):
498 def addparam(self, name, value=None):
499 """add a stream level parameter"""
499 """add a stream level parameter"""
500 if not name:
500 if not name:
501 raise ValueError('empty parameter name')
501 raise ValueError('empty parameter name')
502 if name[0] not in string.letters:
502 if name[0] not in string.letters:
503 raise ValueError('non letter first character: %r' % name)
503 raise ValueError('non letter first character: %r' % name)
504 self._params.append((name, value))
504 self._params.append((name, value))
505
505
506 def addpart(self, part):
506 def addpart(self, part):
507 """add a new part to the bundle2 container
507 """add a new part to the bundle2 container
508
508
509 Parts contains the actual applicative payload."""
509 Parts contains the actual applicative payload."""
510 assert part.id is None
510 assert part.id is None
511 part.id = len(self._parts) # very cheap counter
511 part.id = len(self._parts) # very cheap counter
512 self._parts.append(part)
512 self._parts.append(part)
513
513
514 def newpart(self, typeid, *args, **kwargs):
514 def newpart(self, typeid, *args, **kwargs):
515 """create a new part and add it to the containers
515 """create a new part and add it to the containers
516
516
517 As the part is directly added to the containers. For now, this means
517 As the part is directly added to the containers. For now, this means
518 that any failure to properly initialize the part after calling
518 that any failure to properly initialize the part after calling
519 ``newpart`` should result in a failure of the whole bundling process.
519 ``newpart`` should result in a failure of the whole bundling process.
520
520
521 You can still fall back to manually create and add if you need better
521 You can still fall back to manually create and add if you need better
522 control."""
522 control."""
523 part = bundlepart(typeid, *args, **kwargs)
523 part = bundlepart(typeid, *args, **kwargs)
524 self.addpart(part)
524 self.addpart(part)
525 return part
525 return part
526
526
527 # methods used to generate the bundle2 stream
527 # methods used to generate the bundle2 stream
528 def getchunks(self):
528 def getchunks(self):
529 if self.ui.debugflag:
529 if self.ui.debugflag:
530 msg = ['bundle2-output-bundle: "%s",' % self._magicstring]
530 msg = ['bundle2-output-bundle: "%s",' % self._magicstring]
531 if self._params:
531 if self._params:
532 msg.append(' (%i params)' % len(self._params))
532 msg.append(' (%i params)' % len(self._params))
533 msg.append(' %i parts total\n' % len(self._parts))
533 msg.append(' %i parts total\n' % len(self._parts))
534 self.ui.debug(''.join(msg))
534 self.ui.debug(''.join(msg))
535 outdebug(self.ui, 'start emission of %s stream' % self._magicstring)
535 outdebug(self.ui, 'start emission of %s stream' % self._magicstring)
536 yield self._magicstring
536 yield self._magicstring
537 param = self._paramchunk()
537 param = self._paramchunk()
538 outdebug(self.ui, 'bundle parameter: %s' % param)
538 outdebug(self.ui, 'bundle parameter: %s' % param)
539 yield _pack(_fstreamparamsize, len(param))
539 yield _pack(_fstreamparamsize, len(param))
540 if param:
540 if param:
541 yield param
541 yield param
542 # starting compression
542 # starting compression
543 for chunk in self._getcorechunk():
543 for chunk in self._getcorechunk():
544 yield self._compressor.compress(chunk)
544 yield self._compressor.compress(chunk)
545 yield self._compressor.flush()
545 yield self._compressor.flush()
546
546
547 def _paramchunk(self):
547 def _paramchunk(self):
548 """return a encoded version of all stream parameters"""
548 """return a encoded version of all stream parameters"""
549 blocks = []
549 blocks = []
550 for par, value in self._params:
550 for par, value in self._params:
551 par = urllib.quote(par)
551 par = urllib.quote(par)
552 if value is not None:
552 if value is not None:
553 value = urllib.quote(value)
553 value = urllib.quote(value)
554 par = '%s=%s' % (par, value)
554 par = '%s=%s' % (par, value)
555 blocks.append(par)
555 blocks.append(par)
556 return ' '.join(blocks)
556 return ' '.join(blocks)
557
557
558 def _getcorechunk(self):
558 def _getcorechunk(self):
559 """yield chunk for the core part of the bundle
559 """yield chunk for the core part of the bundle
560
560
561 (all but headers and parameters)"""
561 (all but headers and parameters)"""
562 outdebug(self.ui, 'start of parts')
562 outdebug(self.ui, 'start of parts')
563 for part in self._parts:
563 for part in self._parts:
564 outdebug(self.ui, 'bundle part: "%s"' % part.type)
564 outdebug(self.ui, 'bundle part: "%s"' % part.type)
565 for chunk in part.getchunks(ui=self.ui):
565 for chunk in part.getchunks(ui=self.ui):
566 yield chunk
566 yield chunk
567 outdebug(self.ui, 'end of bundle')
567 outdebug(self.ui, 'end of bundle')
568 yield _pack(_fpartheadersize, 0)
568 yield _pack(_fpartheadersize, 0)
569
569
570
570
571 def salvageoutput(self):
571 def salvageoutput(self):
572 """return a list with a copy of all output parts in the bundle
572 """return a list with a copy of all output parts in the bundle
573
573
574 This is meant to be used during error handling to make sure we preserve
574 This is meant to be used during error handling to make sure we preserve
575 server output"""
575 server output"""
576 salvaged = []
576 salvaged = []
577 for part in self._parts:
577 for part in self._parts:
578 if part.type.startswith('output'):
578 if part.type.startswith('output'):
579 salvaged.append(part.copy())
579 salvaged.append(part.copy())
580 return salvaged
580 return salvaged
581
581
582
582
583 class unpackermixin(object):
583 class unpackermixin(object):
584 """A mixin to extract bytes and struct data from a stream"""
584 """A mixin to extract bytes and struct data from a stream"""
585
585
586 def __init__(self, fp):
586 def __init__(self, fp):
587 self._fp = fp
587 self._fp = fp
588 self._seekable = (util.safehasattr(fp, 'seek') and
588 self._seekable = (util.safehasattr(fp, 'seek') and
589 util.safehasattr(fp, 'tell'))
589 util.safehasattr(fp, 'tell'))
590
590
591 def _unpack(self, format):
591 def _unpack(self, format):
592 """unpack this struct format from the stream"""
592 """unpack this struct format from the stream"""
593 data = self._readexact(struct.calcsize(format))
593 data = self._readexact(struct.calcsize(format))
594 return _unpack(format, data)
594 return _unpack(format, data)
595
595
596 def _readexact(self, size):
596 def _readexact(self, size):
597 """read exactly <size> bytes from the stream"""
597 """read exactly <size> bytes from the stream"""
598 return changegroup.readexactly(self._fp, size)
598 return changegroup.readexactly(self._fp, size)
599
599
600 def seek(self, offset, whence=0):
600 def seek(self, offset, whence=0):
601 """move the underlying file pointer"""
601 """move the underlying file pointer"""
602 if self._seekable:
602 if self._seekable:
603 return self._fp.seek(offset, whence)
603 return self._fp.seek(offset, whence)
604 else:
604 else:
605 raise NotImplementedError(_('File pointer is not seekable'))
605 raise NotImplementedError(_('File pointer is not seekable'))
606
606
607 def tell(self):
607 def tell(self):
608 """return the file offset, or None if file is not seekable"""
608 """return the file offset, or None if file is not seekable"""
609 if self._seekable:
609 if self._seekable:
610 try:
610 try:
611 return self._fp.tell()
611 return self._fp.tell()
612 except IOError as e:
612 except IOError as e:
613 if e.errno == errno.ESPIPE:
613 if e.errno == errno.ESPIPE:
614 self._seekable = False
614 self._seekable = False
615 else:
615 else:
616 raise
616 raise
617 return None
617 return None
618
618
619 def close(self):
619 def close(self):
620 """close underlying file"""
620 """close underlying file"""
621 if util.safehasattr(self._fp, 'close'):
621 if util.safehasattr(self._fp, 'close'):
622 return self._fp.close()
622 return self._fp.close()
623
623
624 def getunbundler(ui, fp, magicstring=None):
624 def getunbundler(ui, fp, magicstring=None):
625 """return a valid unbundler object for a given magicstring"""
625 """return a valid unbundler object for a given magicstring"""
626 if magicstring is None:
626 if magicstring is None:
627 magicstring = changegroup.readexactly(fp, 4)
627 magicstring = changegroup.readexactly(fp, 4)
628 magic, version = magicstring[0:2], magicstring[2:4]
628 magic, version = magicstring[0:2], magicstring[2:4]
629 if magic != 'HG':
629 if magic != 'HG':
630 raise util.Abort(_('not a Mercurial bundle'))
630 raise util.Abort(_('not a Mercurial bundle'))
631 unbundlerclass = formatmap.get(version)
631 unbundlerclass = formatmap.get(version)
632 if unbundlerclass is None:
632 if unbundlerclass is None:
633 raise util.Abort(_('unknown bundle version %s') % version)
633 raise util.Abort(_('unknown bundle version %s') % version)
634 unbundler = unbundlerclass(ui, fp)
634 unbundler = unbundlerclass(ui, fp)
635 indebug(ui, 'start processing of %s stream' % magicstring)
635 indebug(ui, 'start processing of %s stream' % magicstring)
636 return unbundler
636 return unbundler
637
637
638 class unbundle20(unpackermixin):
638 class unbundle20(unpackermixin):
639 """interpret a bundle2 stream
639 """interpret a bundle2 stream
640
640
641 This class is fed with a binary stream and yields parts through its
641 This class is fed with a binary stream and yields parts through its
642 `iterparts` methods."""
642 `iterparts` methods."""
643
643
644 _magicstring = 'HG20'
645
644 def __init__(self, ui, fp):
646 def __init__(self, ui, fp):
645 """If header is specified, we do not read it out of the stream."""
647 """If header is specified, we do not read it out of the stream."""
646 self.ui = ui
648 self.ui = ui
647 self._decompressor = util.decompressors[None]
649 self._decompressor = util.decompressors[None]
648 super(unbundle20, self).__init__(fp)
650 super(unbundle20, self).__init__(fp)
649
651
650 @util.propertycache
652 @util.propertycache
651 def params(self):
653 def params(self):
652 """dictionary of stream level parameters"""
654 """dictionary of stream level parameters"""
653 indebug(self.ui, 'reading bundle2 stream parameters')
655 indebug(self.ui, 'reading bundle2 stream parameters')
654 params = {}
656 params = {}
655 paramssize = self._unpack(_fstreamparamsize)[0]
657 paramssize = self._unpack(_fstreamparamsize)[0]
656 if paramssize < 0:
658 if paramssize < 0:
657 raise error.BundleValueError('negative bundle param size: %i'
659 raise error.BundleValueError('negative bundle param size: %i'
658 % paramssize)
660 % paramssize)
659 if paramssize:
661 if paramssize:
660 params = self._readexact(paramssize)
662 params = self._readexact(paramssize)
661 params = self._processallparams(params)
663 params = self._processallparams(params)
662 return params
664 return params
663
665
664 def _processallparams(self, paramsblock):
666 def _processallparams(self, paramsblock):
665 """"""
667 """"""
666 params = {}
668 params = {}
667 for p in paramsblock.split(' '):
669 for p in paramsblock.split(' '):
668 p = p.split('=', 1)
670 p = p.split('=', 1)
669 p = [urllib.unquote(i) for i in p]
671 p = [urllib.unquote(i) for i in p]
670 if len(p) < 2:
672 if len(p) < 2:
671 p.append(None)
673 p.append(None)
672 self._processparam(*p)
674 self._processparam(*p)
673 params[p[0]] = p[1]
675 params[p[0]] = p[1]
674 return params
676 return params
675
677
676
678
677 def _processparam(self, name, value):
679 def _processparam(self, name, value):
678 """process a parameter, applying its effect if needed
680 """process a parameter, applying its effect if needed
679
681
680 Parameter starting with a lower case letter are advisory and will be
682 Parameter starting with a lower case letter are advisory and will be
681 ignored when unknown. Those starting with an upper case letter are
683 ignored when unknown. Those starting with an upper case letter are
682 mandatory and will this function will raise a KeyError when unknown.
684 mandatory and will this function will raise a KeyError when unknown.
683
685
684 Note: no option are currently supported. Any input will be either
686 Note: no option are currently supported. Any input will be either
685 ignored or failing.
687 ignored or failing.
686 """
688 """
687 if not name:
689 if not name:
688 raise ValueError('empty parameter name')
690 raise ValueError('empty parameter name')
689 if name[0] not in string.letters:
691 if name[0] not in string.letters:
690 raise ValueError('non letter first character: %r' % name)
692 raise ValueError('non letter first character: %r' % name)
691 try:
693 try:
692 handler = b2streamparamsmap[name.lower()]
694 handler = b2streamparamsmap[name.lower()]
693 except KeyError:
695 except KeyError:
694 if name[0].islower():
696 if name[0].islower():
695 indebug(self.ui, "ignoring unknown parameter %r" % name)
697 indebug(self.ui, "ignoring unknown parameter %r" % name)
696 else:
698 else:
697 raise error.BundleUnknownFeatureError(params=(name,))
699 raise error.BundleUnknownFeatureError(params=(name,))
698 else:
700 else:
699 handler(self, name, value)
701 handler(self, name, value)
700
702
703 def _forwardchunks(self):
704 """utility to transfer a bundle2 as binary
705
706 This is made necessary by the fact the 'getbundle' command over 'ssh'
707 have no way to know then the reply end, relying on the bundle to be
708 interpreted to know its end. This is terrible and we are sorry, but we
709 needed to move forward to get general delta enabled.
710 """
711 yield self._magicstring
712 assert 'params' not in vars(self)
713 paramssize = self._unpack(_fstreamparamsize)[0]
714 if paramssize < 0:
715 raise error.BundleValueError('negative bundle param size: %i'
716 % paramssize)
717 yield _pack(_fstreamparamsize, paramssize)
718 if paramssize:
719 params = self._readexact(paramssize)
720 self._processallparams(params)
721 yield params
722 assert self._decompressor is util.decompressors[None]
723 # From there, payload might need to be decompressed
724 self._fp = self._decompressor(self._fp)
725 emptycount = 0
726 while emptycount < 2:
727 # so we can brainlessly loop
728 assert _fpartheadersize == _fpayloadsize
729 size = self._unpack(_fpartheadersize)[0]
730 yield _pack(_fpartheadersize, size)
731 if size:
732 emptycount = 0
733 else:
734 emptycount += 1
735 continue
736 if size == flaginterrupt:
737 continue
738 elif size < 0:
739 raise error.BundleValueError('negative chunk size: %i')
740 yield self._readexact(size)
741
742
701 def iterparts(self):
743 def iterparts(self):
702 """yield all parts contained in the stream"""
744 """yield all parts contained in the stream"""
703 # make sure param have been loaded
745 # make sure param have been loaded
704 self.params
746 self.params
705 # From there, payload need to be decompressed
747 # From there, payload need to be decompressed
706 self._fp = self._decompressor(self._fp)
748 self._fp = self._decompressor(self._fp)
707 indebug(self.ui, 'start extraction of bundle2 parts')
749 indebug(self.ui, 'start extraction of bundle2 parts')
708 headerblock = self._readpartheader()
750 headerblock = self._readpartheader()
709 while headerblock is not None:
751 while headerblock is not None:
710 part = unbundlepart(self.ui, headerblock, self._fp)
752 part = unbundlepart(self.ui, headerblock, self._fp)
711 yield part
753 yield part
712 part.seek(0, 2)
754 part.seek(0, 2)
713 headerblock = self._readpartheader()
755 headerblock = self._readpartheader()
714 indebug(self.ui, 'end of bundle2 stream')
756 indebug(self.ui, 'end of bundle2 stream')
715
757
716 def _readpartheader(self):
758 def _readpartheader(self):
717 """reads a part header size and return the bytes blob
759 """reads a part header size and return the bytes blob
718
760
719 returns None if empty"""
761 returns None if empty"""
720 headersize = self._unpack(_fpartheadersize)[0]
762 headersize = self._unpack(_fpartheadersize)[0]
721 if headersize < 0:
763 if headersize < 0:
722 raise error.BundleValueError('negative part header size: %i'
764 raise error.BundleValueError('negative part header size: %i'
723 % headersize)
765 % headersize)
724 indebug(self.ui, 'part header size: %i' % headersize)
766 indebug(self.ui, 'part header size: %i' % headersize)
725 if headersize:
767 if headersize:
726 return self._readexact(headersize)
768 return self._readexact(headersize)
727 return None
769 return None
728
770
729 def compressed(self):
771 def compressed(self):
730 return False
772 return False
731
773
732 formatmap = {'20': unbundle20}
774 formatmap = {'20': unbundle20}
733
775
734 b2streamparamsmap = {}
776 b2streamparamsmap = {}
735
777
736 def b2streamparamhandler(name):
778 def b2streamparamhandler(name):
737 """register a handler for a stream level parameter"""
779 """register a handler for a stream level parameter"""
738 def decorator(func):
780 def decorator(func):
739 assert name not in formatmap
781 assert name not in formatmap
740 b2streamparamsmap[name] = func
782 b2streamparamsmap[name] = func
741 return func
783 return func
742 return decorator
784 return decorator
743
785
744 @b2streamparamhandler('compression')
786 @b2streamparamhandler('compression')
745 def processcompression(unbundler, param, value):
787 def processcompression(unbundler, param, value):
746 """read compression parameter and install payload decompression"""
788 """read compression parameter and install payload decompression"""
747 if value not in util.decompressors:
789 if value not in util.decompressors:
748 raise error.BundleUnknownFeatureError(params=(param,),
790 raise error.BundleUnknownFeatureError(params=(param,),
749 values=(value,))
791 values=(value,))
750 unbundler._decompressor = util.decompressors[value]
792 unbundler._decompressor = util.decompressors[value]
751
793
752 class bundlepart(object):
794 class bundlepart(object):
753 """A bundle2 part contains application level payload
795 """A bundle2 part contains application level payload
754
796
755 The part `type` is used to route the part to the application level
797 The part `type` is used to route the part to the application level
756 handler.
798 handler.
757
799
758 The part payload is contained in ``part.data``. It could be raw bytes or a
800 The part payload is contained in ``part.data``. It could be raw bytes or a
759 generator of byte chunks.
801 generator of byte chunks.
760
802
761 You can add parameters to the part using the ``addparam`` method.
803 You can add parameters to the part using the ``addparam`` method.
762 Parameters can be either mandatory (default) or advisory. Remote side
804 Parameters can be either mandatory (default) or advisory. Remote side
763 should be able to safely ignore the advisory ones.
805 should be able to safely ignore the advisory ones.
764
806
765 Both data and parameters cannot be modified after the generation has begun.
807 Both data and parameters cannot be modified after the generation has begun.
766 """
808 """
767
809
768 def __init__(self, parttype, mandatoryparams=(), advisoryparams=(),
810 def __init__(self, parttype, mandatoryparams=(), advisoryparams=(),
769 data='', mandatory=True):
811 data='', mandatory=True):
770 validateparttype(parttype)
812 validateparttype(parttype)
771 self.id = None
813 self.id = None
772 self.type = parttype
814 self.type = parttype
773 self._data = data
815 self._data = data
774 self._mandatoryparams = list(mandatoryparams)
816 self._mandatoryparams = list(mandatoryparams)
775 self._advisoryparams = list(advisoryparams)
817 self._advisoryparams = list(advisoryparams)
776 # checking for duplicated entries
818 # checking for duplicated entries
777 self._seenparams = set()
819 self._seenparams = set()
778 for pname, __ in self._mandatoryparams + self._advisoryparams:
820 for pname, __ in self._mandatoryparams + self._advisoryparams:
779 if pname in self._seenparams:
821 if pname in self._seenparams:
780 raise RuntimeError('duplicated params: %s' % pname)
822 raise RuntimeError('duplicated params: %s' % pname)
781 self._seenparams.add(pname)
823 self._seenparams.add(pname)
782 # status of the part's generation:
824 # status of the part's generation:
783 # - None: not started,
825 # - None: not started,
784 # - False: currently generated,
826 # - False: currently generated,
785 # - True: generation done.
827 # - True: generation done.
786 self._generated = None
828 self._generated = None
787 self.mandatory = mandatory
829 self.mandatory = mandatory
788
830
789 def copy(self):
831 def copy(self):
790 """return a copy of the part
832 """return a copy of the part
791
833
792 The new part have the very same content but no partid assigned yet.
834 The new part have the very same content but no partid assigned yet.
793 Parts with generated data cannot be copied."""
835 Parts with generated data cannot be copied."""
794 assert not util.safehasattr(self.data, 'next')
836 assert not util.safehasattr(self.data, 'next')
795 return self.__class__(self.type, self._mandatoryparams,
837 return self.__class__(self.type, self._mandatoryparams,
796 self._advisoryparams, self._data, self.mandatory)
838 self._advisoryparams, self._data, self.mandatory)
797
839
798 # methods used to defines the part content
840 # methods used to defines the part content
799 def __setdata(self, data):
841 def __setdata(self, data):
800 if self._generated is not None:
842 if self._generated is not None:
801 raise error.ReadOnlyPartError('part is being generated')
843 raise error.ReadOnlyPartError('part is being generated')
802 self._data = data
844 self._data = data
803 def __getdata(self):
845 def __getdata(self):
804 return self._data
846 return self._data
805 data = property(__getdata, __setdata)
847 data = property(__getdata, __setdata)
806
848
807 @property
849 @property
808 def mandatoryparams(self):
850 def mandatoryparams(self):
809 # make it an immutable tuple to force people through ``addparam``
851 # make it an immutable tuple to force people through ``addparam``
810 return tuple(self._mandatoryparams)
852 return tuple(self._mandatoryparams)
811
853
812 @property
854 @property
813 def advisoryparams(self):
855 def advisoryparams(self):
814 # make it an immutable tuple to force people through ``addparam``
856 # make it an immutable tuple to force people through ``addparam``
815 return tuple(self._advisoryparams)
857 return tuple(self._advisoryparams)
816
858
817 def addparam(self, name, value='', mandatory=True):
859 def addparam(self, name, value='', mandatory=True):
818 if self._generated is not None:
860 if self._generated is not None:
819 raise error.ReadOnlyPartError('part is being generated')
861 raise error.ReadOnlyPartError('part is being generated')
820 if name in self._seenparams:
862 if name in self._seenparams:
821 raise ValueError('duplicated params: %s' % name)
863 raise ValueError('duplicated params: %s' % name)
822 self._seenparams.add(name)
864 self._seenparams.add(name)
823 params = self._advisoryparams
865 params = self._advisoryparams
824 if mandatory:
866 if mandatory:
825 params = self._mandatoryparams
867 params = self._mandatoryparams
826 params.append((name, value))
868 params.append((name, value))
827
869
828 # methods used to generates the bundle2 stream
870 # methods used to generates the bundle2 stream
829 def getchunks(self, ui):
871 def getchunks(self, ui):
830 if self._generated is not None:
872 if self._generated is not None:
831 raise RuntimeError('part can only be consumed once')
873 raise RuntimeError('part can only be consumed once')
832 self._generated = False
874 self._generated = False
833
875
834 if ui.debugflag:
876 if ui.debugflag:
835 msg = ['bundle2-output-part: "%s"' % self.type]
877 msg = ['bundle2-output-part: "%s"' % self.type]
836 if not self.mandatory:
878 if not self.mandatory:
837 msg.append(' (advisory)')
879 msg.append(' (advisory)')
838 nbmp = len(self.mandatoryparams)
880 nbmp = len(self.mandatoryparams)
839 nbap = len(self.advisoryparams)
881 nbap = len(self.advisoryparams)
840 if nbmp or nbap:
882 if nbmp or nbap:
841 msg.append(' (params:')
883 msg.append(' (params:')
842 if nbmp:
884 if nbmp:
843 msg.append(' %i mandatory' % nbmp)
885 msg.append(' %i mandatory' % nbmp)
844 if nbap:
886 if nbap:
845 msg.append(' %i advisory' % nbmp)
887 msg.append(' %i advisory' % nbmp)
846 msg.append(')')
888 msg.append(')')
847 if not self.data:
889 if not self.data:
848 msg.append(' empty payload')
890 msg.append(' empty payload')
849 elif util.safehasattr(self.data, 'next'):
891 elif util.safehasattr(self.data, 'next'):
850 msg.append(' streamed payload')
892 msg.append(' streamed payload')
851 else:
893 else:
852 msg.append(' %i bytes payload' % len(self.data))
894 msg.append(' %i bytes payload' % len(self.data))
853 msg.append('\n')
895 msg.append('\n')
854 ui.debug(''.join(msg))
896 ui.debug(''.join(msg))
855
897
856 #### header
898 #### header
857 if self.mandatory:
899 if self.mandatory:
858 parttype = self.type.upper()
900 parttype = self.type.upper()
859 else:
901 else:
860 parttype = self.type.lower()
902 parttype = self.type.lower()
861 outdebug(ui, 'part %s: "%s"' % (self.id, parttype))
903 outdebug(ui, 'part %s: "%s"' % (self.id, parttype))
862 ## parttype
904 ## parttype
863 header = [_pack(_fparttypesize, len(parttype)),
905 header = [_pack(_fparttypesize, len(parttype)),
864 parttype, _pack(_fpartid, self.id),
906 parttype, _pack(_fpartid, self.id),
865 ]
907 ]
866 ## parameters
908 ## parameters
867 # count
909 # count
868 manpar = self.mandatoryparams
910 manpar = self.mandatoryparams
869 advpar = self.advisoryparams
911 advpar = self.advisoryparams
870 header.append(_pack(_fpartparamcount, len(manpar), len(advpar)))
912 header.append(_pack(_fpartparamcount, len(manpar), len(advpar)))
871 # size
913 # size
872 parsizes = []
914 parsizes = []
873 for key, value in manpar:
915 for key, value in manpar:
874 parsizes.append(len(key))
916 parsizes.append(len(key))
875 parsizes.append(len(value))
917 parsizes.append(len(value))
876 for key, value in advpar:
918 for key, value in advpar:
877 parsizes.append(len(key))
919 parsizes.append(len(key))
878 parsizes.append(len(value))
920 parsizes.append(len(value))
879 paramsizes = _pack(_makefpartparamsizes(len(parsizes) / 2), *parsizes)
921 paramsizes = _pack(_makefpartparamsizes(len(parsizes) / 2), *parsizes)
880 header.append(paramsizes)
922 header.append(paramsizes)
881 # key, value
923 # key, value
882 for key, value in manpar:
924 for key, value in manpar:
883 header.append(key)
925 header.append(key)
884 header.append(value)
926 header.append(value)
885 for key, value in advpar:
927 for key, value in advpar:
886 header.append(key)
928 header.append(key)
887 header.append(value)
929 header.append(value)
888 ## finalize header
930 ## finalize header
889 headerchunk = ''.join(header)
931 headerchunk = ''.join(header)
890 outdebug(ui, 'header chunk size: %i' % len(headerchunk))
932 outdebug(ui, 'header chunk size: %i' % len(headerchunk))
891 yield _pack(_fpartheadersize, len(headerchunk))
933 yield _pack(_fpartheadersize, len(headerchunk))
892 yield headerchunk
934 yield headerchunk
893 ## payload
935 ## payload
894 try:
936 try:
895 for chunk in self._payloadchunks():
937 for chunk in self._payloadchunks():
896 outdebug(ui, 'payload chunk size: %i' % len(chunk))
938 outdebug(ui, 'payload chunk size: %i' % len(chunk))
897 yield _pack(_fpayloadsize, len(chunk))
939 yield _pack(_fpayloadsize, len(chunk))
898 yield chunk
940 yield chunk
899 except GeneratorExit:
941 except GeneratorExit:
900 # GeneratorExit means that nobody is listening for our
942 # GeneratorExit means that nobody is listening for our
901 # results anyway, so just bail quickly rather than trying
943 # results anyway, so just bail quickly rather than trying
902 # to produce an error part.
944 # to produce an error part.
903 ui.debug('bundle2-generatorexit\n')
945 ui.debug('bundle2-generatorexit\n')
904 raise
946 raise
905 except BaseException as exc:
947 except BaseException as exc:
906 # backup exception data for later
948 # backup exception data for later
907 ui.debug('bundle2-input-stream-interrupt: encoding exception %s'
949 ui.debug('bundle2-input-stream-interrupt: encoding exception %s'
908 % exc)
950 % exc)
909 exc_info = sys.exc_info()
951 exc_info = sys.exc_info()
910 msg = 'unexpected error: %s' % exc
952 msg = 'unexpected error: %s' % exc
911 interpart = bundlepart('error:abort', [('message', msg)],
953 interpart = bundlepart('error:abort', [('message', msg)],
912 mandatory=False)
954 mandatory=False)
913 interpart.id = 0
955 interpart.id = 0
914 yield _pack(_fpayloadsize, -1)
956 yield _pack(_fpayloadsize, -1)
915 for chunk in interpart.getchunks(ui=ui):
957 for chunk in interpart.getchunks(ui=ui):
916 yield chunk
958 yield chunk
917 outdebug(ui, 'closing payload chunk')
959 outdebug(ui, 'closing payload chunk')
918 # abort current part payload
960 # abort current part payload
919 yield _pack(_fpayloadsize, 0)
961 yield _pack(_fpayloadsize, 0)
920 raise exc_info[0], exc_info[1], exc_info[2]
962 raise exc_info[0], exc_info[1], exc_info[2]
921 # end of payload
963 # end of payload
922 outdebug(ui, 'closing payload chunk')
964 outdebug(ui, 'closing payload chunk')
923 yield _pack(_fpayloadsize, 0)
965 yield _pack(_fpayloadsize, 0)
924 self._generated = True
966 self._generated = True
925
967
926 def _payloadchunks(self):
968 def _payloadchunks(self):
927 """yield chunks of a the part payload
969 """yield chunks of a the part payload
928
970
929 Exists to handle the different methods to provide data to a part."""
971 Exists to handle the different methods to provide data to a part."""
930 # we only support fixed size data now.
972 # we only support fixed size data now.
931 # This will be improved in the future.
973 # This will be improved in the future.
932 if util.safehasattr(self.data, 'next'):
974 if util.safehasattr(self.data, 'next'):
933 buff = util.chunkbuffer(self.data)
975 buff = util.chunkbuffer(self.data)
934 chunk = buff.read(preferedchunksize)
976 chunk = buff.read(preferedchunksize)
935 while chunk:
977 while chunk:
936 yield chunk
978 yield chunk
937 chunk = buff.read(preferedchunksize)
979 chunk = buff.read(preferedchunksize)
938 elif len(self.data):
980 elif len(self.data):
939 yield self.data
981 yield self.data
940
982
941
983
942 flaginterrupt = -1
984 flaginterrupt = -1
943
985
944 class interrupthandler(unpackermixin):
986 class interrupthandler(unpackermixin):
945 """read one part and process it with restricted capability
987 """read one part and process it with restricted capability
946
988
947 This allows to transmit exception raised on the producer size during part
989 This allows to transmit exception raised on the producer size during part
948 iteration while the consumer is reading a part.
990 iteration while the consumer is reading a part.
949
991
950 Part processed in this manner only have access to a ui object,"""
992 Part processed in this manner only have access to a ui object,"""
951
993
952 def __init__(self, ui, fp):
994 def __init__(self, ui, fp):
953 super(interrupthandler, self).__init__(fp)
995 super(interrupthandler, self).__init__(fp)
954 self.ui = ui
996 self.ui = ui
955
997
956 def _readpartheader(self):
998 def _readpartheader(self):
957 """reads a part header size and return the bytes blob
999 """reads a part header size and return the bytes blob
958
1000
959 returns None if empty"""
1001 returns None if empty"""
960 headersize = self._unpack(_fpartheadersize)[0]
1002 headersize = self._unpack(_fpartheadersize)[0]
961 if headersize < 0:
1003 if headersize < 0:
962 raise error.BundleValueError('negative part header size: %i'
1004 raise error.BundleValueError('negative part header size: %i'
963 % headersize)
1005 % headersize)
964 indebug(self.ui, 'part header size: %i\n' % headersize)
1006 indebug(self.ui, 'part header size: %i\n' % headersize)
965 if headersize:
1007 if headersize:
966 return self._readexact(headersize)
1008 return self._readexact(headersize)
967 return None
1009 return None
968
1010
969 def __call__(self):
1011 def __call__(self):
970
1012
971 self.ui.debug('bundle2-input-stream-interrupt:'
1013 self.ui.debug('bundle2-input-stream-interrupt:'
972 ' opening out of band context\n')
1014 ' opening out of band context\n')
973 indebug(self.ui, 'bundle2 stream interruption, looking for a part.')
1015 indebug(self.ui, 'bundle2 stream interruption, looking for a part.')
974 headerblock = self._readpartheader()
1016 headerblock = self._readpartheader()
975 if headerblock is None:
1017 if headerblock is None:
976 indebug(self.ui, 'no part found during interruption.')
1018 indebug(self.ui, 'no part found during interruption.')
977 return
1019 return
978 part = unbundlepart(self.ui, headerblock, self._fp)
1020 part = unbundlepart(self.ui, headerblock, self._fp)
979 op = interruptoperation(self.ui)
1021 op = interruptoperation(self.ui)
980 _processpart(op, part)
1022 _processpart(op, part)
981 self.ui.debug('bundle2-input-stream-interrupt:'
1023 self.ui.debug('bundle2-input-stream-interrupt:'
982 ' closing out of band context\n')
1024 ' closing out of band context\n')
983
1025
984 class interruptoperation(object):
1026 class interruptoperation(object):
985 """A limited operation to be use by part handler during interruption
1027 """A limited operation to be use by part handler during interruption
986
1028
987 It only have access to an ui object.
1029 It only have access to an ui object.
988 """
1030 """
989
1031
990 def __init__(self, ui):
1032 def __init__(self, ui):
991 self.ui = ui
1033 self.ui = ui
992 self.reply = None
1034 self.reply = None
993 self.captureoutput = False
1035 self.captureoutput = False
994
1036
995 @property
1037 @property
996 def repo(self):
1038 def repo(self):
997 raise RuntimeError('no repo access from stream interruption')
1039 raise RuntimeError('no repo access from stream interruption')
998
1040
999 def gettransaction(self):
1041 def gettransaction(self):
1000 raise TransactionUnavailable('no repo access from stream interruption')
1042 raise TransactionUnavailable('no repo access from stream interruption')
1001
1043
1002 class unbundlepart(unpackermixin):
1044 class unbundlepart(unpackermixin):
1003 """a bundle part read from a bundle"""
1045 """a bundle part read from a bundle"""
1004
1046
1005 def __init__(self, ui, header, fp):
1047 def __init__(self, ui, header, fp):
1006 super(unbundlepart, self).__init__(fp)
1048 super(unbundlepart, self).__init__(fp)
1007 self.ui = ui
1049 self.ui = ui
1008 # unbundle state attr
1050 # unbundle state attr
1009 self._headerdata = header
1051 self._headerdata = header
1010 self._headeroffset = 0
1052 self._headeroffset = 0
1011 self._initialized = False
1053 self._initialized = False
1012 self.consumed = False
1054 self.consumed = False
1013 # part data
1055 # part data
1014 self.id = None
1056 self.id = None
1015 self.type = None
1057 self.type = None
1016 self.mandatoryparams = None
1058 self.mandatoryparams = None
1017 self.advisoryparams = None
1059 self.advisoryparams = None
1018 self.params = None
1060 self.params = None
1019 self.mandatorykeys = ()
1061 self.mandatorykeys = ()
1020 self._payloadstream = None
1062 self._payloadstream = None
1021 self._readheader()
1063 self._readheader()
1022 self._mandatory = None
1064 self._mandatory = None
1023 self._chunkindex = [] #(payload, file) position tuples for chunk starts
1065 self._chunkindex = [] #(payload, file) position tuples for chunk starts
1024 self._pos = 0
1066 self._pos = 0
1025
1067
1026 def _fromheader(self, size):
1068 def _fromheader(self, size):
1027 """return the next <size> byte from the header"""
1069 """return the next <size> byte from the header"""
1028 offset = self._headeroffset
1070 offset = self._headeroffset
1029 data = self._headerdata[offset:(offset + size)]
1071 data = self._headerdata[offset:(offset + size)]
1030 self._headeroffset = offset + size
1072 self._headeroffset = offset + size
1031 return data
1073 return data
1032
1074
1033 def _unpackheader(self, format):
1075 def _unpackheader(self, format):
1034 """read given format from header
1076 """read given format from header
1035
1077
1036 This automatically compute the size of the format to read."""
1078 This automatically compute the size of the format to read."""
1037 data = self._fromheader(struct.calcsize(format))
1079 data = self._fromheader(struct.calcsize(format))
1038 return _unpack(format, data)
1080 return _unpack(format, data)
1039
1081
1040 def _initparams(self, mandatoryparams, advisoryparams):
1082 def _initparams(self, mandatoryparams, advisoryparams):
1041 """internal function to setup all logic related parameters"""
1083 """internal function to setup all logic related parameters"""
1042 # make it read only to prevent people touching it by mistake.
1084 # make it read only to prevent people touching it by mistake.
1043 self.mandatoryparams = tuple(mandatoryparams)
1085 self.mandatoryparams = tuple(mandatoryparams)
1044 self.advisoryparams = tuple(advisoryparams)
1086 self.advisoryparams = tuple(advisoryparams)
1045 # user friendly UI
1087 # user friendly UI
1046 self.params = dict(self.mandatoryparams)
1088 self.params = dict(self.mandatoryparams)
1047 self.params.update(dict(self.advisoryparams))
1089 self.params.update(dict(self.advisoryparams))
1048 self.mandatorykeys = frozenset(p[0] for p in mandatoryparams)
1090 self.mandatorykeys = frozenset(p[0] for p in mandatoryparams)
1049
1091
1050 def _payloadchunks(self, chunknum=0):
1092 def _payloadchunks(self, chunknum=0):
1051 '''seek to specified chunk and start yielding data'''
1093 '''seek to specified chunk and start yielding data'''
1052 if len(self._chunkindex) == 0:
1094 if len(self._chunkindex) == 0:
1053 assert chunknum == 0, 'Must start with chunk 0'
1095 assert chunknum == 0, 'Must start with chunk 0'
1054 self._chunkindex.append((0, super(unbundlepart, self).tell()))
1096 self._chunkindex.append((0, super(unbundlepart, self).tell()))
1055 else:
1097 else:
1056 assert chunknum < len(self._chunkindex), \
1098 assert chunknum < len(self._chunkindex), \
1057 'Unknown chunk %d' % chunknum
1099 'Unknown chunk %d' % chunknum
1058 super(unbundlepart, self).seek(self._chunkindex[chunknum][1])
1100 super(unbundlepart, self).seek(self._chunkindex[chunknum][1])
1059
1101
1060 pos = self._chunkindex[chunknum][0]
1102 pos = self._chunkindex[chunknum][0]
1061 payloadsize = self._unpack(_fpayloadsize)[0]
1103 payloadsize = self._unpack(_fpayloadsize)[0]
1062 indebug(self.ui, 'payload chunk size: %i' % payloadsize)
1104 indebug(self.ui, 'payload chunk size: %i' % payloadsize)
1063 while payloadsize:
1105 while payloadsize:
1064 if payloadsize == flaginterrupt:
1106 if payloadsize == flaginterrupt:
1065 # interruption detection, the handler will now read a
1107 # interruption detection, the handler will now read a
1066 # single part and process it.
1108 # single part and process it.
1067 interrupthandler(self.ui, self._fp)()
1109 interrupthandler(self.ui, self._fp)()
1068 elif payloadsize < 0:
1110 elif payloadsize < 0:
1069 msg = 'negative payload chunk size: %i' % payloadsize
1111 msg = 'negative payload chunk size: %i' % payloadsize
1070 raise error.BundleValueError(msg)
1112 raise error.BundleValueError(msg)
1071 else:
1113 else:
1072 result = self._readexact(payloadsize)
1114 result = self._readexact(payloadsize)
1073 chunknum += 1
1115 chunknum += 1
1074 pos += payloadsize
1116 pos += payloadsize
1075 if chunknum == len(self._chunkindex):
1117 if chunknum == len(self._chunkindex):
1076 self._chunkindex.append((pos,
1118 self._chunkindex.append((pos,
1077 super(unbundlepart, self).tell()))
1119 super(unbundlepart, self).tell()))
1078 yield result
1120 yield result
1079 payloadsize = self._unpack(_fpayloadsize)[0]
1121 payloadsize = self._unpack(_fpayloadsize)[0]
1080 indebug(self.ui, 'payload chunk size: %i' % payloadsize)
1122 indebug(self.ui, 'payload chunk size: %i' % payloadsize)
1081
1123
1082 def _findchunk(self, pos):
1124 def _findchunk(self, pos):
1083 '''for a given payload position, return a chunk number and offset'''
1125 '''for a given payload position, return a chunk number and offset'''
1084 for chunk, (ppos, fpos) in enumerate(self._chunkindex):
1126 for chunk, (ppos, fpos) in enumerate(self._chunkindex):
1085 if ppos == pos:
1127 if ppos == pos:
1086 return chunk, 0
1128 return chunk, 0
1087 elif ppos > pos:
1129 elif ppos > pos:
1088 return chunk - 1, pos - self._chunkindex[chunk - 1][0]
1130 return chunk - 1, pos - self._chunkindex[chunk - 1][0]
1089 raise ValueError('Unknown chunk')
1131 raise ValueError('Unknown chunk')
1090
1132
1091 def _readheader(self):
1133 def _readheader(self):
1092 """read the header and setup the object"""
1134 """read the header and setup the object"""
1093 typesize = self._unpackheader(_fparttypesize)[0]
1135 typesize = self._unpackheader(_fparttypesize)[0]
1094 self.type = self._fromheader(typesize)
1136 self.type = self._fromheader(typesize)
1095 indebug(self.ui, 'part type: "%s"' % self.type)
1137 indebug(self.ui, 'part type: "%s"' % self.type)
1096 self.id = self._unpackheader(_fpartid)[0]
1138 self.id = self._unpackheader(_fpartid)[0]
1097 indebug(self.ui, 'part id: "%s"' % self.id)
1139 indebug(self.ui, 'part id: "%s"' % self.id)
1098 # extract mandatory bit from type
1140 # extract mandatory bit from type
1099 self.mandatory = (self.type != self.type.lower())
1141 self.mandatory = (self.type != self.type.lower())
1100 self.type = self.type.lower()
1142 self.type = self.type.lower()
1101 ## reading parameters
1143 ## reading parameters
1102 # param count
1144 # param count
1103 mancount, advcount = self._unpackheader(_fpartparamcount)
1145 mancount, advcount = self._unpackheader(_fpartparamcount)
1104 indebug(self.ui, 'part parameters: %i' % (mancount + advcount))
1146 indebug(self.ui, 'part parameters: %i' % (mancount + advcount))
1105 # param size
1147 # param size
1106 fparamsizes = _makefpartparamsizes(mancount + advcount)
1148 fparamsizes = _makefpartparamsizes(mancount + advcount)
1107 paramsizes = self._unpackheader(fparamsizes)
1149 paramsizes = self._unpackheader(fparamsizes)
1108 # make it a list of couple again
1150 # make it a list of couple again
1109 paramsizes = zip(paramsizes[::2], paramsizes[1::2])
1151 paramsizes = zip(paramsizes[::2], paramsizes[1::2])
1110 # split mandatory from advisory
1152 # split mandatory from advisory
1111 mansizes = paramsizes[:mancount]
1153 mansizes = paramsizes[:mancount]
1112 advsizes = paramsizes[mancount:]
1154 advsizes = paramsizes[mancount:]
1113 # retrieve param value
1155 # retrieve param value
1114 manparams = []
1156 manparams = []
1115 for key, value in mansizes:
1157 for key, value in mansizes:
1116 manparams.append((self._fromheader(key), self._fromheader(value)))
1158 manparams.append((self._fromheader(key), self._fromheader(value)))
1117 advparams = []
1159 advparams = []
1118 for key, value in advsizes:
1160 for key, value in advsizes:
1119 advparams.append((self._fromheader(key), self._fromheader(value)))
1161 advparams.append((self._fromheader(key), self._fromheader(value)))
1120 self._initparams(manparams, advparams)
1162 self._initparams(manparams, advparams)
1121 ## part payload
1163 ## part payload
1122 self._payloadstream = util.chunkbuffer(self._payloadchunks())
1164 self._payloadstream = util.chunkbuffer(self._payloadchunks())
1123 # we read the data, tell it
1165 # we read the data, tell it
1124 self._initialized = True
1166 self._initialized = True
1125
1167
1126 def read(self, size=None):
1168 def read(self, size=None):
1127 """read payload data"""
1169 """read payload data"""
1128 if not self._initialized:
1170 if not self._initialized:
1129 self._readheader()
1171 self._readheader()
1130 if size is None:
1172 if size is None:
1131 data = self._payloadstream.read()
1173 data = self._payloadstream.read()
1132 else:
1174 else:
1133 data = self._payloadstream.read(size)
1175 data = self._payloadstream.read(size)
1134 self._pos += len(data)
1176 self._pos += len(data)
1135 if size is None or len(data) < size:
1177 if size is None or len(data) < size:
1136 if not self.consumed and self._pos:
1178 if not self.consumed and self._pos:
1137 self.ui.debug('bundle2-input-part: total payload size %i\n'
1179 self.ui.debug('bundle2-input-part: total payload size %i\n'
1138 % self._pos)
1180 % self._pos)
1139 self.consumed = True
1181 self.consumed = True
1140 return data
1182 return data
1141
1183
1142 def tell(self):
1184 def tell(self):
1143 return self._pos
1185 return self._pos
1144
1186
1145 def seek(self, offset, whence=0):
1187 def seek(self, offset, whence=0):
1146 if whence == 0:
1188 if whence == 0:
1147 newpos = offset
1189 newpos = offset
1148 elif whence == 1:
1190 elif whence == 1:
1149 newpos = self._pos + offset
1191 newpos = self._pos + offset
1150 elif whence == 2:
1192 elif whence == 2:
1151 if not self.consumed:
1193 if not self.consumed:
1152 self.read()
1194 self.read()
1153 newpos = self._chunkindex[-1][0] - offset
1195 newpos = self._chunkindex[-1][0] - offset
1154 else:
1196 else:
1155 raise ValueError('Unknown whence value: %r' % (whence,))
1197 raise ValueError('Unknown whence value: %r' % (whence,))
1156
1198
1157 if newpos > self._chunkindex[-1][0] and not self.consumed:
1199 if newpos > self._chunkindex[-1][0] and not self.consumed:
1158 self.read()
1200 self.read()
1159 if not 0 <= newpos <= self._chunkindex[-1][0]:
1201 if not 0 <= newpos <= self._chunkindex[-1][0]:
1160 raise ValueError('Offset out of range')
1202 raise ValueError('Offset out of range')
1161
1203
1162 if self._pos != newpos:
1204 if self._pos != newpos:
1163 chunk, internaloffset = self._findchunk(newpos)
1205 chunk, internaloffset = self._findchunk(newpos)
1164 self._payloadstream = util.chunkbuffer(self._payloadchunks(chunk))
1206 self._payloadstream = util.chunkbuffer(self._payloadchunks(chunk))
1165 adjust = self.read(internaloffset)
1207 adjust = self.read(internaloffset)
1166 if len(adjust) != internaloffset:
1208 if len(adjust) != internaloffset:
1167 raise util.Abort(_('Seek failed\n'))
1209 raise util.Abort(_('Seek failed\n'))
1168 self._pos = newpos
1210 self._pos = newpos
1169
1211
1170 # These are only the static capabilities.
1212 # These are only the static capabilities.
1171 # Check the 'getrepocaps' function for the rest.
1213 # Check the 'getrepocaps' function for the rest.
1172 capabilities = {'HG20': (),
1214 capabilities = {'HG20': (),
1173 'error': ('abort', 'unsupportedcontent', 'pushraced',
1215 'error': ('abort', 'unsupportedcontent', 'pushraced',
1174 'pushkey'),
1216 'pushkey'),
1175 'listkeys': (),
1217 'listkeys': (),
1176 'pushkey': (),
1218 'pushkey': (),
1177 'digests': tuple(sorted(util.DIGESTS.keys())),
1219 'digests': tuple(sorted(util.DIGESTS.keys())),
1178 'remote-changegroup': ('http', 'https'),
1220 'remote-changegroup': ('http', 'https'),
1179 'hgtagsfnodes': (),
1221 'hgtagsfnodes': (),
1180 }
1222 }
1181
1223
1182 def getrepocaps(repo, allowpushback=False):
1224 def getrepocaps(repo, allowpushback=False):
1183 """return the bundle2 capabilities for a given repo
1225 """return the bundle2 capabilities for a given repo
1184
1226
1185 Exists to allow extensions (like evolution) to mutate the capabilities.
1227 Exists to allow extensions (like evolution) to mutate the capabilities.
1186 """
1228 """
1187 caps = capabilities.copy()
1229 caps = capabilities.copy()
1188 caps['changegroup'] = tuple(sorted(changegroup.packermap.keys()))
1230 caps['changegroup'] = tuple(sorted(changegroup.packermap.keys()))
1189 if obsolete.isenabled(repo, obsolete.exchangeopt):
1231 if obsolete.isenabled(repo, obsolete.exchangeopt):
1190 supportedformat = tuple('V%i' % v for v in obsolete.formats)
1232 supportedformat = tuple('V%i' % v for v in obsolete.formats)
1191 caps['obsmarkers'] = supportedformat
1233 caps['obsmarkers'] = supportedformat
1192 if allowpushback:
1234 if allowpushback:
1193 caps['pushback'] = ()
1235 caps['pushback'] = ()
1194 return caps
1236 return caps
1195
1237
1196 def bundle2caps(remote):
1238 def bundle2caps(remote):
1197 """return the bundle capabilities of a peer as dict"""
1239 """return the bundle capabilities of a peer as dict"""
1198 raw = remote.capable('bundle2')
1240 raw = remote.capable('bundle2')
1199 if not raw and raw != '':
1241 if not raw and raw != '':
1200 return {}
1242 return {}
1201 capsblob = urllib.unquote(remote.capable('bundle2'))
1243 capsblob = urllib.unquote(remote.capable('bundle2'))
1202 return decodecaps(capsblob)
1244 return decodecaps(capsblob)
1203
1245
1204 def obsmarkersversion(caps):
1246 def obsmarkersversion(caps):
1205 """extract the list of supported obsmarkers versions from a bundle2caps dict
1247 """extract the list of supported obsmarkers versions from a bundle2caps dict
1206 """
1248 """
1207 obscaps = caps.get('obsmarkers', ())
1249 obscaps = caps.get('obsmarkers', ())
1208 return [int(c[1:]) for c in obscaps if c.startswith('V')]
1250 return [int(c[1:]) for c in obscaps if c.startswith('V')]
1209
1251
1210 @parthandler('changegroup', ('version', 'nbchanges'))
1252 @parthandler('changegroup', ('version', 'nbchanges'))
1211 def handlechangegroup(op, inpart):
1253 def handlechangegroup(op, inpart):
1212 """apply a changegroup part on the repo
1254 """apply a changegroup part on the repo
1213
1255
1214 This is a very early implementation that will massive rework before being
1256 This is a very early implementation that will massive rework before being
1215 inflicted to any end-user.
1257 inflicted to any end-user.
1216 """
1258 """
1217 # Make sure we trigger a transaction creation
1259 # Make sure we trigger a transaction creation
1218 #
1260 #
1219 # The addchangegroup function will get a transaction object by itself, but
1261 # The addchangegroup function will get a transaction object by itself, but
1220 # we need to make sure we trigger the creation of a transaction object used
1262 # we need to make sure we trigger the creation of a transaction object used
1221 # for the whole processing scope.
1263 # for the whole processing scope.
1222 op.gettransaction()
1264 op.gettransaction()
1223 unpackerversion = inpart.params.get('version', '01')
1265 unpackerversion = inpart.params.get('version', '01')
1224 # We should raise an appropriate exception here
1266 # We should raise an appropriate exception here
1225 unpacker = changegroup.packermap[unpackerversion][1]
1267 unpacker = changegroup.packermap[unpackerversion][1]
1226 cg = unpacker(inpart, None)
1268 cg = unpacker(inpart, None)
1227 # the source and url passed here are overwritten by the one contained in
1269 # the source and url passed here are overwritten by the one contained in
1228 # the transaction.hookargs argument. So 'bundle2' is a placeholder
1270 # the transaction.hookargs argument. So 'bundle2' is a placeholder
1229 nbchangesets = None
1271 nbchangesets = None
1230 if 'nbchanges' in inpart.params:
1272 if 'nbchanges' in inpart.params:
1231 nbchangesets = int(inpart.params.get('nbchanges'))
1273 nbchangesets = int(inpart.params.get('nbchanges'))
1232 ret = changegroup.addchangegroup(op.repo, cg, 'bundle2', 'bundle2',
1274 ret = changegroup.addchangegroup(op.repo, cg, 'bundle2', 'bundle2',
1233 expectedtotal=nbchangesets)
1275 expectedtotal=nbchangesets)
1234 op.records.add('changegroup', {'return': ret})
1276 op.records.add('changegroup', {'return': ret})
1235 if op.reply is not None:
1277 if op.reply is not None:
1236 # This is definitely not the final form of this
1278 # This is definitely not the final form of this
1237 # return. But one need to start somewhere.
1279 # return. But one need to start somewhere.
1238 part = op.reply.newpart('reply:changegroup', mandatory=False)
1280 part = op.reply.newpart('reply:changegroup', mandatory=False)
1239 part.addparam('in-reply-to', str(inpart.id), mandatory=False)
1281 part.addparam('in-reply-to', str(inpart.id), mandatory=False)
1240 part.addparam('return', '%i' % ret, mandatory=False)
1282 part.addparam('return', '%i' % ret, mandatory=False)
1241 assert not inpart.read()
1283 assert not inpart.read()
1242
1284
1243 _remotechangegroupparams = tuple(['url', 'size', 'digests'] +
1285 _remotechangegroupparams = tuple(['url', 'size', 'digests'] +
1244 ['digest:%s' % k for k in util.DIGESTS.keys()])
1286 ['digest:%s' % k for k in util.DIGESTS.keys()])
1245 @parthandler('remote-changegroup', _remotechangegroupparams)
1287 @parthandler('remote-changegroup', _remotechangegroupparams)
1246 def handleremotechangegroup(op, inpart):
1288 def handleremotechangegroup(op, inpart):
1247 """apply a bundle10 on the repo, given an url and validation information
1289 """apply a bundle10 on the repo, given an url and validation information
1248
1290
1249 All the information about the remote bundle to import are given as
1291 All the information about the remote bundle to import are given as
1250 parameters. The parameters include:
1292 parameters. The parameters include:
1251 - url: the url to the bundle10.
1293 - url: the url to the bundle10.
1252 - size: the bundle10 file size. It is used to validate what was
1294 - size: the bundle10 file size. It is used to validate what was
1253 retrieved by the client matches the server knowledge about the bundle.
1295 retrieved by the client matches the server knowledge about the bundle.
1254 - digests: a space separated list of the digest types provided as
1296 - digests: a space separated list of the digest types provided as
1255 parameters.
1297 parameters.
1256 - digest:<digest-type>: the hexadecimal representation of the digest with
1298 - digest:<digest-type>: the hexadecimal representation of the digest with
1257 that name. Like the size, it is used to validate what was retrieved by
1299 that name. Like the size, it is used to validate what was retrieved by
1258 the client matches what the server knows about the bundle.
1300 the client matches what the server knows about the bundle.
1259
1301
1260 When multiple digest types are given, all of them are checked.
1302 When multiple digest types are given, all of them are checked.
1261 """
1303 """
1262 try:
1304 try:
1263 raw_url = inpart.params['url']
1305 raw_url = inpart.params['url']
1264 except KeyError:
1306 except KeyError:
1265 raise util.Abort(_('remote-changegroup: missing "%s" param') % 'url')
1307 raise util.Abort(_('remote-changegroup: missing "%s" param') % 'url')
1266 parsed_url = util.url(raw_url)
1308 parsed_url = util.url(raw_url)
1267 if parsed_url.scheme not in capabilities['remote-changegroup']:
1309 if parsed_url.scheme not in capabilities['remote-changegroup']:
1268 raise util.Abort(_('remote-changegroup does not support %s urls') %
1310 raise util.Abort(_('remote-changegroup does not support %s urls') %
1269 parsed_url.scheme)
1311 parsed_url.scheme)
1270
1312
1271 try:
1313 try:
1272 size = int(inpart.params['size'])
1314 size = int(inpart.params['size'])
1273 except ValueError:
1315 except ValueError:
1274 raise util.Abort(_('remote-changegroup: invalid value for param "%s"')
1316 raise util.Abort(_('remote-changegroup: invalid value for param "%s"')
1275 % 'size')
1317 % 'size')
1276 except KeyError:
1318 except KeyError:
1277 raise util.Abort(_('remote-changegroup: missing "%s" param') % 'size')
1319 raise util.Abort(_('remote-changegroup: missing "%s" param') % 'size')
1278
1320
1279 digests = {}
1321 digests = {}
1280 for typ in inpart.params.get('digests', '').split():
1322 for typ in inpart.params.get('digests', '').split():
1281 param = 'digest:%s' % typ
1323 param = 'digest:%s' % typ
1282 try:
1324 try:
1283 value = inpart.params[param]
1325 value = inpart.params[param]
1284 except KeyError:
1326 except KeyError:
1285 raise util.Abort(_('remote-changegroup: missing "%s" param') %
1327 raise util.Abort(_('remote-changegroup: missing "%s" param') %
1286 param)
1328 param)
1287 digests[typ] = value
1329 digests[typ] = value
1288
1330
1289 real_part = util.digestchecker(url.open(op.ui, raw_url), size, digests)
1331 real_part = util.digestchecker(url.open(op.ui, raw_url), size, digests)
1290
1332
1291 # Make sure we trigger a transaction creation
1333 # Make sure we trigger a transaction creation
1292 #
1334 #
1293 # The addchangegroup function will get a transaction object by itself, but
1335 # The addchangegroup function will get a transaction object by itself, but
1294 # we need to make sure we trigger the creation of a transaction object used
1336 # we need to make sure we trigger the creation of a transaction object used
1295 # for the whole processing scope.
1337 # for the whole processing scope.
1296 op.gettransaction()
1338 op.gettransaction()
1297 from . import exchange
1339 from . import exchange
1298 cg = exchange.readbundle(op.repo.ui, real_part, raw_url)
1340 cg = exchange.readbundle(op.repo.ui, real_part, raw_url)
1299 if not isinstance(cg, changegroup.cg1unpacker):
1341 if not isinstance(cg, changegroup.cg1unpacker):
1300 raise util.Abort(_('%s: not a bundle version 1.0') %
1342 raise util.Abort(_('%s: not a bundle version 1.0') %
1301 util.hidepassword(raw_url))
1343 util.hidepassword(raw_url))
1302 ret = changegroup.addchangegroup(op.repo, cg, 'bundle2', 'bundle2')
1344 ret = changegroup.addchangegroup(op.repo, cg, 'bundle2', 'bundle2')
1303 op.records.add('changegroup', {'return': ret})
1345 op.records.add('changegroup', {'return': ret})
1304 if op.reply is not None:
1346 if op.reply is not None:
1305 # This is definitely not the final form of this
1347 # This is definitely not the final form of this
1306 # return. But one need to start somewhere.
1348 # return. But one need to start somewhere.
1307 part = op.reply.newpart('reply:changegroup')
1349 part = op.reply.newpart('reply:changegroup')
1308 part.addparam('in-reply-to', str(inpart.id), mandatory=False)
1350 part.addparam('in-reply-to', str(inpart.id), mandatory=False)
1309 part.addparam('return', '%i' % ret, mandatory=False)
1351 part.addparam('return', '%i' % ret, mandatory=False)
1310 try:
1352 try:
1311 real_part.validate()
1353 real_part.validate()
1312 except util.Abort as e:
1354 except util.Abort as e:
1313 raise util.Abort(_('bundle at %s is corrupted:\n%s') %
1355 raise util.Abort(_('bundle at %s is corrupted:\n%s') %
1314 (util.hidepassword(raw_url), str(e)))
1356 (util.hidepassword(raw_url), str(e)))
1315 assert not inpart.read()
1357 assert not inpart.read()
1316
1358
1317 @parthandler('reply:changegroup', ('return', 'in-reply-to'))
1359 @parthandler('reply:changegroup', ('return', 'in-reply-to'))
1318 def handlereplychangegroup(op, inpart):
1360 def handlereplychangegroup(op, inpart):
1319 ret = int(inpart.params['return'])
1361 ret = int(inpart.params['return'])
1320 replyto = int(inpart.params['in-reply-to'])
1362 replyto = int(inpart.params['in-reply-to'])
1321 op.records.add('changegroup', {'return': ret}, replyto)
1363 op.records.add('changegroup', {'return': ret}, replyto)
1322
1364
1323 @parthandler('check:heads')
1365 @parthandler('check:heads')
1324 def handlecheckheads(op, inpart):
1366 def handlecheckheads(op, inpart):
1325 """check that head of the repo did not change
1367 """check that head of the repo did not change
1326
1368
1327 This is used to detect a push race when using unbundle.
1369 This is used to detect a push race when using unbundle.
1328 This replaces the "heads" argument of unbundle."""
1370 This replaces the "heads" argument of unbundle."""
1329 h = inpart.read(20)
1371 h = inpart.read(20)
1330 heads = []
1372 heads = []
1331 while len(h) == 20:
1373 while len(h) == 20:
1332 heads.append(h)
1374 heads.append(h)
1333 h = inpart.read(20)
1375 h = inpart.read(20)
1334 assert not h
1376 assert not h
1335 if heads != op.repo.heads():
1377 if heads != op.repo.heads():
1336 raise error.PushRaced('repository changed while pushing - '
1378 raise error.PushRaced('repository changed while pushing - '
1337 'please try again')
1379 'please try again')
1338
1380
1339 @parthandler('output')
1381 @parthandler('output')
1340 def handleoutput(op, inpart):
1382 def handleoutput(op, inpart):
1341 """forward output captured on the server to the client"""
1383 """forward output captured on the server to the client"""
1342 for line in inpart.read().splitlines():
1384 for line in inpart.read().splitlines():
1343 op.ui.status(('remote: %s\n' % line))
1385 op.ui.status(('remote: %s\n' % line))
1344
1386
1345 @parthandler('replycaps')
1387 @parthandler('replycaps')
1346 def handlereplycaps(op, inpart):
1388 def handlereplycaps(op, inpart):
1347 """Notify that a reply bundle should be created
1389 """Notify that a reply bundle should be created
1348
1390
1349 The payload contains the capabilities information for the reply"""
1391 The payload contains the capabilities information for the reply"""
1350 caps = decodecaps(inpart.read())
1392 caps = decodecaps(inpart.read())
1351 if op.reply is None:
1393 if op.reply is None:
1352 op.reply = bundle20(op.ui, caps)
1394 op.reply = bundle20(op.ui, caps)
1353
1395
1354 @parthandler('error:abort', ('message', 'hint'))
1396 @parthandler('error:abort', ('message', 'hint'))
1355 def handleerrorabort(op, inpart):
1397 def handleerrorabort(op, inpart):
1356 """Used to transmit abort error over the wire"""
1398 """Used to transmit abort error over the wire"""
1357 raise util.Abort(inpart.params['message'], hint=inpart.params.get('hint'))
1399 raise util.Abort(inpart.params['message'], hint=inpart.params.get('hint'))
1358
1400
1359 @parthandler('error:pushkey', ('namespace', 'key', 'new', 'old', 'ret',
1401 @parthandler('error:pushkey', ('namespace', 'key', 'new', 'old', 'ret',
1360 'in-reply-to'))
1402 'in-reply-to'))
1361 def handleerrorpushkey(op, inpart):
1403 def handleerrorpushkey(op, inpart):
1362 """Used to transmit failure of a mandatory pushkey over the wire"""
1404 """Used to transmit failure of a mandatory pushkey over the wire"""
1363 kwargs = {}
1405 kwargs = {}
1364 for name in ('namespace', 'key', 'new', 'old', 'ret'):
1406 for name in ('namespace', 'key', 'new', 'old', 'ret'):
1365 value = inpart.params.get(name)
1407 value = inpart.params.get(name)
1366 if value is not None:
1408 if value is not None:
1367 kwargs[name] = value
1409 kwargs[name] = value
1368 raise error.PushkeyFailed(inpart.params['in-reply-to'], **kwargs)
1410 raise error.PushkeyFailed(inpart.params['in-reply-to'], **kwargs)
1369
1411
1370 @parthandler('error:unsupportedcontent', ('parttype', 'params'))
1412 @parthandler('error:unsupportedcontent', ('parttype', 'params'))
1371 def handleerrorunsupportedcontent(op, inpart):
1413 def handleerrorunsupportedcontent(op, inpart):
1372 """Used to transmit unknown content error over the wire"""
1414 """Used to transmit unknown content error over the wire"""
1373 kwargs = {}
1415 kwargs = {}
1374 parttype = inpart.params.get('parttype')
1416 parttype = inpart.params.get('parttype')
1375 if parttype is not None:
1417 if parttype is not None:
1376 kwargs['parttype'] = parttype
1418 kwargs['parttype'] = parttype
1377 params = inpart.params.get('params')
1419 params = inpart.params.get('params')
1378 if params is not None:
1420 if params is not None:
1379 kwargs['params'] = params.split('\0')
1421 kwargs['params'] = params.split('\0')
1380
1422
1381 raise error.BundleUnknownFeatureError(**kwargs)
1423 raise error.BundleUnknownFeatureError(**kwargs)
1382
1424
1383 @parthandler('error:pushraced', ('message',))
1425 @parthandler('error:pushraced', ('message',))
1384 def handleerrorpushraced(op, inpart):
1426 def handleerrorpushraced(op, inpart):
1385 """Used to transmit push race error over the wire"""
1427 """Used to transmit push race error over the wire"""
1386 raise error.ResponseError(_('push failed:'), inpart.params['message'])
1428 raise error.ResponseError(_('push failed:'), inpart.params['message'])
1387
1429
1388 @parthandler('listkeys', ('namespace',))
1430 @parthandler('listkeys', ('namespace',))
1389 def handlelistkeys(op, inpart):
1431 def handlelistkeys(op, inpart):
1390 """retrieve pushkey namespace content stored in a bundle2"""
1432 """retrieve pushkey namespace content stored in a bundle2"""
1391 namespace = inpart.params['namespace']
1433 namespace = inpart.params['namespace']
1392 r = pushkey.decodekeys(inpart.read())
1434 r = pushkey.decodekeys(inpart.read())
1393 op.records.add('listkeys', (namespace, r))
1435 op.records.add('listkeys', (namespace, r))
1394
1436
1395 @parthandler('pushkey', ('namespace', 'key', 'old', 'new'))
1437 @parthandler('pushkey', ('namespace', 'key', 'old', 'new'))
1396 def handlepushkey(op, inpart):
1438 def handlepushkey(op, inpart):
1397 """process a pushkey request"""
1439 """process a pushkey request"""
1398 dec = pushkey.decode
1440 dec = pushkey.decode
1399 namespace = dec(inpart.params['namespace'])
1441 namespace = dec(inpart.params['namespace'])
1400 key = dec(inpart.params['key'])
1442 key = dec(inpart.params['key'])
1401 old = dec(inpart.params['old'])
1443 old = dec(inpart.params['old'])
1402 new = dec(inpart.params['new'])
1444 new = dec(inpart.params['new'])
1403 ret = op.repo.pushkey(namespace, key, old, new)
1445 ret = op.repo.pushkey(namespace, key, old, new)
1404 record = {'namespace': namespace,
1446 record = {'namespace': namespace,
1405 'key': key,
1447 'key': key,
1406 'old': old,
1448 'old': old,
1407 'new': new}
1449 'new': new}
1408 op.records.add('pushkey', record)
1450 op.records.add('pushkey', record)
1409 if op.reply is not None:
1451 if op.reply is not None:
1410 rpart = op.reply.newpart('reply:pushkey')
1452 rpart = op.reply.newpart('reply:pushkey')
1411 rpart.addparam('in-reply-to', str(inpart.id), mandatory=False)
1453 rpart.addparam('in-reply-to', str(inpart.id), mandatory=False)
1412 rpart.addparam('return', '%i' % ret, mandatory=False)
1454 rpart.addparam('return', '%i' % ret, mandatory=False)
1413 if inpart.mandatory and not ret:
1455 if inpart.mandatory and not ret:
1414 kwargs = {}
1456 kwargs = {}
1415 for key in ('namespace', 'key', 'new', 'old', 'ret'):
1457 for key in ('namespace', 'key', 'new', 'old', 'ret'):
1416 if key in inpart.params:
1458 if key in inpart.params:
1417 kwargs[key] = inpart.params[key]
1459 kwargs[key] = inpart.params[key]
1418 raise error.PushkeyFailed(partid=str(inpart.id), **kwargs)
1460 raise error.PushkeyFailed(partid=str(inpart.id), **kwargs)
1419
1461
1420 @parthandler('reply:pushkey', ('return', 'in-reply-to'))
1462 @parthandler('reply:pushkey', ('return', 'in-reply-to'))
1421 def handlepushkeyreply(op, inpart):
1463 def handlepushkeyreply(op, inpart):
1422 """retrieve the result of a pushkey request"""
1464 """retrieve the result of a pushkey request"""
1423 ret = int(inpart.params['return'])
1465 ret = int(inpart.params['return'])
1424 partid = int(inpart.params['in-reply-to'])
1466 partid = int(inpart.params['in-reply-to'])
1425 op.records.add('pushkey', {'return': ret}, partid)
1467 op.records.add('pushkey', {'return': ret}, partid)
1426
1468
1427 @parthandler('obsmarkers')
1469 @parthandler('obsmarkers')
1428 def handleobsmarker(op, inpart):
1470 def handleobsmarker(op, inpart):
1429 """add a stream of obsmarkers to the repo"""
1471 """add a stream of obsmarkers to the repo"""
1430 tr = op.gettransaction()
1472 tr = op.gettransaction()
1431 markerdata = inpart.read()
1473 markerdata = inpart.read()
1432 if op.ui.config('experimental', 'obsmarkers-exchange-debug', False):
1474 if op.ui.config('experimental', 'obsmarkers-exchange-debug', False):
1433 op.ui.write(('obsmarker-exchange: %i bytes received\n')
1475 op.ui.write(('obsmarker-exchange: %i bytes received\n')
1434 % len(markerdata))
1476 % len(markerdata))
1435 new = op.repo.obsstore.mergemarkers(tr, markerdata)
1477 new = op.repo.obsstore.mergemarkers(tr, markerdata)
1436 if new:
1478 if new:
1437 op.repo.ui.status(_('%i new obsolescence markers\n') % new)
1479 op.repo.ui.status(_('%i new obsolescence markers\n') % new)
1438 op.records.add('obsmarkers', {'new': new})
1480 op.records.add('obsmarkers', {'new': new})
1439 if op.reply is not None:
1481 if op.reply is not None:
1440 rpart = op.reply.newpart('reply:obsmarkers')
1482 rpart = op.reply.newpart('reply:obsmarkers')
1441 rpart.addparam('in-reply-to', str(inpart.id), mandatory=False)
1483 rpart.addparam('in-reply-to', str(inpart.id), mandatory=False)
1442 rpart.addparam('new', '%i' % new, mandatory=False)
1484 rpart.addparam('new', '%i' % new, mandatory=False)
1443
1485
1444
1486
1445 @parthandler('reply:obsmarkers', ('new', 'in-reply-to'))
1487 @parthandler('reply:obsmarkers', ('new', 'in-reply-to'))
1446 def handleobsmarkerreply(op, inpart):
1488 def handleobsmarkerreply(op, inpart):
1447 """retrieve the result of a pushkey request"""
1489 """retrieve the result of a pushkey request"""
1448 ret = int(inpart.params['new'])
1490 ret = int(inpart.params['new'])
1449 partid = int(inpart.params['in-reply-to'])
1491 partid = int(inpart.params['in-reply-to'])
1450 op.records.add('obsmarkers', {'new': ret}, partid)
1492 op.records.add('obsmarkers', {'new': ret}, partid)
1451
1493
1452 @parthandler('hgtagsfnodes')
1494 @parthandler('hgtagsfnodes')
1453 def handlehgtagsfnodes(op, inpart):
1495 def handlehgtagsfnodes(op, inpart):
1454 """Applies .hgtags fnodes cache entries to the local repo.
1496 """Applies .hgtags fnodes cache entries to the local repo.
1455
1497
1456 Payload is pairs of 20 byte changeset nodes and filenodes.
1498 Payload is pairs of 20 byte changeset nodes and filenodes.
1457 """
1499 """
1458 cache = tags.hgtagsfnodescache(op.repo.unfiltered())
1500 cache = tags.hgtagsfnodescache(op.repo.unfiltered())
1459
1501
1460 count = 0
1502 count = 0
1461 while True:
1503 while True:
1462 node = inpart.read(20)
1504 node = inpart.read(20)
1463 fnode = inpart.read(20)
1505 fnode = inpart.read(20)
1464 if len(node) < 20 or len(fnode) < 20:
1506 if len(node) < 20 or len(fnode) < 20:
1465 op.ui.debug('ignoring incomplete received .hgtags fnodes data\n')
1507 op.ui.debug('ignoring incomplete received .hgtags fnodes data\n')
1466 break
1508 break
1467 cache.setfnode(node, fnode)
1509 cache.setfnode(node, fnode)
1468 count += 1
1510 count += 1
1469
1511
1470 cache.write()
1512 cache.write()
1471 op.ui.debug('applied %i hgtags fnodes cache entries\n' % count)
1513 op.ui.debug('applied %i hgtags fnodes cache entries\n' % count)
General Comments 0
You need to be logged in to leave comments. Login now