##// END OF EJS Templates
safehasattr: pass attribute name as string instead of bytes...
marmoute -
r51509:7200a9d4 default
parent child Browse files
Show More
@@ -1,2669 +1,2669 b''
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
148
149 import collections
149 import collections
150 import errno
150 import errno
151 import os
151 import os
152 import re
152 import re
153 import string
153 import string
154 import struct
154 import struct
155 import sys
155 import sys
156
156
157 from .i18n import _
157 from .i18n import _
158 from .node import (
158 from .node import (
159 hex,
159 hex,
160 short,
160 short,
161 )
161 )
162 from . import (
162 from . import (
163 bookmarks,
163 bookmarks,
164 changegroup,
164 changegroup,
165 encoding,
165 encoding,
166 error,
166 error,
167 obsolete,
167 obsolete,
168 phases,
168 phases,
169 pushkey,
169 pushkey,
170 pycompat,
170 pycompat,
171 requirements,
171 requirements,
172 scmutil,
172 scmutil,
173 streamclone,
173 streamclone,
174 tags,
174 tags,
175 url,
175 url,
176 util,
176 util,
177 )
177 )
178 from .utils import (
178 from .utils import (
179 stringutil,
179 stringutil,
180 urlutil,
180 urlutil,
181 )
181 )
182 from .interfaces import repository
182 from .interfaces import repository
183
183
184 urlerr = util.urlerr
184 urlerr = util.urlerr
185 urlreq = util.urlreq
185 urlreq = util.urlreq
186
186
187 _pack = struct.pack
187 _pack = struct.pack
188 _unpack = struct.unpack
188 _unpack = struct.unpack
189
189
190 _fstreamparamsize = b'>i'
190 _fstreamparamsize = b'>i'
191 _fpartheadersize = b'>i'
191 _fpartheadersize = b'>i'
192 _fparttypesize = b'>B'
192 _fparttypesize = b'>B'
193 _fpartid = b'>I'
193 _fpartid = b'>I'
194 _fpayloadsize = b'>i'
194 _fpayloadsize = b'>i'
195 _fpartparamcount = b'>BB'
195 _fpartparamcount = b'>BB'
196
196
197 preferedchunksize = 32768
197 preferedchunksize = 32768
198
198
199 _parttypeforbidden = re.compile(b'[^a-zA-Z0-9_:-]')
199 _parttypeforbidden = re.compile(b'[^a-zA-Z0-9_:-]')
200
200
201
201
202 def outdebug(ui, message):
202 def outdebug(ui, message):
203 """debug regarding output stream (bundling)"""
203 """debug regarding output stream (bundling)"""
204 if ui.configbool(b'devel', b'bundle2.debug'):
204 if ui.configbool(b'devel', b'bundle2.debug'):
205 ui.debug(b'bundle2-output: %s\n' % message)
205 ui.debug(b'bundle2-output: %s\n' % message)
206
206
207
207
208 def indebug(ui, message):
208 def indebug(ui, message):
209 """debug on input stream (unbundling)"""
209 """debug on input stream (unbundling)"""
210 if ui.configbool(b'devel', b'bundle2.debug'):
210 if ui.configbool(b'devel', b'bundle2.debug'):
211 ui.debug(b'bundle2-input: %s\n' % message)
211 ui.debug(b'bundle2-input: %s\n' % message)
212
212
213
213
214 def validateparttype(parttype):
214 def validateparttype(parttype):
215 """raise ValueError if a parttype contains invalid character"""
215 """raise ValueError if a parttype contains invalid character"""
216 if _parttypeforbidden.search(parttype):
216 if _parttypeforbidden.search(parttype):
217 raise ValueError(parttype)
217 raise ValueError(parttype)
218
218
219
219
220 def _makefpartparamsizes(nbparams):
220 def _makefpartparamsizes(nbparams):
221 """return a struct format to read part parameter sizes
221 """return a struct format to read part parameter sizes
222
222
223 The number parameters is variable so we need to build that format
223 The number parameters is variable so we need to build that format
224 dynamically.
224 dynamically.
225 """
225 """
226 return b'>' + (b'BB' * nbparams)
226 return b'>' + (b'BB' * nbparams)
227
227
228
228
229 parthandlermapping = {}
229 parthandlermapping = {}
230
230
231
231
232 def parthandler(parttype, params=()):
232 def parthandler(parttype, params=()):
233 """decorator that register a function as a bundle2 part handler
233 """decorator that register a function as a bundle2 part handler
234
234
235 eg::
235 eg::
236
236
237 @parthandler('myparttype', ('mandatory', 'param', 'handled'))
237 @parthandler('myparttype', ('mandatory', 'param', 'handled'))
238 def myparttypehandler(...):
238 def myparttypehandler(...):
239 '''process a part of type "my part".'''
239 '''process a part of type "my part".'''
240 ...
240 ...
241 """
241 """
242 validateparttype(parttype)
242 validateparttype(parttype)
243
243
244 def _decorator(func):
244 def _decorator(func):
245 lparttype = parttype.lower() # enforce lower case matching.
245 lparttype = parttype.lower() # enforce lower case matching.
246 assert lparttype not in parthandlermapping
246 assert lparttype not in parthandlermapping
247 parthandlermapping[lparttype] = func
247 parthandlermapping[lparttype] = func
248 func.params = frozenset(params)
248 func.params = frozenset(params)
249 return func
249 return func
250
250
251 return _decorator
251 return _decorator
252
252
253
253
254 class unbundlerecords:
254 class unbundlerecords:
255 """keep record of what happens during and unbundle
255 """keep record of what happens during and unbundle
256
256
257 New records are added using `records.add('cat', obj)`. Where 'cat' is a
257 New records are added using `records.add('cat', obj)`. Where 'cat' is a
258 category of record and obj is an arbitrary object.
258 category of record and obj is an arbitrary object.
259
259
260 `records['cat']` will return all entries of this category 'cat'.
260 `records['cat']` will return all entries of this category 'cat'.
261
261
262 Iterating on the object itself will yield `('category', obj)` tuples
262 Iterating on the object itself will yield `('category', obj)` tuples
263 for all entries.
263 for all entries.
264
264
265 All iterations happens in chronological order.
265 All iterations happens in chronological order.
266 """
266 """
267
267
268 def __init__(self):
268 def __init__(self):
269 self._categories = {}
269 self._categories = {}
270 self._sequences = []
270 self._sequences = []
271 self._replies = {}
271 self._replies = {}
272
272
273 def add(self, category, entry, inreplyto=None):
273 def add(self, category, entry, inreplyto=None):
274 """add a new record of a given category.
274 """add a new record of a given category.
275
275
276 The entry can then be retrieved in the list returned by
276 The entry can then be retrieved in the list returned by
277 self['category']."""
277 self['category']."""
278 self._categories.setdefault(category, []).append(entry)
278 self._categories.setdefault(category, []).append(entry)
279 self._sequences.append((category, entry))
279 self._sequences.append((category, entry))
280 if inreplyto is not None:
280 if inreplyto is not None:
281 self.getreplies(inreplyto).add(category, entry)
281 self.getreplies(inreplyto).add(category, entry)
282
282
283 def getreplies(self, partid):
283 def getreplies(self, partid):
284 """get the records that are replies to a specific part"""
284 """get the records that are replies to a specific part"""
285 return self._replies.setdefault(partid, unbundlerecords())
285 return self._replies.setdefault(partid, unbundlerecords())
286
286
287 def __getitem__(self, cat):
287 def __getitem__(self, cat):
288 return tuple(self._categories.get(cat, ()))
288 return tuple(self._categories.get(cat, ()))
289
289
290 def __iter__(self):
290 def __iter__(self):
291 return iter(self._sequences)
291 return iter(self._sequences)
292
292
293 def __len__(self):
293 def __len__(self):
294 return len(self._sequences)
294 return len(self._sequences)
295
295
296 def __nonzero__(self):
296 def __nonzero__(self):
297 return bool(self._sequences)
297 return bool(self._sequences)
298
298
299 __bool__ = __nonzero__
299 __bool__ = __nonzero__
300
300
301
301
302 class bundleoperation:
302 class bundleoperation:
303 """an object that represents a single bundling process
303 """an object that represents a single bundling process
304
304
305 Its purpose is to carry unbundle-related objects and states.
305 Its purpose is to carry unbundle-related objects and states.
306
306
307 A new object should be created at the beginning of each bundle processing.
307 A new object should be created at the beginning of each bundle processing.
308 The object is to be returned by the processing function.
308 The object is to be returned by the processing function.
309
309
310 The object has very little content now it will ultimately contain:
310 The object has very little content now it will ultimately contain:
311 * an access to the repo the bundle is applied to,
311 * an access to the repo the bundle is applied to,
312 * a ui object,
312 * a ui object,
313 * a way to retrieve a transaction to add changes to the repo,
313 * a way to retrieve a transaction to add changes to the repo,
314 * a way to record the result of processing each part,
314 * a way to record the result of processing each part,
315 * a way to construct a bundle response when applicable.
315 * a way to construct a bundle response when applicable.
316 """
316 """
317
317
318 def __init__(
318 def __init__(
319 self,
319 self,
320 repo,
320 repo,
321 transactiongetter,
321 transactiongetter,
322 captureoutput=True,
322 captureoutput=True,
323 source=b'',
323 source=b'',
324 remote=None,
324 remote=None,
325 ):
325 ):
326 self.repo = repo
326 self.repo = repo
327 # the peer object who produced this bundle if available
327 # the peer object who produced this bundle if available
328 self.remote = remote
328 self.remote = remote
329 self.ui = repo.ui
329 self.ui = repo.ui
330 self.records = unbundlerecords()
330 self.records = unbundlerecords()
331 self.reply = None
331 self.reply = None
332 self.captureoutput = captureoutput
332 self.captureoutput = captureoutput
333 self.hookargs = {}
333 self.hookargs = {}
334 self._gettransaction = transactiongetter
334 self._gettransaction = transactiongetter
335 # carries value that can modify part behavior
335 # carries value that can modify part behavior
336 self.modes = {}
336 self.modes = {}
337 self.source = source
337 self.source = source
338
338
339 def gettransaction(self):
339 def gettransaction(self):
340 transaction = self._gettransaction()
340 transaction = self._gettransaction()
341
341
342 if self.hookargs:
342 if self.hookargs:
343 # the ones added to the transaction supercede those added
343 # the ones added to the transaction supercede those added
344 # to the operation.
344 # to the operation.
345 self.hookargs.update(transaction.hookargs)
345 self.hookargs.update(transaction.hookargs)
346 transaction.hookargs = self.hookargs
346 transaction.hookargs = self.hookargs
347
347
348 # mark the hookargs as flushed. further attempts to add to
348 # mark the hookargs as flushed. further attempts to add to
349 # hookargs will result in an abort.
349 # hookargs will result in an abort.
350 self.hookargs = None
350 self.hookargs = None
351
351
352 return transaction
352 return transaction
353
353
354 def addhookargs(self, hookargs):
354 def addhookargs(self, hookargs):
355 if self.hookargs is None:
355 if self.hookargs is None:
356 raise error.ProgrammingError(
356 raise error.ProgrammingError(
357 b'attempted to add hookargs to '
357 b'attempted to add hookargs to '
358 b'operation after transaction started'
358 b'operation after transaction started'
359 )
359 )
360 self.hookargs.update(hookargs)
360 self.hookargs.update(hookargs)
361
361
362
362
363 class TransactionUnavailable(RuntimeError):
363 class TransactionUnavailable(RuntimeError):
364 pass
364 pass
365
365
366
366
367 def _notransaction():
367 def _notransaction():
368 """default method to get a transaction while processing a bundle
368 """default method to get a transaction while processing a bundle
369
369
370 Raise an exception to highlight the fact that no transaction was expected
370 Raise an exception to highlight the fact that no transaction was expected
371 to be created"""
371 to be created"""
372 raise TransactionUnavailable()
372 raise TransactionUnavailable()
373
373
374
374
375 def applybundle(repo, unbundler, tr, source, url=None, remote=None, **kwargs):
375 def applybundle(repo, unbundler, tr, source, url=None, remote=None, **kwargs):
376 # transform me into unbundler.apply() as soon as the freeze is lifted
376 # transform me into unbundler.apply() as soon as the freeze is lifted
377 if isinstance(unbundler, unbundle20):
377 if isinstance(unbundler, unbundle20):
378 tr.hookargs[b'bundle2'] = b'1'
378 tr.hookargs[b'bundle2'] = b'1'
379 if source is not None and b'source' not in tr.hookargs:
379 if source is not None and b'source' not in tr.hookargs:
380 tr.hookargs[b'source'] = source
380 tr.hookargs[b'source'] = source
381 if url is not None and b'url' not in tr.hookargs:
381 if url is not None and b'url' not in tr.hookargs:
382 tr.hookargs[b'url'] = url
382 tr.hookargs[b'url'] = url
383 return processbundle(
383 return processbundle(
384 repo, unbundler, lambda: tr, source=source, remote=remote
384 repo, unbundler, lambda: tr, source=source, remote=remote
385 )
385 )
386 else:
386 else:
387 # the transactiongetter won't be used, but we might as well set it
387 # the transactiongetter won't be used, but we might as well set it
388 op = bundleoperation(repo, lambda: tr, source=source, remote=remote)
388 op = bundleoperation(repo, lambda: tr, source=source, remote=remote)
389 _processchangegroup(op, unbundler, tr, source, url, **kwargs)
389 _processchangegroup(op, unbundler, tr, source, url, **kwargs)
390 return op
390 return op
391
391
392
392
393 class partiterator:
393 class partiterator:
394 def __init__(self, repo, op, unbundler):
394 def __init__(self, repo, op, unbundler):
395 self.repo = repo
395 self.repo = repo
396 self.op = op
396 self.op = op
397 self.unbundler = unbundler
397 self.unbundler = unbundler
398 self.iterator = None
398 self.iterator = None
399 self.count = 0
399 self.count = 0
400 self.current = None
400 self.current = None
401
401
402 def __enter__(self):
402 def __enter__(self):
403 def func():
403 def func():
404 itr = enumerate(self.unbundler.iterparts(), 1)
404 itr = enumerate(self.unbundler.iterparts(), 1)
405 for count, p in itr:
405 for count, p in itr:
406 self.count = count
406 self.count = count
407 self.current = p
407 self.current = p
408 yield p
408 yield p
409 p.consume()
409 p.consume()
410 self.current = None
410 self.current = None
411
411
412 self.iterator = func()
412 self.iterator = func()
413 return self.iterator
413 return self.iterator
414
414
415 def __exit__(self, type, exc, tb):
415 def __exit__(self, type, exc, tb):
416 if not self.iterator:
416 if not self.iterator:
417 return
417 return
418
418
419 # Only gracefully abort in a normal exception situation. User aborts
419 # Only gracefully abort in a normal exception situation. User aborts
420 # like Ctrl+C throw a KeyboardInterrupt which is not a base Exception,
420 # like Ctrl+C throw a KeyboardInterrupt which is not a base Exception,
421 # and should not gracefully cleanup.
421 # and should not gracefully cleanup.
422 if isinstance(exc, Exception):
422 if isinstance(exc, Exception):
423 # Any exceptions seeking to the end of the bundle at this point are
423 # Any exceptions seeking to the end of the bundle at this point are
424 # almost certainly related to the underlying stream being bad.
424 # almost certainly related to the underlying stream being bad.
425 # And, chances are that the exception we're handling is related to
425 # And, chances are that the exception we're handling is related to
426 # getting in that bad state. So, we swallow the seeking error and
426 # getting in that bad state. So, we swallow the seeking error and
427 # re-raise the original error.
427 # re-raise the original error.
428 seekerror = False
428 seekerror = False
429 try:
429 try:
430 if self.current:
430 if self.current:
431 # consume the part content to not corrupt the stream.
431 # consume the part content to not corrupt the stream.
432 self.current.consume()
432 self.current.consume()
433
433
434 for part in self.iterator:
434 for part in self.iterator:
435 # consume the bundle content
435 # consume the bundle content
436 part.consume()
436 part.consume()
437 except Exception:
437 except Exception:
438 seekerror = True
438 seekerror = True
439
439
440 # Small hack to let caller code distinguish exceptions from bundle2
440 # Small hack to let caller code distinguish exceptions from bundle2
441 # processing from processing the old format. This is mostly needed
441 # processing from processing the old format. This is mostly needed
442 # to handle different return codes to unbundle according to the type
442 # to handle different return codes to unbundle according to the type
443 # of bundle. We should probably clean up or drop this return code
443 # of bundle. We should probably clean up or drop this return code
444 # craziness in a future version.
444 # craziness in a future version.
445 exc.duringunbundle2 = True
445 exc.duringunbundle2 = True
446 salvaged = []
446 salvaged = []
447 replycaps = None
447 replycaps = None
448 if self.op.reply is not None:
448 if self.op.reply is not None:
449 salvaged = self.op.reply.salvageoutput()
449 salvaged = self.op.reply.salvageoutput()
450 replycaps = self.op.reply.capabilities
450 replycaps = self.op.reply.capabilities
451 exc._replycaps = replycaps
451 exc._replycaps = replycaps
452 exc._bundle2salvagedoutput = salvaged
452 exc._bundle2salvagedoutput = salvaged
453
453
454 # Re-raising from a variable loses the original stack. So only use
454 # Re-raising from a variable loses the original stack. So only use
455 # that form if we need to.
455 # that form if we need to.
456 if seekerror:
456 if seekerror:
457 raise exc
457 raise exc
458
458
459 self.repo.ui.debug(
459 self.repo.ui.debug(
460 b'bundle2-input-bundle: %i parts total\n' % self.count
460 b'bundle2-input-bundle: %i parts total\n' % self.count
461 )
461 )
462
462
463
463
464 def processbundle(
464 def processbundle(
465 repo,
465 repo,
466 unbundler,
466 unbundler,
467 transactiongetter=None,
467 transactiongetter=None,
468 op=None,
468 op=None,
469 source=b'',
469 source=b'',
470 remote=None,
470 remote=None,
471 ):
471 ):
472 """This function process a bundle, apply effect to/from a repo
472 """This function process a bundle, apply effect to/from a repo
473
473
474 It iterates over each part then searches for and uses the proper handling
474 It iterates over each part then searches for and uses the proper handling
475 code to process the part. Parts are processed in order.
475 code to process the part. Parts are processed in order.
476
476
477 Unknown Mandatory part will abort the process.
477 Unknown Mandatory part will abort the process.
478
478
479 It is temporarily possible to provide a prebuilt bundleoperation to the
479 It is temporarily possible to provide a prebuilt bundleoperation to the
480 function. This is used to ensure output is properly propagated in case of
480 function. This is used to ensure output is properly propagated in case of
481 an error during the unbundling. This output capturing part will likely be
481 an error during the unbundling. This output capturing part will likely be
482 reworked and this ability will probably go away in the process.
482 reworked and this ability will probably go away in the process.
483 """
483 """
484 if op is None:
484 if op is None:
485 if transactiongetter is None:
485 if transactiongetter is None:
486 transactiongetter = _notransaction
486 transactiongetter = _notransaction
487 op = bundleoperation(
487 op = bundleoperation(
488 repo,
488 repo,
489 transactiongetter,
489 transactiongetter,
490 source=source,
490 source=source,
491 remote=remote,
491 remote=remote,
492 )
492 )
493 # todo:
493 # todo:
494 # - replace this is a init function soon.
494 # - replace this is a init function soon.
495 # - exception catching
495 # - exception catching
496 unbundler.params
496 unbundler.params
497 if repo.ui.debugflag:
497 if repo.ui.debugflag:
498 msg = [b'bundle2-input-bundle:']
498 msg = [b'bundle2-input-bundle:']
499 if unbundler.params:
499 if unbundler.params:
500 msg.append(b' %i params' % len(unbundler.params))
500 msg.append(b' %i params' % len(unbundler.params))
501 if op._gettransaction is None or op._gettransaction is _notransaction:
501 if op._gettransaction is None or op._gettransaction is _notransaction:
502 msg.append(b' no-transaction')
502 msg.append(b' no-transaction')
503 else:
503 else:
504 msg.append(b' with-transaction')
504 msg.append(b' with-transaction')
505 msg.append(b'\n')
505 msg.append(b'\n')
506 repo.ui.debug(b''.join(msg))
506 repo.ui.debug(b''.join(msg))
507
507
508 processparts(repo, op, unbundler)
508 processparts(repo, op, unbundler)
509
509
510 return op
510 return op
511
511
512
512
513 def processparts(repo, op, unbundler):
513 def processparts(repo, op, unbundler):
514 with partiterator(repo, op, unbundler) as parts:
514 with partiterator(repo, op, unbundler) as parts:
515 for part in parts:
515 for part in parts:
516 _processpart(op, part)
516 _processpart(op, part)
517
517
518
518
519 def _processchangegroup(op, cg, tr, source, url, **kwargs):
519 def _processchangegroup(op, cg, tr, source, url, **kwargs):
520 if op.remote is not None and op.remote.path is not None:
520 if op.remote is not None and op.remote.path is not None:
521 remote_path = op.remote.path
521 remote_path = op.remote.path
522 kwargs = kwargs.copy()
522 kwargs = kwargs.copy()
523 kwargs['delta_base_reuse_policy'] = remote_path.delta_reuse_policy
523 kwargs['delta_base_reuse_policy'] = remote_path.delta_reuse_policy
524 ret = cg.apply(op.repo, tr, source, url, **kwargs)
524 ret = cg.apply(op.repo, tr, source, url, **kwargs)
525 op.records.add(
525 op.records.add(
526 b'changegroup',
526 b'changegroup',
527 {
527 {
528 b'return': ret,
528 b'return': ret,
529 },
529 },
530 )
530 )
531 return ret
531 return ret
532
532
533
533
534 def _gethandler(op, part):
534 def _gethandler(op, part):
535 status = b'unknown' # used by debug output
535 status = b'unknown' # used by debug output
536 try:
536 try:
537 handler = parthandlermapping.get(part.type)
537 handler = parthandlermapping.get(part.type)
538 if handler is None:
538 if handler is None:
539 status = b'unsupported-type'
539 status = b'unsupported-type'
540 raise error.BundleUnknownFeatureError(parttype=part.type)
540 raise error.BundleUnknownFeatureError(parttype=part.type)
541 indebug(op.ui, b'found a handler for part %s' % part.type)
541 indebug(op.ui, b'found a handler for part %s' % part.type)
542 unknownparams = part.mandatorykeys - handler.params
542 unknownparams = part.mandatorykeys - handler.params
543 if unknownparams:
543 if unknownparams:
544 unknownparams = list(unknownparams)
544 unknownparams = list(unknownparams)
545 unknownparams.sort()
545 unknownparams.sort()
546 status = b'unsupported-params (%s)' % b', '.join(unknownparams)
546 status = b'unsupported-params (%s)' % b', '.join(unknownparams)
547 raise error.BundleUnknownFeatureError(
547 raise error.BundleUnknownFeatureError(
548 parttype=part.type, params=unknownparams
548 parttype=part.type, params=unknownparams
549 )
549 )
550 status = b'supported'
550 status = b'supported'
551 except error.BundleUnknownFeatureError as exc:
551 except error.BundleUnknownFeatureError as exc:
552 if part.mandatory: # mandatory parts
552 if part.mandatory: # mandatory parts
553 raise
553 raise
554 indebug(op.ui, b'ignoring unsupported advisory part %s' % exc)
554 indebug(op.ui, b'ignoring unsupported advisory part %s' % exc)
555 return # skip to part processing
555 return # skip to part processing
556 finally:
556 finally:
557 if op.ui.debugflag:
557 if op.ui.debugflag:
558 msg = [b'bundle2-input-part: "%s"' % part.type]
558 msg = [b'bundle2-input-part: "%s"' % part.type]
559 if not part.mandatory:
559 if not part.mandatory:
560 msg.append(b' (advisory)')
560 msg.append(b' (advisory)')
561 nbmp = len(part.mandatorykeys)
561 nbmp = len(part.mandatorykeys)
562 nbap = len(part.params) - nbmp
562 nbap = len(part.params) - nbmp
563 if nbmp or nbap:
563 if nbmp or nbap:
564 msg.append(b' (params:')
564 msg.append(b' (params:')
565 if nbmp:
565 if nbmp:
566 msg.append(b' %i mandatory' % nbmp)
566 msg.append(b' %i mandatory' % nbmp)
567 if nbap:
567 if nbap:
568 msg.append(b' %i advisory' % nbmp)
568 msg.append(b' %i advisory' % nbmp)
569 msg.append(b')')
569 msg.append(b')')
570 msg.append(b' %s\n' % status)
570 msg.append(b' %s\n' % status)
571 op.ui.debug(b''.join(msg))
571 op.ui.debug(b''.join(msg))
572
572
573 return handler
573 return handler
574
574
575
575
576 def _processpart(op, part):
576 def _processpart(op, part):
577 """process a single part from a bundle
577 """process a single part from a bundle
578
578
579 The part is guaranteed to have been fully consumed when the function exits
579 The part is guaranteed to have been fully consumed when the function exits
580 (even if an exception is raised)."""
580 (even if an exception is raised)."""
581 handler = _gethandler(op, part)
581 handler = _gethandler(op, part)
582 if handler is None:
582 if handler is None:
583 return
583 return
584
584
585 # handler is called outside the above try block so that we don't
585 # handler is called outside the above try block so that we don't
586 # risk catching KeyErrors from anything other than the
586 # risk catching KeyErrors from anything other than the
587 # parthandlermapping lookup (any KeyError raised by handler()
587 # parthandlermapping lookup (any KeyError raised by handler()
588 # itself represents a defect of a different variety).
588 # itself represents a defect of a different variety).
589 output = None
589 output = None
590 if op.captureoutput and op.reply is not None:
590 if op.captureoutput and op.reply is not None:
591 op.ui.pushbuffer(error=True, subproc=True)
591 op.ui.pushbuffer(error=True, subproc=True)
592 output = b''
592 output = b''
593 try:
593 try:
594 handler(op, part)
594 handler(op, part)
595 finally:
595 finally:
596 if output is not None:
596 if output is not None:
597 output = op.ui.popbuffer()
597 output = op.ui.popbuffer()
598 if output:
598 if output:
599 outpart = op.reply.newpart(b'output', data=output, mandatory=False)
599 outpart = op.reply.newpart(b'output', data=output, mandatory=False)
600 outpart.addparam(
600 outpart.addparam(
601 b'in-reply-to', pycompat.bytestr(part.id), mandatory=False
601 b'in-reply-to', pycompat.bytestr(part.id), mandatory=False
602 )
602 )
603
603
604
604
605 def decodecaps(blob):
605 def decodecaps(blob):
606 """decode a bundle2 caps bytes blob into a dictionary
606 """decode a bundle2 caps bytes blob into a dictionary
607
607
608 The blob is a list of capabilities (one per line)
608 The blob is a list of capabilities (one per line)
609 Capabilities may have values using a line of the form::
609 Capabilities may have values using a line of the form::
610
610
611 capability=value1,value2,value3
611 capability=value1,value2,value3
612
612
613 The values are always a list."""
613 The values are always a list."""
614 caps = {}
614 caps = {}
615 for line in blob.splitlines():
615 for line in blob.splitlines():
616 if not line:
616 if not line:
617 continue
617 continue
618 if b'=' not in line:
618 if b'=' not in line:
619 key, vals = line, ()
619 key, vals = line, ()
620 else:
620 else:
621 key, vals = line.split(b'=', 1)
621 key, vals = line.split(b'=', 1)
622 vals = vals.split(b',')
622 vals = vals.split(b',')
623 key = urlreq.unquote(key)
623 key = urlreq.unquote(key)
624 vals = [urlreq.unquote(v) for v in vals]
624 vals = [urlreq.unquote(v) for v in vals]
625 caps[key] = vals
625 caps[key] = vals
626 return caps
626 return caps
627
627
628
628
629 def encodecaps(caps):
629 def encodecaps(caps):
630 """encode a bundle2 caps dictionary into a bytes blob"""
630 """encode a bundle2 caps dictionary into a bytes blob"""
631 chunks = []
631 chunks = []
632 for ca in sorted(caps):
632 for ca in sorted(caps):
633 vals = caps[ca]
633 vals = caps[ca]
634 ca = urlreq.quote(ca)
634 ca = urlreq.quote(ca)
635 vals = [urlreq.quote(v) for v in vals]
635 vals = [urlreq.quote(v) for v in vals]
636 if vals:
636 if vals:
637 ca = b"%s=%s" % (ca, b','.join(vals))
637 ca = b"%s=%s" % (ca, b','.join(vals))
638 chunks.append(ca)
638 chunks.append(ca)
639 return b'\n'.join(chunks)
639 return b'\n'.join(chunks)
640
640
641
641
642 bundletypes = {
642 bundletypes = {
643 b"": (b"", b'UN'), # only when using unbundle on ssh and old http servers
643 b"": (b"", b'UN'), # only when using unbundle on ssh and old http servers
644 # since the unification ssh accepts a header but there
644 # since the unification ssh accepts a header but there
645 # is no capability signaling it.
645 # is no capability signaling it.
646 b"HG20": (), # special-cased below
646 b"HG20": (), # special-cased below
647 b"HG10UN": (b"HG10UN", b'UN'),
647 b"HG10UN": (b"HG10UN", b'UN'),
648 b"HG10BZ": (b"HG10", b'BZ'),
648 b"HG10BZ": (b"HG10", b'BZ'),
649 b"HG10GZ": (b"HG10GZ", b'GZ'),
649 b"HG10GZ": (b"HG10GZ", b'GZ'),
650 }
650 }
651
651
652 # hgweb uses this list to communicate its preferred type
652 # hgweb uses this list to communicate its preferred type
653 bundlepriority = [b'HG10GZ', b'HG10BZ', b'HG10UN']
653 bundlepriority = [b'HG10GZ', b'HG10BZ', b'HG10UN']
654
654
655
655
656 class bundle20:
656 class bundle20:
657 """represent an outgoing bundle2 container
657 """represent an outgoing bundle2 container
658
658
659 Use the `addparam` method to add stream level parameter. and `newpart` to
659 Use the `addparam` method to add stream level parameter. and `newpart` to
660 populate it. Then call `getchunks` to retrieve all the binary chunks of
660 populate it. Then call `getchunks` to retrieve all the binary chunks of
661 data that compose the bundle2 container."""
661 data that compose the bundle2 container."""
662
662
663 _magicstring = b'HG20'
663 _magicstring = b'HG20'
664
664
665 def __init__(self, ui, capabilities=()):
665 def __init__(self, ui, capabilities=()):
666 self.ui = ui
666 self.ui = ui
667 self._params = []
667 self._params = []
668 self._parts = []
668 self._parts = []
669 self.capabilities = dict(capabilities)
669 self.capabilities = dict(capabilities)
670 self._compengine = util.compengines.forbundletype(b'UN')
670 self._compengine = util.compengines.forbundletype(b'UN')
671 self._compopts = None
671 self._compopts = None
672 # If compression is being handled by a consumer of the raw
672 # If compression is being handled by a consumer of the raw
673 # data (e.g. the wire protocol), unsetting this flag tells
673 # data (e.g. the wire protocol), unsetting this flag tells
674 # consumers that the bundle is best left uncompressed.
674 # consumers that the bundle is best left uncompressed.
675 self.prefercompressed = True
675 self.prefercompressed = True
676
676
677 def setcompression(self, alg, compopts=None):
677 def setcompression(self, alg, compopts=None):
678 """setup core part compression to <alg>"""
678 """setup core part compression to <alg>"""
679 if alg in (None, b'UN'):
679 if alg in (None, b'UN'):
680 return
680 return
681 assert not any(n.lower() == b'compression' for n, v in self._params)
681 assert not any(n.lower() == b'compression' for n, v in self._params)
682 self.addparam(b'Compression', alg)
682 self.addparam(b'Compression', alg)
683 self._compengine = util.compengines.forbundletype(alg)
683 self._compengine = util.compengines.forbundletype(alg)
684 self._compopts = compopts
684 self._compopts = compopts
685
685
686 @property
686 @property
687 def nbparts(self):
687 def nbparts(self):
688 """total number of parts added to the bundler"""
688 """total number of parts added to the bundler"""
689 return len(self._parts)
689 return len(self._parts)
690
690
691 # methods used to defines the bundle2 content
691 # methods used to defines the bundle2 content
692 def addparam(self, name, value=None):
692 def addparam(self, name, value=None):
693 """add a stream level parameter"""
693 """add a stream level parameter"""
694 if not name:
694 if not name:
695 raise error.ProgrammingError(b'empty parameter name')
695 raise error.ProgrammingError(b'empty parameter name')
696 if name[0:1] not in pycompat.bytestr(
696 if name[0:1] not in pycompat.bytestr(
697 string.ascii_letters # pytype: disable=wrong-arg-types
697 string.ascii_letters # pytype: disable=wrong-arg-types
698 ):
698 ):
699 raise error.ProgrammingError(
699 raise error.ProgrammingError(
700 b'non letter first character: %s' % name
700 b'non letter first character: %s' % name
701 )
701 )
702 self._params.append((name, value))
702 self._params.append((name, value))
703
703
704 def addpart(self, part):
704 def addpart(self, part):
705 """add a new part to the bundle2 container
705 """add a new part to the bundle2 container
706
706
707 Parts contains the actual applicative payload."""
707 Parts contains the actual applicative payload."""
708 assert part.id is None
708 assert part.id is None
709 part.id = len(self._parts) # very cheap counter
709 part.id = len(self._parts) # very cheap counter
710 self._parts.append(part)
710 self._parts.append(part)
711
711
712 def newpart(self, typeid, *args, **kwargs):
712 def newpart(self, typeid, *args, **kwargs):
713 """create a new part and add it to the containers
713 """create a new part and add it to the containers
714
714
715 As the part is directly added to the containers. For now, this means
715 As the part is directly added to the containers. For now, this means
716 that any failure to properly initialize the part after calling
716 that any failure to properly initialize the part after calling
717 ``newpart`` should result in a failure of the whole bundling process.
717 ``newpart`` should result in a failure of the whole bundling process.
718
718
719 You can still fall back to manually create and add if you need better
719 You can still fall back to manually create and add if you need better
720 control."""
720 control."""
721 part = bundlepart(typeid, *args, **kwargs)
721 part = bundlepart(typeid, *args, **kwargs)
722 self.addpart(part)
722 self.addpart(part)
723 return part
723 return part
724
724
725 # methods used to generate the bundle2 stream
725 # methods used to generate the bundle2 stream
726 def getchunks(self):
726 def getchunks(self):
727 if self.ui.debugflag:
727 if self.ui.debugflag:
728 msg = [b'bundle2-output-bundle: "%s",' % self._magicstring]
728 msg = [b'bundle2-output-bundle: "%s",' % self._magicstring]
729 if self._params:
729 if self._params:
730 msg.append(b' (%i params)' % len(self._params))
730 msg.append(b' (%i params)' % len(self._params))
731 msg.append(b' %i parts total\n' % len(self._parts))
731 msg.append(b' %i parts total\n' % len(self._parts))
732 self.ui.debug(b''.join(msg))
732 self.ui.debug(b''.join(msg))
733 outdebug(self.ui, b'start emission of %s stream' % self._magicstring)
733 outdebug(self.ui, b'start emission of %s stream' % self._magicstring)
734 yield self._magicstring
734 yield self._magicstring
735 param = self._paramchunk()
735 param = self._paramchunk()
736 outdebug(self.ui, b'bundle parameter: %s' % param)
736 outdebug(self.ui, b'bundle parameter: %s' % param)
737 yield _pack(_fstreamparamsize, len(param))
737 yield _pack(_fstreamparamsize, len(param))
738 if param:
738 if param:
739 yield param
739 yield param
740 for chunk in self._compengine.compressstream(
740 for chunk in self._compengine.compressstream(
741 self._getcorechunk(), self._compopts
741 self._getcorechunk(), self._compopts
742 ):
742 ):
743 yield chunk
743 yield chunk
744
744
745 def _paramchunk(self):
745 def _paramchunk(self):
746 """return a encoded version of all stream parameters"""
746 """return a encoded version of all stream parameters"""
747 blocks = []
747 blocks = []
748 for par, value in self._params:
748 for par, value in self._params:
749 par = urlreq.quote(par)
749 par = urlreq.quote(par)
750 if value is not None:
750 if value is not None:
751 value = urlreq.quote(value)
751 value = urlreq.quote(value)
752 par = b'%s=%s' % (par, value)
752 par = b'%s=%s' % (par, value)
753 blocks.append(par)
753 blocks.append(par)
754 return b' '.join(blocks)
754 return b' '.join(blocks)
755
755
756 def _getcorechunk(self):
756 def _getcorechunk(self):
757 """yield chunk for the core part of the bundle
757 """yield chunk for the core part of the bundle
758
758
759 (all but headers and parameters)"""
759 (all but headers and parameters)"""
760 outdebug(self.ui, b'start of parts')
760 outdebug(self.ui, b'start of parts')
761 for part in self._parts:
761 for part in self._parts:
762 outdebug(self.ui, b'bundle part: "%s"' % part.type)
762 outdebug(self.ui, b'bundle part: "%s"' % part.type)
763 for chunk in part.getchunks(ui=self.ui):
763 for chunk in part.getchunks(ui=self.ui):
764 yield chunk
764 yield chunk
765 outdebug(self.ui, b'end of bundle')
765 outdebug(self.ui, b'end of bundle')
766 yield _pack(_fpartheadersize, 0)
766 yield _pack(_fpartheadersize, 0)
767
767
768 def salvageoutput(self):
768 def salvageoutput(self):
769 """return a list with a copy of all output parts in the bundle
769 """return a list with a copy of all output parts in the bundle
770
770
771 This is meant to be used during error handling to make sure we preserve
771 This is meant to be used during error handling to make sure we preserve
772 server output"""
772 server output"""
773 salvaged = []
773 salvaged = []
774 for part in self._parts:
774 for part in self._parts:
775 if part.type.startswith(b'output'):
775 if part.type.startswith(b'output'):
776 salvaged.append(part.copy())
776 salvaged.append(part.copy())
777 return salvaged
777 return salvaged
778
778
779
779
780 class unpackermixin:
780 class unpackermixin:
781 """A mixin to extract bytes and struct data from a stream"""
781 """A mixin to extract bytes and struct data from a stream"""
782
782
783 def __init__(self, fp):
783 def __init__(self, fp):
784 self._fp = fp
784 self._fp = fp
785
785
786 def _unpack(self, format):
786 def _unpack(self, format):
787 """unpack this struct format from the stream
787 """unpack this struct format from the stream
788
788
789 This method is meant for internal usage by the bundle2 protocol only.
789 This method is meant for internal usage by the bundle2 protocol only.
790 They directly manipulate the low level stream including bundle2 level
790 They directly manipulate the low level stream including bundle2 level
791 instruction.
791 instruction.
792
792
793 Do not use it to implement higher-level logic or methods."""
793 Do not use it to implement higher-level logic or methods."""
794 data = self._readexact(struct.calcsize(format))
794 data = self._readexact(struct.calcsize(format))
795 return _unpack(format, data)
795 return _unpack(format, data)
796
796
797 def _readexact(self, size):
797 def _readexact(self, size):
798 """read exactly <size> bytes from the stream
798 """read exactly <size> bytes from the stream
799
799
800 This method is meant for internal usage by the bundle2 protocol only.
800 This method is meant for internal usage by the bundle2 protocol only.
801 They directly manipulate the low level stream including bundle2 level
801 They directly manipulate the low level stream including bundle2 level
802 instruction.
802 instruction.
803
803
804 Do not use it to implement higher-level logic or methods."""
804 Do not use it to implement higher-level logic or methods."""
805 return changegroup.readexactly(self._fp, size)
805 return changegroup.readexactly(self._fp, size)
806
806
807
807
808 def getunbundler(ui, fp, magicstring=None):
808 def getunbundler(ui, fp, magicstring=None):
809 """return a valid unbundler object for a given magicstring"""
809 """return a valid unbundler object for a given magicstring"""
810 if magicstring is None:
810 if magicstring is None:
811 magicstring = changegroup.readexactly(fp, 4)
811 magicstring = changegroup.readexactly(fp, 4)
812 magic, version = magicstring[0:2], magicstring[2:4]
812 magic, version = magicstring[0:2], magicstring[2:4]
813 if magic != b'HG':
813 if magic != b'HG':
814 ui.debug(
814 ui.debug(
815 b"error: invalid magic: %r (version %r), should be 'HG'\n"
815 b"error: invalid magic: %r (version %r), should be 'HG'\n"
816 % (magic, version)
816 % (magic, version)
817 )
817 )
818 raise error.Abort(_(b'not a Mercurial bundle'))
818 raise error.Abort(_(b'not a Mercurial bundle'))
819 unbundlerclass = formatmap.get(version)
819 unbundlerclass = formatmap.get(version)
820 if unbundlerclass is None:
820 if unbundlerclass is None:
821 raise error.Abort(_(b'unknown bundle version %s') % version)
821 raise error.Abort(_(b'unknown bundle version %s') % version)
822 unbundler = unbundlerclass(ui, fp)
822 unbundler = unbundlerclass(ui, fp)
823 indebug(ui, b'start processing of %s stream' % magicstring)
823 indebug(ui, b'start processing of %s stream' % magicstring)
824 return unbundler
824 return unbundler
825
825
826
826
827 class unbundle20(unpackermixin):
827 class unbundle20(unpackermixin):
828 """interpret a bundle2 stream
828 """interpret a bundle2 stream
829
829
830 This class is fed with a binary stream and yields parts through its
830 This class is fed with a binary stream and yields parts through its
831 `iterparts` methods."""
831 `iterparts` methods."""
832
832
833 _magicstring = b'HG20'
833 _magicstring = b'HG20'
834
834
835 def __init__(self, ui, fp):
835 def __init__(self, ui, fp):
836 """If header is specified, we do not read it out of the stream."""
836 """If header is specified, we do not read it out of the stream."""
837 self.ui = ui
837 self.ui = ui
838 self._compengine = util.compengines.forbundletype(b'UN')
838 self._compengine = util.compengines.forbundletype(b'UN')
839 self._compressed = None
839 self._compressed = None
840 super(unbundle20, self).__init__(fp)
840 super(unbundle20, self).__init__(fp)
841
841
842 @util.propertycache
842 @util.propertycache
843 def params(self):
843 def params(self):
844 """dictionary of stream level parameters"""
844 """dictionary of stream level parameters"""
845 indebug(self.ui, b'reading bundle2 stream parameters')
845 indebug(self.ui, b'reading bundle2 stream parameters')
846 params = {}
846 params = {}
847 paramssize = self._unpack(_fstreamparamsize)[0]
847 paramssize = self._unpack(_fstreamparamsize)[0]
848 if paramssize < 0:
848 if paramssize < 0:
849 raise error.BundleValueError(
849 raise error.BundleValueError(
850 b'negative bundle param size: %i' % paramssize
850 b'negative bundle param size: %i' % paramssize
851 )
851 )
852 if paramssize:
852 if paramssize:
853 params = self._readexact(paramssize)
853 params = self._readexact(paramssize)
854 params = self._processallparams(params)
854 params = self._processallparams(params)
855 return params
855 return params
856
856
857 def _processallparams(self, paramsblock):
857 def _processallparams(self, paramsblock):
858 """ """
858 """ """
859 params = util.sortdict()
859 params = util.sortdict()
860 for p in paramsblock.split(b' '):
860 for p in paramsblock.split(b' '):
861 p = p.split(b'=', 1)
861 p = p.split(b'=', 1)
862 p = [urlreq.unquote(i) for i in p]
862 p = [urlreq.unquote(i) for i in p]
863 if len(p) < 2:
863 if len(p) < 2:
864 p.append(None)
864 p.append(None)
865 self._processparam(*p)
865 self._processparam(*p)
866 params[p[0]] = p[1]
866 params[p[0]] = p[1]
867 return params
867 return params
868
868
869 def _processparam(self, name, value):
869 def _processparam(self, name, value):
870 """process a parameter, applying its effect if needed
870 """process a parameter, applying its effect if needed
871
871
872 Parameter starting with a lower case letter are advisory and will be
872 Parameter starting with a lower case letter are advisory and will be
873 ignored when unknown. Those starting with an upper case letter are
873 ignored when unknown. Those starting with an upper case letter are
874 mandatory and will this function will raise a KeyError when unknown.
874 mandatory and will this function will raise a KeyError when unknown.
875
875
876 Note: no option are currently supported. Any input will be either
876 Note: no option are currently supported. Any input will be either
877 ignored or failing.
877 ignored or failing.
878 """
878 """
879 if not name:
879 if not name:
880 raise ValueError('empty parameter name')
880 raise ValueError('empty parameter name')
881 if name[0:1] not in pycompat.bytestr(
881 if name[0:1] not in pycompat.bytestr(
882 string.ascii_letters # pytype: disable=wrong-arg-types
882 string.ascii_letters # pytype: disable=wrong-arg-types
883 ):
883 ):
884 raise ValueError('non letter first character: %s' % name)
884 raise ValueError('non letter first character: %s' % name)
885 try:
885 try:
886 handler = b2streamparamsmap[name.lower()]
886 handler = b2streamparamsmap[name.lower()]
887 except KeyError:
887 except KeyError:
888 if name[0:1].islower():
888 if name[0:1].islower():
889 indebug(self.ui, b"ignoring unknown parameter %s" % name)
889 indebug(self.ui, b"ignoring unknown parameter %s" % name)
890 else:
890 else:
891 raise error.BundleUnknownFeatureError(params=(name,))
891 raise error.BundleUnknownFeatureError(params=(name,))
892 else:
892 else:
893 handler(self, name, value)
893 handler(self, name, value)
894
894
895 def _forwardchunks(self):
895 def _forwardchunks(self):
896 """utility to transfer a bundle2 as binary
896 """utility to transfer a bundle2 as binary
897
897
898 This is made necessary by the fact the 'getbundle' command over 'ssh'
898 This is made necessary by the fact the 'getbundle' command over 'ssh'
899 have no way to know then the reply end, relying on the bundle to be
899 have no way to know then the reply end, relying on the bundle to be
900 interpreted to know its end. This is terrible and we are sorry, but we
900 interpreted to know its end. This is terrible and we are sorry, but we
901 needed to move forward to get general delta enabled.
901 needed to move forward to get general delta enabled.
902 """
902 """
903 yield self._magicstring
903 yield self._magicstring
904 assert 'params' not in vars(self)
904 assert 'params' not in vars(self)
905 paramssize = self._unpack(_fstreamparamsize)[0]
905 paramssize = self._unpack(_fstreamparamsize)[0]
906 if paramssize < 0:
906 if paramssize < 0:
907 raise error.BundleValueError(
907 raise error.BundleValueError(
908 b'negative bundle param size: %i' % paramssize
908 b'negative bundle param size: %i' % paramssize
909 )
909 )
910 if paramssize:
910 if paramssize:
911 params = self._readexact(paramssize)
911 params = self._readexact(paramssize)
912 self._processallparams(params)
912 self._processallparams(params)
913 # The payload itself is decompressed below, so drop
913 # The payload itself is decompressed below, so drop
914 # the compression parameter passed down to compensate.
914 # the compression parameter passed down to compensate.
915 outparams = []
915 outparams = []
916 for p in params.split(b' '):
916 for p in params.split(b' '):
917 k, v = p.split(b'=', 1)
917 k, v = p.split(b'=', 1)
918 if k.lower() != b'compression':
918 if k.lower() != b'compression':
919 outparams.append(p)
919 outparams.append(p)
920 outparams = b' '.join(outparams)
920 outparams = b' '.join(outparams)
921 yield _pack(_fstreamparamsize, len(outparams))
921 yield _pack(_fstreamparamsize, len(outparams))
922 yield outparams
922 yield outparams
923 else:
923 else:
924 yield _pack(_fstreamparamsize, paramssize)
924 yield _pack(_fstreamparamsize, paramssize)
925 # From there, payload might need to be decompressed
925 # From there, payload might need to be decompressed
926 self._fp = self._compengine.decompressorreader(self._fp)
926 self._fp = self._compengine.decompressorreader(self._fp)
927 emptycount = 0
927 emptycount = 0
928 while emptycount < 2:
928 while emptycount < 2:
929 # so we can brainlessly loop
929 # so we can brainlessly loop
930 assert _fpartheadersize == _fpayloadsize
930 assert _fpartheadersize == _fpayloadsize
931 size = self._unpack(_fpartheadersize)[0]
931 size = self._unpack(_fpartheadersize)[0]
932 yield _pack(_fpartheadersize, size)
932 yield _pack(_fpartheadersize, size)
933 if size:
933 if size:
934 emptycount = 0
934 emptycount = 0
935 else:
935 else:
936 emptycount += 1
936 emptycount += 1
937 continue
937 continue
938 if size == flaginterrupt:
938 if size == flaginterrupt:
939 continue
939 continue
940 elif size < 0:
940 elif size < 0:
941 raise error.BundleValueError(b'negative chunk size: %i')
941 raise error.BundleValueError(b'negative chunk size: %i')
942 yield self._readexact(size)
942 yield self._readexact(size)
943
943
944 def iterparts(self, seekable=False):
944 def iterparts(self, seekable=False):
945 """yield all parts contained in the stream"""
945 """yield all parts contained in the stream"""
946 cls = seekableunbundlepart if seekable else unbundlepart
946 cls = seekableunbundlepart if seekable else unbundlepart
947 # make sure param have been loaded
947 # make sure param have been loaded
948 self.params
948 self.params
949 # From there, payload need to be decompressed
949 # From there, payload need to be decompressed
950 self._fp = self._compengine.decompressorreader(self._fp)
950 self._fp = self._compengine.decompressorreader(self._fp)
951 indebug(self.ui, b'start extraction of bundle2 parts')
951 indebug(self.ui, b'start extraction of bundle2 parts')
952 headerblock = self._readpartheader()
952 headerblock = self._readpartheader()
953 while headerblock is not None:
953 while headerblock is not None:
954 part = cls(self.ui, headerblock, self._fp)
954 part = cls(self.ui, headerblock, self._fp)
955 yield part
955 yield part
956 # Ensure part is fully consumed so we can start reading the next
956 # Ensure part is fully consumed so we can start reading the next
957 # part.
957 # part.
958 part.consume()
958 part.consume()
959
959
960 headerblock = self._readpartheader()
960 headerblock = self._readpartheader()
961 indebug(self.ui, b'end of bundle2 stream')
961 indebug(self.ui, b'end of bundle2 stream')
962
962
963 def _readpartheader(self):
963 def _readpartheader(self):
964 """reads a part header size and return the bytes blob
964 """reads a part header size and return the bytes blob
965
965
966 returns None if empty"""
966 returns None if empty"""
967 headersize = self._unpack(_fpartheadersize)[0]
967 headersize = self._unpack(_fpartheadersize)[0]
968 if headersize < 0:
968 if headersize < 0:
969 raise error.BundleValueError(
969 raise error.BundleValueError(
970 b'negative part header size: %i' % headersize
970 b'negative part header size: %i' % headersize
971 )
971 )
972 indebug(self.ui, b'part header size: %i' % headersize)
972 indebug(self.ui, b'part header size: %i' % headersize)
973 if headersize:
973 if headersize:
974 return self._readexact(headersize)
974 return self._readexact(headersize)
975 return None
975 return None
976
976
977 def compressed(self):
977 def compressed(self):
978 self.params # load params
978 self.params # load params
979 return self._compressed
979 return self._compressed
980
980
981 def close(self):
981 def close(self):
982 """close underlying file"""
982 """close underlying file"""
983 if util.safehasattr(self._fp, 'close'):
983 if util.safehasattr(self._fp, 'close'):
984 return self._fp.close()
984 return self._fp.close()
985
985
986
986
987 formatmap = {b'20': unbundle20}
987 formatmap = {b'20': unbundle20}
988
988
989 b2streamparamsmap = {}
989 b2streamparamsmap = {}
990
990
991
991
992 def b2streamparamhandler(name):
992 def b2streamparamhandler(name):
993 """register a handler for a stream level parameter"""
993 """register a handler for a stream level parameter"""
994
994
995 def decorator(func):
995 def decorator(func):
996 assert name not in formatmap
996 assert name not in formatmap
997 b2streamparamsmap[name] = func
997 b2streamparamsmap[name] = func
998 return func
998 return func
999
999
1000 return decorator
1000 return decorator
1001
1001
1002
1002
1003 @b2streamparamhandler(b'compression')
1003 @b2streamparamhandler(b'compression')
1004 def processcompression(unbundler, param, value):
1004 def processcompression(unbundler, param, value):
1005 """read compression parameter and install payload decompression"""
1005 """read compression parameter and install payload decompression"""
1006 if value not in util.compengines.supportedbundletypes:
1006 if value not in util.compengines.supportedbundletypes:
1007 raise error.BundleUnknownFeatureError(params=(param,), values=(value,))
1007 raise error.BundleUnknownFeatureError(params=(param,), values=(value,))
1008 unbundler._compengine = util.compengines.forbundletype(value)
1008 unbundler._compengine = util.compengines.forbundletype(value)
1009 if value is not None:
1009 if value is not None:
1010 unbundler._compressed = True
1010 unbundler._compressed = True
1011
1011
1012
1012
1013 class bundlepart:
1013 class bundlepart:
1014 """A bundle2 part contains application level payload
1014 """A bundle2 part contains application level payload
1015
1015
1016 The part `type` is used to route the part to the application level
1016 The part `type` is used to route the part to the application level
1017 handler.
1017 handler.
1018
1018
1019 The part payload is contained in ``part.data``. It could be raw bytes or a
1019 The part payload is contained in ``part.data``. It could be raw bytes or a
1020 generator of byte chunks.
1020 generator of byte chunks.
1021
1021
1022 You can add parameters to the part using the ``addparam`` method.
1022 You can add parameters to the part using the ``addparam`` method.
1023 Parameters can be either mandatory (default) or advisory. Remote side
1023 Parameters can be either mandatory (default) or advisory. Remote side
1024 should be able to safely ignore the advisory ones.
1024 should be able to safely ignore the advisory ones.
1025
1025
1026 Both data and parameters cannot be modified after the generation has begun.
1026 Both data and parameters cannot be modified after the generation has begun.
1027 """
1027 """
1028
1028
1029 def __init__(
1029 def __init__(
1030 self,
1030 self,
1031 parttype,
1031 parttype,
1032 mandatoryparams=(),
1032 mandatoryparams=(),
1033 advisoryparams=(),
1033 advisoryparams=(),
1034 data=b'',
1034 data=b'',
1035 mandatory=True,
1035 mandatory=True,
1036 ):
1036 ):
1037 validateparttype(parttype)
1037 validateparttype(parttype)
1038 self.id = None
1038 self.id = None
1039 self.type = parttype
1039 self.type = parttype
1040 self._data = data
1040 self._data = data
1041 self._mandatoryparams = list(mandatoryparams)
1041 self._mandatoryparams = list(mandatoryparams)
1042 self._advisoryparams = list(advisoryparams)
1042 self._advisoryparams = list(advisoryparams)
1043 # checking for duplicated entries
1043 # checking for duplicated entries
1044 self._seenparams = set()
1044 self._seenparams = set()
1045 for pname, __ in self._mandatoryparams + self._advisoryparams:
1045 for pname, __ in self._mandatoryparams + self._advisoryparams:
1046 if pname in self._seenparams:
1046 if pname in self._seenparams:
1047 raise error.ProgrammingError(b'duplicated params: %s' % pname)
1047 raise error.ProgrammingError(b'duplicated params: %s' % pname)
1048 self._seenparams.add(pname)
1048 self._seenparams.add(pname)
1049 # status of the part's generation:
1049 # status of the part's generation:
1050 # - None: not started,
1050 # - None: not started,
1051 # - False: currently generated,
1051 # - False: currently generated,
1052 # - True: generation done.
1052 # - True: generation done.
1053 self._generated = None
1053 self._generated = None
1054 self.mandatory = mandatory
1054 self.mandatory = mandatory
1055
1055
1056 def __repr__(self):
1056 def __repr__(self):
1057 cls = "%s.%s" % (self.__class__.__module__, self.__class__.__name__)
1057 cls = "%s.%s" % (self.__class__.__module__, self.__class__.__name__)
1058 return '<%s object at %x; id: %s; type: %s; mandatory: %s>' % (
1058 return '<%s object at %x; id: %s; type: %s; mandatory: %s>' % (
1059 cls,
1059 cls,
1060 id(self),
1060 id(self),
1061 self.id,
1061 self.id,
1062 self.type,
1062 self.type,
1063 self.mandatory,
1063 self.mandatory,
1064 )
1064 )
1065
1065
1066 def copy(self):
1066 def copy(self):
1067 """return a copy of the part
1067 """return a copy of the part
1068
1068
1069 The new part have the very same content but no partid assigned yet.
1069 The new part have the very same content but no partid assigned yet.
1070 Parts with generated data cannot be copied."""
1070 Parts with generated data cannot be copied."""
1071 assert not util.safehasattr(self.data, 'next')
1071 assert not util.safehasattr(self.data, 'next')
1072 return self.__class__(
1072 return self.__class__(
1073 self.type,
1073 self.type,
1074 self._mandatoryparams,
1074 self._mandatoryparams,
1075 self._advisoryparams,
1075 self._advisoryparams,
1076 self._data,
1076 self._data,
1077 self.mandatory,
1077 self.mandatory,
1078 )
1078 )
1079
1079
1080 # methods used to defines the part content
1080 # methods used to defines the part content
1081 @property
1081 @property
1082 def data(self):
1082 def data(self):
1083 return self._data
1083 return self._data
1084
1084
1085 @data.setter
1085 @data.setter
1086 def data(self, data):
1086 def data(self, data):
1087 if self._generated is not None:
1087 if self._generated is not None:
1088 raise error.ReadOnlyPartError(b'part is being generated')
1088 raise error.ReadOnlyPartError(b'part is being generated')
1089 self._data = data
1089 self._data = data
1090
1090
1091 @property
1091 @property
1092 def mandatoryparams(self):
1092 def mandatoryparams(self):
1093 # make it an immutable tuple to force people through ``addparam``
1093 # make it an immutable tuple to force people through ``addparam``
1094 return tuple(self._mandatoryparams)
1094 return tuple(self._mandatoryparams)
1095
1095
1096 @property
1096 @property
1097 def advisoryparams(self):
1097 def advisoryparams(self):
1098 # make it an immutable tuple to force people through ``addparam``
1098 # make it an immutable tuple to force people through ``addparam``
1099 return tuple(self._advisoryparams)
1099 return tuple(self._advisoryparams)
1100
1100
1101 def addparam(self, name, value=b'', mandatory=True):
1101 def addparam(self, name, value=b'', mandatory=True):
1102 """add a parameter to the part
1102 """add a parameter to the part
1103
1103
1104 If 'mandatory' is set to True, the remote handler must claim support
1104 If 'mandatory' is set to True, the remote handler must claim support
1105 for this parameter or the unbundling will be aborted.
1105 for this parameter or the unbundling will be aborted.
1106
1106
1107 The 'name' and 'value' cannot exceed 255 bytes each.
1107 The 'name' and 'value' cannot exceed 255 bytes each.
1108 """
1108 """
1109 if self._generated is not None:
1109 if self._generated is not None:
1110 raise error.ReadOnlyPartError(b'part is being generated')
1110 raise error.ReadOnlyPartError(b'part is being generated')
1111 if name in self._seenparams:
1111 if name in self._seenparams:
1112 raise ValueError(b'duplicated params: %s' % name)
1112 raise ValueError(b'duplicated params: %s' % name)
1113 self._seenparams.add(name)
1113 self._seenparams.add(name)
1114 params = self._advisoryparams
1114 params = self._advisoryparams
1115 if mandatory:
1115 if mandatory:
1116 params = self._mandatoryparams
1116 params = self._mandatoryparams
1117 params.append((name, value))
1117 params.append((name, value))
1118
1118
1119 # methods used to generates the bundle2 stream
1119 # methods used to generates the bundle2 stream
1120 def getchunks(self, ui):
1120 def getchunks(self, ui):
1121 if self._generated is not None:
1121 if self._generated is not None:
1122 raise error.ProgrammingError(b'part can only be consumed once')
1122 raise error.ProgrammingError(b'part can only be consumed once')
1123 self._generated = False
1123 self._generated = False
1124
1124
1125 if ui.debugflag:
1125 if ui.debugflag:
1126 msg = [b'bundle2-output-part: "%s"' % self.type]
1126 msg = [b'bundle2-output-part: "%s"' % self.type]
1127 if not self.mandatory:
1127 if not self.mandatory:
1128 msg.append(b' (advisory)')
1128 msg.append(b' (advisory)')
1129 nbmp = len(self.mandatoryparams)
1129 nbmp = len(self.mandatoryparams)
1130 nbap = len(self.advisoryparams)
1130 nbap = len(self.advisoryparams)
1131 if nbmp or nbap:
1131 if nbmp or nbap:
1132 msg.append(b' (params:')
1132 msg.append(b' (params:')
1133 if nbmp:
1133 if nbmp:
1134 msg.append(b' %i mandatory' % nbmp)
1134 msg.append(b' %i mandatory' % nbmp)
1135 if nbap:
1135 if nbap:
1136 msg.append(b' %i advisory' % nbmp)
1136 msg.append(b' %i advisory' % nbmp)
1137 msg.append(b')')
1137 msg.append(b')')
1138 if not self.data:
1138 if not self.data:
1139 msg.append(b' empty payload')
1139 msg.append(b' empty payload')
1140 elif util.safehasattr(self.data, 'next') or util.safehasattr(
1140 elif util.safehasattr(self.data, 'next') or util.safehasattr(
1141 self.data, b'__next__'
1141 self.data, b'__next__'
1142 ):
1142 ):
1143 msg.append(b' streamed payload')
1143 msg.append(b' streamed payload')
1144 else:
1144 else:
1145 msg.append(b' %i bytes payload' % len(self.data))
1145 msg.append(b' %i bytes payload' % len(self.data))
1146 msg.append(b'\n')
1146 msg.append(b'\n')
1147 ui.debug(b''.join(msg))
1147 ui.debug(b''.join(msg))
1148
1148
1149 #### header
1149 #### header
1150 if self.mandatory:
1150 if self.mandatory:
1151 parttype = self.type.upper()
1151 parttype = self.type.upper()
1152 else:
1152 else:
1153 parttype = self.type.lower()
1153 parttype = self.type.lower()
1154 outdebug(ui, b'part %s: "%s"' % (pycompat.bytestr(self.id), parttype))
1154 outdebug(ui, b'part %s: "%s"' % (pycompat.bytestr(self.id), parttype))
1155 ## parttype
1155 ## parttype
1156 header = [
1156 header = [
1157 _pack(_fparttypesize, len(parttype)),
1157 _pack(_fparttypesize, len(parttype)),
1158 parttype,
1158 parttype,
1159 _pack(_fpartid, self.id),
1159 _pack(_fpartid, self.id),
1160 ]
1160 ]
1161 ## parameters
1161 ## parameters
1162 # count
1162 # count
1163 manpar = self.mandatoryparams
1163 manpar = self.mandatoryparams
1164 advpar = self.advisoryparams
1164 advpar = self.advisoryparams
1165 header.append(_pack(_fpartparamcount, len(manpar), len(advpar)))
1165 header.append(_pack(_fpartparamcount, len(manpar), len(advpar)))
1166 # size
1166 # size
1167 parsizes = []
1167 parsizes = []
1168 for key, value in manpar:
1168 for key, value in manpar:
1169 parsizes.append(len(key))
1169 parsizes.append(len(key))
1170 parsizes.append(len(value))
1170 parsizes.append(len(value))
1171 for key, value in advpar:
1171 for key, value in advpar:
1172 parsizes.append(len(key))
1172 parsizes.append(len(key))
1173 parsizes.append(len(value))
1173 parsizes.append(len(value))
1174 paramsizes = _pack(_makefpartparamsizes(len(parsizes) // 2), *parsizes)
1174 paramsizes = _pack(_makefpartparamsizes(len(parsizes) // 2), *parsizes)
1175 header.append(paramsizes)
1175 header.append(paramsizes)
1176 # key, value
1176 # key, value
1177 for key, value in manpar:
1177 for key, value in manpar:
1178 header.append(key)
1178 header.append(key)
1179 header.append(value)
1179 header.append(value)
1180 for key, value in advpar:
1180 for key, value in advpar:
1181 header.append(key)
1181 header.append(key)
1182 header.append(value)
1182 header.append(value)
1183 ## finalize header
1183 ## finalize header
1184 try:
1184 try:
1185 headerchunk = b''.join(header)
1185 headerchunk = b''.join(header)
1186 except TypeError:
1186 except TypeError:
1187 raise TypeError(
1187 raise TypeError(
1188 'Found a non-bytes trying to '
1188 'Found a non-bytes trying to '
1189 'build bundle part header: %r' % header
1189 'build bundle part header: %r' % header
1190 )
1190 )
1191 outdebug(ui, b'header chunk size: %i' % len(headerchunk))
1191 outdebug(ui, b'header chunk size: %i' % len(headerchunk))
1192 yield _pack(_fpartheadersize, len(headerchunk))
1192 yield _pack(_fpartheadersize, len(headerchunk))
1193 yield headerchunk
1193 yield headerchunk
1194 ## payload
1194 ## payload
1195 try:
1195 try:
1196 for chunk in self._payloadchunks():
1196 for chunk in self._payloadchunks():
1197 outdebug(ui, b'payload chunk size: %i' % len(chunk))
1197 outdebug(ui, b'payload chunk size: %i' % len(chunk))
1198 yield _pack(_fpayloadsize, len(chunk))
1198 yield _pack(_fpayloadsize, len(chunk))
1199 yield chunk
1199 yield chunk
1200 except GeneratorExit:
1200 except GeneratorExit:
1201 # GeneratorExit means that nobody is listening for our
1201 # GeneratorExit means that nobody is listening for our
1202 # results anyway, so just bail quickly rather than trying
1202 # results anyway, so just bail quickly rather than trying
1203 # to produce an error part.
1203 # to produce an error part.
1204 ui.debug(b'bundle2-generatorexit\n')
1204 ui.debug(b'bundle2-generatorexit\n')
1205 raise
1205 raise
1206 except BaseException as exc:
1206 except BaseException as exc:
1207 bexc = stringutil.forcebytestr(exc)
1207 bexc = stringutil.forcebytestr(exc)
1208 # backup exception data for later
1208 # backup exception data for later
1209 ui.debug(
1209 ui.debug(
1210 b'bundle2-input-stream-interrupt: encoding exception %s' % bexc
1210 b'bundle2-input-stream-interrupt: encoding exception %s' % bexc
1211 )
1211 )
1212 tb = sys.exc_info()[2]
1212 tb = sys.exc_info()[2]
1213 msg = b'unexpected error: %s' % bexc
1213 msg = b'unexpected error: %s' % bexc
1214 interpart = bundlepart(
1214 interpart = bundlepart(
1215 b'error:abort', [(b'message', msg)], mandatory=False
1215 b'error:abort', [(b'message', msg)], mandatory=False
1216 )
1216 )
1217 interpart.id = 0
1217 interpart.id = 0
1218 yield _pack(_fpayloadsize, -1)
1218 yield _pack(_fpayloadsize, -1)
1219 for chunk in interpart.getchunks(ui=ui):
1219 for chunk in interpart.getchunks(ui=ui):
1220 yield chunk
1220 yield chunk
1221 outdebug(ui, b'closing payload chunk')
1221 outdebug(ui, b'closing payload chunk')
1222 # abort current part payload
1222 # abort current part payload
1223 yield _pack(_fpayloadsize, 0)
1223 yield _pack(_fpayloadsize, 0)
1224 pycompat.raisewithtb(exc, tb)
1224 pycompat.raisewithtb(exc, tb)
1225 # end of payload
1225 # end of payload
1226 outdebug(ui, b'closing payload chunk')
1226 outdebug(ui, b'closing payload chunk')
1227 yield _pack(_fpayloadsize, 0)
1227 yield _pack(_fpayloadsize, 0)
1228 self._generated = True
1228 self._generated = True
1229
1229
1230 def _payloadchunks(self):
1230 def _payloadchunks(self):
1231 """yield chunks of a the part payload
1231 """yield chunks of a the part payload
1232
1232
1233 Exists to handle the different methods to provide data to a part."""
1233 Exists to handle the different methods to provide data to a part."""
1234 # we only support fixed size data now.
1234 # we only support fixed size data now.
1235 # This will be improved in the future.
1235 # This will be improved in the future.
1236 if util.safehasattr(self.data, 'next') or util.safehasattr(
1236 if util.safehasattr(self.data, 'next') or util.safehasattr(
1237 self.data, '__next__'
1237 self.data, '__next__'
1238 ):
1238 ):
1239 buff = util.chunkbuffer(self.data)
1239 buff = util.chunkbuffer(self.data)
1240 chunk = buff.read(preferedchunksize)
1240 chunk = buff.read(preferedchunksize)
1241 while chunk:
1241 while chunk:
1242 yield chunk
1242 yield chunk
1243 chunk = buff.read(preferedchunksize)
1243 chunk = buff.read(preferedchunksize)
1244 elif len(self.data):
1244 elif len(self.data):
1245 yield self.data
1245 yield self.data
1246
1246
1247
1247
1248 flaginterrupt = -1
1248 flaginterrupt = -1
1249
1249
1250
1250
1251 class interrupthandler(unpackermixin):
1251 class interrupthandler(unpackermixin):
1252 """read one part and process it with restricted capability
1252 """read one part and process it with restricted capability
1253
1253
1254 This allows to transmit exception raised on the producer size during part
1254 This allows to transmit exception raised on the producer size during part
1255 iteration while the consumer is reading a part.
1255 iteration while the consumer is reading a part.
1256
1256
1257 Part processed in this manner only have access to a ui object,"""
1257 Part processed in this manner only have access to a ui object,"""
1258
1258
1259 def __init__(self, ui, fp):
1259 def __init__(self, ui, fp):
1260 super(interrupthandler, self).__init__(fp)
1260 super(interrupthandler, self).__init__(fp)
1261 self.ui = ui
1261 self.ui = ui
1262
1262
1263 def _readpartheader(self):
1263 def _readpartheader(self):
1264 """reads a part header size and return the bytes blob
1264 """reads a part header size and return the bytes blob
1265
1265
1266 returns None if empty"""
1266 returns None if empty"""
1267 headersize = self._unpack(_fpartheadersize)[0]
1267 headersize = self._unpack(_fpartheadersize)[0]
1268 if headersize < 0:
1268 if headersize < 0:
1269 raise error.BundleValueError(
1269 raise error.BundleValueError(
1270 b'negative part header size: %i' % headersize
1270 b'negative part header size: %i' % headersize
1271 )
1271 )
1272 indebug(self.ui, b'part header size: %i\n' % headersize)
1272 indebug(self.ui, b'part header size: %i\n' % headersize)
1273 if headersize:
1273 if headersize:
1274 return self._readexact(headersize)
1274 return self._readexact(headersize)
1275 return None
1275 return None
1276
1276
1277 def __call__(self):
1277 def __call__(self):
1278
1278
1279 self.ui.debug(
1279 self.ui.debug(
1280 b'bundle2-input-stream-interrupt: opening out of band context\n'
1280 b'bundle2-input-stream-interrupt: opening out of band context\n'
1281 )
1281 )
1282 indebug(self.ui, b'bundle2 stream interruption, looking for a part.')
1282 indebug(self.ui, b'bundle2 stream interruption, looking for a part.')
1283 headerblock = self._readpartheader()
1283 headerblock = self._readpartheader()
1284 if headerblock is None:
1284 if headerblock is None:
1285 indebug(self.ui, b'no part found during interruption.')
1285 indebug(self.ui, b'no part found during interruption.')
1286 return
1286 return
1287 part = unbundlepart(self.ui, headerblock, self._fp)
1287 part = unbundlepart(self.ui, headerblock, self._fp)
1288 op = interruptoperation(self.ui)
1288 op = interruptoperation(self.ui)
1289 hardabort = False
1289 hardabort = False
1290 try:
1290 try:
1291 _processpart(op, part)
1291 _processpart(op, part)
1292 except (SystemExit, KeyboardInterrupt):
1292 except (SystemExit, KeyboardInterrupt):
1293 hardabort = True
1293 hardabort = True
1294 raise
1294 raise
1295 finally:
1295 finally:
1296 if not hardabort:
1296 if not hardabort:
1297 part.consume()
1297 part.consume()
1298 self.ui.debug(
1298 self.ui.debug(
1299 b'bundle2-input-stream-interrupt: closing out of band context\n'
1299 b'bundle2-input-stream-interrupt: closing out of band context\n'
1300 )
1300 )
1301
1301
1302
1302
1303 class interruptoperation:
1303 class interruptoperation:
1304 """A limited operation to be use by part handler during interruption
1304 """A limited operation to be use by part handler during interruption
1305
1305
1306 It only have access to an ui object.
1306 It only have access to an ui object.
1307 """
1307 """
1308
1308
1309 def __init__(self, ui):
1309 def __init__(self, ui):
1310 self.ui = ui
1310 self.ui = ui
1311 self.reply = None
1311 self.reply = None
1312 self.captureoutput = False
1312 self.captureoutput = False
1313
1313
1314 @property
1314 @property
1315 def repo(self):
1315 def repo(self):
1316 raise error.ProgrammingError(b'no repo access from stream interruption')
1316 raise error.ProgrammingError(b'no repo access from stream interruption')
1317
1317
1318 def gettransaction(self):
1318 def gettransaction(self):
1319 raise TransactionUnavailable(b'no repo access from stream interruption')
1319 raise TransactionUnavailable(b'no repo access from stream interruption')
1320
1320
1321
1321
1322 def decodepayloadchunks(ui, fh):
1322 def decodepayloadchunks(ui, fh):
1323 """Reads bundle2 part payload data into chunks.
1323 """Reads bundle2 part payload data into chunks.
1324
1324
1325 Part payload data consists of framed chunks. This function takes
1325 Part payload data consists of framed chunks. This function takes
1326 a file handle and emits those chunks.
1326 a file handle and emits those chunks.
1327 """
1327 """
1328 dolog = ui.configbool(b'devel', b'bundle2.debug')
1328 dolog = ui.configbool(b'devel', b'bundle2.debug')
1329 debug = ui.debug
1329 debug = ui.debug
1330
1330
1331 headerstruct = struct.Struct(_fpayloadsize)
1331 headerstruct = struct.Struct(_fpayloadsize)
1332 headersize = headerstruct.size
1332 headersize = headerstruct.size
1333 unpack = headerstruct.unpack
1333 unpack = headerstruct.unpack
1334
1334
1335 readexactly = changegroup.readexactly
1335 readexactly = changegroup.readexactly
1336 read = fh.read
1336 read = fh.read
1337
1337
1338 chunksize = unpack(readexactly(fh, headersize))[0]
1338 chunksize = unpack(readexactly(fh, headersize))[0]
1339 indebug(ui, b'payload chunk size: %i' % chunksize)
1339 indebug(ui, b'payload chunk size: %i' % chunksize)
1340
1340
1341 # changegroup.readexactly() is inlined below for performance.
1341 # changegroup.readexactly() is inlined below for performance.
1342 while chunksize:
1342 while chunksize:
1343 if chunksize >= 0:
1343 if chunksize >= 0:
1344 s = read(chunksize)
1344 s = read(chunksize)
1345 if len(s) < chunksize:
1345 if len(s) < chunksize:
1346 raise error.Abort(
1346 raise error.Abort(
1347 _(
1347 _(
1348 b'stream ended unexpectedly '
1348 b'stream ended unexpectedly '
1349 b' (got %d bytes, expected %d)'
1349 b' (got %d bytes, expected %d)'
1350 )
1350 )
1351 % (len(s), chunksize)
1351 % (len(s), chunksize)
1352 )
1352 )
1353
1353
1354 yield s
1354 yield s
1355 elif chunksize == flaginterrupt:
1355 elif chunksize == flaginterrupt:
1356 # Interrupt "signal" detected. The regular stream is interrupted
1356 # Interrupt "signal" detected. The regular stream is interrupted
1357 # and a bundle2 part follows. Consume it.
1357 # and a bundle2 part follows. Consume it.
1358 interrupthandler(ui, fh)()
1358 interrupthandler(ui, fh)()
1359 else:
1359 else:
1360 raise error.BundleValueError(
1360 raise error.BundleValueError(
1361 b'negative payload chunk size: %s' % chunksize
1361 b'negative payload chunk size: %s' % chunksize
1362 )
1362 )
1363
1363
1364 s = read(headersize)
1364 s = read(headersize)
1365 if len(s) < headersize:
1365 if len(s) < headersize:
1366 raise error.Abort(
1366 raise error.Abort(
1367 _(b'stream ended unexpectedly (got %d bytes, expected %d)')
1367 _(b'stream ended unexpectedly (got %d bytes, expected %d)')
1368 % (len(s), chunksize)
1368 % (len(s), chunksize)
1369 )
1369 )
1370
1370
1371 chunksize = unpack(s)[0]
1371 chunksize = unpack(s)[0]
1372
1372
1373 # indebug() inlined for performance.
1373 # indebug() inlined for performance.
1374 if dolog:
1374 if dolog:
1375 debug(b'bundle2-input: payload chunk size: %i\n' % chunksize)
1375 debug(b'bundle2-input: payload chunk size: %i\n' % chunksize)
1376
1376
1377
1377
1378 class unbundlepart(unpackermixin):
1378 class unbundlepart(unpackermixin):
1379 """a bundle part read from a bundle"""
1379 """a bundle part read from a bundle"""
1380
1380
1381 def __init__(self, ui, header, fp):
1381 def __init__(self, ui, header, fp):
1382 super(unbundlepart, self).__init__(fp)
1382 super(unbundlepart, self).__init__(fp)
1383 self._seekable = util.safehasattr(fp, 'seek') and util.safehasattr(
1383 self._seekable = util.safehasattr(fp, 'seek') and util.safehasattr(
1384 fp, b'tell'
1384 fp, 'tell'
1385 )
1385 )
1386 self.ui = ui
1386 self.ui = ui
1387 # unbundle state attr
1387 # unbundle state attr
1388 self._headerdata = header
1388 self._headerdata = header
1389 self._headeroffset = 0
1389 self._headeroffset = 0
1390 self._initialized = False
1390 self._initialized = False
1391 self.consumed = False
1391 self.consumed = False
1392 # part data
1392 # part data
1393 self.id = None
1393 self.id = None
1394 self.type = None
1394 self.type = None
1395 self.mandatoryparams = None
1395 self.mandatoryparams = None
1396 self.advisoryparams = None
1396 self.advisoryparams = None
1397 self.params = None
1397 self.params = None
1398 self.mandatorykeys = ()
1398 self.mandatorykeys = ()
1399 self._readheader()
1399 self._readheader()
1400 self._mandatory = None
1400 self._mandatory = None
1401 self._pos = 0
1401 self._pos = 0
1402
1402
1403 def _fromheader(self, size):
1403 def _fromheader(self, size):
1404 """return the next <size> byte from the header"""
1404 """return the next <size> byte from the header"""
1405 offset = self._headeroffset
1405 offset = self._headeroffset
1406 data = self._headerdata[offset : (offset + size)]
1406 data = self._headerdata[offset : (offset + size)]
1407 self._headeroffset = offset + size
1407 self._headeroffset = offset + size
1408 return data
1408 return data
1409
1409
1410 def _unpackheader(self, format):
1410 def _unpackheader(self, format):
1411 """read given format from header
1411 """read given format from header
1412
1412
1413 This automatically compute the size of the format to read."""
1413 This automatically compute the size of the format to read."""
1414 data = self._fromheader(struct.calcsize(format))
1414 data = self._fromheader(struct.calcsize(format))
1415 return _unpack(format, data)
1415 return _unpack(format, data)
1416
1416
1417 def _initparams(self, mandatoryparams, advisoryparams):
1417 def _initparams(self, mandatoryparams, advisoryparams):
1418 """internal function to setup all logic related parameters"""
1418 """internal function to setup all logic related parameters"""
1419 # make it read only to prevent people touching it by mistake.
1419 # make it read only to prevent people touching it by mistake.
1420 self.mandatoryparams = tuple(mandatoryparams)
1420 self.mandatoryparams = tuple(mandatoryparams)
1421 self.advisoryparams = tuple(advisoryparams)
1421 self.advisoryparams = tuple(advisoryparams)
1422 # user friendly UI
1422 # user friendly UI
1423 self.params = util.sortdict(self.mandatoryparams)
1423 self.params = util.sortdict(self.mandatoryparams)
1424 self.params.update(self.advisoryparams)
1424 self.params.update(self.advisoryparams)
1425 self.mandatorykeys = frozenset(p[0] for p in mandatoryparams)
1425 self.mandatorykeys = frozenset(p[0] for p in mandatoryparams)
1426
1426
1427 def _readheader(self):
1427 def _readheader(self):
1428 """read the header and setup the object"""
1428 """read the header and setup the object"""
1429 typesize = self._unpackheader(_fparttypesize)[0]
1429 typesize = self._unpackheader(_fparttypesize)[0]
1430 self.type = self._fromheader(typesize)
1430 self.type = self._fromheader(typesize)
1431 indebug(self.ui, b'part type: "%s"' % self.type)
1431 indebug(self.ui, b'part type: "%s"' % self.type)
1432 self.id = self._unpackheader(_fpartid)[0]
1432 self.id = self._unpackheader(_fpartid)[0]
1433 indebug(self.ui, b'part id: "%s"' % pycompat.bytestr(self.id))
1433 indebug(self.ui, b'part id: "%s"' % pycompat.bytestr(self.id))
1434 # extract mandatory bit from type
1434 # extract mandatory bit from type
1435 self.mandatory = self.type != self.type.lower()
1435 self.mandatory = self.type != self.type.lower()
1436 self.type = self.type.lower()
1436 self.type = self.type.lower()
1437 ## reading parameters
1437 ## reading parameters
1438 # param count
1438 # param count
1439 mancount, advcount = self._unpackheader(_fpartparamcount)
1439 mancount, advcount = self._unpackheader(_fpartparamcount)
1440 indebug(self.ui, b'part parameters: %i' % (mancount + advcount))
1440 indebug(self.ui, b'part parameters: %i' % (mancount + advcount))
1441 # param size
1441 # param size
1442 fparamsizes = _makefpartparamsizes(mancount + advcount)
1442 fparamsizes = _makefpartparamsizes(mancount + advcount)
1443 paramsizes = self._unpackheader(fparamsizes)
1443 paramsizes = self._unpackheader(fparamsizes)
1444 # make it a list of couple again
1444 # make it a list of couple again
1445 paramsizes = list(zip(paramsizes[::2], paramsizes[1::2]))
1445 paramsizes = list(zip(paramsizes[::2], paramsizes[1::2]))
1446 # split mandatory from advisory
1446 # split mandatory from advisory
1447 mansizes = paramsizes[:mancount]
1447 mansizes = paramsizes[:mancount]
1448 advsizes = paramsizes[mancount:]
1448 advsizes = paramsizes[mancount:]
1449 # retrieve param value
1449 # retrieve param value
1450 manparams = []
1450 manparams = []
1451 for key, value in mansizes:
1451 for key, value in mansizes:
1452 manparams.append((self._fromheader(key), self._fromheader(value)))
1452 manparams.append((self._fromheader(key), self._fromheader(value)))
1453 advparams = []
1453 advparams = []
1454 for key, value in advsizes:
1454 for key, value in advsizes:
1455 advparams.append((self._fromheader(key), self._fromheader(value)))
1455 advparams.append((self._fromheader(key), self._fromheader(value)))
1456 self._initparams(manparams, advparams)
1456 self._initparams(manparams, advparams)
1457 ## part payload
1457 ## part payload
1458 self._payloadstream = util.chunkbuffer(self._payloadchunks())
1458 self._payloadstream = util.chunkbuffer(self._payloadchunks())
1459 # we read the data, tell it
1459 # we read the data, tell it
1460 self._initialized = True
1460 self._initialized = True
1461
1461
1462 def _payloadchunks(self):
1462 def _payloadchunks(self):
1463 """Generator of decoded chunks in the payload."""
1463 """Generator of decoded chunks in the payload."""
1464 return decodepayloadchunks(self.ui, self._fp)
1464 return decodepayloadchunks(self.ui, self._fp)
1465
1465
1466 def consume(self):
1466 def consume(self):
1467 """Read the part payload until completion.
1467 """Read the part payload until completion.
1468
1468
1469 By consuming the part data, the underlying stream read offset will
1469 By consuming the part data, the underlying stream read offset will
1470 be advanced to the next part (or end of stream).
1470 be advanced to the next part (or end of stream).
1471 """
1471 """
1472 if self.consumed:
1472 if self.consumed:
1473 return
1473 return
1474
1474
1475 chunk = self.read(32768)
1475 chunk = self.read(32768)
1476 while chunk:
1476 while chunk:
1477 self._pos += len(chunk)
1477 self._pos += len(chunk)
1478 chunk = self.read(32768)
1478 chunk = self.read(32768)
1479
1479
1480 def read(self, size=None):
1480 def read(self, size=None):
1481 """read payload data"""
1481 """read payload data"""
1482 if not self._initialized:
1482 if not self._initialized:
1483 self._readheader()
1483 self._readheader()
1484 if size is None:
1484 if size is None:
1485 data = self._payloadstream.read()
1485 data = self._payloadstream.read()
1486 else:
1486 else:
1487 data = self._payloadstream.read(size)
1487 data = self._payloadstream.read(size)
1488 self._pos += len(data)
1488 self._pos += len(data)
1489 if size is None or len(data) < size:
1489 if size is None or len(data) < size:
1490 if not self.consumed and self._pos:
1490 if not self.consumed and self._pos:
1491 self.ui.debug(
1491 self.ui.debug(
1492 b'bundle2-input-part: total payload size %i\n' % self._pos
1492 b'bundle2-input-part: total payload size %i\n' % self._pos
1493 )
1493 )
1494 self.consumed = True
1494 self.consumed = True
1495 return data
1495 return data
1496
1496
1497
1497
1498 class seekableunbundlepart(unbundlepart):
1498 class seekableunbundlepart(unbundlepart):
1499 """A bundle2 part in a bundle that is seekable.
1499 """A bundle2 part in a bundle that is seekable.
1500
1500
1501 Regular ``unbundlepart`` instances can only be read once. This class
1501 Regular ``unbundlepart`` instances can only be read once. This class
1502 extends ``unbundlepart`` to enable bi-directional seeking within the
1502 extends ``unbundlepart`` to enable bi-directional seeking within the
1503 part.
1503 part.
1504
1504
1505 Bundle2 part data consists of framed chunks. Offsets when seeking
1505 Bundle2 part data consists of framed chunks. Offsets when seeking
1506 refer to the decoded data, not the offsets in the underlying bundle2
1506 refer to the decoded data, not the offsets in the underlying bundle2
1507 stream.
1507 stream.
1508
1508
1509 To facilitate quickly seeking within the decoded data, instances of this
1509 To facilitate quickly seeking within the decoded data, instances of this
1510 class maintain a mapping between offsets in the underlying stream and
1510 class maintain a mapping between offsets in the underlying stream and
1511 the decoded payload. This mapping will consume memory in proportion
1511 the decoded payload. This mapping will consume memory in proportion
1512 to the number of chunks within the payload (which almost certainly
1512 to the number of chunks within the payload (which almost certainly
1513 increases in proportion with the size of the part).
1513 increases in proportion with the size of the part).
1514 """
1514 """
1515
1515
1516 def __init__(self, ui, header, fp):
1516 def __init__(self, ui, header, fp):
1517 # (payload, file) offsets for chunk starts.
1517 # (payload, file) offsets for chunk starts.
1518 self._chunkindex = []
1518 self._chunkindex = []
1519
1519
1520 super(seekableunbundlepart, self).__init__(ui, header, fp)
1520 super(seekableunbundlepart, self).__init__(ui, header, fp)
1521
1521
1522 def _payloadchunks(self, chunknum=0):
1522 def _payloadchunks(self, chunknum=0):
1523 '''seek to specified chunk and start yielding data'''
1523 '''seek to specified chunk and start yielding data'''
1524 if len(self._chunkindex) == 0:
1524 if len(self._chunkindex) == 0:
1525 assert chunknum == 0, b'Must start with chunk 0'
1525 assert chunknum == 0, b'Must start with chunk 0'
1526 self._chunkindex.append((0, self._tellfp()))
1526 self._chunkindex.append((0, self._tellfp()))
1527 else:
1527 else:
1528 assert chunknum < len(self._chunkindex), (
1528 assert chunknum < len(self._chunkindex), (
1529 b'Unknown chunk %d' % chunknum
1529 b'Unknown chunk %d' % chunknum
1530 )
1530 )
1531 self._seekfp(self._chunkindex[chunknum][1])
1531 self._seekfp(self._chunkindex[chunknum][1])
1532
1532
1533 pos = self._chunkindex[chunknum][0]
1533 pos = self._chunkindex[chunknum][0]
1534
1534
1535 for chunk in decodepayloadchunks(self.ui, self._fp):
1535 for chunk in decodepayloadchunks(self.ui, self._fp):
1536 chunknum += 1
1536 chunknum += 1
1537 pos += len(chunk)
1537 pos += len(chunk)
1538 if chunknum == len(self._chunkindex):
1538 if chunknum == len(self._chunkindex):
1539 self._chunkindex.append((pos, self._tellfp()))
1539 self._chunkindex.append((pos, self._tellfp()))
1540
1540
1541 yield chunk
1541 yield chunk
1542
1542
1543 def _findchunk(self, pos):
1543 def _findchunk(self, pos):
1544 '''for a given payload position, return a chunk number and offset'''
1544 '''for a given payload position, return a chunk number and offset'''
1545 for chunk, (ppos, fpos) in enumerate(self._chunkindex):
1545 for chunk, (ppos, fpos) in enumerate(self._chunkindex):
1546 if ppos == pos:
1546 if ppos == pos:
1547 return chunk, 0
1547 return chunk, 0
1548 elif ppos > pos:
1548 elif ppos > pos:
1549 return chunk - 1, pos - self._chunkindex[chunk - 1][0]
1549 return chunk - 1, pos - self._chunkindex[chunk - 1][0]
1550 raise ValueError(b'Unknown chunk')
1550 raise ValueError(b'Unknown chunk')
1551
1551
1552 def tell(self):
1552 def tell(self):
1553 return self._pos
1553 return self._pos
1554
1554
1555 def seek(self, offset, whence=os.SEEK_SET):
1555 def seek(self, offset, whence=os.SEEK_SET):
1556 if whence == os.SEEK_SET:
1556 if whence == os.SEEK_SET:
1557 newpos = offset
1557 newpos = offset
1558 elif whence == os.SEEK_CUR:
1558 elif whence == os.SEEK_CUR:
1559 newpos = self._pos + offset
1559 newpos = self._pos + offset
1560 elif whence == os.SEEK_END:
1560 elif whence == os.SEEK_END:
1561 if not self.consumed:
1561 if not self.consumed:
1562 # Can't use self.consume() here because it advances self._pos.
1562 # Can't use self.consume() here because it advances self._pos.
1563 chunk = self.read(32768)
1563 chunk = self.read(32768)
1564 while chunk:
1564 while chunk:
1565 chunk = self.read(32768)
1565 chunk = self.read(32768)
1566 newpos = self._chunkindex[-1][0] - offset
1566 newpos = self._chunkindex[-1][0] - offset
1567 else:
1567 else:
1568 raise ValueError(b'Unknown whence value: %r' % (whence,))
1568 raise ValueError(b'Unknown whence value: %r' % (whence,))
1569
1569
1570 if newpos > self._chunkindex[-1][0] and not self.consumed:
1570 if newpos > self._chunkindex[-1][0] and not self.consumed:
1571 # Can't use self.consume() here because it advances self._pos.
1571 # Can't use self.consume() here because it advances self._pos.
1572 chunk = self.read(32768)
1572 chunk = self.read(32768)
1573 while chunk:
1573 while chunk:
1574 chunk = self.read(32668)
1574 chunk = self.read(32668)
1575
1575
1576 if not 0 <= newpos <= self._chunkindex[-1][0]:
1576 if not 0 <= newpos <= self._chunkindex[-1][0]:
1577 raise ValueError(b'Offset out of range')
1577 raise ValueError(b'Offset out of range')
1578
1578
1579 if self._pos != newpos:
1579 if self._pos != newpos:
1580 chunk, internaloffset = self._findchunk(newpos)
1580 chunk, internaloffset = self._findchunk(newpos)
1581 self._payloadstream = util.chunkbuffer(self._payloadchunks(chunk))
1581 self._payloadstream = util.chunkbuffer(self._payloadchunks(chunk))
1582 adjust = self.read(internaloffset)
1582 adjust = self.read(internaloffset)
1583 if len(adjust) != internaloffset:
1583 if len(adjust) != internaloffset:
1584 raise error.Abort(_(b'Seek failed\n'))
1584 raise error.Abort(_(b'Seek failed\n'))
1585 self._pos = newpos
1585 self._pos = newpos
1586
1586
1587 def _seekfp(self, offset, whence=0):
1587 def _seekfp(self, offset, whence=0):
1588 """move the underlying file pointer
1588 """move the underlying file pointer
1589
1589
1590 This method is meant for internal usage by the bundle2 protocol only.
1590 This method is meant for internal usage by the bundle2 protocol only.
1591 They directly manipulate the low level stream including bundle2 level
1591 They directly manipulate the low level stream including bundle2 level
1592 instruction.
1592 instruction.
1593
1593
1594 Do not use it to implement higher-level logic or methods."""
1594 Do not use it to implement higher-level logic or methods."""
1595 if self._seekable:
1595 if self._seekable:
1596 return self._fp.seek(offset, whence)
1596 return self._fp.seek(offset, whence)
1597 else:
1597 else:
1598 raise NotImplementedError(_(b'File pointer is not seekable'))
1598 raise NotImplementedError(_(b'File pointer is not seekable'))
1599
1599
1600 def _tellfp(self):
1600 def _tellfp(self):
1601 """return the file offset, or None if file is not seekable
1601 """return the file offset, or None if file is not seekable
1602
1602
1603 This method is meant for internal usage by the bundle2 protocol only.
1603 This method is meant for internal usage by the bundle2 protocol only.
1604 They directly manipulate the low level stream including bundle2 level
1604 They directly manipulate the low level stream including bundle2 level
1605 instruction.
1605 instruction.
1606
1606
1607 Do not use it to implement higher-level logic or methods."""
1607 Do not use it to implement higher-level logic or methods."""
1608 if self._seekable:
1608 if self._seekable:
1609 try:
1609 try:
1610 return self._fp.tell()
1610 return self._fp.tell()
1611 except IOError as e:
1611 except IOError as e:
1612 if e.errno == errno.ESPIPE:
1612 if e.errno == errno.ESPIPE:
1613 self._seekable = False
1613 self._seekable = False
1614 else:
1614 else:
1615 raise
1615 raise
1616 return None
1616 return None
1617
1617
1618
1618
1619 # These are only the static capabilities.
1619 # These are only the static capabilities.
1620 # Check the 'getrepocaps' function for the rest.
1620 # Check the 'getrepocaps' function for the rest.
1621 capabilities = {
1621 capabilities = {
1622 b'HG20': (),
1622 b'HG20': (),
1623 b'bookmarks': (),
1623 b'bookmarks': (),
1624 b'error': (b'abort', b'unsupportedcontent', b'pushraced', b'pushkey'),
1624 b'error': (b'abort', b'unsupportedcontent', b'pushraced', b'pushkey'),
1625 b'listkeys': (),
1625 b'listkeys': (),
1626 b'pushkey': (),
1626 b'pushkey': (),
1627 b'digests': tuple(sorted(util.DIGESTS.keys())),
1627 b'digests': tuple(sorted(util.DIGESTS.keys())),
1628 b'remote-changegroup': (b'http', b'https'),
1628 b'remote-changegroup': (b'http', b'https'),
1629 b'hgtagsfnodes': (),
1629 b'hgtagsfnodes': (),
1630 b'phases': (b'heads',),
1630 b'phases': (b'heads',),
1631 b'stream': (b'v2',),
1631 b'stream': (b'v2',),
1632 }
1632 }
1633
1633
1634
1634
1635 def getrepocaps(repo, allowpushback=False, role=None):
1635 def getrepocaps(repo, allowpushback=False, role=None):
1636 """return the bundle2 capabilities for a given repo
1636 """return the bundle2 capabilities for a given repo
1637
1637
1638 Exists to allow extensions (like evolution) to mutate the capabilities.
1638 Exists to allow extensions (like evolution) to mutate the capabilities.
1639
1639
1640 The returned value is used for servers advertising their capabilities as
1640 The returned value is used for servers advertising their capabilities as
1641 well as clients advertising their capabilities to servers as part of
1641 well as clients advertising their capabilities to servers as part of
1642 bundle2 requests. The ``role`` argument specifies which is which.
1642 bundle2 requests. The ``role`` argument specifies which is which.
1643 """
1643 """
1644 if role not in (b'client', b'server'):
1644 if role not in (b'client', b'server'):
1645 raise error.ProgrammingError(b'role argument must be client or server')
1645 raise error.ProgrammingError(b'role argument must be client or server')
1646
1646
1647 caps = capabilities.copy()
1647 caps = capabilities.copy()
1648 caps[b'changegroup'] = tuple(
1648 caps[b'changegroup'] = tuple(
1649 sorted(changegroup.supportedincomingversions(repo))
1649 sorted(changegroup.supportedincomingversions(repo))
1650 )
1650 )
1651 if obsolete.isenabled(repo, obsolete.exchangeopt):
1651 if obsolete.isenabled(repo, obsolete.exchangeopt):
1652 supportedformat = tuple(b'V%i' % v for v in obsolete.formats)
1652 supportedformat = tuple(b'V%i' % v for v in obsolete.formats)
1653 caps[b'obsmarkers'] = supportedformat
1653 caps[b'obsmarkers'] = supportedformat
1654 if allowpushback:
1654 if allowpushback:
1655 caps[b'pushback'] = ()
1655 caps[b'pushback'] = ()
1656 cpmode = repo.ui.config(b'server', b'concurrent-push-mode')
1656 cpmode = repo.ui.config(b'server', b'concurrent-push-mode')
1657 if cpmode == b'check-related':
1657 if cpmode == b'check-related':
1658 caps[b'checkheads'] = (b'related',)
1658 caps[b'checkheads'] = (b'related',)
1659 if b'phases' in repo.ui.configlist(b'devel', b'legacy.exchange'):
1659 if b'phases' in repo.ui.configlist(b'devel', b'legacy.exchange'):
1660 caps.pop(b'phases')
1660 caps.pop(b'phases')
1661
1661
1662 # Don't advertise stream clone support in server mode if not configured.
1662 # Don't advertise stream clone support in server mode if not configured.
1663 if role == b'server':
1663 if role == b'server':
1664 streamsupported = repo.ui.configbool(
1664 streamsupported = repo.ui.configbool(
1665 b'server', b'uncompressed', untrusted=True
1665 b'server', b'uncompressed', untrusted=True
1666 )
1666 )
1667 featuresupported = repo.ui.configbool(b'server', b'bundle2.stream')
1667 featuresupported = repo.ui.configbool(b'server', b'bundle2.stream')
1668
1668
1669 if not streamsupported or not featuresupported:
1669 if not streamsupported or not featuresupported:
1670 caps.pop(b'stream')
1670 caps.pop(b'stream')
1671 # Else always advertise support on client, because payload support
1671 # Else always advertise support on client, because payload support
1672 # should always be advertised.
1672 # should always be advertised.
1673
1673
1674 if repo.ui.configbool(b'experimental', b'stream-v3'):
1674 if repo.ui.configbool(b'experimental', b'stream-v3'):
1675 if b'stream' in caps:
1675 if b'stream' in caps:
1676 caps[b'stream'] += (b'v3-exp',)
1676 caps[b'stream'] += (b'v3-exp',)
1677
1677
1678 # b'rev-branch-cache is no longer advertised, but still supported
1678 # b'rev-branch-cache is no longer advertised, but still supported
1679 # for legacy clients.
1679 # for legacy clients.
1680
1680
1681 return caps
1681 return caps
1682
1682
1683
1683
1684 def bundle2caps(remote):
1684 def bundle2caps(remote):
1685 """return the bundle capabilities of a peer as dict"""
1685 """return the bundle capabilities of a peer as dict"""
1686 raw = remote.capable(b'bundle2')
1686 raw = remote.capable(b'bundle2')
1687 if not raw and raw != b'':
1687 if not raw and raw != b'':
1688 return {}
1688 return {}
1689 capsblob = urlreq.unquote(remote.capable(b'bundle2'))
1689 capsblob = urlreq.unquote(remote.capable(b'bundle2'))
1690 return decodecaps(capsblob)
1690 return decodecaps(capsblob)
1691
1691
1692
1692
1693 def obsmarkersversion(caps):
1693 def obsmarkersversion(caps):
1694 """extract the list of supported obsmarkers versions from a bundle2caps dict"""
1694 """extract the list of supported obsmarkers versions from a bundle2caps dict"""
1695 obscaps = caps.get(b'obsmarkers', ())
1695 obscaps = caps.get(b'obsmarkers', ())
1696 return [int(c[1:]) for c in obscaps if c.startswith(b'V')]
1696 return [int(c[1:]) for c in obscaps if c.startswith(b'V')]
1697
1697
1698
1698
1699 def writenewbundle(
1699 def writenewbundle(
1700 ui,
1700 ui,
1701 repo,
1701 repo,
1702 source,
1702 source,
1703 filename,
1703 filename,
1704 bundletype,
1704 bundletype,
1705 outgoing,
1705 outgoing,
1706 opts,
1706 opts,
1707 vfs=None,
1707 vfs=None,
1708 compression=None,
1708 compression=None,
1709 compopts=None,
1709 compopts=None,
1710 allow_internal=False,
1710 allow_internal=False,
1711 ):
1711 ):
1712 if bundletype.startswith(b'HG10'):
1712 if bundletype.startswith(b'HG10'):
1713 cg = changegroup.makechangegroup(repo, outgoing, b'01', source)
1713 cg = changegroup.makechangegroup(repo, outgoing, b'01', source)
1714 return writebundle(
1714 return writebundle(
1715 ui,
1715 ui,
1716 cg,
1716 cg,
1717 filename,
1717 filename,
1718 bundletype,
1718 bundletype,
1719 vfs=vfs,
1719 vfs=vfs,
1720 compression=compression,
1720 compression=compression,
1721 compopts=compopts,
1721 compopts=compopts,
1722 )
1722 )
1723 elif not bundletype.startswith(b'HG20'):
1723 elif not bundletype.startswith(b'HG20'):
1724 raise error.ProgrammingError(b'unknown bundle type: %s' % bundletype)
1724 raise error.ProgrammingError(b'unknown bundle type: %s' % bundletype)
1725
1725
1726 # enforce that no internal phase are to be bundled
1726 # enforce that no internal phase are to be bundled
1727 bundled_internal = repo.revs(b"%ln and _internal()", outgoing.ancestorsof)
1727 bundled_internal = repo.revs(b"%ln and _internal()", outgoing.ancestorsof)
1728 if bundled_internal and not allow_internal:
1728 if bundled_internal and not allow_internal:
1729 count = len(repo.revs(b'%ln and _internal()', outgoing.missing))
1729 count = len(repo.revs(b'%ln and _internal()', outgoing.missing))
1730 msg = "backup bundle would contains %d internal changesets"
1730 msg = "backup bundle would contains %d internal changesets"
1731 msg %= count
1731 msg %= count
1732 raise error.ProgrammingError(msg)
1732 raise error.ProgrammingError(msg)
1733
1733
1734 caps = {}
1734 caps = {}
1735 if opts.get(b'obsolescence', False):
1735 if opts.get(b'obsolescence', False):
1736 caps[b'obsmarkers'] = (b'V1',)
1736 caps[b'obsmarkers'] = (b'V1',)
1737 if opts.get(b'streamv2'):
1737 if opts.get(b'streamv2'):
1738 caps[b'stream'] = [b'v2']
1738 caps[b'stream'] = [b'v2']
1739 elif opts.get(b'streamv3-exp'):
1739 elif opts.get(b'streamv3-exp'):
1740 caps[b'stream'] = [b'v3-exp']
1740 caps[b'stream'] = [b'v3-exp']
1741 bundle = bundle20(ui, caps)
1741 bundle = bundle20(ui, caps)
1742 bundle.setcompression(compression, compopts)
1742 bundle.setcompression(compression, compopts)
1743 _addpartsfromopts(ui, repo, bundle, source, outgoing, opts)
1743 _addpartsfromopts(ui, repo, bundle, source, outgoing, opts)
1744 chunkiter = bundle.getchunks()
1744 chunkiter = bundle.getchunks()
1745
1745
1746 return changegroup.writechunks(ui, chunkiter, filename, vfs=vfs)
1746 return changegroup.writechunks(ui, chunkiter, filename, vfs=vfs)
1747
1747
1748
1748
1749 def _addpartsfromopts(ui, repo, bundler, source, outgoing, opts):
1749 def _addpartsfromopts(ui, repo, bundler, source, outgoing, opts):
1750 # We should eventually reconcile this logic with the one behind
1750 # We should eventually reconcile this logic with the one behind
1751 # 'exchange.getbundle2partsgenerator'.
1751 # 'exchange.getbundle2partsgenerator'.
1752 #
1752 #
1753 # The type of input from 'getbundle' and 'writenewbundle' are a bit
1753 # The type of input from 'getbundle' and 'writenewbundle' are a bit
1754 # different right now. So we keep them separated for now for the sake of
1754 # different right now. So we keep them separated for now for the sake of
1755 # simplicity.
1755 # simplicity.
1756
1756
1757 # we might not always want a changegroup in such bundle, for example in
1757 # we might not always want a changegroup in such bundle, for example in
1758 # stream bundles
1758 # stream bundles
1759 if opts.get(b'changegroup', True):
1759 if opts.get(b'changegroup', True):
1760 cgversion = opts.get(b'cg.version')
1760 cgversion = opts.get(b'cg.version')
1761 if cgversion is None:
1761 if cgversion is None:
1762 cgversion = changegroup.safeversion(repo)
1762 cgversion = changegroup.safeversion(repo)
1763 cg = changegroup.makechangegroup(repo, outgoing, cgversion, source)
1763 cg = changegroup.makechangegroup(repo, outgoing, cgversion, source)
1764 part = bundler.newpart(b'changegroup', data=cg.getchunks())
1764 part = bundler.newpart(b'changegroup', data=cg.getchunks())
1765 part.addparam(b'version', cg.version)
1765 part.addparam(b'version', cg.version)
1766 if b'clcount' in cg.extras:
1766 if b'clcount' in cg.extras:
1767 part.addparam(
1767 part.addparam(
1768 b'nbchanges', b'%d' % cg.extras[b'clcount'], mandatory=False
1768 b'nbchanges', b'%d' % cg.extras[b'clcount'], mandatory=False
1769 )
1769 )
1770 if opts.get(b'phases'):
1770 if opts.get(b'phases'):
1771 target_phase = phases.draft
1771 target_phase = phases.draft
1772 for head in outgoing.ancestorsof:
1772 for head in outgoing.ancestorsof:
1773 target_phase = max(target_phase, repo[head].phase())
1773 target_phase = max(target_phase, repo[head].phase())
1774 if target_phase > phases.draft:
1774 if target_phase > phases.draft:
1775 part.addparam(
1775 part.addparam(
1776 b'targetphase',
1776 b'targetphase',
1777 b'%d' % target_phase,
1777 b'%d' % target_phase,
1778 mandatory=False,
1778 mandatory=False,
1779 )
1779 )
1780 if repository.REPO_FEATURE_SIDE_DATA in repo.features:
1780 if repository.REPO_FEATURE_SIDE_DATA in repo.features:
1781 part.addparam(b'exp-sidedata', b'1')
1781 part.addparam(b'exp-sidedata', b'1')
1782
1782
1783 if opts.get(b'streamv2', False):
1783 if opts.get(b'streamv2', False):
1784 addpartbundlestream2(bundler, repo, stream=True)
1784 addpartbundlestream2(bundler, repo, stream=True)
1785
1785
1786 if opts.get(b'streamv3-exp', False):
1786 if opts.get(b'streamv3-exp', False):
1787 addpartbundlestream2(bundler, repo, stream=True)
1787 addpartbundlestream2(bundler, repo, stream=True)
1788
1788
1789 if opts.get(b'tagsfnodescache', True):
1789 if opts.get(b'tagsfnodescache', True):
1790 addparttagsfnodescache(repo, bundler, outgoing)
1790 addparttagsfnodescache(repo, bundler, outgoing)
1791
1791
1792 if opts.get(b'revbranchcache', True):
1792 if opts.get(b'revbranchcache', True):
1793 addpartrevbranchcache(repo, bundler, outgoing)
1793 addpartrevbranchcache(repo, bundler, outgoing)
1794
1794
1795 if opts.get(b'obsolescence', False):
1795 if opts.get(b'obsolescence', False):
1796 obsmarkers = repo.obsstore.relevantmarkers(outgoing.missing)
1796 obsmarkers = repo.obsstore.relevantmarkers(outgoing.missing)
1797 buildobsmarkerspart(
1797 buildobsmarkerspart(
1798 bundler,
1798 bundler,
1799 obsmarkers,
1799 obsmarkers,
1800 mandatory=opts.get(b'obsolescence-mandatory', True),
1800 mandatory=opts.get(b'obsolescence-mandatory', True),
1801 )
1801 )
1802
1802
1803 if opts.get(b'phases', False):
1803 if opts.get(b'phases', False):
1804 headsbyphase = phases.subsetphaseheads(repo, outgoing.missing)
1804 headsbyphase = phases.subsetphaseheads(repo, outgoing.missing)
1805 phasedata = phases.binaryencode(headsbyphase)
1805 phasedata = phases.binaryencode(headsbyphase)
1806 bundler.newpart(b'phase-heads', data=phasedata)
1806 bundler.newpart(b'phase-heads', data=phasedata)
1807
1807
1808
1808
1809 def addparttagsfnodescache(repo, bundler, outgoing):
1809 def addparttagsfnodescache(repo, bundler, outgoing):
1810 # we include the tags fnode cache for the bundle changeset
1810 # we include the tags fnode cache for the bundle changeset
1811 # (as an optional parts)
1811 # (as an optional parts)
1812 cache = tags.hgtagsfnodescache(repo.unfiltered())
1812 cache = tags.hgtagsfnodescache(repo.unfiltered())
1813 chunks = []
1813 chunks = []
1814
1814
1815 # .hgtags fnodes are only relevant for head changesets. While we could
1815 # .hgtags fnodes are only relevant for head changesets. While we could
1816 # transfer values for all known nodes, there will likely be little to
1816 # transfer values for all known nodes, there will likely be little to
1817 # no benefit.
1817 # no benefit.
1818 #
1818 #
1819 # We don't bother using a generator to produce output data because
1819 # We don't bother using a generator to produce output data because
1820 # a) we only have 40 bytes per head and even esoteric numbers of heads
1820 # a) we only have 40 bytes per head and even esoteric numbers of heads
1821 # consume little memory (1M heads is 40MB) b) we don't want to send the
1821 # consume little memory (1M heads is 40MB) b) we don't want to send the
1822 # part if we don't have entries and knowing if we have entries requires
1822 # part if we don't have entries and knowing if we have entries requires
1823 # cache lookups.
1823 # cache lookups.
1824 for node in outgoing.ancestorsof:
1824 for node in outgoing.ancestorsof:
1825 # Don't compute missing, as this may slow down serving.
1825 # Don't compute missing, as this may slow down serving.
1826 fnode = cache.getfnode(node, computemissing=False)
1826 fnode = cache.getfnode(node, computemissing=False)
1827 if fnode:
1827 if fnode:
1828 chunks.extend([node, fnode])
1828 chunks.extend([node, fnode])
1829
1829
1830 if chunks:
1830 if chunks:
1831 bundler.newpart(b'hgtagsfnodes', data=b''.join(chunks))
1831 bundler.newpart(b'hgtagsfnodes', data=b''.join(chunks))
1832
1832
1833
1833
1834 def addpartrevbranchcache(repo, bundler, outgoing):
1834 def addpartrevbranchcache(repo, bundler, outgoing):
1835 # we include the rev branch cache for the bundle changeset
1835 # we include the rev branch cache for the bundle changeset
1836 # (as an optional parts)
1836 # (as an optional parts)
1837 cache = repo.revbranchcache()
1837 cache = repo.revbranchcache()
1838 cl = repo.unfiltered().changelog
1838 cl = repo.unfiltered().changelog
1839 branchesdata = collections.defaultdict(lambda: (set(), set()))
1839 branchesdata = collections.defaultdict(lambda: (set(), set()))
1840 for node in outgoing.missing:
1840 for node in outgoing.missing:
1841 branch, close = cache.branchinfo(cl.rev(node))
1841 branch, close = cache.branchinfo(cl.rev(node))
1842 branchesdata[branch][close].add(node)
1842 branchesdata[branch][close].add(node)
1843
1843
1844 def generate():
1844 def generate():
1845 for branch, (nodes, closed) in sorted(branchesdata.items()):
1845 for branch, (nodes, closed) in sorted(branchesdata.items()):
1846 utf8branch = encoding.fromlocal(branch)
1846 utf8branch = encoding.fromlocal(branch)
1847 yield rbcstruct.pack(len(utf8branch), len(nodes), len(closed))
1847 yield rbcstruct.pack(len(utf8branch), len(nodes), len(closed))
1848 yield utf8branch
1848 yield utf8branch
1849 for n in sorted(nodes):
1849 for n in sorted(nodes):
1850 yield n
1850 yield n
1851 for n in sorted(closed):
1851 for n in sorted(closed):
1852 yield n
1852 yield n
1853
1853
1854 bundler.newpart(b'cache:rev-branch-cache', data=generate(), mandatory=False)
1854 bundler.newpart(b'cache:rev-branch-cache', data=generate(), mandatory=False)
1855
1855
1856
1856
1857 def _formatrequirementsspec(requirements):
1857 def _formatrequirementsspec(requirements):
1858 requirements = [req for req in requirements if req != b"shared"]
1858 requirements = [req for req in requirements if req != b"shared"]
1859 return urlreq.quote(b','.join(sorted(requirements)))
1859 return urlreq.quote(b','.join(sorted(requirements)))
1860
1860
1861
1861
1862 def _formatrequirementsparams(requirements):
1862 def _formatrequirementsparams(requirements):
1863 requirements = _formatrequirementsspec(requirements)
1863 requirements = _formatrequirementsspec(requirements)
1864 params = b"%s%s" % (urlreq.quote(b"requirements="), requirements)
1864 params = b"%s%s" % (urlreq.quote(b"requirements="), requirements)
1865 return params
1865 return params
1866
1866
1867
1867
1868 def format_remote_wanted_sidedata(repo):
1868 def format_remote_wanted_sidedata(repo):
1869 """Formats a repo's wanted sidedata categories into a bytestring for
1869 """Formats a repo's wanted sidedata categories into a bytestring for
1870 capabilities exchange."""
1870 capabilities exchange."""
1871 wanted = b""
1871 wanted = b""
1872 if repo._wanted_sidedata:
1872 if repo._wanted_sidedata:
1873 wanted = b','.join(
1873 wanted = b','.join(
1874 pycompat.bytestr(c) for c in sorted(repo._wanted_sidedata)
1874 pycompat.bytestr(c) for c in sorted(repo._wanted_sidedata)
1875 )
1875 )
1876 return wanted
1876 return wanted
1877
1877
1878
1878
1879 def read_remote_wanted_sidedata(remote):
1879 def read_remote_wanted_sidedata(remote):
1880 sidedata_categories = remote.capable(b'exp-wanted-sidedata')
1880 sidedata_categories = remote.capable(b'exp-wanted-sidedata')
1881 return read_wanted_sidedata(sidedata_categories)
1881 return read_wanted_sidedata(sidedata_categories)
1882
1882
1883
1883
1884 def read_wanted_sidedata(formatted):
1884 def read_wanted_sidedata(formatted):
1885 if formatted:
1885 if formatted:
1886 return set(formatted.split(b','))
1886 return set(formatted.split(b','))
1887 return set()
1887 return set()
1888
1888
1889
1889
1890 def addpartbundlestream2(bundler, repo, **kwargs):
1890 def addpartbundlestream2(bundler, repo, **kwargs):
1891 if not kwargs.get('stream', False):
1891 if not kwargs.get('stream', False):
1892 return
1892 return
1893
1893
1894 if not streamclone.allowservergeneration(repo):
1894 if not streamclone.allowservergeneration(repo):
1895 msg = _(b'stream data requested but server does not allow this feature')
1895 msg = _(b'stream data requested but server does not allow this feature')
1896 hint = _(b'the client seems buggy')
1896 hint = _(b'the client seems buggy')
1897 raise error.Abort(msg, hint=hint)
1897 raise error.Abort(msg, hint=hint)
1898 if not (b'stream' in bundler.capabilities):
1898 if not (b'stream' in bundler.capabilities):
1899 msg = _(
1899 msg = _(
1900 b'stream data requested but supported streaming clone versions were not specified'
1900 b'stream data requested but supported streaming clone versions were not specified'
1901 )
1901 )
1902 hint = _(b'the client seems buggy')
1902 hint = _(b'the client seems buggy')
1903 raise error.Abort(msg, hint=hint)
1903 raise error.Abort(msg, hint=hint)
1904 client_supported = set(bundler.capabilities[b'stream'])
1904 client_supported = set(bundler.capabilities[b'stream'])
1905 server_supported = set(getrepocaps(repo, role=b'client').get(b'stream', []))
1905 server_supported = set(getrepocaps(repo, role=b'client').get(b'stream', []))
1906 common_supported = client_supported & server_supported
1906 common_supported = client_supported & server_supported
1907 if not common_supported:
1907 if not common_supported:
1908 msg = _(b'no common supported version with the client: %s; %s')
1908 msg = _(b'no common supported version with the client: %s; %s')
1909 str_server = b','.join(sorted(server_supported))
1909 str_server = b','.join(sorted(server_supported))
1910 str_client = b','.join(sorted(client_supported))
1910 str_client = b','.join(sorted(client_supported))
1911 msg %= (str_server, str_client)
1911 msg %= (str_server, str_client)
1912 raise error.Abort(msg)
1912 raise error.Abort(msg)
1913 version = max(common_supported)
1913 version = max(common_supported)
1914
1914
1915 # Stream clones don't compress well. And compression undermines a
1915 # Stream clones don't compress well. And compression undermines a
1916 # goal of stream clones, which is to be fast. Communicate the desire
1916 # goal of stream clones, which is to be fast. Communicate the desire
1917 # to avoid compression to consumers of the bundle.
1917 # to avoid compression to consumers of the bundle.
1918 bundler.prefercompressed = False
1918 bundler.prefercompressed = False
1919
1919
1920 # get the includes and excludes
1920 # get the includes and excludes
1921 includepats = kwargs.get('includepats')
1921 includepats = kwargs.get('includepats')
1922 excludepats = kwargs.get('excludepats')
1922 excludepats = kwargs.get('excludepats')
1923
1923
1924 narrowstream = repo.ui.configbool(
1924 narrowstream = repo.ui.configbool(
1925 b'experimental', b'server.stream-narrow-clones'
1925 b'experimental', b'server.stream-narrow-clones'
1926 )
1926 )
1927
1927
1928 if (includepats or excludepats) and not narrowstream:
1928 if (includepats or excludepats) and not narrowstream:
1929 raise error.Abort(_(b'server does not support narrow stream clones'))
1929 raise error.Abort(_(b'server does not support narrow stream clones'))
1930
1930
1931 includeobsmarkers = False
1931 includeobsmarkers = False
1932 if repo.obsstore:
1932 if repo.obsstore:
1933 remoteversions = obsmarkersversion(bundler.capabilities)
1933 remoteversions = obsmarkersversion(bundler.capabilities)
1934 if not remoteversions:
1934 if not remoteversions:
1935 raise error.Abort(
1935 raise error.Abort(
1936 _(
1936 _(
1937 b'server has obsolescence markers, but client '
1937 b'server has obsolescence markers, but client '
1938 b'cannot receive them via stream clone'
1938 b'cannot receive them via stream clone'
1939 )
1939 )
1940 )
1940 )
1941 elif repo.obsstore._version in remoteversions:
1941 elif repo.obsstore._version in remoteversions:
1942 includeobsmarkers = True
1942 includeobsmarkers = True
1943
1943
1944 if version == b"v2":
1944 if version == b"v2":
1945 filecount, bytecount, it = streamclone.generatev2(
1945 filecount, bytecount, it = streamclone.generatev2(
1946 repo, includepats, excludepats, includeobsmarkers
1946 repo, includepats, excludepats, includeobsmarkers
1947 )
1947 )
1948 requirements = streamclone.streamed_requirements(repo)
1948 requirements = streamclone.streamed_requirements(repo)
1949 requirements = _formatrequirementsspec(requirements)
1949 requirements = _formatrequirementsspec(requirements)
1950 part = bundler.newpart(b'stream2', data=it)
1950 part = bundler.newpart(b'stream2', data=it)
1951 part.addparam(b'bytecount', b'%d' % bytecount, mandatory=True)
1951 part.addparam(b'bytecount', b'%d' % bytecount, mandatory=True)
1952 part.addparam(b'filecount', b'%d' % filecount, mandatory=True)
1952 part.addparam(b'filecount', b'%d' % filecount, mandatory=True)
1953 part.addparam(b'requirements', requirements, mandatory=True)
1953 part.addparam(b'requirements', requirements, mandatory=True)
1954 elif version == b"v3-exp":
1954 elif version == b"v3-exp":
1955 filecount, bytecount, it = streamclone.generatev2(
1955 filecount, bytecount, it = streamclone.generatev2(
1956 repo, includepats, excludepats, includeobsmarkers
1956 repo, includepats, excludepats, includeobsmarkers
1957 )
1957 )
1958 requirements = streamclone.streamed_requirements(repo)
1958 requirements = streamclone.streamed_requirements(repo)
1959 requirements = _formatrequirementsspec(requirements)
1959 requirements = _formatrequirementsspec(requirements)
1960 part = bundler.newpart(b'stream3-exp', data=it)
1960 part = bundler.newpart(b'stream3-exp', data=it)
1961 part.addparam(b'bytecount', b'%d' % bytecount, mandatory=True)
1961 part.addparam(b'bytecount', b'%d' % bytecount, mandatory=True)
1962 part.addparam(b'filecount', b'%d' % filecount, mandatory=True)
1962 part.addparam(b'filecount', b'%d' % filecount, mandatory=True)
1963 part.addparam(b'requirements', requirements, mandatory=True)
1963 part.addparam(b'requirements', requirements, mandatory=True)
1964
1964
1965
1965
1966 def buildobsmarkerspart(bundler, markers, mandatory=True):
1966 def buildobsmarkerspart(bundler, markers, mandatory=True):
1967 """add an obsmarker part to the bundler with <markers>
1967 """add an obsmarker part to the bundler with <markers>
1968
1968
1969 No part is created if markers is empty.
1969 No part is created if markers is empty.
1970 Raises ValueError if the bundler doesn't support any known obsmarker format.
1970 Raises ValueError if the bundler doesn't support any known obsmarker format.
1971 """
1971 """
1972 if not markers:
1972 if not markers:
1973 return None
1973 return None
1974
1974
1975 remoteversions = obsmarkersversion(bundler.capabilities)
1975 remoteversions = obsmarkersversion(bundler.capabilities)
1976 version = obsolete.commonversion(remoteversions)
1976 version = obsolete.commonversion(remoteversions)
1977 if version is None:
1977 if version is None:
1978 raise ValueError(b'bundler does not support common obsmarker format')
1978 raise ValueError(b'bundler does not support common obsmarker format')
1979 stream = obsolete.encodemarkers(markers, True, version=version)
1979 stream = obsolete.encodemarkers(markers, True, version=version)
1980 return bundler.newpart(b'obsmarkers', data=stream, mandatory=mandatory)
1980 return bundler.newpart(b'obsmarkers', data=stream, mandatory=mandatory)
1981
1981
1982
1982
1983 def writebundle(
1983 def writebundle(
1984 ui, cg, filename, bundletype, vfs=None, compression=None, compopts=None
1984 ui, cg, filename, bundletype, vfs=None, compression=None, compopts=None
1985 ):
1985 ):
1986 """Write a bundle file and return its filename.
1986 """Write a bundle file and return its filename.
1987
1987
1988 Existing files will not be overwritten.
1988 Existing files will not be overwritten.
1989 If no filename is specified, a temporary file is created.
1989 If no filename is specified, a temporary file is created.
1990 bz2 compression can be turned off.
1990 bz2 compression can be turned off.
1991 The bundle file will be deleted in case of errors.
1991 The bundle file will be deleted in case of errors.
1992 """
1992 """
1993
1993
1994 if bundletype == b"HG20":
1994 if bundletype == b"HG20":
1995 bundle = bundle20(ui)
1995 bundle = bundle20(ui)
1996 bundle.setcompression(compression, compopts)
1996 bundle.setcompression(compression, compopts)
1997 part = bundle.newpart(b'changegroup', data=cg.getchunks())
1997 part = bundle.newpart(b'changegroup', data=cg.getchunks())
1998 part.addparam(b'version', cg.version)
1998 part.addparam(b'version', cg.version)
1999 if b'clcount' in cg.extras:
1999 if b'clcount' in cg.extras:
2000 part.addparam(
2000 part.addparam(
2001 b'nbchanges', b'%d' % cg.extras[b'clcount'], mandatory=False
2001 b'nbchanges', b'%d' % cg.extras[b'clcount'], mandatory=False
2002 )
2002 )
2003 chunkiter = bundle.getchunks()
2003 chunkiter = bundle.getchunks()
2004 else:
2004 else:
2005 # compression argument is only for the bundle2 case
2005 # compression argument is only for the bundle2 case
2006 assert compression is None
2006 assert compression is None
2007 if cg.version != b'01':
2007 if cg.version != b'01':
2008 raise error.Abort(
2008 raise error.Abort(
2009 _(b'old bundle types only supports v1 changegroups')
2009 _(b'old bundle types only supports v1 changegroups')
2010 )
2010 )
2011
2011
2012 # HG20 is the case without 2 values to unpack, but is handled above.
2012 # HG20 is the case without 2 values to unpack, but is handled above.
2013 # pytype: disable=bad-unpacking
2013 # pytype: disable=bad-unpacking
2014 header, comp = bundletypes[bundletype]
2014 header, comp = bundletypes[bundletype]
2015 # pytype: enable=bad-unpacking
2015 # pytype: enable=bad-unpacking
2016
2016
2017 if comp not in util.compengines.supportedbundletypes:
2017 if comp not in util.compengines.supportedbundletypes:
2018 raise error.Abort(_(b'unknown stream compression type: %s') % comp)
2018 raise error.Abort(_(b'unknown stream compression type: %s') % comp)
2019 compengine = util.compengines.forbundletype(comp)
2019 compengine = util.compengines.forbundletype(comp)
2020
2020
2021 def chunkiter():
2021 def chunkiter():
2022 yield header
2022 yield header
2023 for chunk in compengine.compressstream(cg.getchunks(), compopts):
2023 for chunk in compengine.compressstream(cg.getchunks(), compopts):
2024 yield chunk
2024 yield chunk
2025
2025
2026 chunkiter = chunkiter()
2026 chunkiter = chunkiter()
2027
2027
2028 # parse the changegroup data, otherwise we will block
2028 # parse the changegroup data, otherwise we will block
2029 # in case of sshrepo because we don't know the end of the stream
2029 # in case of sshrepo because we don't know the end of the stream
2030 return changegroup.writechunks(ui, chunkiter, filename, vfs=vfs)
2030 return changegroup.writechunks(ui, chunkiter, filename, vfs=vfs)
2031
2031
2032
2032
2033 def combinechangegroupresults(op):
2033 def combinechangegroupresults(op):
2034 """logic to combine 0 or more addchangegroup results into one"""
2034 """logic to combine 0 or more addchangegroup results into one"""
2035 results = [r.get(b'return', 0) for r in op.records[b'changegroup']]
2035 results = [r.get(b'return', 0) for r in op.records[b'changegroup']]
2036 changedheads = 0
2036 changedheads = 0
2037 result = 1
2037 result = 1
2038 for ret in results:
2038 for ret in results:
2039 # If any changegroup result is 0, return 0
2039 # If any changegroup result is 0, return 0
2040 if ret == 0:
2040 if ret == 0:
2041 result = 0
2041 result = 0
2042 break
2042 break
2043 if ret < -1:
2043 if ret < -1:
2044 changedheads += ret + 1
2044 changedheads += ret + 1
2045 elif ret > 1:
2045 elif ret > 1:
2046 changedheads += ret - 1
2046 changedheads += ret - 1
2047 if changedheads > 0:
2047 if changedheads > 0:
2048 result = 1 + changedheads
2048 result = 1 + changedheads
2049 elif changedheads < 0:
2049 elif changedheads < 0:
2050 result = -1 + changedheads
2050 result = -1 + changedheads
2051 return result
2051 return result
2052
2052
2053
2053
2054 @parthandler(
2054 @parthandler(
2055 b'changegroup',
2055 b'changegroup',
2056 (
2056 (
2057 b'version',
2057 b'version',
2058 b'nbchanges',
2058 b'nbchanges',
2059 b'exp-sidedata',
2059 b'exp-sidedata',
2060 b'exp-wanted-sidedata',
2060 b'exp-wanted-sidedata',
2061 b'treemanifest',
2061 b'treemanifest',
2062 b'targetphase',
2062 b'targetphase',
2063 ),
2063 ),
2064 )
2064 )
2065 def handlechangegroup(op, inpart):
2065 def handlechangegroup(op, inpart):
2066 """apply a changegroup part on the repo"""
2066 """apply a changegroup part on the repo"""
2067 from . import localrepo
2067 from . import localrepo
2068
2068
2069 tr = op.gettransaction()
2069 tr = op.gettransaction()
2070 unpackerversion = inpart.params.get(b'version', b'01')
2070 unpackerversion = inpart.params.get(b'version', b'01')
2071 # We should raise an appropriate exception here
2071 # We should raise an appropriate exception here
2072 cg = changegroup.getunbundler(unpackerversion, inpart, None)
2072 cg = changegroup.getunbundler(unpackerversion, inpart, None)
2073 # the source and url passed here are overwritten by the one contained in
2073 # the source and url passed here are overwritten by the one contained in
2074 # the transaction.hookargs argument. So 'bundle2' is a placeholder
2074 # the transaction.hookargs argument. So 'bundle2' is a placeholder
2075 nbchangesets = None
2075 nbchangesets = None
2076 if b'nbchanges' in inpart.params:
2076 if b'nbchanges' in inpart.params:
2077 nbchangesets = int(inpart.params.get(b'nbchanges'))
2077 nbchangesets = int(inpart.params.get(b'nbchanges'))
2078 if b'treemanifest' in inpart.params and not scmutil.istreemanifest(op.repo):
2078 if b'treemanifest' in inpart.params and not scmutil.istreemanifest(op.repo):
2079 if len(op.repo.changelog) != 0:
2079 if len(op.repo.changelog) != 0:
2080 raise error.Abort(
2080 raise error.Abort(
2081 _(
2081 _(
2082 b"bundle contains tree manifests, but local repo is "
2082 b"bundle contains tree manifests, but local repo is "
2083 b"non-empty and does not use tree manifests"
2083 b"non-empty and does not use tree manifests"
2084 )
2084 )
2085 )
2085 )
2086 op.repo.requirements.add(requirements.TREEMANIFEST_REQUIREMENT)
2086 op.repo.requirements.add(requirements.TREEMANIFEST_REQUIREMENT)
2087 op.repo.svfs.options = localrepo.resolvestorevfsoptions(
2087 op.repo.svfs.options = localrepo.resolvestorevfsoptions(
2088 op.repo.ui, op.repo.requirements, op.repo.features
2088 op.repo.ui, op.repo.requirements, op.repo.features
2089 )
2089 )
2090 scmutil.writereporequirements(op.repo)
2090 scmutil.writereporequirements(op.repo)
2091
2091
2092 extrakwargs = {}
2092 extrakwargs = {}
2093 targetphase = inpart.params.get(b'targetphase')
2093 targetphase = inpart.params.get(b'targetphase')
2094 if targetphase is not None:
2094 if targetphase is not None:
2095 extrakwargs['targetphase'] = int(targetphase)
2095 extrakwargs['targetphase'] = int(targetphase)
2096
2096
2097 remote_sidedata = inpart.params.get(b'exp-wanted-sidedata')
2097 remote_sidedata = inpart.params.get(b'exp-wanted-sidedata')
2098 extrakwargs['sidedata_categories'] = read_wanted_sidedata(remote_sidedata)
2098 extrakwargs['sidedata_categories'] = read_wanted_sidedata(remote_sidedata)
2099
2099
2100 ret = _processchangegroup(
2100 ret = _processchangegroup(
2101 op,
2101 op,
2102 cg,
2102 cg,
2103 tr,
2103 tr,
2104 op.source,
2104 op.source,
2105 b'bundle2',
2105 b'bundle2',
2106 expectedtotal=nbchangesets,
2106 expectedtotal=nbchangesets,
2107 **extrakwargs
2107 **extrakwargs
2108 )
2108 )
2109 if op.reply is not None:
2109 if op.reply is not None:
2110 # This is definitely not the final form of this
2110 # This is definitely not the final form of this
2111 # return. But one need to start somewhere.
2111 # return. But one need to start somewhere.
2112 part = op.reply.newpart(b'reply:changegroup', mandatory=False)
2112 part = op.reply.newpart(b'reply:changegroup', mandatory=False)
2113 part.addparam(
2113 part.addparam(
2114 b'in-reply-to', pycompat.bytestr(inpart.id), mandatory=False
2114 b'in-reply-to', pycompat.bytestr(inpart.id), mandatory=False
2115 )
2115 )
2116 part.addparam(b'return', b'%i' % ret, mandatory=False)
2116 part.addparam(b'return', b'%i' % ret, mandatory=False)
2117 assert not inpart.read()
2117 assert not inpart.read()
2118
2118
2119
2119
2120 _remotechangegroupparams = tuple(
2120 _remotechangegroupparams = tuple(
2121 [b'url', b'size', b'digests']
2121 [b'url', b'size', b'digests']
2122 + [b'digest:%s' % k for k in util.DIGESTS.keys()]
2122 + [b'digest:%s' % k for k in util.DIGESTS.keys()]
2123 )
2123 )
2124
2124
2125
2125
2126 @parthandler(b'remote-changegroup', _remotechangegroupparams)
2126 @parthandler(b'remote-changegroup', _remotechangegroupparams)
2127 def handleremotechangegroup(op, inpart):
2127 def handleremotechangegroup(op, inpart):
2128 """apply a bundle10 on the repo, given an url and validation information
2128 """apply a bundle10 on the repo, given an url and validation information
2129
2129
2130 All the information about the remote bundle to import are given as
2130 All the information about the remote bundle to import are given as
2131 parameters. The parameters include:
2131 parameters. The parameters include:
2132 - url: the url to the bundle10.
2132 - url: the url to the bundle10.
2133 - size: the bundle10 file size. It is used to validate what was
2133 - size: the bundle10 file size. It is used to validate what was
2134 retrieved by the client matches the server knowledge about the bundle.
2134 retrieved by the client matches the server knowledge about the bundle.
2135 - digests: a space separated list of the digest types provided as
2135 - digests: a space separated list of the digest types provided as
2136 parameters.
2136 parameters.
2137 - digest:<digest-type>: the hexadecimal representation of the digest with
2137 - digest:<digest-type>: the hexadecimal representation of the digest with
2138 that name. Like the size, it is used to validate what was retrieved by
2138 that name. Like the size, it is used to validate what was retrieved by
2139 the client matches what the server knows about the bundle.
2139 the client matches what the server knows about the bundle.
2140
2140
2141 When multiple digest types are given, all of them are checked.
2141 When multiple digest types are given, all of them are checked.
2142 """
2142 """
2143 try:
2143 try:
2144 raw_url = inpart.params[b'url']
2144 raw_url = inpart.params[b'url']
2145 except KeyError:
2145 except KeyError:
2146 raise error.Abort(_(b'remote-changegroup: missing "%s" param') % b'url')
2146 raise error.Abort(_(b'remote-changegroup: missing "%s" param') % b'url')
2147 parsed_url = urlutil.url(raw_url)
2147 parsed_url = urlutil.url(raw_url)
2148 if parsed_url.scheme not in capabilities[b'remote-changegroup']:
2148 if parsed_url.scheme not in capabilities[b'remote-changegroup']:
2149 raise error.Abort(
2149 raise error.Abort(
2150 _(b'remote-changegroup does not support %s urls')
2150 _(b'remote-changegroup does not support %s urls')
2151 % parsed_url.scheme
2151 % parsed_url.scheme
2152 )
2152 )
2153
2153
2154 try:
2154 try:
2155 size = int(inpart.params[b'size'])
2155 size = int(inpart.params[b'size'])
2156 except ValueError:
2156 except ValueError:
2157 raise error.Abort(
2157 raise error.Abort(
2158 _(b'remote-changegroup: invalid value for param "%s"') % b'size'
2158 _(b'remote-changegroup: invalid value for param "%s"') % b'size'
2159 )
2159 )
2160 except KeyError:
2160 except KeyError:
2161 raise error.Abort(
2161 raise error.Abort(
2162 _(b'remote-changegroup: missing "%s" param') % b'size'
2162 _(b'remote-changegroup: missing "%s" param') % b'size'
2163 )
2163 )
2164
2164
2165 digests = {}
2165 digests = {}
2166 for typ in inpart.params.get(b'digests', b'').split():
2166 for typ in inpart.params.get(b'digests', b'').split():
2167 param = b'digest:%s' % typ
2167 param = b'digest:%s' % typ
2168 try:
2168 try:
2169 value = inpart.params[param]
2169 value = inpart.params[param]
2170 except KeyError:
2170 except KeyError:
2171 raise error.Abort(
2171 raise error.Abort(
2172 _(b'remote-changegroup: missing "%s" param') % param
2172 _(b'remote-changegroup: missing "%s" param') % param
2173 )
2173 )
2174 digests[typ] = value
2174 digests[typ] = value
2175
2175
2176 real_part = util.digestchecker(url.open(op.ui, raw_url), size, digests)
2176 real_part = util.digestchecker(url.open(op.ui, raw_url), size, digests)
2177
2177
2178 tr = op.gettransaction()
2178 tr = op.gettransaction()
2179 from . import exchange
2179 from . import exchange
2180
2180
2181 cg = exchange.readbundle(op.repo.ui, real_part, raw_url)
2181 cg = exchange.readbundle(op.repo.ui, real_part, raw_url)
2182 if not isinstance(cg, changegroup.cg1unpacker):
2182 if not isinstance(cg, changegroup.cg1unpacker):
2183 raise error.Abort(
2183 raise error.Abort(
2184 _(b'%s: not a bundle version 1.0') % urlutil.hidepassword(raw_url)
2184 _(b'%s: not a bundle version 1.0') % urlutil.hidepassword(raw_url)
2185 )
2185 )
2186 ret = _processchangegroup(op, cg, tr, op.source, b'bundle2')
2186 ret = _processchangegroup(op, cg, tr, op.source, b'bundle2')
2187 if op.reply is not None:
2187 if op.reply is not None:
2188 # This is definitely not the final form of this
2188 # This is definitely not the final form of this
2189 # return. But one need to start somewhere.
2189 # return. But one need to start somewhere.
2190 part = op.reply.newpart(b'reply:changegroup')
2190 part = op.reply.newpart(b'reply:changegroup')
2191 part.addparam(
2191 part.addparam(
2192 b'in-reply-to', pycompat.bytestr(inpart.id), mandatory=False
2192 b'in-reply-to', pycompat.bytestr(inpart.id), mandatory=False
2193 )
2193 )
2194 part.addparam(b'return', b'%i' % ret, mandatory=False)
2194 part.addparam(b'return', b'%i' % ret, mandatory=False)
2195 try:
2195 try:
2196 real_part.validate()
2196 real_part.validate()
2197 except error.Abort as e:
2197 except error.Abort as e:
2198 raise error.Abort(
2198 raise error.Abort(
2199 _(b'bundle at %s is corrupted:\n%s')
2199 _(b'bundle at %s is corrupted:\n%s')
2200 % (urlutil.hidepassword(raw_url), e.message)
2200 % (urlutil.hidepassword(raw_url), e.message)
2201 )
2201 )
2202 assert not inpart.read()
2202 assert not inpart.read()
2203
2203
2204
2204
2205 @parthandler(b'reply:changegroup', (b'return', b'in-reply-to'))
2205 @parthandler(b'reply:changegroup', (b'return', b'in-reply-to'))
2206 def handlereplychangegroup(op, inpart):
2206 def handlereplychangegroup(op, inpart):
2207 ret = int(inpart.params[b'return'])
2207 ret = int(inpart.params[b'return'])
2208 replyto = int(inpart.params[b'in-reply-to'])
2208 replyto = int(inpart.params[b'in-reply-to'])
2209 op.records.add(b'changegroup', {b'return': ret}, replyto)
2209 op.records.add(b'changegroup', {b'return': ret}, replyto)
2210
2210
2211
2211
2212 @parthandler(b'check:bookmarks')
2212 @parthandler(b'check:bookmarks')
2213 def handlecheckbookmarks(op, inpart):
2213 def handlecheckbookmarks(op, inpart):
2214 """check location of bookmarks
2214 """check location of bookmarks
2215
2215
2216 This part is to be used to detect push race regarding bookmark, it
2216 This part is to be used to detect push race regarding bookmark, it
2217 contains binary encoded (bookmark, node) tuple. If the local state does
2217 contains binary encoded (bookmark, node) tuple. If the local state does
2218 not marks the one in the part, a PushRaced exception is raised
2218 not marks the one in the part, a PushRaced exception is raised
2219 """
2219 """
2220 bookdata = bookmarks.binarydecode(op.repo, inpart)
2220 bookdata = bookmarks.binarydecode(op.repo, inpart)
2221
2221
2222 msgstandard = (
2222 msgstandard = (
2223 b'remote repository changed while pushing - please try again '
2223 b'remote repository changed while pushing - please try again '
2224 b'(bookmark "%s" move from %s to %s)'
2224 b'(bookmark "%s" move from %s to %s)'
2225 )
2225 )
2226 msgmissing = (
2226 msgmissing = (
2227 b'remote repository changed while pushing - please try again '
2227 b'remote repository changed while pushing - please try again '
2228 b'(bookmark "%s" is missing, expected %s)'
2228 b'(bookmark "%s" is missing, expected %s)'
2229 )
2229 )
2230 msgexist = (
2230 msgexist = (
2231 b'remote repository changed while pushing - please try again '
2231 b'remote repository changed while pushing - please try again '
2232 b'(bookmark "%s" set on %s, expected missing)'
2232 b'(bookmark "%s" set on %s, expected missing)'
2233 )
2233 )
2234 for book, node in bookdata:
2234 for book, node in bookdata:
2235 currentnode = op.repo._bookmarks.get(book)
2235 currentnode = op.repo._bookmarks.get(book)
2236 if currentnode != node:
2236 if currentnode != node:
2237 if node is None:
2237 if node is None:
2238 finalmsg = msgexist % (book, short(currentnode))
2238 finalmsg = msgexist % (book, short(currentnode))
2239 elif currentnode is None:
2239 elif currentnode is None:
2240 finalmsg = msgmissing % (book, short(node))
2240 finalmsg = msgmissing % (book, short(node))
2241 else:
2241 else:
2242 finalmsg = msgstandard % (
2242 finalmsg = msgstandard % (
2243 book,
2243 book,
2244 short(node),
2244 short(node),
2245 short(currentnode),
2245 short(currentnode),
2246 )
2246 )
2247 raise error.PushRaced(finalmsg)
2247 raise error.PushRaced(finalmsg)
2248
2248
2249
2249
2250 @parthandler(b'check:heads')
2250 @parthandler(b'check:heads')
2251 def handlecheckheads(op, inpart):
2251 def handlecheckheads(op, inpart):
2252 """check that head of the repo did not change
2252 """check that head of the repo did not change
2253
2253
2254 This is used to detect a push race when using unbundle.
2254 This is used to detect a push race when using unbundle.
2255 This replaces the "heads" argument of unbundle."""
2255 This replaces the "heads" argument of unbundle."""
2256 h = inpart.read(20)
2256 h = inpart.read(20)
2257 heads = []
2257 heads = []
2258 while len(h) == 20:
2258 while len(h) == 20:
2259 heads.append(h)
2259 heads.append(h)
2260 h = inpart.read(20)
2260 h = inpart.read(20)
2261 assert not h
2261 assert not h
2262 # Trigger a transaction so that we are guaranteed to have the lock now.
2262 # Trigger a transaction so that we are guaranteed to have the lock now.
2263 if op.ui.configbool(b'experimental', b'bundle2lazylocking'):
2263 if op.ui.configbool(b'experimental', b'bundle2lazylocking'):
2264 op.gettransaction()
2264 op.gettransaction()
2265 if sorted(heads) != sorted(op.repo.heads()):
2265 if sorted(heads) != sorted(op.repo.heads()):
2266 raise error.PushRaced(
2266 raise error.PushRaced(
2267 b'remote repository changed while pushing - please try again'
2267 b'remote repository changed while pushing - please try again'
2268 )
2268 )
2269
2269
2270
2270
2271 @parthandler(b'check:updated-heads')
2271 @parthandler(b'check:updated-heads')
2272 def handlecheckupdatedheads(op, inpart):
2272 def handlecheckupdatedheads(op, inpart):
2273 """check for race on the heads touched by a push
2273 """check for race on the heads touched by a push
2274
2274
2275 This is similar to 'check:heads' but focus on the heads actually updated
2275 This is similar to 'check:heads' but focus on the heads actually updated
2276 during the push. If other activities happen on unrelated heads, it is
2276 during the push. If other activities happen on unrelated heads, it is
2277 ignored.
2277 ignored.
2278
2278
2279 This allow server with high traffic to avoid push contention as long as
2279 This allow server with high traffic to avoid push contention as long as
2280 unrelated parts of the graph are involved."""
2280 unrelated parts of the graph are involved."""
2281 h = inpart.read(20)
2281 h = inpart.read(20)
2282 heads = []
2282 heads = []
2283 while len(h) == 20:
2283 while len(h) == 20:
2284 heads.append(h)
2284 heads.append(h)
2285 h = inpart.read(20)
2285 h = inpart.read(20)
2286 assert not h
2286 assert not h
2287 # trigger a transaction so that we are guaranteed to have the lock now.
2287 # trigger a transaction so that we are guaranteed to have the lock now.
2288 if op.ui.configbool(b'experimental', b'bundle2lazylocking'):
2288 if op.ui.configbool(b'experimental', b'bundle2lazylocking'):
2289 op.gettransaction()
2289 op.gettransaction()
2290
2290
2291 currentheads = set()
2291 currentheads = set()
2292 for ls in op.repo.branchmap().iterheads():
2292 for ls in op.repo.branchmap().iterheads():
2293 currentheads.update(ls)
2293 currentheads.update(ls)
2294
2294
2295 for h in heads:
2295 for h in heads:
2296 if h not in currentheads:
2296 if h not in currentheads:
2297 raise error.PushRaced(
2297 raise error.PushRaced(
2298 b'remote repository changed while pushing - '
2298 b'remote repository changed while pushing - '
2299 b'please try again'
2299 b'please try again'
2300 )
2300 )
2301
2301
2302
2302
2303 @parthandler(b'check:phases')
2303 @parthandler(b'check:phases')
2304 def handlecheckphases(op, inpart):
2304 def handlecheckphases(op, inpart):
2305 """check that phase boundaries of the repository did not change
2305 """check that phase boundaries of the repository did not change
2306
2306
2307 This is used to detect a push race.
2307 This is used to detect a push race.
2308 """
2308 """
2309 phasetonodes = phases.binarydecode(inpart)
2309 phasetonodes = phases.binarydecode(inpart)
2310 unfi = op.repo.unfiltered()
2310 unfi = op.repo.unfiltered()
2311 cl = unfi.changelog
2311 cl = unfi.changelog
2312 phasecache = unfi._phasecache
2312 phasecache = unfi._phasecache
2313 msg = (
2313 msg = (
2314 b'remote repository changed while pushing - please try again '
2314 b'remote repository changed while pushing - please try again '
2315 b'(%s is %s expected %s)'
2315 b'(%s is %s expected %s)'
2316 )
2316 )
2317 for expectedphase, nodes in phasetonodes.items():
2317 for expectedphase, nodes in phasetonodes.items():
2318 for n in nodes:
2318 for n in nodes:
2319 actualphase = phasecache.phase(unfi, cl.rev(n))
2319 actualphase = phasecache.phase(unfi, cl.rev(n))
2320 if actualphase != expectedphase:
2320 if actualphase != expectedphase:
2321 finalmsg = msg % (
2321 finalmsg = msg % (
2322 short(n),
2322 short(n),
2323 phases.phasenames[actualphase],
2323 phases.phasenames[actualphase],
2324 phases.phasenames[expectedphase],
2324 phases.phasenames[expectedphase],
2325 )
2325 )
2326 raise error.PushRaced(finalmsg)
2326 raise error.PushRaced(finalmsg)
2327
2327
2328
2328
2329 @parthandler(b'output')
2329 @parthandler(b'output')
2330 def handleoutput(op, inpart):
2330 def handleoutput(op, inpart):
2331 """forward output captured on the server to the client"""
2331 """forward output captured on the server to the client"""
2332 for line in inpart.read().splitlines():
2332 for line in inpart.read().splitlines():
2333 op.ui.status(_(b'remote: %s\n') % line)
2333 op.ui.status(_(b'remote: %s\n') % line)
2334
2334
2335
2335
2336 @parthandler(b'replycaps')
2336 @parthandler(b'replycaps')
2337 def handlereplycaps(op, inpart):
2337 def handlereplycaps(op, inpart):
2338 """Notify that a reply bundle should be created
2338 """Notify that a reply bundle should be created
2339
2339
2340 The payload contains the capabilities information for the reply"""
2340 The payload contains the capabilities information for the reply"""
2341 caps = decodecaps(inpart.read())
2341 caps = decodecaps(inpart.read())
2342 if op.reply is None:
2342 if op.reply is None:
2343 op.reply = bundle20(op.ui, caps)
2343 op.reply = bundle20(op.ui, caps)
2344
2344
2345
2345
2346 class AbortFromPart(error.Abort):
2346 class AbortFromPart(error.Abort):
2347 """Sub-class of Abort that denotes an error from a bundle2 part."""
2347 """Sub-class of Abort that denotes an error from a bundle2 part."""
2348
2348
2349
2349
2350 @parthandler(b'error:abort', (b'message', b'hint'))
2350 @parthandler(b'error:abort', (b'message', b'hint'))
2351 def handleerrorabort(op, inpart):
2351 def handleerrorabort(op, inpart):
2352 """Used to transmit abort error over the wire"""
2352 """Used to transmit abort error over the wire"""
2353 raise AbortFromPart(
2353 raise AbortFromPart(
2354 inpart.params[b'message'], hint=inpart.params.get(b'hint')
2354 inpart.params[b'message'], hint=inpart.params.get(b'hint')
2355 )
2355 )
2356
2356
2357
2357
2358 @parthandler(
2358 @parthandler(
2359 b'error:pushkey',
2359 b'error:pushkey',
2360 (b'namespace', b'key', b'new', b'old', b'ret', b'in-reply-to'),
2360 (b'namespace', b'key', b'new', b'old', b'ret', b'in-reply-to'),
2361 )
2361 )
2362 def handleerrorpushkey(op, inpart):
2362 def handleerrorpushkey(op, inpart):
2363 """Used to transmit failure of a mandatory pushkey over the wire"""
2363 """Used to transmit failure of a mandatory pushkey over the wire"""
2364 kwargs = {}
2364 kwargs = {}
2365 for name in (b'namespace', b'key', b'new', b'old', b'ret'):
2365 for name in (b'namespace', b'key', b'new', b'old', b'ret'):
2366 value = inpart.params.get(name)
2366 value = inpart.params.get(name)
2367 if value is not None:
2367 if value is not None:
2368 kwargs[name] = value
2368 kwargs[name] = value
2369 raise error.PushkeyFailed(
2369 raise error.PushkeyFailed(
2370 inpart.params[b'in-reply-to'], **pycompat.strkwargs(kwargs)
2370 inpart.params[b'in-reply-to'], **pycompat.strkwargs(kwargs)
2371 )
2371 )
2372
2372
2373
2373
2374 @parthandler(b'error:unsupportedcontent', (b'parttype', b'params'))
2374 @parthandler(b'error:unsupportedcontent', (b'parttype', b'params'))
2375 def handleerrorunsupportedcontent(op, inpart):
2375 def handleerrorunsupportedcontent(op, inpart):
2376 """Used to transmit unknown content error over the wire"""
2376 """Used to transmit unknown content error over the wire"""
2377 kwargs = {}
2377 kwargs = {}
2378 parttype = inpart.params.get(b'parttype')
2378 parttype = inpart.params.get(b'parttype')
2379 if parttype is not None:
2379 if parttype is not None:
2380 kwargs[b'parttype'] = parttype
2380 kwargs[b'parttype'] = parttype
2381 params = inpart.params.get(b'params')
2381 params = inpart.params.get(b'params')
2382 if params is not None:
2382 if params is not None:
2383 kwargs[b'params'] = params.split(b'\0')
2383 kwargs[b'params'] = params.split(b'\0')
2384
2384
2385 raise error.BundleUnknownFeatureError(**pycompat.strkwargs(kwargs))
2385 raise error.BundleUnknownFeatureError(**pycompat.strkwargs(kwargs))
2386
2386
2387
2387
2388 @parthandler(b'error:pushraced', (b'message',))
2388 @parthandler(b'error:pushraced', (b'message',))
2389 def handleerrorpushraced(op, inpart):
2389 def handleerrorpushraced(op, inpart):
2390 """Used to transmit push race error over the wire"""
2390 """Used to transmit push race error over the wire"""
2391 raise error.ResponseError(_(b'push failed:'), inpart.params[b'message'])
2391 raise error.ResponseError(_(b'push failed:'), inpart.params[b'message'])
2392
2392
2393
2393
2394 @parthandler(b'listkeys', (b'namespace',))
2394 @parthandler(b'listkeys', (b'namespace',))
2395 def handlelistkeys(op, inpart):
2395 def handlelistkeys(op, inpart):
2396 """retrieve pushkey namespace content stored in a bundle2"""
2396 """retrieve pushkey namespace content stored in a bundle2"""
2397 namespace = inpart.params[b'namespace']
2397 namespace = inpart.params[b'namespace']
2398 r = pushkey.decodekeys(inpart.read())
2398 r = pushkey.decodekeys(inpart.read())
2399 op.records.add(b'listkeys', (namespace, r))
2399 op.records.add(b'listkeys', (namespace, r))
2400
2400
2401
2401
2402 @parthandler(b'pushkey', (b'namespace', b'key', b'old', b'new'))
2402 @parthandler(b'pushkey', (b'namespace', b'key', b'old', b'new'))
2403 def handlepushkey(op, inpart):
2403 def handlepushkey(op, inpart):
2404 """process a pushkey request"""
2404 """process a pushkey request"""
2405 dec = pushkey.decode
2405 dec = pushkey.decode
2406 namespace = dec(inpart.params[b'namespace'])
2406 namespace = dec(inpart.params[b'namespace'])
2407 key = dec(inpart.params[b'key'])
2407 key = dec(inpart.params[b'key'])
2408 old = dec(inpart.params[b'old'])
2408 old = dec(inpart.params[b'old'])
2409 new = dec(inpart.params[b'new'])
2409 new = dec(inpart.params[b'new'])
2410 # Grab the transaction to ensure that we have the lock before performing the
2410 # Grab the transaction to ensure that we have the lock before performing the
2411 # pushkey.
2411 # pushkey.
2412 if op.ui.configbool(b'experimental', b'bundle2lazylocking'):
2412 if op.ui.configbool(b'experimental', b'bundle2lazylocking'):
2413 op.gettransaction()
2413 op.gettransaction()
2414 ret = op.repo.pushkey(namespace, key, old, new)
2414 ret = op.repo.pushkey(namespace, key, old, new)
2415 record = {b'namespace': namespace, b'key': key, b'old': old, b'new': new}
2415 record = {b'namespace': namespace, b'key': key, b'old': old, b'new': new}
2416 op.records.add(b'pushkey', record)
2416 op.records.add(b'pushkey', record)
2417 if op.reply is not None:
2417 if op.reply is not None:
2418 rpart = op.reply.newpart(b'reply:pushkey')
2418 rpart = op.reply.newpart(b'reply:pushkey')
2419 rpart.addparam(
2419 rpart.addparam(
2420 b'in-reply-to', pycompat.bytestr(inpart.id), mandatory=False
2420 b'in-reply-to', pycompat.bytestr(inpart.id), mandatory=False
2421 )
2421 )
2422 rpart.addparam(b'return', b'%i' % ret, mandatory=False)
2422 rpart.addparam(b'return', b'%i' % ret, mandatory=False)
2423 if inpart.mandatory and not ret:
2423 if inpart.mandatory and not ret:
2424 kwargs = {}
2424 kwargs = {}
2425 for key in (b'namespace', b'key', b'new', b'old', b'ret'):
2425 for key in (b'namespace', b'key', b'new', b'old', b'ret'):
2426 if key in inpart.params:
2426 if key in inpart.params:
2427 kwargs[key] = inpart.params[key]
2427 kwargs[key] = inpart.params[key]
2428 raise error.PushkeyFailed(
2428 raise error.PushkeyFailed(
2429 partid=b'%d' % inpart.id, **pycompat.strkwargs(kwargs)
2429 partid=b'%d' % inpart.id, **pycompat.strkwargs(kwargs)
2430 )
2430 )
2431
2431
2432
2432
2433 @parthandler(b'bookmarks')
2433 @parthandler(b'bookmarks')
2434 def handlebookmark(op, inpart):
2434 def handlebookmark(op, inpart):
2435 """transmit bookmark information
2435 """transmit bookmark information
2436
2436
2437 The part contains binary encoded bookmark information.
2437 The part contains binary encoded bookmark information.
2438
2438
2439 The exact behavior of this part can be controlled by the 'bookmarks' mode
2439 The exact behavior of this part can be controlled by the 'bookmarks' mode
2440 on the bundle operation.
2440 on the bundle operation.
2441
2441
2442 When mode is 'apply' (the default) the bookmark information is applied as
2442 When mode is 'apply' (the default) the bookmark information is applied as
2443 is to the unbundling repository. Make sure a 'check:bookmarks' part is
2443 is to the unbundling repository. Make sure a 'check:bookmarks' part is
2444 issued earlier to check for push races in such update. This behavior is
2444 issued earlier to check for push races in such update. This behavior is
2445 suitable for pushing.
2445 suitable for pushing.
2446
2446
2447 When mode is 'records', the information is recorded into the 'bookmarks'
2447 When mode is 'records', the information is recorded into the 'bookmarks'
2448 records of the bundle operation. This behavior is suitable for pulling.
2448 records of the bundle operation. This behavior is suitable for pulling.
2449 """
2449 """
2450 changes = bookmarks.binarydecode(op.repo, inpart)
2450 changes = bookmarks.binarydecode(op.repo, inpart)
2451
2451
2452 pushkeycompat = op.repo.ui.configbool(
2452 pushkeycompat = op.repo.ui.configbool(
2453 b'server', b'bookmarks-pushkey-compat'
2453 b'server', b'bookmarks-pushkey-compat'
2454 )
2454 )
2455 bookmarksmode = op.modes.get(b'bookmarks', b'apply')
2455 bookmarksmode = op.modes.get(b'bookmarks', b'apply')
2456
2456
2457 if bookmarksmode == b'apply':
2457 if bookmarksmode == b'apply':
2458 tr = op.gettransaction()
2458 tr = op.gettransaction()
2459 bookstore = op.repo._bookmarks
2459 bookstore = op.repo._bookmarks
2460 if pushkeycompat:
2460 if pushkeycompat:
2461 allhooks = []
2461 allhooks = []
2462 for book, node in changes:
2462 for book, node in changes:
2463 hookargs = tr.hookargs.copy()
2463 hookargs = tr.hookargs.copy()
2464 hookargs[b'pushkeycompat'] = b'1'
2464 hookargs[b'pushkeycompat'] = b'1'
2465 hookargs[b'namespace'] = b'bookmarks'
2465 hookargs[b'namespace'] = b'bookmarks'
2466 hookargs[b'key'] = book
2466 hookargs[b'key'] = book
2467 hookargs[b'old'] = hex(bookstore.get(book, b''))
2467 hookargs[b'old'] = hex(bookstore.get(book, b''))
2468 hookargs[b'new'] = hex(node if node is not None else b'')
2468 hookargs[b'new'] = hex(node if node is not None else b'')
2469 allhooks.append(hookargs)
2469 allhooks.append(hookargs)
2470
2470
2471 for hookargs in allhooks:
2471 for hookargs in allhooks:
2472 op.repo.hook(
2472 op.repo.hook(
2473 b'prepushkey', throw=True, **pycompat.strkwargs(hookargs)
2473 b'prepushkey', throw=True, **pycompat.strkwargs(hookargs)
2474 )
2474 )
2475
2475
2476 for book, node in changes:
2476 for book, node in changes:
2477 if bookmarks.isdivergent(book):
2477 if bookmarks.isdivergent(book):
2478 msg = _(b'cannot accept divergent bookmark %s!') % book
2478 msg = _(b'cannot accept divergent bookmark %s!') % book
2479 raise error.Abort(msg)
2479 raise error.Abort(msg)
2480
2480
2481 bookstore.applychanges(op.repo, op.gettransaction(), changes)
2481 bookstore.applychanges(op.repo, op.gettransaction(), changes)
2482
2482
2483 if pushkeycompat:
2483 if pushkeycompat:
2484
2484
2485 def runhook(unused_success):
2485 def runhook(unused_success):
2486 for hookargs in allhooks:
2486 for hookargs in allhooks:
2487 op.repo.hook(b'pushkey', **pycompat.strkwargs(hookargs))
2487 op.repo.hook(b'pushkey', **pycompat.strkwargs(hookargs))
2488
2488
2489 op.repo._afterlock(runhook)
2489 op.repo._afterlock(runhook)
2490
2490
2491 elif bookmarksmode == b'records':
2491 elif bookmarksmode == b'records':
2492 for book, node in changes:
2492 for book, node in changes:
2493 record = {b'bookmark': book, b'node': node}
2493 record = {b'bookmark': book, b'node': node}
2494 op.records.add(b'bookmarks', record)
2494 op.records.add(b'bookmarks', record)
2495 else:
2495 else:
2496 raise error.ProgrammingError(
2496 raise error.ProgrammingError(
2497 b'unknown bookmark mode: %s' % bookmarksmode
2497 b'unknown bookmark mode: %s' % bookmarksmode
2498 )
2498 )
2499
2499
2500
2500
2501 @parthandler(b'phase-heads')
2501 @parthandler(b'phase-heads')
2502 def handlephases(op, inpart):
2502 def handlephases(op, inpart):
2503 """apply phases from bundle part to repo"""
2503 """apply phases from bundle part to repo"""
2504 headsbyphase = phases.binarydecode(inpart)
2504 headsbyphase = phases.binarydecode(inpart)
2505 phases.updatephases(op.repo.unfiltered(), op.gettransaction, headsbyphase)
2505 phases.updatephases(op.repo.unfiltered(), op.gettransaction, headsbyphase)
2506
2506
2507
2507
2508 @parthandler(b'reply:pushkey', (b'return', b'in-reply-to'))
2508 @parthandler(b'reply:pushkey', (b'return', b'in-reply-to'))
2509 def handlepushkeyreply(op, inpart):
2509 def handlepushkeyreply(op, inpart):
2510 """retrieve the result of a pushkey request"""
2510 """retrieve the result of a pushkey request"""
2511 ret = int(inpart.params[b'return'])
2511 ret = int(inpart.params[b'return'])
2512 partid = int(inpart.params[b'in-reply-to'])
2512 partid = int(inpart.params[b'in-reply-to'])
2513 op.records.add(b'pushkey', {b'return': ret}, partid)
2513 op.records.add(b'pushkey', {b'return': ret}, partid)
2514
2514
2515
2515
2516 @parthandler(b'obsmarkers')
2516 @parthandler(b'obsmarkers')
2517 def handleobsmarker(op, inpart):
2517 def handleobsmarker(op, inpart):
2518 """add a stream of obsmarkers to the repo"""
2518 """add a stream of obsmarkers to the repo"""
2519 tr = op.gettransaction()
2519 tr = op.gettransaction()
2520 markerdata = inpart.read()
2520 markerdata = inpart.read()
2521 if op.ui.config(b'experimental', b'obsmarkers-exchange-debug'):
2521 if op.ui.config(b'experimental', b'obsmarkers-exchange-debug'):
2522 op.ui.writenoi18n(
2522 op.ui.writenoi18n(
2523 b'obsmarker-exchange: %i bytes received\n' % len(markerdata)
2523 b'obsmarker-exchange: %i bytes received\n' % len(markerdata)
2524 )
2524 )
2525 # The mergemarkers call will crash if marker creation is not enabled.
2525 # The mergemarkers call will crash if marker creation is not enabled.
2526 # we want to avoid this if the part is advisory.
2526 # we want to avoid this if the part is advisory.
2527 if not inpart.mandatory and op.repo.obsstore.readonly:
2527 if not inpart.mandatory and op.repo.obsstore.readonly:
2528 op.repo.ui.debug(
2528 op.repo.ui.debug(
2529 b'ignoring obsolescence markers, feature not enabled\n'
2529 b'ignoring obsolescence markers, feature not enabled\n'
2530 )
2530 )
2531 return
2531 return
2532 new = op.repo.obsstore.mergemarkers(tr, markerdata)
2532 new = op.repo.obsstore.mergemarkers(tr, markerdata)
2533 op.repo.invalidatevolatilesets()
2533 op.repo.invalidatevolatilesets()
2534 op.records.add(b'obsmarkers', {b'new': new})
2534 op.records.add(b'obsmarkers', {b'new': new})
2535 if op.reply is not None:
2535 if op.reply is not None:
2536 rpart = op.reply.newpart(b'reply:obsmarkers')
2536 rpart = op.reply.newpart(b'reply:obsmarkers')
2537 rpart.addparam(
2537 rpart.addparam(
2538 b'in-reply-to', pycompat.bytestr(inpart.id), mandatory=False
2538 b'in-reply-to', pycompat.bytestr(inpart.id), mandatory=False
2539 )
2539 )
2540 rpart.addparam(b'new', b'%i' % new, mandatory=False)
2540 rpart.addparam(b'new', b'%i' % new, mandatory=False)
2541
2541
2542
2542
2543 @parthandler(b'reply:obsmarkers', (b'new', b'in-reply-to'))
2543 @parthandler(b'reply:obsmarkers', (b'new', b'in-reply-to'))
2544 def handleobsmarkerreply(op, inpart):
2544 def handleobsmarkerreply(op, inpart):
2545 """retrieve the result of a pushkey request"""
2545 """retrieve the result of a pushkey request"""
2546 ret = int(inpart.params[b'new'])
2546 ret = int(inpart.params[b'new'])
2547 partid = int(inpart.params[b'in-reply-to'])
2547 partid = int(inpart.params[b'in-reply-to'])
2548 op.records.add(b'obsmarkers', {b'new': ret}, partid)
2548 op.records.add(b'obsmarkers', {b'new': ret}, partid)
2549
2549
2550
2550
2551 @parthandler(b'hgtagsfnodes')
2551 @parthandler(b'hgtagsfnodes')
2552 def handlehgtagsfnodes(op, inpart):
2552 def handlehgtagsfnodes(op, inpart):
2553 """Applies .hgtags fnodes cache entries to the local repo.
2553 """Applies .hgtags fnodes cache entries to the local repo.
2554
2554
2555 Payload is pairs of 20 byte changeset nodes and filenodes.
2555 Payload is pairs of 20 byte changeset nodes and filenodes.
2556 """
2556 """
2557 # Grab the transaction so we ensure that we have the lock at this point.
2557 # Grab the transaction so we ensure that we have the lock at this point.
2558 if op.ui.configbool(b'experimental', b'bundle2lazylocking'):
2558 if op.ui.configbool(b'experimental', b'bundle2lazylocking'):
2559 op.gettransaction()
2559 op.gettransaction()
2560 cache = tags.hgtagsfnodescache(op.repo.unfiltered())
2560 cache = tags.hgtagsfnodescache(op.repo.unfiltered())
2561
2561
2562 count = 0
2562 count = 0
2563 while True:
2563 while True:
2564 node = inpart.read(20)
2564 node = inpart.read(20)
2565 fnode = inpart.read(20)
2565 fnode = inpart.read(20)
2566 if len(node) < 20 or len(fnode) < 20:
2566 if len(node) < 20 or len(fnode) < 20:
2567 op.ui.debug(b'ignoring incomplete received .hgtags fnodes data\n')
2567 op.ui.debug(b'ignoring incomplete received .hgtags fnodes data\n')
2568 break
2568 break
2569 cache.setfnode(node, fnode)
2569 cache.setfnode(node, fnode)
2570 count += 1
2570 count += 1
2571
2571
2572 cache.write()
2572 cache.write()
2573 op.ui.debug(b'applied %i hgtags fnodes cache entries\n' % count)
2573 op.ui.debug(b'applied %i hgtags fnodes cache entries\n' % count)
2574
2574
2575
2575
2576 rbcstruct = struct.Struct(b'>III')
2576 rbcstruct = struct.Struct(b'>III')
2577
2577
2578
2578
2579 @parthandler(b'cache:rev-branch-cache')
2579 @parthandler(b'cache:rev-branch-cache')
2580 def handlerbc(op, inpart):
2580 def handlerbc(op, inpart):
2581 """Legacy part, ignored for compatibility with bundles from or
2581 """Legacy part, ignored for compatibility with bundles from or
2582 for Mercurial before 5.7. Newer Mercurial computes the cache
2582 for Mercurial before 5.7. Newer Mercurial computes the cache
2583 efficiently enough during unbundling that the additional transfer
2583 efficiently enough during unbundling that the additional transfer
2584 is unnecessary."""
2584 is unnecessary."""
2585
2585
2586
2586
2587 @parthandler(b'pushvars')
2587 @parthandler(b'pushvars')
2588 def bundle2getvars(op, part):
2588 def bundle2getvars(op, part):
2589 '''unbundle a bundle2 containing shellvars on the server'''
2589 '''unbundle a bundle2 containing shellvars on the server'''
2590 # An option to disable unbundling on server-side for security reasons
2590 # An option to disable unbundling on server-side for security reasons
2591 if op.ui.configbool(b'push', b'pushvars.server'):
2591 if op.ui.configbool(b'push', b'pushvars.server'):
2592 hookargs = {}
2592 hookargs = {}
2593 for key, value in part.advisoryparams:
2593 for key, value in part.advisoryparams:
2594 key = key.upper()
2594 key = key.upper()
2595 # We want pushed variables to have USERVAR_ prepended so we know
2595 # We want pushed variables to have USERVAR_ prepended so we know
2596 # they came from the --pushvar flag.
2596 # they came from the --pushvar flag.
2597 key = b"USERVAR_" + key
2597 key = b"USERVAR_" + key
2598 hookargs[key] = value
2598 hookargs[key] = value
2599 op.addhookargs(hookargs)
2599 op.addhookargs(hookargs)
2600
2600
2601
2601
2602 @parthandler(b'stream2', (b'requirements', b'filecount', b'bytecount'))
2602 @parthandler(b'stream2', (b'requirements', b'filecount', b'bytecount'))
2603 def handlestreamv2bundle(op, part):
2603 def handlestreamv2bundle(op, part):
2604
2604
2605 requirements = urlreq.unquote(part.params[b'requirements'])
2605 requirements = urlreq.unquote(part.params[b'requirements'])
2606 requirements = requirements.split(b',') if requirements else []
2606 requirements = requirements.split(b',') if requirements else []
2607 filecount = int(part.params[b'filecount'])
2607 filecount = int(part.params[b'filecount'])
2608 bytecount = int(part.params[b'bytecount'])
2608 bytecount = int(part.params[b'bytecount'])
2609
2609
2610 repo = op.repo
2610 repo = op.repo
2611 if len(repo):
2611 if len(repo):
2612 msg = _(b'cannot apply stream clone to non empty repository')
2612 msg = _(b'cannot apply stream clone to non empty repository')
2613 raise error.Abort(msg)
2613 raise error.Abort(msg)
2614
2614
2615 repo.ui.debug(b'applying stream bundle\n')
2615 repo.ui.debug(b'applying stream bundle\n')
2616 streamclone.applybundlev2(repo, part, filecount, bytecount, requirements)
2616 streamclone.applybundlev2(repo, part, filecount, bytecount, requirements)
2617
2617
2618
2618
2619 @parthandler(b'stream3-exp', (b'requirements', b'filecount', b'bytecount'))
2619 @parthandler(b'stream3-exp', (b'requirements', b'filecount', b'bytecount'))
2620 def handlestreamv3bundle(op, part):
2620 def handlestreamv3bundle(op, part):
2621 return handlestreamv2bundle(op, part)
2621 return handlestreamv2bundle(op, part)
2622
2622
2623
2623
2624 def widen_bundle(
2624 def widen_bundle(
2625 bundler, repo, oldmatcher, newmatcher, common, known, cgversion, ellipses
2625 bundler, repo, oldmatcher, newmatcher, common, known, cgversion, ellipses
2626 ):
2626 ):
2627 """generates bundle2 for widening a narrow clone
2627 """generates bundle2 for widening a narrow clone
2628
2628
2629 bundler is the bundle to which data should be added
2629 bundler is the bundle to which data should be added
2630 repo is the localrepository instance
2630 repo is the localrepository instance
2631 oldmatcher matches what the client already has
2631 oldmatcher matches what the client already has
2632 newmatcher matches what the client needs (including what it already has)
2632 newmatcher matches what the client needs (including what it already has)
2633 common is set of common heads between server and client
2633 common is set of common heads between server and client
2634 known is a set of revs known on the client side (used in ellipses)
2634 known is a set of revs known on the client side (used in ellipses)
2635 cgversion is the changegroup version to send
2635 cgversion is the changegroup version to send
2636 ellipses is boolean value telling whether to send ellipses data or not
2636 ellipses is boolean value telling whether to send ellipses data or not
2637
2637
2638 returns bundle2 of the data required for extending
2638 returns bundle2 of the data required for extending
2639 """
2639 """
2640 commonnodes = set()
2640 commonnodes = set()
2641 cl = repo.changelog
2641 cl = repo.changelog
2642 for r in repo.revs(b"::%ln", common):
2642 for r in repo.revs(b"::%ln", common):
2643 commonnodes.add(cl.node(r))
2643 commonnodes.add(cl.node(r))
2644 if commonnodes:
2644 if commonnodes:
2645 packer = changegroup.getbundler(
2645 packer = changegroup.getbundler(
2646 cgversion,
2646 cgversion,
2647 repo,
2647 repo,
2648 oldmatcher=oldmatcher,
2648 oldmatcher=oldmatcher,
2649 matcher=newmatcher,
2649 matcher=newmatcher,
2650 fullnodes=commonnodes,
2650 fullnodes=commonnodes,
2651 )
2651 )
2652 cgdata = packer.generate(
2652 cgdata = packer.generate(
2653 {repo.nullid},
2653 {repo.nullid},
2654 list(commonnodes),
2654 list(commonnodes),
2655 False,
2655 False,
2656 b'narrow_widen',
2656 b'narrow_widen',
2657 changelog=False,
2657 changelog=False,
2658 )
2658 )
2659
2659
2660 part = bundler.newpart(b'changegroup', data=cgdata)
2660 part = bundler.newpart(b'changegroup', data=cgdata)
2661 part.addparam(b'version', cgversion)
2661 part.addparam(b'version', cgversion)
2662 if scmutil.istreemanifest(repo):
2662 if scmutil.istreemanifest(repo):
2663 part.addparam(b'treemanifest', b'1')
2663 part.addparam(b'treemanifest', b'1')
2664 if repository.REPO_FEATURE_SIDE_DATA in repo.features:
2664 if repository.REPO_FEATURE_SIDE_DATA in repo.features:
2665 part.addparam(b'exp-sidedata', b'1')
2665 part.addparam(b'exp-sidedata', b'1')
2666 wanted = format_remote_wanted_sidedata(repo)
2666 wanted = format_remote_wanted_sidedata(repo)
2667 part.addparam(b'exp-wanted-sidedata', wanted)
2667 part.addparam(b'exp-wanted-sidedata', wanted)
2668
2668
2669 return bundler
2669 return bundler
General Comments 0
You need to be logged in to leave comments. Login now