##// END OF EJS Templates
changelog: never inline changelog...
marmoute -
r52074:dcaa2df1 default
parent child Browse files
Show More
@@ -308,6 +308,7 b' class changelog(revlog.revlog):'
308 persistentnodemap=opener.options.get(b'persistent-nodemap', False),
308 persistentnodemap=opener.options.get(b'persistent-nodemap', False),
309 concurrencychecker=concurrencychecker,
309 concurrencychecker=concurrencychecker,
310 trypending=trypending,
310 trypending=trypending,
311 may_inline=False,
311 )
312 )
312
313
313 if self._initempty and (self._format_version == revlog.REVLOGV1):
314 if self._initempty and (self._format_version == revlog.REVLOGV1):
@@ -344,6 +345,11 b' class changelog(revlog.revlog):'
344 def delayupdate(self, tr):
345 def delayupdate(self, tr):
345 """delay visibility of index updates to other readers"""
346 """delay visibility of index updates to other readers"""
346 assert not self._inner.is_open
347 assert not self._inner.is_open
348 assert not self._may_inline
349 # enforce that older changelog that are still inline are split at the
350 # first opportunity.
351 if self._inline:
352 self._enforceinlinesize(tr)
347 if self._docket is not None:
353 if self._docket is not None:
348 self._v2_delayed = True
354 self._v2_delayed = True
349 else:
355 else:
@@ -1391,194 +1391,6 b' class revlog:'
1391 self._load_inner(chunk_cache)
1391 self._load_inner(chunk_cache)
1392 self._concurrencychecker = concurrencychecker
1392 self._concurrencychecker = concurrencychecker
1393
1393
1394 @property
1395 def _generaldelta(self):
1396 """temporary compatibility proxy"""
1397 util.nouideprecwarn(
1398 b"use revlog.delta_config.general_delta", b"6.6", stacklevel=2
1399 )
1400 return self.delta_config.general_delta
1401
1402 @property
1403 def _checkambig(self):
1404 """temporary compatibility proxy"""
1405 util.nouideprecwarn(
1406 b"use revlog.data_config.checkambig", b"6.6", stacklevel=2
1407 )
1408 return self.data_config.check_ambig
1409
1410 @property
1411 def _mmaplargeindex(self):
1412 """temporary compatibility proxy"""
1413 util.nouideprecwarn(
1414 b"use revlog.data_config.mmap_large_index", b"6.6", stacklevel=2
1415 )
1416 return self.data_config.mmap_large_index
1417
1418 @property
1419 def _censorable(self):
1420 """temporary compatibility proxy"""
1421 util.nouideprecwarn(
1422 b"use revlog.feature_config.censorable", b"6.6", stacklevel=2
1423 )
1424 return self.feature_config.censorable
1425
1426 @property
1427 def _chunkcachesize(self):
1428 """temporary compatibility proxy"""
1429 util.nouideprecwarn(
1430 b"use revlog.data_config.chunk_cache_size", b"6.6", stacklevel=2
1431 )
1432 return self.data_config.chunk_cache_size
1433
1434 @property
1435 def _maxchainlen(self):
1436 """temporary compatibility proxy"""
1437 util.nouideprecwarn(
1438 b"use revlog.delta_config.max_chain_len", b"6.6", stacklevel=2
1439 )
1440 return self.delta_config.max_chain_len
1441
1442 @property
1443 def _deltabothparents(self):
1444 """temporary compatibility proxy"""
1445 util.nouideprecwarn(
1446 b"use revlog.delta_config.delta_both_parents", b"6.6", stacklevel=2
1447 )
1448 return self.delta_config.delta_both_parents
1449
1450 @property
1451 def _candidate_group_chunk_size(self):
1452 """temporary compatibility proxy"""
1453 util.nouideprecwarn(
1454 b"use revlog.delta_config.candidate_group_chunk_size",
1455 b"6.6",
1456 stacklevel=2,
1457 )
1458 return self.delta_config.candidate_group_chunk_size
1459
1460 @property
1461 def _debug_delta(self):
1462 """temporary compatibility proxy"""
1463 util.nouideprecwarn(
1464 b"use revlog.delta_config.debug_delta", b"6.6", stacklevel=2
1465 )
1466 return self.delta_config.debug_delta
1467
1468 @property
1469 def _compengine(self):
1470 """temporary compatibility proxy"""
1471 util.nouideprecwarn(
1472 b"use revlog.feature_config.compression_engine",
1473 b"6.6",
1474 stacklevel=2,
1475 )
1476 return self.feature_config.compression_engine
1477
1478 @property
1479 def upperboundcomp(self):
1480 """temporary compatibility proxy"""
1481 util.nouideprecwarn(
1482 b"use revlog.delta_config.upper_bound_comp",
1483 b"6.6",
1484 stacklevel=2,
1485 )
1486 return self.delta_config.upper_bound_comp
1487
1488 @property
1489 def _compengineopts(self):
1490 """temporary compatibility proxy"""
1491 util.nouideprecwarn(
1492 b"use revlog.feature_config.compression_engine_options",
1493 b"6.6",
1494 stacklevel=2,
1495 )
1496 return self.feature_config.compression_engine_options
1497
1498 @property
1499 def _maxdeltachainspan(self):
1500 """temporary compatibility proxy"""
1501 util.nouideprecwarn(
1502 b"use revlog.delta_config.max_deltachain_span", b"6.6", stacklevel=2
1503 )
1504 return self.delta_config.max_deltachain_span
1505
1506 @property
1507 def _withsparseread(self):
1508 """temporary compatibility proxy"""
1509 util.nouideprecwarn(
1510 b"use revlog.data_config.with_sparse_read", b"6.6", stacklevel=2
1511 )
1512 return self.data_config.with_sparse_read
1513
1514 @property
1515 def _sparserevlog(self):
1516 """temporary compatibility proxy"""
1517 util.nouideprecwarn(
1518 b"use revlog.delta_config.sparse_revlog", b"6.6", stacklevel=2
1519 )
1520 return self.delta_config.sparse_revlog
1521
1522 @property
1523 def hassidedata(self):
1524 """temporary compatibility proxy"""
1525 util.nouideprecwarn(
1526 b"use revlog.feature_config.has_side_data", b"6.6", stacklevel=2
1527 )
1528 return self.feature_config.has_side_data
1529
1530 @property
1531 def _srdensitythreshold(self):
1532 """temporary compatibility proxy"""
1533 util.nouideprecwarn(
1534 b"use revlog.data_config.sr_density_threshold",
1535 b"6.6",
1536 stacklevel=2,
1537 )
1538 return self.data_config.sr_density_threshold
1539
1540 @property
1541 def _srmingapsize(self):
1542 """temporary compatibility proxy"""
1543 util.nouideprecwarn(
1544 b"use revlog.data_config.sr_min_gap_size", b"6.6", stacklevel=2
1545 )
1546 return self.data_config.sr_min_gap_size
1547
1548 @property
1549 def _compute_rank(self):
1550 """temporary compatibility proxy"""
1551 util.nouideprecwarn(
1552 b"use revlog.feature_config.compute_rank", b"6.6", stacklevel=2
1553 )
1554 return self.feature_config.compute_rank
1555
1556 @property
1557 def canonical_parent_order(self):
1558 """temporary compatibility proxy"""
1559 util.nouideprecwarn(
1560 b"use revlog.feature_config.canonical_parent_order",
1561 b"6.6",
1562 stacklevel=2,
1563 )
1564 return self.feature_config.canonical_parent_order
1565
1566 @property
1567 def _lazydelta(self):
1568 """temporary compatibility proxy"""
1569 util.nouideprecwarn(
1570 b"use revlog.delta_config.lazy_delta", b"6.6", stacklevel=2
1571 )
1572 return self.delta_config.lazy_delta
1573
1574 @property
1575 def _lazydeltabase(self):
1576 """temporary compatibility proxy"""
1577 util.nouideprecwarn(
1578 b"use revlog.delta_config.lazy_delta_base", b"6.6", stacklevel=2
1579 )
1580 return self.delta_config.lazy_delta_base
1581
1582 def _init_opts(self):
1394 def _init_opts(self):
1583 """process options (from above/config) to setup associated default revlog mode
1395 """process options (from above/config) to setup associated default revlog mode
1584
1396
@@ -3026,13 +2838,17 b' class revlog:'
3026 msg = b"inline revlog should not have a docket"
2838 msg = b"inline revlog should not have a docket"
3027 raise error.ProgrammingError(msg)
2839 raise error.ProgrammingError(msg)
3028
2840
2841 # In the common case, we enforce inline size because the revlog has
2842 # been appened too. And in such case, it must have an initial offset
2843 # recorded in the transaction.
3029 troffset = tr.findoffset(self._inner.canonical_index_file)
2844 troffset = tr.findoffset(self._inner.canonical_index_file)
3030 if troffset is None:
2845 pre_touched = troffset is not None
2846 if not pre_touched and self.target[0] != KIND_CHANGELOG:
3031 raise error.RevlogError(
2847 raise error.RevlogError(
3032 _(b"%s not found in the transaction") % self._indexfile
2848 _(b"%s not found in the transaction") % self._indexfile
3033 )
2849 )
3034 if troffset:
2850
3035 tr.addbackup(self._inner.canonical_index_file, for_offset=True)
2851 tr.addbackup(self._inner.canonical_index_file, for_offset=pre_touched)
3036 tr.add(self._datafile, 0)
2852 tr.add(self._datafile, 0)
3037
2853
3038 new_index_file_path = None
2854 new_index_file_path = None
@@ -286,13 +286,17 b' packed1 is produced properly'
286 #if reporevlogstore rust
286 #if reporevlogstore rust
287
287
288 $ hg -R test debugcreatestreamclonebundle packed.hg
288 $ hg -R test debugcreatestreamclonebundle packed.hg
289 writing 2665 bytes for 6 files
289 writing 2665 bytes for 6 files (no-rust !)
290 writing 2919 bytes for 9 files (rust !)
290 bundle requirements: generaldelta, revlog-compression-zstd, revlogv1, sparserevlog
291 bundle requirements: generaldelta, revlog-compression-zstd, revlogv1, sparserevlog
291
292
292 $ f -B 64 --size --sha1 --hexdump packed.hg
293 $ f -B 64 --size --sha1 --hexdump packed.hg
293 packed.hg: size=2865, sha1=353d10311f4befa195d9a1ca4b8e26518115c702
294 packed.hg: size=2865, sha1=353d10311f4befa195d9a1ca4b8e26518115c702 (no-rust !)
294 0000: 48 47 53 31 55 4e 00 00 00 00 00 00 00 06 00 00 |HGS1UN..........|
295 0000: 48 47 53 31 55 4e 00 00 00 00 00 00 00 06 00 00 |HGS1UN..........| (no-rust !)
295 0010: 00 00 00 00 0a 69 00 3b 67 65 6e 65 72 61 6c 64 |.....i.;generald|
296 0010: 00 00 00 00 0a 69 00 3b 67 65 6e 65 72 61 6c 64 |.....i.;generald| (no-rust !)
297 packed.hg: size=3181, sha1=b202787710a1c109246554be589506cd2916acb7 (rust !)
298 0000: 48 47 53 31 55 4e 00 00 00 00 00 00 00 09 00 00 |HGS1UN..........| (rust !)
299 0010: 00 00 00 00 0b 67 00 3b 67 65 6e 65 72 61 6c 64 |.....g.;generald| (rust !)
296 0020: 65 6c 74 61 2c 72 65 76 6c 6f 67 2d 63 6f 6d 70 |elta,revlog-comp|
300 0020: 65 6c 74 61 2c 72 65 76 6c 6f 67 2d 63 6f 6d 70 |elta,revlog-comp|
297 0030: 72 65 73 73 69 6f 6e 2d 7a 73 74 64 2c 72 65 76 |ression-zstd,rev|
301 0030: 72 65 73 73 69 6f 6e 2d 7a 73 74 64 2c 72 65 76 |ression-zstd,rev|
298 $ hg debugbundle --spec packed.hg
302 $ hg debugbundle --spec packed.hg
@@ -302,12 +306,12 b' packed1 is produced properly'
302 #if reporevlogstore no-rust zstd
306 #if reporevlogstore no-rust zstd
303
307
304 $ hg -R test debugcreatestreamclonebundle packed.hg
308 $ hg -R test debugcreatestreamclonebundle packed.hg
305 writing 2665 bytes for 6 files
309 writing 2665 bytes for 7 files
306 bundle requirements: generaldelta, revlog-compression-zstd, revlogv1, sparserevlog
310 bundle requirements: generaldelta, revlog-compression-zstd, revlogv1, sparserevlog
307
311
308 $ f -B 64 --size --sha1 --hexdump packed.hg
312 $ f -B 64 --size --sha1 --hexdump packed.hg
309 packed.hg: size=2865, sha1=353d10311f4befa195d9a1ca4b8e26518115c702
313 packed.hg: size=2882, sha1=6525b07e6bfced4b6c2319cb58c6ff76ca72fa13
310 0000: 48 47 53 31 55 4e 00 00 00 00 00 00 00 06 00 00 |HGS1UN..........|
314 0000: 48 47 53 31 55 4e 00 00 00 00 00 00 00 07 00 00 |HGS1UN..........|
311 0010: 00 00 00 00 0a 69 00 3b 67 65 6e 65 72 61 6c 64 |.....i.;generald|
315 0010: 00 00 00 00 0a 69 00 3b 67 65 6e 65 72 61 6c 64 |.....i.;generald|
312 0020: 65 6c 74 61 2c 72 65 76 6c 6f 67 2d 63 6f 6d 70 |elta,revlog-comp|
316 0020: 65 6c 74 61 2c 72 65 76 6c 6f 67 2d 63 6f 6d 70 |elta,revlog-comp|
313 0030: 72 65 73 73 69 6f 6e 2d 7a 73 74 64 2c 72 65 76 |ression-zstd,rev|
317 0030: 72 65 73 73 69 6f 6e 2d 7a 73 74 64 2c 72 65 76 |ression-zstd,rev|
@@ -318,12 +322,12 b' packed1 is produced properly'
318 #if reporevlogstore no-rust no-zstd
322 #if reporevlogstore no-rust no-zstd
319
323
320 $ hg -R test debugcreatestreamclonebundle packed.hg
324 $ hg -R test debugcreatestreamclonebundle packed.hg
321 writing 2664 bytes for 6 files
325 writing 2664 bytes for 7 files
322 bundle requirements: generaldelta, revlogv1, sparserevlog
326 bundle requirements: generaldelta, revlogv1, sparserevlog
323
327
324 $ f -B 64 --size --sha1 --hexdump packed.hg
328 $ f -B 64 --size --sha1 --hexdump packed.hg
325 packed.hg: size=2840, sha1=12bf3eee3eb8a04c503ce2d29b48f0135c7edff5
329 packed.hg: size=2857, sha1=3a7353323915b095baa6f2ee0a5aed588f11f5f0
326 0000: 48 47 53 31 55 4e 00 00 00 00 00 00 00 06 00 00 |HGS1UN..........|
330 0000: 48 47 53 31 55 4e 00 00 00 00 00 00 00 07 00 00 |HGS1UN..........|
327 0010: 00 00 00 00 0a 68 00 23 67 65 6e 65 72 61 6c 64 |.....h.#generald|
331 0010: 00 00 00 00 0a 68 00 23 67 65 6e 65 72 61 6c 64 |.....h.#generald|
328 0020: 65 6c 74 61 2c 72 65 76 6c 6f 67 76 31 2c 73 70 |elta,revlogv1,sp|
332 0020: 65 6c 74 61 2c 72 65 76 6c 6f 67 76 31 2c 73 70 |elta,revlogv1,sp|
329 0030: 61 72 73 65 72 65 76 6c 6f 67 00 64 61 74 61 2f |arserevlog.data/|
333 0030: 61 72 73 65 72 65 76 6c 6f 67 00 64 61 74 61 2f |arserevlog.data/|
@@ -346,13 +350,17 b' generaldelta requirement is not listed i'
346 #if reporevlogstore rust
350 #if reporevlogstore rust
347
351
348 $ hg -R testnongd debugcreatestreamclonebundle packednongd.hg
352 $ hg -R testnongd debugcreatestreamclonebundle packednongd.hg
349 writing 301 bytes for 3 files
353 writing 301 bytes for 3 files (no-rust !)
354 writing 427 bytes for 6 files (rust !)
350 bundle requirements: revlog-compression-zstd, revlogv1
355 bundle requirements: revlog-compression-zstd, revlogv1
351
356
352 $ f -B 64 --size --sha1 --hexdump packednongd.hg
357 $ f -B 64 --size --sha1 --hexdump packednongd.hg
353 packednongd.hg: size=407, sha1=0b8714422b785ba8eb98c916b41ffd5fb994c9b5
358 packednongd.hg: size=407, sha1=0b8714422b785ba8eb98c916b41ffd5fb994c9b5 (no-rust !)
354 0000: 48 47 53 31 55 4e 00 00 00 00 00 00 00 03 00 00 |HGS1UN..........|
359 0000: 48 47 53 31 55 4e 00 00 00 00 00 00 00 03 00 00 |HGS1UN..........| (no-rust !)
355 0010: 00 00 00 00 01 2d 00 21 72 65 76 6c 6f 67 2d 63 |.....-.!revlog-c|
360 0010: 00 00 00 00 01 2d 00 21 72 65 76 6c 6f 67 2d 63 |.....-.!revlog-c| (no-rust !)
361 packednongd.hg: size=593, sha1=1ad0cbea11b5dd7b0437e54ae20fc5f8df118521 (rust !)
362 0000: 48 47 53 31 55 4e 00 00 00 00 00 00 00 06 00 00 |HGS1UN..........| (rust !)
363 0010: 00 00 00 00 01 ab 00 21 72 65 76 6c 6f 67 2d 63 |.......!revlog-c| (rust !)
356 0020: 6f 6d 70 72 65 73 73 69 6f 6e 2d 7a 73 74 64 2c |ompression-zstd,|
364 0020: 6f 6d 70 72 65 73 73 69 6f 6e 2d 7a 73 74 64 2c |ompression-zstd,|
357 0030: 72 65 76 6c 6f 67 76 31 00 64 61 74 61 2f 66 6f |revlogv1.data/fo|
365 0030: 72 65 76 6c 6f 67 76 31 00 64 61 74 61 2f 66 6f |revlogv1.data/fo|
358
366
@@ -364,12 +372,12 b' generaldelta requirement is not listed i'
364 #if reporevlogstore no-rust zstd
372 #if reporevlogstore no-rust zstd
365
373
366 $ hg -R testnongd debugcreatestreamclonebundle packednongd.hg
374 $ hg -R testnongd debugcreatestreamclonebundle packednongd.hg
367 writing 301 bytes for 3 files
375 writing 301 bytes for 4 files
368 bundle requirements: revlog-compression-zstd, revlogv1
376 bundle requirements: revlog-compression-zstd, revlogv1
369
377
370 $ f -B 64 --size --sha1 --hexdump packednongd.hg
378 $ f -B 64 --size --sha1 --hexdump packednongd.hg
371 packednongd.hg: size=407, sha1=0b8714422b785ba8eb98c916b41ffd5fb994c9b5
379 packednongd.hg: size=423, sha1=4269c89cf64b6a4377be75a3983771c4153362bf
372 0000: 48 47 53 31 55 4e 00 00 00 00 00 00 00 03 00 00 |HGS1UN..........|
380 0000: 48 47 53 31 55 4e 00 00 00 00 00 00 00 04 00 00 |HGS1UN..........|
373 0010: 00 00 00 00 01 2d 00 21 72 65 76 6c 6f 67 2d 63 |.....-.!revlog-c|
381 0010: 00 00 00 00 01 2d 00 21 72 65 76 6c 6f 67 2d 63 |.....-.!revlog-c|
374 0020: 6f 6d 70 72 65 73 73 69 6f 6e 2d 7a 73 74 64 2c |ompression-zstd,|
382 0020: 6f 6d 70 72 65 73 73 69 6f 6e 2d 7a 73 74 64 2c |ompression-zstd,|
375 0030: 72 65 76 6c 6f 67 76 31 00 64 61 74 61 2f 66 6f |revlogv1.data/fo|
383 0030: 72 65 76 6c 6f 67 76 31 00 64 61 74 61 2f 66 6f |revlogv1.data/fo|
@@ -383,12 +391,12 b' generaldelta requirement is not listed i'
383 #if reporevlogstore no-rust no-zstd
391 #if reporevlogstore no-rust no-zstd
384
392
385 $ hg -R testnongd debugcreatestreamclonebundle packednongd.hg
393 $ hg -R testnongd debugcreatestreamclonebundle packednongd.hg
386 writing 301 bytes for 3 files
394 writing 301 bytes for 4 files
387 bundle requirements: revlogv1
395 bundle requirements: revlogv1
388
396
389 $ f -B 64 --size --sha1 --hexdump packednongd.hg
397 $ f -B 64 --size --sha1 --hexdump packednongd.hg
390 packednongd.hg: size=383, sha1=1d9c230238edd5d38907100b729ba72b1831fe6f
398 packednongd.hg: size=399, sha1=99bb89decfc6674a3cf2cc87accc8c5332ede7fd
391 0000: 48 47 53 31 55 4e 00 00 00 00 00 00 00 03 00 00 |HGS1UN..........|
399 0000: 48 47 53 31 55 4e 00 00 00 00 00 00 00 04 00 00 |HGS1UN..........|
392 0010: 00 00 00 00 01 2d 00 09 72 65 76 6c 6f 67 76 31 |.....-..revlogv1|
400 0010: 00 00 00 00 01 2d 00 09 72 65 76 6c 6f 67 76 31 |.....-..revlogv1|
393 0020: 00 64 61 74 61 2f 66 6f 6f 2e 69 00 36 34 0a 00 |.data/foo.i.64..|
401 0020: 00 64 61 74 61 2f 66 6f 6f 2e 69 00 36 34 0a 00 |.data/foo.i.64..|
394 0030: 01 00 01 00 00 00 00 00 00 00 00 00 00 00 00 00 |................|
402 0030: 01 00 01 00 00 00 00 00 00 00 00 00 00 00 00 00 |................|
@@ -416,7 +424,8 b' Warning emitted when packed bundles cont'
416
424
417 $ hg -R testsecret debugcreatestreamclonebundle packedsecret.hg
425 $ hg -R testsecret debugcreatestreamclonebundle packedsecret.hg
418 (warning: stream clone bundle will contain secret revisions)
426 (warning: stream clone bundle will contain secret revisions)
419 writing 301 bytes for 3 files
427 writing 301 bytes for 3 files (no-rust !)
428 writing 427 bytes for 6 files (rust !)
420 bundle requirements: generaldelta, revlog-compression-zstd, revlogv1, sparserevlog
429 bundle requirements: generaldelta, revlog-compression-zstd, revlogv1, sparserevlog
421
430
422 #endif
431 #endif
@@ -425,7 +434,7 b' Warning emitted when packed bundles cont'
425
434
426 $ hg -R testsecret debugcreatestreamclonebundle packedsecret.hg
435 $ hg -R testsecret debugcreatestreamclonebundle packedsecret.hg
427 (warning: stream clone bundle will contain secret revisions)
436 (warning: stream clone bundle will contain secret revisions)
428 writing 301 bytes for 3 files
437 writing 301 bytes for 4 files
429 bundle requirements: generaldelta, revlog-compression-zstd, revlogv1, sparserevlog
438 bundle requirements: generaldelta, revlog-compression-zstd, revlogv1, sparserevlog
430
439
431 #endif
440 #endif
@@ -434,7 +443,7 b' Warning emitted when packed bundles cont'
434
443
435 $ hg -R testsecret debugcreatestreamclonebundle packedsecret.hg
444 $ hg -R testsecret debugcreatestreamclonebundle packedsecret.hg
436 (warning: stream clone bundle will contain secret revisions)
445 (warning: stream clone bundle will contain secret revisions)
437 writing 301 bytes for 3 files
446 writing 301 bytes for 4 files
438 bundle requirements: generaldelta, revlogv1, sparserevlog
447 bundle requirements: generaldelta, revlogv1, sparserevlog
439
448
440 #endif
449 #endif
@@ -479,10 +488,12 b' transaction)'
479 > EOF
488 > EOF
480
489
481 $ hg -R packed debugapplystreamclonebundle packed.hg
490 $ hg -R packed debugapplystreamclonebundle packed.hg
482 6 files to transfer, 2.60 KB of data
491 7 files to transfer, 2.60 KB of data (no-rust !)
492 9 files to transfer, 2.85 KB of data (rust !)
483 pretxnopen: 000000000000
493 pretxnopen: 000000000000
484 pretxnclose: aa35859c02ea
494 pretxnclose: aa35859c02ea
485 transferred 2.60 KB in * seconds (* */sec) (glob)
495 transferred 2.60 KB in * seconds (* */sec) (glob) (no-rust !)
496 transferred 2.85 KB in * seconds (* */sec) (glob) (rust !)
486 txnclose: aa35859c02ea
497 txnclose: aa35859c02ea
487
498
488 (for safety, confirm visibility of streamclone-ed changes by another
499 (for safety, confirm visibility of streamclone-ed changes by another
@@ -1042,6 +1042,8 b' Verify the global server.bundle1 option '
1042 adding changesets
1042 adding changesets
1043 remote: abort: incompatible Mercurial client; bundle2 required
1043 remote: abort: incompatible Mercurial client; bundle2 required
1044 remote: (see https://www.mercurial-scm.org/wiki/IncompatibleClient)
1044 remote: (see https://www.mercurial-scm.org/wiki/IncompatibleClient)
1045 transaction abort!
1046 rollback completed
1045 abort: stream ended unexpectedly (got 0 bytes, expected 4)
1047 abort: stream ended unexpectedly (got 0 bytes, expected 4)
1046 [255]
1048 [255]
1047
1049
@@ -102,21 +102,28 b' Check everything is fine'
102 bundle2-input-part: "stream2" (params: 3 mandatory) supported (stream-bundle2-v2 !)
102 bundle2-input-part: "stream2" (params: 3 mandatory) supported (stream-bundle2-v2 !)
103 bundle2-input-part: "stream3-exp" (params: 1 mandatory) supported (stream-bundle2-v3 !)
103 bundle2-input-part: "stream3-exp" (params: 1 mandatory) supported (stream-bundle2-v3 !)
104 applying stream bundle
104 applying stream bundle
105 7 files to transfer, 2.11 KB of data (stream-bundle2-v2 !)
105 8 files to transfer, 2.11 KB of data (stream-bundle2-v2 no-rust !)
106 10 files to transfer, 2.29 KB of data (stream-bundle2-v2 rust !)
106 adding [s] data/some-file.i (1.23 KB) (stream-bundle2-v2 !)
107 adding [s] data/some-file.i (1.23 KB) (stream-bundle2-v2 !)
107 7 entries to transfer (stream-bundle2-v3 !)
108 7 entries to transfer (stream-bundle2-v3 !)
108 adding [s] data/some-file.d (1.04 KB) (stream-bundle2-v3 !)
109 adding [s] data/some-file.d (1.04 KB) (stream-bundle2-v3 !)
109 adding [s] data/some-file.i (192 bytes) (stream-bundle2-v3 !)
110 adding [s] data/some-file.i (192 bytes) (stream-bundle2-v3 !)
110 adding [s] phaseroots (43 bytes)
111 adding [s] phaseroots (43 bytes)
111 adding [s] 00manifest.i (348 bytes)
112 adding [s] 00manifest.i (348 bytes)
112 adding [s] 00changelog.i (381 bytes)
113 adding [s] 00changelog.n (62 bytes) (rust !)
114 adding [s] 00changelog-88698448.nd (128 bytes) (rust !)
115 adding [s] 00changelog.d (189 bytes)
116 adding [s] 00changelog.i (192 bytes)
113 adding [c] branch2-served (94 bytes)
117 adding [c] branch2-served (94 bytes)
114 adding [c] rbc-names-v1 (7 bytes)
118 adding [c] rbc-names-v1 (7 bytes)
115 adding [c] rbc-revs-v1 (24 bytes)
119 adding [c] rbc-revs-v1 (24 bytes)
116 updating the branch cache
120 updating the branch cache
117 transferred 2.11 KB in * seconds (* */sec) (glob)
121 transferred 2.11 KB in * seconds (* */sec) (glob) (no-rust !)
118 bundle2-input-part: total payload size 2268 (stream-bundle2-v2 !)
122 transferred 2.29 KB in * seconds (* */sec) (glob) (rust !)
119 bundle2-input-part: total payload size 2296 (stream-bundle2-v3 !)
123 bundle2-input-part: total payload size 2285 (stream-bundle2-v2 no-rust !)
124 bundle2-input-part: total payload size 2518 (stream-bundle2-v2 rust !)
125 bundle2-input-part: total payload size 2313 (stream-bundle2-v3 no-rust !)
126 bundle2-input-part: total payload size 2546 (stream-bundle2-v3 rust !)
120 bundle2-input-part: "listkeys" (params: 1 mandatory) supported
127 bundle2-input-part: "listkeys" (params: 1 mandatory) supported
121 bundle2-input-bundle: 2 parts total
128 bundle2-input-bundle: 2 parts total
122 checking for updated bookmarks
129 checking for updated bookmarks
@@ -6,6 +6,10 b''
6 $ cat << EOF >> $HGRCPATH
6 $ cat << EOF >> $HGRCPATH
7 > [server]
7 > [server]
8 > bundle2.stream = no
8 > bundle2.stream = no
9 > [format]
10 > # persistent nodemap is too broken with legacy format,
11 > # however client with nodemap support will have better stream support.
12 > use-persistent-nodemap=no
9 > EOF
13 > EOF
10 #endif
14 #endif
11 #if stream-bundle2-v3
15 #if stream-bundle2-v3
@@ -328,9 +332,9 b' Basic clone'
328 #if stream-legacy
332 #if stream-legacy
329 $ hg clone --stream -U http://localhost:$HGPORT clone1
333 $ hg clone --stream -U http://localhost:$HGPORT clone1
330 streaming all changes
334 streaming all changes
331 1090 files to transfer, 102 KB of data (no-zstd !)
335 1091 files to transfer, 102 KB of data (no-zstd !)
332 transferred 102 KB in * seconds (* */sec) (glob) (no-zstd !)
336 transferred 102 KB in * seconds (* */sec) (glob) (no-zstd !)
333 1090 files to transfer, 98.8 KB of data (zstd !)
337 1091 files to transfer, 98.8 KB of data (zstd !)
334 transferred 98.8 KB in * seconds (* */sec) (glob) (zstd !)
338 transferred 98.8 KB in * seconds (* */sec) (glob) (zstd !)
335 searching for changes
339 searching for changes
336 no changes found
340 no changes found
@@ -339,10 +343,12 b' Basic clone'
339 #if stream-bundle2-v2
343 #if stream-bundle2-v2
340 $ hg clone --stream -U http://localhost:$HGPORT clone1
344 $ hg clone --stream -U http://localhost:$HGPORT clone1
341 streaming all changes
345 streaming all changes
342 1093 files to transfer, 102 KB of data (no-zstd !)
346 1094 files to transfer, 102 KB of data (no-zstd !)
343 transferred 102 KB in * seconds (* */sec) (glob) (no-zstd !)
347 transferred 102 KB in * seconds (* */sec) (glob) (no-zstd !)
344 1093 files to transfer, 98.9 KB of data (zstd !)
348 1094 files to transfer, 98.9 KB of data (zstd no-rust !)
345 transferred 98.9 KB in * seconds (* */sec) (glob) (zstd !)
349 transferred 98.9 KB in * seconds (* */sec) (glob) (zstd no-rust !)
350 1096 files to transfer, 99.0 KB of data (zstd rust !)
351 transferred 99.0 KB in * seconds (* */sec) (glob) (zstd rust !)
346
352
347 $ ls -1 clone1/.hg/cache
353 $ ls -1 clone1/.hg/cache
348 branch2-base
354 branch2-base
@@ -362,7 +368,8 b' Basic clone'
362 streaming all changes
368 streaming all changes
363 1093 entries to transfer
369 1093 entries to transfer
364 transferred 102 KB in * seconds (* */sec) (glob) (no-zstd !)
370 transferred 102 KB in * seconds (* */sec) (glob) (no-zstd !)
365 transferred 98.9 KB in * seconds (* */sec) (glob) (zstd !)
371 transferred 98.9 KB in * seconds (* */sec) (glob) (zstd no-rust !)
372 transferred 99.0 KB in * seconds (* */sec) (glob) (zstd rust !)
366
373
367 $ ls -1 clone1/.hg/cache
374 $ ls -1 clone1/.hg/cache
368 branch2-base
375 branch2-base
@@ -387,12 +394,12 b' getbundle requests with stream=1 are unc'
387
394
388 #if no-zstd no-rust
395 #if no-zstd no-rust
389 $ f --size --hex --bytes 256 body
396 $ f --size --hex --bytes 256 body
390 body: size=119123
397 body: size=119140
391 0000: 04 6e 6f 6e 65 48 47 32 30 00 00 00 00 00 00 00 |.noneHG20.......|
398 0000: 04 6e 6f 6e 65 48 47 32 30 00 00 00 00 00 00 00 |.noneHG20.......|
392 0010: 62 07 53 54 52 45 41 4d 32 00 00 00 00 03 00 09 |b.STREAM2.......|
399 0010: 62 07 53 54 52 45 41 4d 32 00 00 00 00 03 00 09 |b.STREAM2.......|
393 0020: 06 09 04 0c 26 62 79 74 65 63 6f 75 6e 74 31 30 |....&bytecount10|
400 0020: 06 09 04 0c 26 62 79 74 65 63 6f 75 6e 74 31 30 |....&bytecount10|
394 0030: 34 31 31 35 66 69 6c 65 63 6f 75 6e 74 31 30 39 |4115filecount109|
401 0030: 34 31 31 35 66 69 6c 65 63 6f 75 6e 74 31 30 39 |4115filecount109|
395 0040: 33 72 65 71 75 69 72 65 6d 65 6e 74 73 67 65 6e |3requirementsgen|
402 0040: 34 72 65 71 75 69 72 65 6d 65 6e 74 73 67 65 6e |4requirementsgen|
396 0050: 65 72 61 6c 64 65 6c 74 61 25 32 43 72 65 76 6c |eraldelta%2Crevl|
403 0050: 65 72 61 6c 64 65 6c 74 61 25 32 43 72 65 76 6c |eraldelta%2Crevl|
397 0060: 6f 67 76 31 25 32 43 73 70 61 72 73 65 72 65 76 |ogv1%2Csparserev|
404 0060: 6f 67 76 31 25 32 43 73 70 61 72 73 65 72 65 76 |ogv1%2Csparserev|
398 0070: 6c 6f 67 00 00 80 00 73 08 42 64 61 74 61 2f 30 |log....s.Bdata/0|
405 0070: 6c 6f 67 00 00 80 00 73 08 42 64 61 74 61 2f 30 |log....s.Bdata/0|
@@ -407,14 +414,14 b' getbundle requests with stream=1 are unc'
407 #endif
414 #endif
408 #if zstd no-rust
415 #if zstd no-rust
409 $ f --size --hex --bytes 256 body
416 $ f --size --hex --bytes 256 body
410 body: size=116310 (no-bigendian !)
417 body: size=116327 (no-bigendian !)
411 body: size=116305 (bigendian !)
418 body: size=116322 (bigendian !)
412 0000: 04 6e 6f 6e 65 48 47 32 30 00 00 00 00 00 00 00 |.noneHG20.......|
419 0000: 04 6e 6f 6e 65 48 47 32 30 00 00 00 00 00 00 00 |.noneHG20.......|
413 0010: 7c 07 53 54 52 45 41 4d 32 00 00 00 00 03 00 09 ||.STREAM2.......|
420 0010: 7c 07 53 54 52 45 41 4d 32 00 00 00 00 03 00 09 ||.STREAM2.......|
414 0020: 06 09 04 0c 40 62 79 74 65 63 6f 75 6e 74 31 30 |....@bytecount10|
421 0020: 06 09 04 0c 40 62 79 74 65 63 6f 75 6e 74 31 30 |....@bytecount10|
415 0030: 31 32 37 36 66 69 6c 65 63 6f 75 6e 74 31 30 39 |1276filecount109| (no-bigendian !)
422 0030: 31 32 37 36 66 69 6c 65 63 6f 75 6e 74 31 30 39 |1276filecount109| (no-bigendian !)
416 0030: 31 32 37 31 66 69 6c 65 63 6f 75 6e 74 31 30 39 |1271filecount109| (bigendian !)
423 0030: 31 32 37 31 66 69 6c 65 63 6f 75 6e 74 31 30 39 |1271filecount109| (bigendian !)
417 0040: 33 72 65 71 75 69 72 65 6d 65 6e 74 73 67 65 6e |3requirementsgen|
424 0040: 34 72 65 71 75 69 72 65 6d 65 6e 74 73 67 65 6e |4requirementsgen|
418 0050: 65 72 61 6c 64 65 6c 74 61 25 32 43 72 65 76 6c |eraldelta%2Crevl|
425 0050: 65 72 61 6c 64 65 6c 74 61 25 32 43 72 65 76 6c |eraldelta%2Crevl|
419 0060: 6f 67 2d 63 6f 6d 70 72 65 73 73 69 6f 6e 2d 7a |og-compression-z|
426 0060: 6f 67 2d 63 6f 6d 70 72 65 73 73 69 6f 6e 2d 7a |og-compression-z|
420 0070: 73 74 64 25 32 43 72 65 76 6c 6f 67 76 31 25 32 |std%2Crevlogv1%2|
427 0070: 73 74 64 25 32 43 72 65 76 6c 6f 67 76 31 25 32 |std%2Crevlogv1%2|
@@ -429,12 +436,22 b' getbundle requests with stream=1 are unc'
429 #endif
436 #endif
430 #if zstd rust no-dirstate-v2
437 #if zstd rust no-dirstate-v2
431 $ f --size --hex --bytes 256 body
438 $ f --size --hex --bytes 256 body
432 body: size=116310
439 body: size=116310 (no-rust !)
440 body: size=116495 (rust no-stream-legacy no-bigendian !)
441 body: size=116490 (rust no-stream-legacy bigendian !)
442 body: size=116327 (rust stream-legacy no-bigendian !)
443 body: size=116322 (rust stream-legacy bigendian !)
433 0000: 04 6e 6f 6e 65 48 47 32 30 00 00 00 00 00 00 00 |.noneHG20.......|
444 0000: 04 6e 6f 6e 65 48 47 32 30 00 00 00 00 00 00 00 |.noneHG20.......|
434 0010: 7c 07 53 54 52 45 41 4d 32 00 00 00 00 03 00 09 ||.STREAM2.......|
445 0010: 7c 07 53 54 52 45 41 4d 32 00 00 00 00 03 00 09 ||.STREAM2.......|
435 0020: 06 09 04 0c 40 62 79 74 65 63 6f 75 6e 74 31 30 |....@bytecount10|
446 0020: 06 09 04 0c 40 62 79 74 65 63 6f 75 6e 74 31 30 |....@bytecount10|
436 0030: 31 32 37 36 66 69 6c 65 63 6f 75 6e 74 31 30 39 |1276filecount109|
447 0030: 31 32 37 36 66 69 6c 65 63 6f 75 6e 74 31 30 39 |1276filecount109| (no-rust !)
437 0040: 33 72 65 71 75 69 72 65 6d 65 6e 74 73 67 65 6e |3requirementsgen|
448 0040: 33 72 65 71 75 69 72 65 6d 65 6e 74 73 67 65 6e |3requirementsgen| (no-rust !)
449 0030: 31 34 30 32 66 69 6c 65 63 6f 75 6e 74 31 30 39 |1402filecount109| (rust no-stream-legacy no-bigendian !)
450 0030: 31 33 39 37 66 69 6c 65 63 6f 75 6e 74 31 30 39 |1397filecount109| (rust no-stream-legacy bigendian !)
451 0040: 36 72 65 71 75 69 72 65 6d 65 6e 74 73 67 65 6e |6requirementsgen| (rust no-stream-legacy !)
452 0030: 31 32 37 36 66 69 6c 65 63 6f 75 6e 74 31 30 39 |1276filecount109| (rust stream-legacy no-bigendian !)
453 0030: 31 32 37 31 66 69 6c 65 63 6f 75 6e 74 31 30 39 |1271filecount109| (rust stream-legacy bigendian !)
454 0040: 34 72 65 71 75 69 72 65 6d 65 6e 74 73 67 65 6e |4requirementsgen| (rust stream-legacy !)
438 0050: 65 72 61 6c 64 65 6c 74 61 25 32 43 72 65 76 6c |eraldelta%2Crevl|
455 0050: 65 72 61 6c 64 65 6c 74 61 25 32 43 72 65 76 6c |eraldelta%2Crevl|
439 0060: 6f 67 2d 63 6f 6d 70 72 65 73 73 69 6f 6e 2d 7a |og-compression-z|
456 0060: 6f 67 2d 63 6f 6d 70 72 65 73 73 69 6f 6e 2d 7a |og-compression-z|
440 0070: 73 74 64 25 32 43 72 65 76 6c 6f 67 76 31 25 32 |std%2Crevlogv1%2|
457 0070: 73 74 64 25 32 43 72 65 76 6c 6f 67 76 31 25 32 |std%2Crevlogv1%2|
@@ -473,9 +490,9 b' getbundle requests with stream=1 are unc'
473 #if stream-legacy
490 #if stream-legacy
474 $ hg clone --uncompressed -U http://localhost:$HGPORT clone1-uncompressed
491 $ hg clone --uncompressed -U http://localhost:$HGPORT clone1-uncompressed
475 streaming all changes
492 streaming all changes
476 1090 files to transfer, 102 KB of data (no-zstd !)
493 1091 files to transfer, 102 KB of data (no-zstd !)
477 transferred 102 KB in * seconds (* */sec) (glob) (no-zstd !)
494 transferred 102 KB in * seconds (* */sec) (glob) (no-zstd !)
478 1090 files to transfer, 98.8 KB of data (zstd !)
495 1091 files to transfer, 98.8 KB of data (zstd !)
479 transferred 98.8 KB in * seconds (* */sec) (glob) (zstd !)
496 transferred 98.8 KB in * seconds (* */sec) (glob) (zstd !)
480 searching for changes
497 searching for changes
481 no changes found
498 no changes found
@@ -483,17 +500,20 b' getbundle requests with stream=1 are unc'
483 #if stream-bundle2-v2
500 #if stream-bundle2-v2
484 $ hg clone --uncompressed -U http://localhost:$HGPORT clone1-uncompressed
501 $ hg clone --uncompressed -U http://localhost:$HGPORT clone1-uncompressed
485 streaming all changes
502 streaming all changes
486 1093 files to transfer, 102 KB of data (no-zstd !)
503 1094 files to transfer, 102 KB of data (no-zstd !)
487 transferred 102 KB in * seconds (* */sec) (glob) (no-zstd !)
504 transferred 102 KB in * seconds (* */sec) (glob) (no-zstd !)
488 1093 files to transfer, 98.9 KB of data (zstd !)
505 1094 files to transfer, 98.9 KB of data (zstd no-rust !)
489 transferred 98.9 KB in * seconds (* */sec) (glob) (zstd !)
506 transferred 98.9 KB in * seconds (* */sec) (glob) (zstd no-rust !)
507 1096 files to transfer, 99.0 KB of data (zstd rust !)
508 transferred 99.0 KB in * seconds (* */sec) (glob) (zstd rust !)
490 #endif
509 #endif
491 #if stream-bundle2-v3
510 #if stream-bundle2-v3
492 $ hg clone --uncompressed -U http://localhost:$HGPORT clone1-uncompressed
511 $ hg clone --uncompressed -U http://localhost:$HGPORT clone1-uncompressed
493 streaming all changes
512 streaming all changes
494 1093 entries to transfer
513 1093 entries to transfer
495 transferred 102 KB in * seconds (* */sec) (glob) (no-zstd !)
514 transferred 102 KB in * seconds (* */sec) (glob) (no-zstd !)
496 transferred 98.9 KB in * seconds (* */sec) (glob) (zstd !)
515 transferred 98.9 KB in * seconds (* */sec) (glob) (zstd no-rust !)
516 transferred 99.0 KB in * seconds (* */sec) (glob) (zstd rust !)
497 #endif
517 #endif
498
518
499 Clone with background file closing enabled
519 Clone with background file closing enabled
@@ -505,8 +525,8 b' Clone with background file closing enabl'
505 sending branchmap command
525 sending branchmap command
506 streaming all changes
526 streaming all changes
507 sending stream_out command
527 sending stream_out command
508 1090 files to transfer, 102 KB of data (no-zstd !)
528 1091 files to transfer, 102 KB of data (no-zstd !)
509 1090 files to transfer, 98.8 KB of data (zstd !)
529 1091 files to transfer, 98.8 KB of data (zstd !)
510 starting 4 threads for background file closing
530 starting 4 threads for background file closing
511 updating the branch cache
531 updating the branch cache
512 transferred 102 KB in * seconds (* */sec) (glob) (no-zstd !)
532 transferred 102 KB in * seconds (* */sec) (glob) (no-zstd !)
@@ -537,16 +557,20 b' Clone with background file closing enabl'
537 bundle2-input-bundle: with-transaction
557 bundle2-input-bundle: with-transaction
538 bundle2-input-part: "stream2" (params: 3 mandatory) supported
558 bundle2-input-part: "stream2" (params: 3 mandatory) supported
539 applying stream bundle
559 applying stream bundle
540 1093 files to transfer, 102 KB of data (no-zstd !)
560 1094 files to transfer, 102 KB of data (no-zstd !)
541 1093 files to transfer, 98.9 KB of data (zstd !)
561 1094 files to transfer, 98.9 KB of data (zstd no-rust !)
562 1096 files to transfer, 99.0 KB of data (zstd rust !)
542 starting 4 threads for background file closing
563 starting 4 threads for background file closing
543 starting 4 threads for background file closing
564 starting 4 threads for background file closing
544 updating the branch cache
565 updating the branch cache
545 transferred 102 KB in * seconds (* */sec) (glob) (no-zstd !)
566 transferred 102 KB in * seconds (* */sec) (glob) (no-zstd !)
546 bundle2-input-part: total payload size 118984 (no-zstd !)
567 bundle2-input-part: total payload size 119001 (no-zstd !)
547 transferred 98.9 KB in * seconds (* */sec) (glob) (zstd !)
568 transferred 98.9 KB in * seconds (* */sec) (glob) (zstd no-rust !)
548 bundle2-input-part: total payload size 116145 (zstd no-bigendian !)
569 transferred 99.0 KB in * seconds (* */sec) (glob) (zstd rust !)
549 bundle2-input-part: total payload size 116140 (zstd bigendian !)
570 bundle2-input-part: total payload size 116162 (zstd no-bigendian no-rust !)
571 bundle2-input-part: total payload size 116330 (zstd no-bigendian rust !)
572 bundle2-input-part: total payload size 116157 (zstd bigendian no-rust !)
573 bundle2-input-part: total payload size 116325 (zstd bigendian rust !)
550 bundle2-input-part: "listkeys" (params: 1 mandatory) supported
574 bundle2-input-part: "listkeys" (params: 1 mandatory) supported
551 bundle2-input-bundle: 2 parts total
575 bundle2-input-bundle: 2 parts total
552 checking for updated bookmarks
576 checking for updated bookmarks
@@ -569,10 +593,13 b' Clone with background file closing enabl'
569 starting 4 threads for background file closing
593 starting 4 threads for background file closing
570 updating the branch cache
594 updating the branch cache
571 transferred 102 KB in * seconds (* */sec) (glob) (no-zstd !)
595 transferred 102 KB in * seconds (* */sec) (glob) (no-zstd !)
572 bundle2-input-part: total payload size 120079 (no-zstd !)
596 bundle2-input-part: total payload size 120096 (no-zstd !)
573 transferred 98.9 KB in * seconds (* */sec) (glob) (zstd !)
597 transferred 98.9 KB in * seconds (* */sec) (glob) (zstd no-rust !)
574 bundle2-input-part: total payload size 117240 (zstd no-bigendian !)
598 transferred 99.0 KB in * seconds (* */sec) (glob) (zstd rust !)
575 bundle2-input-part: total payload size 116138 (zstd bigendian !)
599 bundle2-input-part: total payload size 117257 (zstd no-rust no-bigendian !)
600 bundle2-input-part: total payload size 117425 (zstd rust no-bigendian !)
601 bundle2-input-part: total payload size 117252 (zstd bigendian no-rust !)
602 bundle2-input-part: total payload size 117420 (zstd bigendian rust !)
576 bundle2-input-part: "listkeys" (params: 1 mandatory) supported
603 bundle2-input-part: "listkeys" (params: 1 mandatory) supported
577 bundle2-input-bundle: 2 parts total
604 bundle2-input-bundle: 2 parts total
578 checking for updated bookmarks
605 checking for updated bookmarks
@@ -604,9 +631,9 b' Streaming of secrets can be overridden b'
604 #if stream-legacy
631 #if stream-legacy
605 $ hg clone --stream -U http://localhost:$HGPORT secret-allowed
632 $ hg clone --stream -U http://localhost:$HGPORT secret-allowed
606 streaming all changes
633 streaming all changes
607 1090 files to transfer, 102 KB of data (no-zstd !)
634 1091 files to transfer, 102 KB of data (no-zstd !)
608 transferred 102 KB in * seconds (* */sec) (glob) (no-zstd !)
635 transferred 102 KB in * seconds (* */sec) (glob) (no-zstd !)
609 1090 files to transfer, 98.8 KB of data (zstd !)
636 1091 files to transfer, 98.8 KB of data (zstd !)
610 transferred 98.8 KB in * seconds (* */sec) (glob) (zstd !)
637 transferred 98.8 KB in * seconds (* */sec) (glob) (zstd !)
611 searching for changes
638 searching for changes
612 no changes found
639 no changes found
@@ -614,17 +641,20 b' Streaming of secrets can be overridden b'
614 #if stream-bundle2-v2
641 #if stream-bundle2-v2
615 $ hg clone --stream -U http://localhost:$HGPORT secret-allowed
642 $ hg clone --stream -U http://localhost:$HGPORT secret-allowed
616 streaming all changes
643 streaming all changes
617 1093 files to transfer, 102 KB of data (no-zstd !)
644 1094 files to transfer, 102 KB of data (no-zstd !)
618 transferred 102 KB in * seconds (* */sec) (glob) (no-zstd !)
645 transferred 102 KB in * seconds (* */sec) (glob) (no-zstd !)
619 1093 files to transfer, 98.9 KB of data (zstd !)
646 1094 files to transfer, 98.9 KB of data (zstd no-rust !)
620 transferred 98.9 KB in * seconds (* */sec) (glob) (zstd !)
647 transferred 98.9 KB in * seconds (* */sec) (glob) (zstd no-rust !)
648 1096 files to transfer, 99.0 KB of data (zstd rust !)
649 transferred 99.0 KB in * seconds (* */sec) (glob) (zstd rust !)
621 #endif
650 #endif
622 #if stream-bundle2-v3
651 #if stream-bundle2-v3
623 $ hg clone --stream -U http://localhost:$HGPORT secret-allowed
652 $ hg clone --stream -U http://localhost:$HGPORT secret-allowed
624 streaming all changes
653 streaming all changes
625 1093 entries to transfer
654 1093 entries to transfer
626 transferred 102 KB in * seconds (* */sec) (glob) (no-zstd !)
655 transferred 102 KB in * seconds (* */sec) (glob) (no-zstd !)
627 transferred 98.9 KB in * seconds (* */sec) (glob) (zstd !)
656 transferred 98.9 KB in * seconds (* */sec) (glob) (zstd no-rust !)
657 transferred 99.0 KB in * seconds (* */sec) (glob) (zstd rust !)
628 #endif
658 #endif
629
659
630 $ killdaemons.py
660 $ killdaemons.py
@@ -729,9 +759,9 b' clone it'
729 #if stream-legacy
759 #if stream-legacy
730 $ hg clone --stream http://localhost:$HGPORT with-bookmarks
760 $ hg clone --stream http://localhost:$HGPORT with-bookmarks
731 streaming all changes
761 streaming all changes
732 1090 files to transfer, 102 KB of data (no-zstd !)
762 1091 files to transfer, 102 KB of data (no-zstd !)
733 transferred 102 KB in * seconds (* */sec) (glob) (no-zstd !)
763 transferred 102 KB in * seconds (* */sec) (glob) (no-zstd !)
734 1090 files to transfer, 98.8 KB of data (zstd !)
764 1091 files to transfer, 98.8 KB of data (zstd !)
735 transferred 98.8 KB in * seconds (* */sec) (glob) (zstd !)
765 transferred 98.8 KB in * seconds (* */sec) (glob) (zstd !)
736 searching for changes
766 searching for changes
737 no changes found
767 no changes found
@@ -741,10 +771,12 b' clone it'
741 #if stream-bundle2-v2
771 #if stream-bundle2-v2
742 $ hg clone --stream http://localhost:$HGPORT with-bookmarks
772 $ hg clone --stream http://localhost:$HGPORT with-bookmarks
743 streaming all changes
773 streaming all changes
744 1096 files to transfer, 102 KB of data (no-zstd !)
774 1097 files to transfer, 102 KB of data (no-zstd !)
745 transferred 102 KB in * seconds (* */sec) (glob) (no-zstd !)
775 transferred 102 KB in * seconds (* */sec) (glob) (no-zstd !)
746 1096 files to transfer, 99.1 KB of data (zstd !)
776 1097 files to transfer, 99.1 KB of data (zstd no-rust !)
747 transferred 99.1 KB in * seconds (* */sec) (glob) (zstd !)
777 transferred 99.1 KB in * seconds (* */sec) (glob) (zstd no-rust !)
778 1099 files to transfer, 99.2 KB of data (zstd rust !)
779 transferred 99.2 KB in * seconds (* */sec) (glob) (zstd rust !)
748 updating to branch default
780 updating to branch default
749 1088 files updated, 0 files merged, 0 files removed, 0 files unresolved
781 1088 files updated, 0 files merged, 0 files removed, 0 files unresolved
750 #endif
782 #endif
@@ -753,7 +785,8 b' clone it'
753 streaming all changes
785 streaming all changes
754 1096 entries to transfer
786 1096 entries to transfer
755 transferred 102 KB in * seconds (* */sec) (glob) (no-zstd !)
787 transferred 102 KB in * seconds (* */sec) (glob) (no-zstd !)
756 transferred 99.1 KB in * seconds (* */sec) (glob) (zstd !)
788 transferred 99.1 KB in * seconds (* */sec) (glob) (zstd no-rust !)
789 transferred 99.2 KB in * seconds (* */sec) (glob) (zstd rust !)
757 updating to branch default
790 updating to branch default
758 1088 files updated, 0 files merged, 0 files removed, 0 files unresolved
791 1088 files updated, 0 files merged, 0 files removed, 0 files unresolved
759 #endif
792 #endif
@@ -774,9 +807,9 b' Clone as publishing'
774 #if stream-legacy
807 #if stream-legacy
775 $ hg clone --stream http://localhost:$HGPORT phase-publish
808 $ hg clone --stream http://localhost:$HGPORT phase-publish
776 streaming all changes
809 streaming all changes
777 1090 files to transfer, 102 KB of data (no-zstd !)
810 1091 files to transfer, 102 KB of data (no-zstd !)
778 transferred 102 KB in * seconds (* */sec) (glob) (no-zstd !)
811 transferred 102 KB in * seconds (* */sec) (glob) (no-zstd !)
779 1090 files to transfer, 98.8 KB of data (zstd !)
812 1091 files to transfer, 98.8 KB of data (zstd !)
780 transferred 98.8 KB in * seconds (* */sec) (glob) (zstd !)
813 transferred 98.8 KB in * seconds (* */sec) (glob) (zstd !)
781 searching for changes
814 searching for changes
782 no changes found
815 no changes found
@@ -786,10 +819,12 b' Clone as publishing'
786 #if stream-bundle2-v2
819 #if stream-bundle2-v2
787 $ hg clone --stream http://localhost:$HGPORT phase-publish
820 $ hg clone --stream http://localhost:$HGPORT phase-publish
788 streaming all changes
821 streaming all changes
789 1096 files to transfer, 102 KB of data (no-zstd !)
822 1097 files to transfer, 102 KB of data (no-zstd !)
790 transferred 102 KB in * seconds (* */sec) (glob) (no-zstd !)
823 transferred 102 KB in * seconds (* */sec) (glob) (no-zstd !)
791 1096 files to transfer, 99.1 KB of data (zstd !)
824 1097 files to transfer, 99.1 KB of data (zstd no-rust !)
792 transferred 99.1 KB in * seconds (* */sec) (glob) (zstd !)
825 transferred 99.1 KB in * seconds (* */sec) (glob) (zstd no-rust !)
826 1099 files to transfer, 99.2 KB of data (zstd rust !)
827 transferred 99.2 KB in * seconds (* */sec) (glob) (zstd rust !)
793 updating to branch default
828 updating to branch default
794 1088 files updated, 0 files merged, 0 files removed, 0 files unresolved
829 1088 files updated, 0 files merged, 0 files removed, 0 files unresolved
795 #endif
830 #endif
@@ -798,7 +833,8 b' Clone as publishing'
798 streaming all changes
833 streaming all changes
799 1096 entries to transfer
834 1096 entries to transfer
800 transferred 102 KB in * seconds (* */sec) (glob) (no-zstd !)
835 transferred 102 KB in * seconds (* */sec) (glob) (no-zstd !)
801 transferred 99.1 KB in * seconds (* */sec) (glob) (zstd !)
836 transferred 99.1 KB in * seconds (* */sec) (glob) (zstd no-rust !)
837 transferred 99.2 KB in * seconds (* */sec) (glob) (zstd rust !)
802 updating to branch default
838 updating to branch default
803 1088 files updated, 0 files merged, 0 files removed, 0 files unresolved
839 1088 files updated, 0 files merged, 0 files removed, 0 files unresolved
804 #endif
840 #endif
@@ -825,9 +861,9 b' stream v1 unsuitable for non-publishing '
825
861
826 $ hg clone --stream http://localhost:$HGPORT phase-no-publish
862 $ hg clone --stream http://localhost:$HGPORT phase-no-publish
827 streaming all changes
863 streaming all changes
828 1090 files to transfer, 102 KB of data (no-zstd !)
864 1091 files to transfer, 102 KB of data (no-zstd !)
829 transferred 102 KB in * seconds (* */sec) (glob) (no-zstd !)
865 transferred 102 KB in * seconds (* */sec) (glob) (no-zstd !)
830 1090 files to transfer, 98.8 KB of data (zstd !)
866 1091 files to transfer, 98.8 KB of data (zstd !)
831 transferred 98.8 KB in * seconds (* */sec) (glob) (zstd !)
867 transferred 98.8 KB in * seconds (* */sec) (glob) (zstd !)
832 searching for changes
868 searching for changes
833 no changes found
869 no changes found
@@ -841,10 +877,12 b' stream v1 unsuitable for non-publishing '
841 #if stream-bundle2-v2
877 #if stream-bundle2-v2
842 $ hg clone --stream http://localhost:$HGPORT phase-no-publish
878 $ hg clone --stream http://localhost:$HGPORT phase-no-publish
843 streaming all changes
879 streaming all changes
844 1097 files to transfer, 102 KB of data (no-zstd !)
880 1098 files to transfer, 102 KB of data (no-zstd !)
845 transferred 102 KB in * seconds (* */sec) (glob) (no-zstd !)
881 transferred 102 KB in * seconds (* */sec) (glob) (no-zstd !)
846 1097 files to transfer, 99.1 KB of data (zstd !)
882 1098 files to transfer, 99.1 KB of data (zstd no-rust !)
847 transferred 99.1 KB in * seconds (* */sec) (glob) (zstd !)
883 transferred 99.1 KB in * seconds (* */sec) (glob) (zstd no-rust !)
884 1100 files to transfer, 99.2 KB of data (zstd rust !)
885 transferred 99.2 KB in * seconds (* */sec) (glob) (zstd rust !)
848 updating to branch default
886 updating to branch default
849 1088 files updated, 0 files merged, 0 files removed, 0 files unresolved
887 1088 files updated, 0 files merged, 0 files removed, 0 files unresolved
850 $ hg -R phase-no-publish phase -r 'all()'
888 $ hg -R phase-no-publish phase -r 'all()'
@@ -857,7 +895,8 b' stream v1 unsuitable for non-publishing '
857 streaming all changes
895 streaming all changes
858 1097 entries to transfer
896 1097 entries to transfer
859 transferred 102 KB in * seconds (* */sec) (glob) (no-zstd !)
897 transferred 102 KB in * seconds (* */sec) (glob) (no-zstd !)
860 transferred 99.1 KB in * seconds (* */sec) (glob) (zstd !)
898 transferred 99.1 KB in * seconds (* */sec) (glob) (zstd no-rust !)
899 transferred 99.2 KB in * seconds (* */sec) (glob) (zstd rust !)
861 updating to branch default
900 updating to branch default
862 1088 files updated, 0 files merged, 0 files removed, 0 files unresolved
901 1088 files updated, 0 files merged, 0 files removed, 0 files unresolved
863 $ hg -R phase-no-publish phase -r 'all()'
902 $ hg -R phase-no-publish phase -r 'all()'
@@ -904,10 +943,12 b' Clone non-publishing with obsolescence'
904
943
905 $ hg clone -U --stream http://localhost:$HGPORT with-obsolescence
944 $ hg clone -U --stream http://localhost:$HGPORT with-obsolescence
906 streaming all changes
945 streaming all changes
907 1098 files to transfer, 102 KB of data (no-zstd !)
946 1099 files to transfer, 102 KB of data (no-zstd !)
908 transferred 102 KB in * seconds (* */sec) (glob) (no-zstd !)
947 transferred 102 KB in * seconds (* */sec) (glob) (no-zstd !)
909 1098 files to transfer, 99.5 KB of data (zstd !)
948 1099 files to transfer, 99.5 KB of data (zstd no-rust !)
910 transferred 99.5 KB in * seconds (* */sec) (glob) (zstd !)
949 transferred 99.5 KB in * seconds (* */sec) (glob) (zstd no-rust !)
950 1101 files to transfer, 99.6 KB of data (zstd rust !)
951 transferred 99.6 KB in * seconds (* */sec) (glob) (zstd rust !)
911 $ hg -R with-obsolescence log -T '{rev}: {phase}\n'
952 $ hg -R with-obsolescence log -T '{rev}: {phase}\n'
912 2: draft
953 2: draft
913 1: draft
954 1: draft
@@ -956,7 +997,8 b' Clone non-publishing with obsolescence'
956 streaming all changes
997 streaming all changes
957 1098 entries to transfer
998 1098 entries to transfer
958 transferred 102 KB in * seconds (* */sec) (glob) (no-zstd !)
999 transferred 102 KB in * seconds (* */sec) (glob) (no-zstd !)
959 transferred 99.5 KB in * seconds (* */sec) (glob) (zstd !)
1000 transferred 99.5 KB in * seconds (* */sec) (glob) (zstd no-rust !)
1001 transferred 99.6 KB in * seconds (* */sec) (glob) (zstd rust !)
960 $ hg -R with-obsolescence log -T '{rev}: {phase}\n'
1002 $ hg -R with-obsolescence log -T '{rev}: {phase}\n'
961 2: draft
1003 2: draft
962 1: draft
1004 1: draft
@@ -71,22 +71,42 b' No update, with debug option:'
71
71
72 #if hardlink
72 #if hardlink
73 $ hg --debug clone -U . ../c --config progress.debug=true
73 $ hg --debug clone -U . ../c --config progress.debug=true
74 linking: 1/15 files (6.67%)
74 linking: 1/16 files (6.25%) (no-rust !)
75 linking: 2/15 files (13.33%)
75 linking: 2/16 files (12.50%) (no-rust !)
76 linking: 3/15 files (20.00%)
76 linking: 3/16 files (18.75%) (no-rust !)
77 linking: 4/15 files (26.67%)
77 linking: 4/16 files (25.00%) (no-rust !)
78 linking: 5/15 files (33.33%)
78 linking: 5/16 files (31.25%) (no-rust !)
79 linking: 6/15 files (40.00%)
79 linking: 6/16 files (37.50%) (no-rust !)
80 linking: 7/15 files (46.67%)
80 linking: 7/16 files (43.75%) (no-rust !)
81 linking: 8/15 files (53.33%)
81 linking: 8/16 files (50.00%) (no-rust !)
82 linking: 9/15 files (60.00%)
82 linking: 9/16 files (56.25%) (no-rust !)
83 linking: 10/15 files (66.67%)
83 linking: 10/16 files (62.50%) (no-rust !)
84 linking: 11/15 files (73.33%)
84 linking: 11/16 files (68.75%) (no-rust !)
85 linking: 12/15 files (80.00%)
85 linking: 12/16 files (75.00%) (no-rust !)
86 linking: 13/15 files (86.67%)
86 linking: 13/16 files (81.25%) (no-rust !)
87 linking: 14/15 files (93.33%)
87 linking: 14/16 files (87.50%) (no-rust !)
88 linking: 15/15 files (100.00%)
88 linking: 15/16 files (93.75%) (no-rust !)
89 linked 15 files
89 linking: 16/16 files (100.00%) (no-rust !)
90 linked 16 files (no-rust !)
91 linking: 1/18 files (5.56%) (rust !)
92 linking: 2/18 files (11.11%) (rust !)
93 linking: 3/18 files (16.67%) (rust !)
94 linking: 4/18 files (22.22%) (rust !)
95 linking: 5/18 files (27.78%) (rust !)
96 linking: 6/18 files (33.33%) (rust !)
97 linking: 7/18 files (38.89%) (rust !)
98 linking: 8/18 files (44.44%) (rust !)
99 linking: 9/18 files (50.00%) (rust !)
100 linking: 10/18 files (55.56%) (rust !)
101 linking: 11/18 files (61.11%) (rust !)
102 linking: 12/18 files (66.67%) (rust !)
103 linking: 13/18 files (72.22%) (rust !)
104 linking: 14/18 files (77.78%) (rust !)
105 linking: 15/18 files (83.33%) (rust !)
106 linking: 16/18 files (88.89%) (rust !)
107 linking: 17/18 files (94.44%) (rust !)
108 linking: 18/18 files (100.00%) (rust !)
109 linked 18 files (rust !)
90 updating the branch cache
110 updating the branch cache
91 #else
111 #else
92 $ hg --debug clone -U . ../c --config progress.debug=true
112 $ hg --debug clone -U . ../c --config progress.debug=true
@@ -379,7 +379,8 b' are not filtered.'
379 Stream clone bundles are supported
379 Stream clone bundles are supported
380
380
381 $ hg -R server debugcreatestreamclonebundle packed.hg
381 $ hg -R server debugcreatestreamclonebundle packed.hg
382 writing 613 bytes for 4 files
382 writing 613 bytes for 5 files (no-rust !)
383 writing 739 bytes for 7 files (rust !)
383 bundle requirements: generaldelta, revlogv1, sparserevlog (no-rust no-zstd !)
384 bundle requirements: generaldelta, revlogv1, sparserevlog (no-rust no-zstd !)
384 bundle requirements: generaldelta, revlog-compression-zstd, revlogv1, sparserevlog (no-rust zstd !)
385 bundle requirements: generaldelta, revlog-compression-zstd, revlogv1, sparserevlog (no-rust zstd !)
385 bundle requirements: generaldelta, revlog-compression-zstd, revlogv1, sparserevlog (rust !)
386 bundle requirements: generaldelta, revlog-compression-zstd, revlogv1, sparserevlog (rust !)
@@ -392,8 +393,10 b' No bundle spec should work'
392
393
393 $ hg clone -U http://localhost:$HGPORT stream-clone-no-spec
394 $ hg clone -U http://localhost:$HGPORT stream-clone-no-spec
394 applying clone bundle from http://localhost:$HGPORT1/packed.hg
395 applying clone bundle from http://localhost:$HGPORT1/packed.hg
395 4 files to transfer, 613 bytes of data
396 5 files to transfer, 613 bytes of data (no-rust !)
396 transferred 613 bytes in *.* seconds (*) (glob)
397 transferred 613 bytes in *.* seconds (*) (glob) (no-rust !)
398 7 files to transfer, 739 bytes of data (rust !)
399 transferred 739 bytes in *.* seconds (*) (glob) (rust !)
397 finished applying clone bundle
400 finished applying clone bundle
398 searching for changes
401 searching for changes
399 no changes found
402 no changes found
@@ -406,8 +409,10 b' Bundle spec without parameters should wo'
406
409
407 $ hg clone -U http://localhost:$HGPORT stream-clone-vanilla-spec
410 $ hg clone -U http://localhost:$HGPORT stream-clone-vanilla-spec
408 applying clone bundle from http://localhost:$HGPORT1/packed.hg
411 applying clone bundle from http://localhost:$HGPORT1/packed.hg
409 4 files to transfer, 613 bytes of data
412 5 files to transfer, 613 bytes of data (no-rust !)
410 transferred 613 bytes in *.* seconds (*) (glob)
413 transferred 613 bytes in *.* seconds (*) (glob) (no-rust !)
414 7 files to transfer, 739 bytes of data (rust !)
415 transferred 739 bytes in *.* seconds (*) (glob) (rust !)
411 finished applying clone bundle
416 finished applying clone bundle
412 searching for changes
417 searching for changes
413 no changes found
418 no changes found
@@ -420,8 +425,10 b' Bundle spec with format requirements sho'
420
425
421 $ hg clone -U http://localhost:$HGPORT stream-clone-supported-requirements
426 $ hg clone -U http://localhost:$HGPORT stream-clone-supported-requirements
422 applying clone bundle from http://localhost:$HGPORT1/packed.hg
427 applying clone bundle from http://localhost:$HGPORT1/packed.hg
423 4 files to transfer, 613 bytes of data
428 5 files to transfer, 613 bytes of data (no-rust !)
424 transferred 613 bytes in *.* seconds (*) (glob)
429 transferred 613 bytes in *.* seconds (*) (glob) (no-rust !)
430 7 files to transfer, 739 bytes of data (rust !)
431 transferred 739 bytes in *.* seconds (*) (glob) (rust !)
425 finished applying clone bundle
432 finished applying clone bundle
426 searching for changes
433 searching for changes
427 no changes found
434 no changes found
@@ -567,8 +574,10 b' A manifest with just a gzip bundle'
567 no compatible clone bundles available on server; falling back to regular clone
574 no compatible clone bundles available on server; falling back to regular clone
568 (you may want to report this to the server operator)
575 (you may want to report this to the server operator)
569 streaming all changes
576 streaming all changes
570 9 files to transfer, 816 bytes of data
577 10 files to transfer, 816 bytes of data (no-rust !)
571 transferred 816 bytes in * seconds (*) (glob)
578 transferred 816 bytes in * seconds (*) (glob) (no-rust !)
579 12 files to transfer, 942 bytes of data (rust !)
580 transferred 942 bytes in *.* seconds (*) (glob) (rust !)
572
581
573 A manifest with a stream clone but no BUNDLESPEC
582 A manifest with a stream clone but no BUNDLESPEC
574
583
@@ -580,8 +589,10 b' A manifest with a stream clone but no BU'
580 no compatible clone bundles available on server; falling back to regular clone
589 no compatible clone bundles available on server; falling back to regular clone
581 (you may want to report this to the server operator)
590 (you may want to report this to the server operator)
582 streaming all changes
591 streaming all changes
583 9 files to transfer, 816 bytes of data
592 10 files to transfer, 816 bytes of data (no-rust !)
584 transferred 816 bytes in * seconds (*) (glob)
593 transferred 816 bytes in * seconds (*) (glob) (no-rust !)
594 12 files to transfer, 942 bytes of data (rust !)
595 transferred 942 bytes in *.* seconds (*) (glob) (rust !)
585
596
586 A manifest with a gzip bundle and a stream clone
597 A manifest with a gzip bundle and a stream clone
587
598
@@ -592,8 +603,10 b' A manifest with a gzip bundle and a stre'
592
603
593 $ hg clone -U --stream http://localhost:$HGPORT uncompressed-gzip-packed
604 $ hg clone -U --stream http://localhost:$HGPORT uncompressed-gzip-packed
594 applying clone bundle from http://localhost:$HGPORT1/packed.hg
605 applying clone bundle from http://localhost:$HGPORT1/packed.hg
595 4 files to transfer, 613 bytes of data
606 5 files to transfer, 613 bytes of data (no-rust !)
596 transferred 613 bytes in * seconds (*) (glob)
607 transferred 613 bytes in *.* seconds (*) (glob) (no-rust !)
608 7 files to transfer, 739 bytes of data (rust !)
609 transferred 739 bytes in *.* seconds (*) (glob) (rust !)
597 finished applying clone bundle
610 finished applying clone bundle
598 searching for changes
611 searching for changes
599 no changes found
612 no changes found
@@ -607,8 +620,10 b' A manifest with a gzip bundle and stream'
607
620
608 $ hg clone -U --stream http://localhost:$HGPORT uncompressed-gzip-packed-requirements
621 $ hg clone -U --stream http://localhost:$HGPORT uncompressed-gzip-packed-requirements
609 applying clone bundle from http://localhost:$HGPORT1/packed.hg
622 applying clone bundle from http://localhost:$HGPORT1/packed.hg
610 4 files to transfer, 613 bytes of data
623 5 files to transfer, 613 bytes of data (no-rust !)
611 transferred 613 bytes in * seconds (*) (glob)
624 transferred 613 bytes in *.* seconds (*) (glob) (no-rust !)
625 7 files to transfer, 739 bytes of data (rust !)
626 transferred 739 bytes in *.* seconds (*) (glob) (rust !)
612 finished applying clone bundle
627 finished applying clone bundle
613 searching for changes
628 searching for changes
614 no changes found
629 no changes found
@@ -624,8 +639,10 b' A manifest with a gzip bundle and a stre'
624 no compatible clone bundles available on server; falling back to regular clone
639 no compatible clone bundles available on server; falling back to regular clone
625 (you may want to report this to the server operator)
640 (you may want to report this to the server operator)
626 streaming all changes
641 streaming all changes
627 9 files to transfer, 816 bytes of data
642 10 files to transfer, 816 bytes of data (no-rust !)
628 transferred 816 bytes in * seconds (*) (glob)
643 transferred 816 bytes in * seconds (*) (glob) (no-rust !)
644 12 files to transfer, 942 bytes of data (rust !)
645 transferred 942 bytes in *.* seconds (*) (glob) (rust !)
629
646
630 Test clone bundle retrieved through bundle2
647 Test clone bundle retrieved through bundle2
631
648
@@ -28,12 +28,12 b" Check that there's no space leak on debu"
28
28
29 $ f --size .hg/dirstate*
29 $ f --size .hg/dirstate*
30 .hg/dirstate: size=133
30 .hg/dirstate: size=133
31 .hg/dirstate.b870a51b: size=511
32 $ hg debugrebuilddirstate
33 $ f --size .hg/dirstate*
34 .hg/dirstate: size=133
35 .hg/dirstate.88698448: size=511
31 .hg/dirstate.88698448: size=511
36 $ hg debugrebuilddirstate
32 $ hg debugrebuilddirstate
37 $ f --size .hg/dirstate*
33 $ f --size .hg/dirstate*
38 .hg/dirstate: size=133
34 .hg/dirstate: size=133
39 .hg/dirstate.6b8ab34b: size=511
35 .hg/dirstate.6b8ab34b: size=511
36 $ hg debugrebuilddirstate
37 $ f --size .hg/dirstate*
38 .hg/dirstate: size=133
39 .hg/dirstate.b875dfc5: size=511
@@ -17,7 +17,7 b''
17 #if reporevlogstore
17 #if reporevlogstore
18 $ hg debugrevlog -c
18 $ hg debugrevlog -c
19 format : 1
19 format : 1
20 flags : inline
20 flags : (none)
21
21
22 revisions : 3
22 revisions : 3
23 merges : 0 ( 0.00%)
23 merges : 0 ( 0.00%)
@@ -80,7 +80,8 b' the source repo:'
80 [patterns]
80 [patterns]
81 **.txt = native
81 **.txt = native
82 $ hg clone repo repo-3 -v --debug
82 $ hg clone repo repo-3 -v --debug
83 linked 7 files
83 linked 8 files (no-rust !)
84 linked 10 files (rust !)
84 updating to branch default
85 updating to branch default
85 resolving manifests
86 resolving manifests
86 branchmerge: False, force: False, partial: False
87 branchmerge: False, force: False, partial: False
@@ -88,7 +88,10 b' Non store repo:'
88 adding tst.d/foo
88 adding tst.d/foo
89 $ find .hg | sort
89 $ find .hg | sort
90 .hg
90 .hg
91 .hg/00changelog-6b8ab34b.nd (rust !)
92 .hg/00changelog.d
91 .hg/00changelog.i
93 .hg/00changelog.i
94 .hg/00changelog.n (rust !)
92 .hg/00manifest.i
95 .hg/00manifest.i
93 .hg/branch
96 .hg/branch
94 .hg/cache
97 .hg/cache
@@ -135,7 +138,10 b' Non fncache repo:'
135 .hg/last-message.txt
138 .hg/last-message.txt
136 .hg/requires
139 .hg/requires
137 .hg/store
140 .hg/store
141 .hg/store/00changelog-b875dfc5.nd (rust !)
142 .hg/store/00changelog.d
138 .hg/store/00changelog.i
143 .hg/store/00changelog.i
144 .hg/store/00changelog.n (rust !)
139 .hg/store/00manifest.i
145 .hg/store/00manifest.i
140 .hg/store/data
146 .hg/store/data
141 .hg/store/data/tst.d.hg
147 .hg/store/data/tst.d.hg
@@ -44,7 +44,10 b' Prepare repo r1:'
44 $ cd ../..
44 $ cd ../..
45
45
46 $ nlinksdir r1/.hg/store
46 $ nlinksdir r1/.hg/store
47 1 r1/.hg/store/00changelog-b870a51b.nd (rust !)
48 1 r1/.hg/store/00changelog.d
47 1 r1/.hg/store/00changelog.i
49 1 r1/.hg/store/00changelog.i
50 1 r1/.hg/store/00changelog.n (rust !)
48 1 r1/.hg/store/00manifest.i
51 1 r1/.hg/store/00manifest.i
49 1 r1/.hg/store/data/d1/f2.i
52 1 r1/.hg/store/data/d1/f2.i
50 1 r1/.hg/store/data/f1.i
53 1 r1/.hg/store/data/f1.i
@@ -52,6 +55,7 b' Prepare repo r1:'
52 1 r1/.hg/store/phaseroots
55 1 r1/.hg/store/phaseroots
53 1 r1/.hg/store/requires
56 1 r1/.hg/store/requires
54 1 r1/.hg/store/undo
57 1 r1/.hg/store/undo
58 1 r1/.hg/store/undo.backup.00changelog.n.bck (rust !)
55 1 r1/.hg/store/undo.backup.fncache.bck (repofncache !)
59 1 r1/.hg/store/undo.backup.fncache.bck (repofncache !)
56 1 r1/.hg/store/undo.backupfiles
60 1 r1/.hg/store/undo.backupfiles
57
61
@@ -59,14 +63,26 b' Prepare repo r1:'
59 Create hardlinked clone r2:
63 Create hardlinked clone r2:
60
64
61 $ hg clone -U --debug r1 r2 --config progress.debug=true
65 $ hg clone -U --debug r1 r2 --config progress.debug=true
62 linking: 1/7 files (14.29%)
66 linking: 1/8 files (12.50%) (no-rust !)
63 linking: 2/7 files (28.57%)
67 linking: 2/8 files (25.00%) (no-rust !)
64 linking: 3/7 files (42.86%)
68 linking: 3/8 files (37.50%) (no-rust !)
65 linking: 4/7 files (57.14%)
69 linking: 4/8 files (50.00%) (no-rust !)
66 linking: 5/7 files (71.43%)
70 linking: 5/8 files (62.50%) (no-rust !)
67 linking: 6/7 files (85.71%)
71 linking: 6/8 files (75.00%) (no-rust !)
68 linking: 7/7 files (100.00%)
72 linking: 7/8 files (87.50%) (no-rust !)
69 linked 7 files
73 linking: 8/8 files (100.00%) (no-rust !)
74 linked 8 files (no-rust !)
75 linking: 1/10 files (10.00%) (rust !)
76 linking: 2/10 files (20.00%) (rust !)
77 linking: 3/10 files (30.00%) (rust !)
78 linking: 4/10 files (40.00%) (rust !)
79 linking: 5/10 files (50.00%) (rust !)
80 linking: 6/10 files (60.00%) (rust !)
81 linking: 7/10 files (70.00%) (rust !)
82 linking: 8/10 files (80.00%) (rust !)
83 linking: 9/10 files (90.00%) (rust !)
84 linking: 10/10 files (100.00%) (rust !)
85 linked 10 files (rust !)
70 updating the branch cache
86 updating the branch cache
71
87
72 Create non-hardlinked clone r3:
88 Create non-hardlinked clone r3:
@@ -85,7 +101,10 b' Create non-hardlinked clone r3:'
85 Repos r1 and r2 should now contain hardlinked files:
101 Repos r1 and r2 should now contain hardlinked files:
86
102
87 $ nlinksdir r1/.hg/store
103 $ nlinksdir r1/.hg/store
104 1 r1/.hg/store/00changelog-b870a51b.nd (rust !)
105 2 r1/.hg/store/00changelog.d
88 2 r1/.hg/store/00changelog.i
106 2 r1/.hg/store/00changelog.i
107 1 r1/.hg/store/00changelog.n (rust !)
89 2 r1/.hg/store/00manifest.i
108 2 r1/.hg/store/00manifest.i
90 2 r1/.hg/store/data/d1/f2.i
109 2 r1/.hg/store/data/d1/f2.i
91 2 r1/.hg/store/data/f1.i
110 2 r1/.hg/store/data/f1.i
@@ -93,11 +112,15 b' Repos r1 and r2 should now contain hardl'
93 1 r1/.hg/store/phaseroots
112 1 r1/.hg/store/phaseroots
94 1 r1/.hg/store/requires
113 1 r1/.hg/store/requires
95 1 r1/.hg/store/undo
114 1 r1/.hg/store/undo
115 1 r1/.hg/store/undo.backup.00changelog.n.bck (rust !)
96 1 r1/.hg/store/undo.backup.fncache.bck (repofncache !)
116 1 r1/.hg/store/undo.backup.fncache.bck (repofncache !)
97 1 r1/.hg/store/undo.backupfiles
117 1 r1/.hg/store/undo.backupfiles
98
118
99 $ nlinksdir r2/.hg/store
119 $ nlinksdir r2/.hg/store
120 1 r2/.hg/store/00changelog-b870a51b.nd (rust !)
121 2 r2/.hg/store/00changelog.d
100 2 r2/.hg/store/00changelog.i
122 2 r2/.hg/store/00changelog.i
123 1 r2/.hg/store/00changelog.n (rust !)
101 2 r2/.hg/store/00manifest.i
124 2 r2/.hg/store/00manifest.i
102 2 r2/.hg/store/data/d1/f2.i
125 2 r2/.hg/store/data/d1/f2.i
103 2 r2/.hg/store/data/f1.i
126 2 r2/.hg/store/data/f1.i
@@ -107,7 +130,10 b' Repos r1 and r2 should now contain hardl'
107 Repo r3 should not be hardlinked:
130 Repo r3 should not be hardlinked:
108
131
109 $ nlinksdir r3/.hg/store
132 $ nlinksdir r3/.hg/store
133 1 r3/.hg/store/00changelog-88698448.nd (rust !)
134 1 r3/.hg/store/00changelog.d
110 1 r3/.hg/store/00changelog.i
135 1 r3/.hg/store/00changelog.i
136 1 r3/.hg/store/00changelog.n (rust !)
111 1 r3/.hg/store/00manifest.i
137 1 r3/.hg/store/00manifest.i
112 1 r3/.hg/store/data/d1/f2.i
138 1 r3/.hg/store/data/d1/f2.i
113 1 r3/.hg/store/data/f1.i
139 1 r3/.hg/store/data/f1.i
@@ -132,7 +158,10 b' Create a non-inlined filelog in r3:'
132 $ cd ../..
158 $ cd ../..
133
159
134 $ nlinksdir r3/.hg/store
160 $ nlinksdir r3/.hg/store
161 1 r3/.hg/store/00changelog-ea337809.nd (rust !)
162 1 r3/.hg/store/00changelog.d
135 1 r3/.hg/store/00changelog.i
163 1 r3/.hg/store/00changelog.i
164 1 r3/.hg/store/00changelog.n (rust !)
136 1 r3/.hg/store/00manifest.i
165 1 r3/.hg/store/00manifest.i
137 1 r3/.hg/store/data/d1/f2.d
166 1 r3/.hg/store/data/d1/f2.d
138 1 r3/.hg/store/data/d1/f2.i
167 1 r3/.hg/store/data/d1/f2.i
@@ -141,6 +170,7 b' Create a non-inlined filelog in r3:'
141 1 r3/.hg/store/phaseroots
170 1 r3/.hg/store/phaseroots
142 1 r3/.hg/store/requires
171 1 r3/.hg/store/requires
143 1 r3/.hg/store/undo
172 1 r3/.hg/store/undo
173 1 r3/.hg/store/undo.backup.00changelog.n.bck (rust !)
144 1 r3/.hg/store/undo.backupfiles
174 1 r3/.hg/store/undo.backupfiles
145
175
146 Push to repo r1 should break up most hardlinks in r2:
176 Push to repo r1 should break up most hardlinks in r2:
@@ -159,7 +189,10 b' Push to repo r1 should break up most har'
159 $ cd ..
189 $ cd ..
160
190
161 $ nlinksdir r2/.hg/store
191 $ nlinksdir r2/.hg/store
192 1 r2/.hg/store/00changelog-b870a51b.nd (rust !)
193 1 r2/.hg/store/00changelog.d
162 1 r2/.hg/store/00changelog.i
194 1 r2/.hg/store/00changelog.i
195 1 r2/.hg/store/00changelog.n (rust !)
163 1 r2/.hg/store/00manifest.i
196 1 r2/.hg/store/00manifest.i
164 1 r2/.hg/store/data/d1/f2.i
197 1 r2/.hg/store/data/d1/f2.i
165 2 r2/.hg/store/data/f1.i
198 2 r2/.hg/store/data/f1.i
@@ -184,7 +217,10 b' Committing a change to f1 in r1 must bre'
184 $ cd ..
217 $ cd ..
185
218
186 $ nlinksdir r2/.hg/store
219 $ nlinksdir r2/.hg/store
220 1 r2/.hg/store/00changelog-b870a51b.nd (rust !)
221 1 r2/.hg/store/00changelog.d
187 1 r2/.hg/store/00changelog.i
222 1 r2/.hg/store/00changelog.i
223 1 r2/.hg/store/00changelog.n (rust !)
188 1 r2/.hg/store/00manifest.i
224 1 r2/.hg/store/00manifest.i
189 1 r2/.hg/store/data/d1/f2.i
225 1 r2/.hg/store/data/d1/f2.i
190 1 r2/.hg/store/data/f1.i
226 1 r2/.hg/store/data/f1.i
@@ -241,7 +277,10 b' r4 has hardlinks in the working dir (not'
241 2 r4/.hg/hgrc
277 2 r4/.hg/hgrc
242 2 r4/.hg/last-message.txt
278 2 r4/.hg/last-message.txt
243 2 r4/.hg/requires
279 2 r4/.hg/requires
280 2 r4/.hg/store/00changelog-7f2eb713.nd (rust !)
281 2 r4/.hg/store/00changelog.d
244 2 r4/.hg/store/00changelog.i
282 2 r4/.hg/store/00changelog.i
283 2 r4/.hg/store/00changelog.n (rust !)
245 2 r4/.hg/store/00manifest.i
284 2 r4/.hg/store/00manifest.i
246 2 r4/.hg/store/data/d1/f2.d
285 2 r4/.hg/store/data/d1/f2.d
247 2 r4/.hg/store/data/d1/f2.i
286 2 r4/.hg/store/data/d1/f2.i
@@ -251,6 +290,7 b' r4 has hardlinks in the working dir (not'
251 2 r4/.hg/store/phaseroots
290 2 r4/.hg/store/phaseroots
252 2 r4/.hg/store/requires
291 2 r4/.hg/store/requires
253 2 r4/.hg/store/undo
292 2 r4/.hg/store/undo
293 2 r4/.hg/store/undo.backup.00changelog.n.bck (rust !)
254 2 r4/.hg/store/undo.backupfiles
294 2 r4/.hg/store/undo.backupfiles
255 [24] r4/.hg/undo.backup.branch.bck (re)
295 [24] r4/.hg/undo.backup.branch.bck (re)
256 2 r4/\.hg/undo\.backup\.dirstate.bck (re)
296 2 r4/\.hg/undo\.backup\.dirstate.bck (re)
@@ -294,7 +334,10 b' Update back to revision 12 in r4 should '
294 2 r4/.hg/hgrc
334 2 r4/.hg/hgrc
295 2 r4/.hg/last-message.txt
335 2 r4/.hg/last-message.txt
296 2 r4/.hg/requires
336 2 r4/.hg/requires
337 2 r4/.hg/store/00changelog-7f2eb713.nd (rust !)
338 2 r4/.hg/store/00changelog.d
297 2 r4/.hg/store/00changelog.i
339 2 r4/.hg/store/00changelog.i
340 2 r4/.hg/store/00changelog.n (rust !)
298 2 r4/.hg/store/00manifest.i
341 2 r4/.hg/store/00manifest.i
299 2 r4/.hg/store/data/d1/f2.d
342 2 r4/.hg/store/data/d1/f2.d
300 2 r4/.hg/store/data/d1/f2.i
343 2 r4/.hg/store/data/d1/f2.i
@@ -304,6 +347,7 b' Update back to revision 12 in r4 should '
304 2 r4/.hg/store/phaseroots
347 2 r4/.hg/store/phaseroots
305 2 r4/.hg/store/requires
348 2 r4/.hg/store/requires
306 2 r4/.hg/store/undo
349 2 r4/.hg/store/undo
350 2 r4/.hg/store/undo.backup.00changelog.n.bck (rust !)
307 2 r4/.hg/store/undo.backupfiles
351 2 r4/.hg/store/undo.backupfiles
308 [23] r4/.hg/undo.backup.branch.bck (re)
352 [23] r4/.hg/undo.backup.branch.bck (re)
309 2 r4/\.hg/undo\.backup\.dirstate.bck (re)
353 2 r4/\.hg/undo\.backup\.dirstate.bck (re)
@@ -458,14 +458,18 b' more there after'
458 (Check that no 'changelog.i.a' file were left behind)
458 (Check that no 'changelog.i.a' file were left behind)
459
459
460 $ ls -1 .hg/store/
460 $ ls -1 .hg/store/
461 00changelog-1335303a.nd (rust !)
462 00changelog.d
461 00changelog.i
463 00changelog.i
464 00changelog.n (rust !)
462 00manifest.i
465 00manifest.i
463 data
466 data
464 fncache (repofncache !)
467 fncache
465 phaseroots
468 phaseroots
466 requires
469 requires
467 undo
470 undo
468 undo.backup.fncache.bck (repofncache !)
471 undo.backup.00changelog.n.bck (rust !)
472 undo.backup.fncache.bck
469 undo.backupfiles
473 undo.backupfiles
470
474
471
475
@@ -725,6 +725,8 b' Server stops sending after bundle2 part '
725 $ hg clone http://localhost:$HGPORT/ clone
725 $ hg clone http://localhost:$HGPORT/ clone
726 requesting all changes
726 requesting all changes
727 adding changesets
727 adding changesets
728 transaction abort!
729 rollback completed
728 abort: HTTP request error (incomplete response)
730 abort: HTTP request error (incomplete response)
729 (this may be an intermittent network failure; if the error persists, consider contacting the network or server operator)
731 (this may be an intermittent network failure; if the error persists, consider contacting the network or server operator)
730 [255]
732 [255]
@@ -757,6 +759,8 b' Server stops after bundle2 part payload '
757 $ hg clone http://localhost:$HGPORT/ clone
759 $ hg clone http://localhost:$HGPORT/ clone
758 requesting all changes
760 requesting all changes
759 adding changesets
761 adding changesets
762 transaction abort!
763 rollback completed
760 abort: HTTP request error (incomplete response*) (glob)
764 abort: HTTP request error (incomplete response*) (glob)
761 (this may be an intermittent network failure; if the error persists, consider contacting the network or server operator)
765 (this may be an intermittent network failure; if the error persists, consider contacting the network or server operator)
762 [255]
766 [255]
@@ -791,6 +795,8 b' Server stops sending in middle of bundle'
791 $ hg clone http://localhost:$HGPORT/ clone
795 $ hg clone http://localhost:$HGPORT/ clone
792 requesting all changes
796 requesting all changes
793 adding changesets
797 adding changesets
798 transaction abort!
799 rollback completed
794 abort: HTTP request error (incomplete response)
800 abort: HTTP request error (incomplete response)
795 (this may be an intermittent network failure; if the error persists, consider contacting the network or server operator)
801 (this may be an intermittent network failure; if the error persists, consider contacting the network or server operator)
796 [255]
802 [255]
@@ -38,8 +38,9 b' clone via stream'
38 #if no-reposimplestore
38 #if no-reposimplestore
39 $ hg clone --stream http://localhost:$HGPORT/ copy 2>&1
39 $ hg clone --stream http://localhost:$HGPORT/ copy 2>&1
40 streaming all changes
40 streaming all changes
41 6 files to transfer, 606 bytes of data (no-zstd !)
41 7 files to transfer, 606 bytes of data (no-zstd !)
42 6 files to transfer, 608 bytes of data (zstd !)
42 7 files to transfer, 608 bytes of data (zstd no-rust !)
43 9 files to transfer, 734 bytes of data (zstd rust !)
43 transferred * bytes in * seconds (*/sec) (glob)
44 transferred * bytes in * seconds (*/sec) (glob)
44 searching for changes
45 searching for changes
45 no changes found
46 no changes found
@@ -218,9 +219,10 b' test http authentication'
218 #if no-reposimplestore
219 #if no-reposimplestore
219 $ hg clone http://user:pass@localhost:$HGPORT2/ dest 2>&1
220 $ hg clone http://user:pass@localhost:$HGPORT2/ dest 2>&1
220 streaming all changes
221 streaming all changes
221 7 files to transfer, 916 bytes of data (no-zstd !)
222 8 files to transfer, 916 bytes of data (no-zstd !)
222 7 files to transfer, 919 bytes of data (zstd !)
223 8 files to transfer, 919 bytes of data (zstd no-rust !)
223 transferred * bytes in * seconds (*/sec) (glob)
224 10 files to transfer, 1.02 KB of data (zstd rust !)
225 transferred * in * seconds (*/sec) (glob)
224 searching for changes
226 searching for changes
225 no changes found
227 no changes found
226 updating to branch default
228 updating to branch default
@@ -378,7 +380,8 b' disable pull-based clones'
378 streaming all changes
380 streaming all changes
379 * files to transfer, * of data (glob)
381 * files to transfer, * of data (glob)
380 transferred 1.36 KB in * seconds (* */sec) (glob) (no-zstd !)
382 transferred 1.36 KB in * seconds (* */sec) (glob) (no-zstd !)
381 transferred 1.38 KB in * seconds (* */sec) (glob) (zstd !)
383 transferred 1.38 KB in * seconds (* */sec) (glob) (zstd no-rust !)
384 transferred 1.56 KB in * seconds (* */sec) (glob) (zstd rust !)
382 searching for changes
385 searching for changes
383 no changes found
386 no changes found
384 #endif
387 #endif
@@ -16,7 +16,8 b' url for proxy, stream'
16
16
17 $ http_proxy=http://localhost:$HGPORT1/ hg --config http_proxy.always=True clone --stream http://localhost:$HGPORT/ b
17 $ http_proxy=http://localhost:$HGPORT1/ hg --config http_proxy.always=True clone --stream http://localhost:$HGPORT/ b
18 streaming all changes
18 streaming all changes
19 6 files to transfer, 412 bytes of data (reporevlogstore !)
19 7 files to transfer, 412 bytes of data (reporevlogstore no-rust !)
20 9 files to transfer, 538 bytes of data (reporevlogstore rust !)
20 4 files to transfer, 330 bytes of data (reposimplestore !)
21 4 files to transfer, 330 bytes of data (reposimplestore !)
21 transferred * bytes in * seconds (*/sec) (glob)
22 transferred * bytes in * seconds (*/sec) (glob)
22 updating to branch default
23 updating to branch default
@@ -29,8 +29,9 b' clone via stream'
29 #if no-reposimplestore
29 #if no-reposimplestore
30 $ hg clone --stream http://localhost:$HGPORT/ copy 2>&1
30 $ hg clone --stream http://localhost:$HGPORT/ copy 2>&1
31 streaming all changes
31 streaming all changes
32 9 files to transfer, 715 bytes of data (no-zstd !)
32 10 files to transfer, 715 bytes of data (no-zstd !)
33 9 files to transfer, 717 bytes of data (zstd !)
33 10 files to transfer, 717 bytes of data (zstd no-rust !)
34 12 files to transfer, 843 bytes of data (zstd rust !)
34 transferred * bytes in * seconds (*/sec) (glob)
35 transferred * bytes in * seconds (*/sec) (glob)
35 updating to branch default
36 updating to branch default
36 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
37 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -254,7 +255,8 b' test http authentication'
254 #if no-reposimplestore
255 #if no-reposimplestore
255 $ hg clone http://user:pass@localhost:$HGPORT2/ dest 2>&1
256 $ hg clone http://user:pass@localhost:$HGPORT2/ dest 2>&1
256 streaming all changes
257 streaming all changes
257 10 files to transfer, 1.01 KB of data
258 11 files to transfer, 1.01 KB of data (no-rust !)
259 13 files to transfer, 1.13 KB of data (rust !)
258 transferred * KB in * seconds (*/sec) (glob)
260 transferred * KB in * seconds (*/sec) (glob)
259 updating to branch default
261 updating to branch default
260 5 files updated, 0 files merged, 0 files removed, 0 files unresolved
262 5 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -78,7 +78,10 b' new directories are setgid'
78 00660 ./.hg/last-message.txt
78 00660 ./.hg/last-message.txt
79 00600 ./.hg/requires
79 00600 ./.hg/requires
80 00770 ./.hg/store/
80 00770 ./.hg/store/
81 00660 ./.hg/store/00changelog-150e1cfc.nd (rust !)
82 00660 ./.hg/store/00changelog.d
81 00660 ./.hg/store/00changelog.i
83 00660 ./.hg/store/00changelog.i
84 00660 ./.hg/store/00changelog.n (rust !)
82 00660 ./.hg/store/00manifest.i
85 00660 ./.hg/store/00manifest.i
83 00770 ./.hg/store/data/
86 00770 ./.hg/store/data/
84 00770 ./.hg/store/data/dir/
87 00770 ./.hg/store/data/dir/
@@ -137,7 +140,10 b' group can still write everything'
137 00660 ../push/.hg/cache/rbc-revs-v1
140 00660 ../push/.hg/cache/rbc-revs-v1
138 00660 ../push/.hg/requires
141 00660 ../push/.hg/requires
139 00770 ../push/.hg/store/
142 00770 ../push/.hg/store/
143 00660 ../push/.hg/store/00changelog-b870a51b.nd (rust !)
144 00660 ../push/.hg/store/00changelog.d
140 00660 ../push/.hg/store/00changelog.i
145 00660 ../push/.hg/store/00changelog.i
146 00660 ../push/.hg/store/00changelog.n (rust !)
141 00660 ../push/.hg/store/00manifest.i
147 00660 ../push/.hg/store/00manifest.i
142 00770 ../push/.hg/store/data/
148 00770 ../push/.hg/store/data/
143 00770 ../push/.hg/store/data/dir/
149 00770 ../push/.hg/store/data/dir/
@@ -367,7 +367,7 b' Try it with a non-inline revlog'
367 $ cd repo-to-fix-not-inline
367 $ cd repo-to-fix-not-inline
368 $ tar -xf - < "$TESTDIR"/bundles/issue6528.tar
368 $ tar -xf - < "$TESTDIR"/bundles/issue6528.tar
369 $ echo b >> b.txt
369 $ echo b >> b.txt
370 $ hg commit -qm "inline -> separate"
370 $ hg commit -qm "inline -> separate" --traceback
371 $ find .hg -name *b.txt.d
371 $ find .hg -name *b.txt.d
372 .hg/store/data/b.txt.d
372 .hg/store/data/b.txt.d
373
373
@@ -47,6 +47,8 b' Check that zero-size journals are correc'
47
47
48 $ hg -R foo unbundle repo.hg
48 $ hg -R foo unbundle repo.hg
49 adding changesets
49 adding changesets
50 transaction abort!
51 rollback completed
50 abort: $EACCES$: '$TESTTMP/repo/foo/.hg/store/.00changelog.i-*' (glob)
52 abort: $EACCES$: '$TESTTMP/repo/foo/.hg/store/.00changelog.i-*' (glob)
51 [255]
53 [255]
52
54
@@ -908,7 +908,8 b' Check error message when object does not'
908 $ cd $TESTTMP
908 $ cd $TESTTMP
909 $ hg --debug clone test test2
909 $ hg --debug clone test test2
910 http auth: user foo, password ***
910 http auth: user foo, password ***
911 linked 6 files
911 linked 7 files (no-rust !)
912 linked 9 files (rust !)
912 http auth: user foo, password ***
913 http auth: user foo, password ***
913 updating to branch default
914 updating to branch default
914 resolving manifests
915 resolving manifests
@@ -80,7 +80,10 b' Making sure we have the correct set of r'
80 Making sure store has the required files
80 Making sure store has the required files
81
81
82 $ ls .hg/store/
82 $ ls .hg/store/
83 00changelog-????????.nd (glob) (rust !)
84 00changelog.d
83 00changelog.i
85 00changelog.i
86 00changelog.n (rust !)
84 00manifest.i
87 00manifest.i
85 data
88 data
86 fncache (tree !)
89 fncache (tree !)
@@ -145,8 +145,8 b' Test corrupted p1/p2 fields that could c'
145 > ]
145 > ]
146 > for n, p in poisons:
146 > for n, p in poisons:
147 > # corrupt p1 at rev0 and p2 at rev1
147 > # corrupt p1 at rev0 and p2 at rev1
148 > rev_0 = data[:64 + 63]
148 > rev_0 = data[:64]
149 > rev_1 = data[64 + 63:]
149 > rev_1 = data[64:]
150 > altered_rev_0 = rev_0[:24] + p + rev_0[24 + 4:]
150 > altered_rev_0 = rev_0[:24] + p + rev_0[24 + 4:]
151 > altered_rev_1 = rev_1[:28] + p + rev_1[28 + 4:]
151 > altered_rev_1 = rev_1[:28] + p + rev_1[28 + 4:]
152 > new_data = altered_rev_0 + altered_rev_1
152 > new_data = altered_rev_0 + altered_rev_1
@@ -110,7 +110,7 b' happen for the changelog (the linkrev sh'
110 note: use 'hg commit --logfile .hg/last-message.txt --edit' to reuse it
110 note: use 'hg commit --logfile .hg/last-message.txt --edit' to reuse it
111 transaction abort!
111 transaction abort!
112 rollback completed
112 rollback completed
113 abort: 00changelog.i: file cursor at position 249, expected 121
113 abort: 00changelog.i: file cursor at position 128, expected 64
114 And no corruption in the changelog.
114 And no corruption in the changelog.
115 $ hg debugrevlogindex -c
115 $ hg debugrevlogindex -c
116 rev linkrev nodeid p1 p2
116 rev linkrev nodeid p1 p2
@@ -80,17 +80,19 b' relink'
80 $ hg relink --debug --config progress.debug=true | fix_path
80 $ hg relink --debug --config progress.debug=true | fix_path
81 relinking $TESTTMP/repo/.hg/store to $TESTTMP/clone/.hg/store
81 relinking $TESTTMP/repo/.hg/store to $TESTTMP/clone/.hg/store
82 tip has 2 files, estimated total number of files: 3
82 tip has 2 files, estimated total number of files: 3
83 collecting: 00changelog.i 1/3 files (33.33%)
83 collecting: 00changelog.d 1/3 files (33.33%)
84 collecting: 00manifest.i 2/3 files (66.67%)
84 collecting: 00changelog.i 2/3 files (66.67%)
85 collecting: a.i 3/3 files (100.00%)
85 collecting: 00manifest.i 3/3 files (100.00%)
86 collecting: b.i 4/3 files (133.33%)
86 collecting: a.i 4/3 files (133.33%)
87 collecting: dummy.i 5/3 files (166.67%)
87 collecting: b.i 5/3 files (166.67%)
88 collected 5 candidate storage files
88 collecting: dummy.i 6/3 files (200.00%)
89 collected 6 candidate storage files
90 not linkable: 00changelog.d
89 not linkable: 00changelog.i
91 not linkable: 00changelog.i
90 not linkable: 00manifest.i
92 not linkable: 00manifest.i
91 pruning: data/a.i 3/5 files (60.00%)
93 pruning: data/a.i 4/6 files (66.67%)
92 not linkable: data/b.i
94 not linkable: data/b.i
93 pruning: data/dummy.i 5/5 files (100.00%)
95 pruning: data/dummy.i 6/6 files (100.00%)
94 pruned down to 2 probably relinkable files
96 pruned down to 2 probably relinkable files
95 relinking: data/a.i 1/2 files (50.00%)
97 relinking: data/a.i 1/2 files (50.00%)
96 not linkable: data/dummy.i
98 not linkable: data/dummy.i
@@ -29,10 +29,12 b''
29
29
30 $ hgcloneshallow ssh://user@dummy/master shallow --noupdate
30 $ hgcloneshallow ssh://user@dummy/master shallow --noupdate
31 streaming all changes
31 streaming all changes
32 2 files to transfer, 776 bytes of data (no-zstd !)
32 3 files to transfer, 776 bytes of data (no-zstd !)
33 transferred 776 bytes in * seconds (*/sec) (glob) (no-zstd !)
33 transferred 776 bytes in * seconds (*/sec) (glob) (no-zstd !)
34 2 files to transfer, 784 bytes of data (zstd !)
34 3 files to transfer, 784 bytes of data (zstd no-rust !)
35 transferred 784 bytes in * seconds (* */sec) (glob) (zstd !)
35 transferred 784 bytes in * seconds (*/sec) (glob) (zstd no-rust !)
36 5 files to transfer, 910 bytes of data (rust !)
37 transferred 910 bytes in * seconds (*/sec) (glob) (rust !)
36 searching for changes
38 searching for changes
37 no changes found
39 no changes found
38
40
@@ -20,8 +20,10 b''
20
20
21 $ hgcloneshallow ssh://user@dummy/master shallow --noupdate
21 $ hgcloneshallow ssh://user@dummy/master shallow --noupdate
22 streaming all changes
22 streaming all changes
23 4 files to transfer, 449 bytes of data
23 5 files to transfer, 449 bytes of data (no-rust !)
24 transferred 449 bytes in * seconds (*/sec) (glob)
24 transferred 449 bytes in * seconds (*/sec) (glob) (no-rust !)
25 7 files to transfer, 575 bytes of data (rust !)
26 transferred 575 bytes in *.* seconds (*) (glob) (rust !)
25 searching for changes
27 searching for changes
26 no changes found
28 no changes found
27 $ cd shallow
29 $ cd shallow
@@ -65,8 +67,10 b''
65
67
66 $ hgcloneshallow ssh://user@dummy/shallow shallow2 --noupdate
68 $ hgcloneshallow ssh://user@dummy/shallow shallow2 --noupdate
67 streaming all changes
69 streaming all changes
68 5 files to transfer, 1008 bytes of data
70 6 files to transfer, 1008 bytes of data (no-rust !)
69 transferred 1008 bytes in * seconds (*/sec) (glob)
71 transferred 1008 bytes in * seconds (*/sec) (glob) (no-rust !)
72 8 files to transfer, 1.11 KB of data (rust !)
73 transferred 1.11 KB in * seconds (* */sec) (glob) (rust !)
70 searching for changes
74 searching for changes
71 no changes found
75 no changes found
72 $ cd shallow2
76 $ cd shallow2
@@ -17,8 +17,10 b''
17
17
18 $ hgcloneshallow ssh://user@dummy/master shallow --noupdate
18 $ hgcloneshallow ssh://user@dummy/master shallow --noupdate
19 streaming all changes
19 streaming all changes
20 2 files to transfer, 227 bytes of data
20 3 files to transfer, 227 bytes of data (no-rust !)
21 transferred 227 bytes in * seconds (*/sec) (glob)
21 transferred 227 bytes in * seconds (*/sec) (glob) (no-rust !)
22 5 files to transfer, 353 bytes of data (rust !)
23 transferred 353 bytes in *.* seconds (*) (glob) (rust !)
22 searching for changes
24 searching for changes
23 no changes found
25 no changes found
24 $ cd shallow
26 $ cd shallow
@@ -55,8 +57,10 b''
55
57
56 $ hgcloneshallow ssh://user@dummy/shallow shallow2 --noupdate
58 $ hgcloneshallow ssh://user@dummy/shallow shallow2 --noupdate
57 streaming all changes
59 streaming all changes
58 3 files to transfer, 564 bytes of data
60 4 files to transfer, 564 bytes of data (no-rust !)
59 transferred 564 bytes in * seconds (*/sec) (glob)
61 transferred 564 bytes in * seconds (*/sec) (glob) (no-rust !)
62 6 files to transfer, 690 bytes of data (rust !)
63 transferred 690 bytes in * seconds (*/sec) (glob) (rust !)
60 searching for changes
64 searching for changes
61 no changes found
65 no changes found
62 $ cd shallow2
66 $ cd shallow2
@@ -20,8 +20,10 b' Shallow clone from full'
20
20
21 $ hgcloneshallow ssh://user@dummy/master shallow --noupdate
21 $ hgcloneshallow ssh://user@dummy/master shallow --noupdate
22 streaming all changes
22 streaming all changes
23 2 files to transfer, 473 bytes of data
23 3 files to transfer, 473 bytes of data (no-rust !)
24 transferred 473 bytes in * seconds (*/sec) (glob)
24 transferred 473 bytes in * seconds (*/sec) (glob) (no-rust !)
25 5 files to transfer, 599 bytes of data (rust !)
26 transferred 599 bytes in * seconds (*/sec) (glob) (rust !)
25 searching for changes
27 searching for changes
26 no changes found
28 no changes found
27 $ cd shallow
29 $ cd shallow
@@ -18,10 +18,12 b''
18
18
19 $ hg clone --shallow ssh://user@dummy/master shallow --noupdate --config remotefilelog.includepattern=foo
19 $ hg clone --shallow ssh://user@dummy/master shallow --noupdate --config remotefilelog.includepattern=foo
20 streaming all changes
20 streaming all changes
21 3 files to transfer, 336 bytes of data (no-zstd !)
21 4 files to transfer, 336 bytes of data (no-zstd !)
22 transferred 336 bytes in * seconds (* */sec) (glob) (no-zstd !)
22 transferred 336 bytes in * seconds (* */sec) (glob) (no-zstd !)
23 3 files to transfer, 338 bytes of data (zstd !)
23 4 files to transfer, 338 bytes of data (zstd no-rust !)
24 transferred 338 bytes in * seconds (* */sec) (glob) (zstd !)
24 transferred 338 bytes in * seconds (* */sec) (glob) (zstd no-rust !)
25 6 files to transfer, 464 bytes of data (zstd rust !)
26 transferred 464 bytes in * seconds (*/sec) (glob) (zstd rust !)
25 searching for changes
27 searching for changes
26 no changes found
28 no changes found
27 $ cat >> shallow/.hg/hgrc <<EOF
29 $ cat >> shallow/.hg/hgrc <<EOF
@@ -22,10 +22,12 b''
22
22
23 $ hgcloneshallow ssh://user@dummy/master shallow --noupdate
23 $ hgcloneshallow ssh://user@dummy/master shallow --noupdate
24 streaming all changes
24 streaming all changes
25 2 files to transfer, 528 bytes of data (no-zstd !)
25 3 files to transfer, 528 bytes of data (no-zstd !)
26 transferred 528 bytes in * seconds (* */sec) (glob) (no-zstd !)
26 transferred 528 bytes in * seconds (* */sec) (glob) (no-zstd !)
27 2 files to transfer, 532 bytes of data (zstd !)
27 3 files to transfer, 532 bytes of data (zstd no-rust !)
28 transferred 532 bytes in * seconds (* */sec) (glob) (zstd !)
28 transferred 532 bytes in * seconds (* */sec) (glob) (zstd no-rust !)
29 5 files to transfer, 658 bytes of data (zstd rust !)
30 transferred 658 bytes in * seconds (*/sec) (glob) (zstd rust !)
29 searching for changes
31 searching for changes
30 no changes found
32 no changes found
31 $ cd shallow
33 $ cd shallow
@@ -166,10 +168,12 b''
166
168
167 $ hgcloneshallow ssh://user@dummy/master shallow2
169 $ hgcloneshallow ssh://user@dummy/master shallow2
168 streaming all changes
170 streaming all changes
169 2 files to transfer, 528 bytes of data (no-zstd !)
171 3 files to transfer, 528 bytes of data (no-zstd !)
170 transferred 528 bytes in * seconds * (glob) (no-zstd !)
172 transferred 528 bytes in * seconds * (glob) (no-zstd !)
171 2 files to transfer, 532 bytes of data (zstd !)
173 3 files to transfer, 532 bytes of data (zstd no-rust !)
172 transferred 532 bytes in * seconds (* */sec) (glob) (zstd !)
174 transferred 532 bytes in * seconds (* */sec) (glob) (zstd no-rust !)
175 5 files to transfer, 658 bytes of data (zstd rust !)
176 transferred 658 bytes in * seconds (*/sec) (glob) (zstd rust !)
173 searching for changes
177 searching for changes
174 no changes found
178 no changes found
175 updating to branch default
179 updating to branch default
@@ -22,10 +22,12 b''
22
22
23 $ hgcloneshallow ssh://user@dummy/master shallow --noupdate
23 $ hgcloneshallow ssh://user@dummy/master shallow --noupdate
24 streaming all changes
24 streaming all changes
25 2 files to transfer, 527 bytes of data (no-zstd !)
25 3 files to transfer, 527 bytes of data (no-zstd !)
26 transferred 527 bytes in * seconds (* */sec) (glob) (no-zstd !)
26 transferred 527 bytes in * seconds (* */sec) (glob) (no-zstd !)
27 2 files to transfer, 534 bytes of data (zstd !)
27 3 files to transfer, 534 bytes of data (zstd no-rust !)
28 transferred 534 bytes in * seconds (* */sec) (glob) (zstd !)
28 transferred 534 bytes in * seconds (* */sec) (glob) (zstd no-rust !)
29 5 files to transfer, 660 bytes of data (zstd rust !)
30 transferred 660 bytes in * seconds (*/sec) (glob) (zstd rust !)
29 searching for changes
31 searching for changes
30 no changes found
32 no changes found
31 $ cd shallow
33 $ cd shallow
@@ -75,10 +77,12 b''
75
77
76 $ hgcloneshallow ssh://user@dummy/master shallow2
78 $ hgcloneshallow ssh://user@dummy/master shallow2
77 streaming all changes
79 streaming all changes
78 2 files to transfer, 527 bytes of data (no-zstd !)
80 3 files to transfer, 527 bytes of data (no-zstd !)
79 transferred 527 bytes in * seconds (*) (glob) (no-zstd !)
81 transferred 527 bytes in * seconds (*) (glob) (no-zstd !)
80 2 files to transfer, 534 bytes of data (zstd !)
82 3 files to transfer, 534 bytes of data (zstd no-rust !)
81 transferred 534 bytes in * seconds (* */sec) (glob) (zstd !)
83 transferred 534 bytes in * seconds (* */sec) (glob) (zstd no-rust !)
84 5 files to transfer, 660 bytes of data (zstd rust !)
85 transferred 660 bytes in * seconds (*/sec) (glob) (zstd rust !)
82 searching for changes
86 searching for changes
83 no changes found
87 no changes found
84 updating to branch default
88 updating to branch default
@@ -18,10 +18,12 b''
18
18
19 $ hg clone --shallow ssh://user@dummy/master shallow --noupdate --config remotefilelog.excludepattern=.hgtags
19 $ hg clone --shallow ssh://user@dummy/master shallow --noupdate --config remotefilelog.excludepattern=.hgtags
20 streaming all changes
20 streaming all changes
21 3 files to transfer, 662 bytes of data (no-zstd !)
21 4 files to transfer, 662 bytes of data (no-zstd !)
22 transferred 662 bytes in * seconds (* */sec) (glob) (no-zstd !)
22 transferred 662 bytes in * seconds (* */sec) (glob) (no-zstd !)
23 3 files to transfer, 665 bytes of data (zstd !)
23 4 files to transfer, 665 bytes of data (zstd no-rust !)
24 transferred 665 bytes in * seconds (* */sec) (glob) (zstd !)
24 transferred 665 bytes in * seconds (* */sec) (glob) (zstd no-rust !)
25 6 files to transfer, 791 bytes of data (zstd rust !)
26 transferred 791 bytes in * seconds (*/sec) (glob) (zstd rust !)
25 searching for changes
27 searching for changes
26 no changes found
28 no changes found
27 $ cat >> shallow/.hg/hgrc <<EOF
29 $ cat >> shallow/.hg/hgrc <<EOF
@@ -25,8 +25,10 b' Shallow clone and activate getflogheads '
25
25
26 $ hgcloneshallow ssh://user@dummy/master shallow --noupdate
26 $ hgcloneshallow ssh://user@dummy/master shallow --noupdate
27 streaming all changes
27 streaming all changes
28 2 files to transfer, 908 bytes of data
28 3 files to transfer, 908 bytes of data (no-rust !)
29 transferred 908 bytes in * seconds (*/sec) (glob)
29 transferred 908 bytes in * seconds (*/sec) (glob) (no-rust !)
30 5 files to transfer, 1.01 KB of data (rust !)
31 transferred 1.01 KB in * seconds (* */sec) (glob) (rust !)
30 searching for changes
32 searching for changes
31 no changes found
33 no changes found
32 $ cd shallow
34 $ cd shallow
@@ -71,6 +71,7 b''
71 2 warnings encountered!
71 2 warnings encountered!
72 2 integrity errors encountered!
72 2 integrity errors encountered!
73 % journal contents
73 % journal contents
74 00changelog.d
74 00changelog.i
75 00changelog.i
75 00manifest.i
76 00manifest.i
76 data/b.i
77 data/b.i
@@ -133,6 +134,7 b''
133 7 integrity errors encountered!
134 7 integrity errors encountered!
134 (first damaged changeset appears to be 3)
135 (first damaged changeset appears to be 3)
135 % journal contents
136 % journal contents
137 00changelog.d
136 00changelog.i
138 00changelog.i
137 00manifest.i
139 00manifest.i
138 data/b.i
140 data/b.i
@@ -10,10 +10,10 b' create verbosemmap.py'
10 > )
10 > )
11 >
11 >
12 > def extsetup(ui):
12 > def extsetup(ui):
13 > def mmapread(orig, fp):
13 > def mmapread(orig, fp, *args):
14 > ui.write(b"mmapping %s\n" % pycompat.bytestr(fp.name))
14 > ui.write(b"mmapping %s\n" % pycompat.bytestr(fp.name))
15 > ui.flush()
15 > ui.flush()
16 > return orig(fp)
16 > return orig(fp, *args)
17 >
17 >
18 > extensions.wrapfunction(util, 'mmapread', mmapread)
18 > extensions.wrapfunction(util, 'mmapread', mmapread)
19 > EOF
19 > EOF
@@ -38,6 +38,7 b' set up verbosemmap extension'
38 mmap index which is now more than 4k long
38 mmap index which is now more than 4k long
39 $ hg log -l 5 -T '{rev}\n' --config experimental.mmapindexthreshold=4k
39 $ hg log -l 5 -T '{rev}\n' --config experimental.mmapindexthreshold=4k
40 mmapping $TESTTMP/a/.hg/store/00changelog.i
40 mmapping $TESTTMP/a/.hg/store/00changelog.i
41 mmapping $TESTTMP/a/.hg/store/00changelog-????????.nd (glob) (rust !)
41 100
42 100
42 99
43 99
43 98
44 98
@@ -46,6 +47,7 b' mmap index which is now more than 4k lon'
46
47
47 do not mmap index which is still less than 32k
48 do not mmap index which is still less than 32k
48 $ hg log -l 5 -T '{rev}\n' --config experimental.mmapindexthreshold=32k
49 $ hg log -l 5 -T '{rev}\n' --config experimental.mmapindexthreshold=32k
50 mmapping $TESTTMP/a/.hg/store/00changelog-????????.nd (glob) (rust !)
49 100
51 100
50 99
52 99
51 98
53 98
@@ -62,10 +62,12 b' clone remote via stream'
62
62
63 $ hg clone --stream ssh://user@dummy/remote local-stream
63 $ hg clone --stream ssh://user@dummy/remote local-stream
64 streaming all changes
64 streaming all changes
65 4 files to transfer, 602 bytes of data (no-zstd !)
65 5 files to transfer, 602 bytes of data (no-zstd !)
66 transferred 602 bytes in * seconds (*) (glob) (no-zstd !)
66 transferred 602 bytes in * seconds (*) (glob) (no-zstd !)
67 4 files to transfer, 621 bytes of data (zstd !)
67 5 files to transfer, 621 bytes of data (zstd no-rust !)
68 transferred 621 bytes in * seconds (* */sec) (glob) (zstd !)
68 transferred 621 bytes in * seconds (* */sec) (glob) (zstd no-rust !)
69 7 files to transfer, 747 bytes of data (zstd rust !)
70 transferred 747 bytes in * seconds (*/sec) (glob) (zstd rust !)
69 searching for changes
71 searching for changes
70 no changes found
72 no changes found
71 updating to branch default
73 updating to branch default
@@ -81,10 +83,12 b' clone bookmarks via stream'
81 $ hg -R local-stream book mybook
83 $ hg -R local-stream book mybook
82 $ hg clone --stream ssh://user@dummy/local-stream stream2
84 $ hg clone --stream ssh://user@dummy/local-stream stream2
83 streaming all changes
85 streaming all changes
84 4 files to transfer, 602 bytes of data (no-zstd !)
86 5 files to transfer, 602 bytes of data (no-zstd !)
85 transferred 602 bytes in * seconds (*) (glob) (no-zstd !)
87 transferred 602 bytes in * seconds (*) (glob) (no-zstd !)
86 4 files to transfer, 621 bytes of data (zstd !)
88 5 files to transfer, 621 bytes of data (zstd no-rust !)
87 transferred 621 bytes in * seconds (* */sec) (glob) (zstd !)
89 transferred 621 bytes in * seconds (* */sec) (glob) (zstd no-rust !)
90 7 files to transfer, 747 bytes of data (zstd rust !)
91 transferred 747 bytes in * seconds (*/sec) (glob) (zstd rust !)
88 searching for changes
92 searching for changes
89 no changes found
93 no changes found
90 updating to branch default
94 updating to branch default
@@ -54,9 +54,10 b' clone remote via stream'
54
54
55 $ hg clone --stream ssh://user@dummy/remote local-stream
55 $ hg clone --stream ssh://user@dummy/remote local-stream
56 streaming all changes
56 streaming all changes
57 8 files to transfer, 827 bytes of data (no-zstd !)
57 9 files to transfer, 827 bytes of data (no-zstd !)
58 transferred 827 bytes in * seconds (*) (glob) (no-zstd !)
58 transferred 827 bytes in * seconds (*) (glob) (no-zstd !)
59 8 files to transfer, 846 bytes of data (zstd !)
59 9 files to transfer, 846 bytes of data (zstd no-rust !)
60 11 files to transfer, 972 bytes of data (zstd rust !)
60 transferred * bytes in * seconds (* */sec) (glob) (zstd !)
61 transferred * bytes in * seconds (* */sec) (glob) (zstd !)
61 updating to branch default
62 updating to branch default
62 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
63 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -71,7 +72,8 b' clone bookmarks via stream'
71 $ hg -R local-stream book mybook
72 $ hg -R local-stream book mybook
72 $ hg clone --stream ssh://user@dummy/local-stream stream2
73 $ hg clone --stream ssh://user@dummy/local-stream stream2
73 streaming all changes
74 streaming all changes
74 15 files to transfer, * of data (glob)
75 16 files to transfer, * of data (glob) (no-rust !)
76 18 files to transfer, * of data (glob) (rust !)
75 transferred * in * seconds (*) (glob)
77 transferred * in * seconds (*) (glob)
76 updating to branch default
78 updating to branch default
77 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
79 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -225,6 +225,7 b' List of files accessed over HTTP:'
225 /.hg/cache/hgtagsfnodes1
225 /.hg/cache/hgtagsfnodes1
226 /.hg/dirstate
226 /.hg/dirstate
227 /.hg/requires
227 /.hg/requires
228 /.hg/store/00changelog.d
228 /.hg/store/00changelog.i
229 /.hg/store/00changelog.i
229 /.hg/store/00manifest.i
230 /.hg/store/00manifest.i
230 /.hg/store/data/%7E2ehgsub.i (no-py37 !)
231 /.hg/store/data/%7E2ehgsub.i (no-py37 !)
@@ -252,6 +253,7 b' List of files accessed over HTTP:'
252 /remote-with-names/.hg/dirstate
253 /remote-with-names/.hg/dirstate
253 /remote-with-names/.hg/localtags
254 /remote-with-names/.hg/localtags
254 /remote-with-names/.hg/requires
255 /remote-with-names/.hg/requires
256 /remote-with-names/.hg/store/00changelog.d
255 /remote-with-names/.hg/store/00changelog.i
257 /remote-with-names/.hg/store/00changelog.i
256 /remote-with-names/.hg/store/00manifest.i
258 /remote-with-names/.hg/store/00manifest.i
257 /remote-with-names/.hg/store/data/%7E2ehgtags.i (no-py37 !)
259 /remote-with-names/.hg/store/data/%7E2ehgtags.i (no-py37 !)
@@ -270,6 +272,7 b' List of files accessed over HTTP:'
270 /remote/.hg/dirstate
272 /remote/.hg/dirstate
271 /remote/.hg/localtags
273 /remote/.hg/localtags
272 /remote/.hg/requires
274 /remote/.hg/requires
275 /remote/.hg/store/00changelog.d
273 /remote/.hg/store/00changelog.i
276 /remote/.hg/store/00changelog.i
274 /remote/.hg/store/00manifest.i
277 /remote/.hg/store/00manifest.i
275 /remote/.hg/store/data/%7E2edotfile%20with%20spaces.i (no-py37 !)
278 /remote/.hg/store/data/%7E2edotfile%20with%20spaces.i (no-py37 !)
@@ -292,6 +295,7 b' List of files accessed over HTTP:'
292 /sub/.hg/cache/hgtagsfnodes1
295 /sub/.hg/cache/hgtagsfnodes1
293 /sub/.hg/dirstate
296 /sub/.hg/dirstate
294 /sub/.hg/requires
297 /sub/.hg/requires
298 /sub/.hg/store/00changelog.d
295 /sub/.hg/store/00changelog.i
299 /sub/.hg/store/00changelog.i
296 /sub/.hg/store/00manifest.i
300 /sub/.hg/store/00manifest.i
297 /sub/.hg/store/data/%7E2ehgtags.i (no-py37 !)
301 /sub/.hg/store/data/%7E2ehgtags.i (no-py37 !)
@@ -60,9 +60,9 b' The extension requires a repo (currently'
60 $ hg bundle -a --type="none-v2;stream=$stream_version" bundle.hg
60 $ hg bundle -a --type="none-v2;stream=$stream_version" bundle.hg
61 $ hg debugbundle bundle.hg
61 $ hg debugbundle bundle.hg
62 Stream params: {}
62 Stream params: {}
63 stream2 -- {bytecount: 1693, filecount: 11, requirements: generaldelta%2Crevlogv1%2Csparserevlog} (mandatory: True) (stream-v2 no-zstd !)
63 stream2 -- {bytecount: 1693, filecount: 12, requirements: generaldelta%2Crevlogv1%2Csparserevlog} (mandatory: True) (stream-v2 no-zstd !)
64 stream2 -- {bytecount: 1693, filecount: 11, requirements: generaldelta%2Crevlog-compression-zstd%2Crevlogv1%2Csparserevlog} (mandatory: True) (stream-v2 zstd no-rust !)
64 stream2 -- {bytecount: 1693, filecount: 12, requirements: generaldelta%2Crevlog-compression-zstd%2Crevlogv1%2Csparserevlog} (mandatory: True) (stream-v2 zstd no-rust !)
65 stream2 -- {bytecount: 1693, filecount: 11, requirements: generaldelta%2Crevlog-compression-zstd%2Crevlogv1%2Csparserevlog} (mandatory: True) (stream-v2 rust !)
65 stream2 -- {bytecount: 1819, filecount: 14, requirements: generaldelta%2Crevlog-compression-zstd%2Crevlogv1%2Csparserevlog} (mandatory: True) (stream-v2 rust !)
66 stream3-exp -- {requirements: generaldelta%2Crevlogv1%2Csparserevlog} (mandatory: True) (stream-v3 no-zstd !)
66 stream3-exp -- {requirements: generaldelta%2Crevlogv1%2Csparserevlog} (mandatory: True) (stream-v3 no-zstd !)
67 stream3-exp -- {requirements: generaldelta%2Crevlog-compression-zstd%2Crevlogv1%2Csparserevlog} (mandatory: True) (stream-v3 zstd no-rust !)
67 stream3-exp -- {requirements: generaldelta%2Crevlog-compression-zstd%2Crevlogv1%2Csparserevlog} (mandatory: True) (stream-v3 zstd no-rust !)
68 stream3-exp -- {requirements: generaldelta%2Crevlog-compression-zstd%2Crevlogv1%2Csparserevlog} (mandatory: True) (stream-v3 rust !)
68 stream3-exp -- {requirements: generaldelta%2Crevlog-compression-zstd%2Crevlogv1%2Csparserevlog} (mandatory: True) (stream-v3 rust !)
@@ -97,7 +97,8 b' Test that we can apply the bundle as a s'
97 bundle2-input-bundle: with-transaction
97 bundle2-input-bundle: with-transaction
98 bundle2-input-part: "stream2" (params: 3 mandatory) supported
98 bundle2-input-part: "stream2" (params: 3 mandatory) supported
99 applying stream bundle
99 applying stream bundle
100 11 files to transfer, 1.65 KB of data
100 12 files to transfer, 1.65 KB of data (no-rust !)
101 14 files to transfer, 1.78 KB of data (rust !)
101 starting 4 threads for background file closing (?)
102 starting 4 threads for background file closing (?)
102 starting 4 threads for background file closing (?)
103 starting 4 threads for background file closing (?)
103 adding [s] data/A.i (66 bytes)
104 adding [s] data/A.i (66 bytes)
@@ -107,12 +108,17 b' Test that we can apply the bundle as a s'
107 adding [s] data/E.i (66 bytes)
108 adding [s] data/E.i (66 bytes)
108 adding [s] phaseroots (43 bytes)
109 adding [s] phaseroots (43 bytes)
109 adding [s] 00manifest.i (584 bytes)
110 adding [s] 00manifest.i (584 bytes)
110 adding [s] 00changelog.i (595 bytes)
111 adding [s] 00changelog.n (62 bytes) (rust !)
112 adding [s] 00changelog-b875dfc5.nd (64 bytes) (rust !)
113 adding [s] 00changelog.d (275 bytes)
114 adding [s] 00changelog.i (320 bytes)
111 adding [c] branch2-served (94 bytes)
115 adding [c] branch2-served (94 bytes)
112 adding [c] rbc-names-v1 (7 bytes)
116 adding [c] rbc-names-v1 (7 bytes)
113 adding [c] rbc-revs-v1 (40 bytes)
117 adding [c] rbc-revs-v1 (40 bytes)
114 transferred 1.65 KB in * seconds (* */sec) (glob)
118 transferred 1.65 KB in * seconds (* */sec) (glob) (no-rust !)
115 bundle2-input-part: total payload size 1840
119 bundle2-input-part: total payload size 1857 (no-rust !)
120 transferred 1.78 KB in * seconds (* */sec) (glob) (rust !)
121 bundle2-input-part: total payload size 2025 (rust !)
116 bundle2-input-bundle: 1 parts total
122 bundle2-input-bundle: 1 parts total
117 updating the branch cache
123 updating the branch cache
118 finished applying clone bundle
124 finished applying clone bundle
@@ -154,7 +160,8 b' Test that we can apply the bundle as a s'
154 bundle2-input-bundle: with-transaction
160 bundle2-input-bundle: with-transaction
155 bundle2-input-part: "stream2" (params: 3 mandatory) supported
161 bundle2-input-part: "stream2" (params: 3 mandatory) supported
156 applying stream bundle
162 applying stream bundle
157 11 files to transfer, 1.65 KB of data
163 12 files to transfer, 1.65 KB of data (no-rust !)
164 14 files to transfer, 1.78 KB of data (rust !)
158 starting 4 threads for background file closing (?)
165 starting 4 threads for background file closing (?)
159 starting 4 threads for background file closing (?)
166 starting 4 threads for background file closing (?)
160 adding [s] data/A.i (66 bytes)
167 adding [s] data/A.i (66 bytes)
@@ -164,12 +171,17 b' Test that we can apply the bundle as a s'
164 adding [s] data/E.i (66 bytes)
171 adding [s] data/E.i (66 bytes)
165 adding [s] phaseroots (43 bytes)
172 adding [s] phaseroots (43 bytes)
166 adding [s] 00manifest.i (584 bytes)
173 adding [s] 00manifest.i (584 bytes)
167 adding [s] 00changelog.i (595 bytes)
174 adding [s] 00changelog.n (62 bytes) (rust !)
175 adding [s] 00changelog-b875dfc5.nd (64 bytes) (rust !)
176 adding [s] 00changelog.d (275 bytes)
177 adding [s] 00changelog.i (320 bytes)
168 adding [c] branch2-served (94 bytes)
178 adding [c] branch2-served (94 bytes)
169 adding [c] rbc-names-v1 (7 bytes)
179 adding [c] rbc-names-v1 (7 bytes)
170 adding [c] rbc-revs-v1 (40 bytes)
180 adding [c] rbc-revs-v1 (40 bytes)
171 transferred 1.65 KB in * seconds (* */sec) (glob)
181 transferred 1.65 KB in * seconds (* */sec) (glob) (no-rust !)
172 bundle2-input-part: total payload size 1840
182 bundle2-input-part: total payload size 1857 (no-rust !)
183 transferred 1.78 KB in * seconds (* */sec) (glob) (rust !)
184 bundle2-input-part: total payload size 2025 (rust !)
173 bundle2-input-bundle: 1 parts total
185 bundle2-input-bundle: 1 parts total
174 updating the branch cache
186 updating the branch cache
175 finished applying clone bundle
187 finished applying clone bundle
@@ -224,12 +236,17 b' Test that we can apply the bundle as a s'
224 adding [s] data/E.i (66 bytes)
236 adding [s] data/E.i (66 bytes)
225 adding [s] phaseroots (43 bytes)
237 adding [s] phaseroots (43 bytes)
226 adding [s] 00manifest.i (584 bytes)
238 adding [s] 00manifest.i (584 bytes)
227 adding [s] 00changelog.i (595 bytes)
239 adding [s] 00changelog.n (62 bytes) (rust !)
240 adding [s] 00changelog-b875dfc5.nd (64 bytes) (rust !)
241 adding [s] 00changelog.d (275 bytes)
242 adding [s] 00changelog.i (320 bytes)
228 adding [c] branch2-served (94 bytes)
243 adding [c] branch2-served (94 bytes)
229 adding [c] rbc-names-v1 (7 bytes)
244 adding [c] rbc-names-v1 (7 bytes)
230 adding [c] rbc-revs-v1 (40 bytes)
245 adding [c] rbc-revs-v1 (40 bytes)
231 transferred 1.65 KB in * seconds (* */sec) (glob)
246 transferred 1.65 KB in * seconds (* */sec) (glob) (no-rust !)
232 bundle2-input-part: total payload size 1852
247 bundle2-input-part: total payload size 1869 (no-rust !)
248 transferred 1.78 KB in * seconds (* */sec) (glob) (rust !)
249 bundle2-input-part: total payload size 2037 (rust !)
233 bundle2-input-bundle: 1 parts total
250 bundle2-input-bundle: 1 parts total
234 updating the branch cache
251 updating the branch cache
235 finished applying clone bundle
252 finished applying clone bundle
@@ -281,12 +298,17 b' Test that we can apply the bundle as a s'
281 adding [s] data/E.i (66 bytes)
298 adding [s] data/E.i (66 bytes)
282 adding [s] phaseroots (43 bytes)
299 adding [s] phaseroots (43 bytes)
283 adding [s] 00manifest.i (584 bytes)
300 adding [s] 00manifest.i (584 bytes)
284 adding [s] 00changelog.i (595 bytes)
301 adding [s] 00changelog.n (62 bytes) (rust !)
302 adding [s] 00changelog-b875dfc5.nd (64 bytes) (rust !)
303 adding [s] 00changelog.d (275 bytes)
304 adding [s] 00changelog.i (320 bytes)
285 adding [c] branch2-served (94 bytes)
305 adding [c] branch2-served (94 bytes)
286 adding [c] rbc-names-v1 (7 bytes)
306 adding [c] rbc-names-v1 (7 bytes)
287 adding [c] rbc-revs-v1 (40 bytes)
307 adding [c] rbc-revs-v1 (40 bytes)
288 transferred 1.65 KB in * seconds (* */sec) (glob)
308 transferred 1.65 KB in * seconds (* */sec) (glob) (no-rust !)
289 bundle2-input-part: total payload size 1852
309 bundle2-input-part: total payload size 1869 (no-rust !)
310 transferred 1.78 KB in * seconds (* */sec) (glob) (rust !)
311 bundle2-input-part: total payload size 2037 (rust !)
290 bundle2-input-bundle: 1 parts total
312 bundle2-input-bundle: 1 parts total
291 updating the branch cache
313 updating the branch cache
292 finished applying clone bundle
314 finished applying clone bundle
@@ -28,12 +28,22 b" Preparing the 'sub1' repo which depends "
28 $ echo "sub2 = ../sub2" > sub1/.hgsub
28 $ echo "sub2 = ../sub2" > sub1/.hgsub
29 $ hg clone sub2 sub1/sub2
29 $ hg clone sub2 sub1/sub2
30 \r (no-eol) (esc)
30 \r (no-eol) (esc)
31 linking [======> ] 1/6\r (no-eol) (esc)
31 linking [=====> ] 1/7\r (no-eol) (esc) (no-rust !)
32 linking [==============> ] 2/6\r (no-eol) (esc)
32 linking [===========> ] 2/7\r (no-eol) (esc) (no-rust !)
33 linking [=====================> ] 3/6\r (no-eol) (esc)
33 linking [==================> ] 3/7\r (no-eol) (esc) (no-rust !)
34 linking [=============================> ] 4/6\r (no-eol) (esc)
34 linking [========================> ] 4/7\r (no-eol) (esc) (no-rust !)
35 linking [====================================> ] 5/6\r (no-eol) (esc)
35 linking [===============================> ] 5/7\r (no-eol) (esc) (no-rust !)
36 linking [============================================>] 6/6\r (no-eol) (esc)
36 linking [=====================================> ] 6/7\r (no-eol) (esc) (no-rust !)
37 linking [============================================>] 7/7\r (no-eol) (esc) (no-rust !)
38 linking [====> ] 1/9\r (no-eol) (esc) (rust !)
39 linking [=========> ] 2/9\r (no-eol) (esc) (rust !)
40 linking [==============> ] 3/9\r (no-eol) (esc) (rust !)
41 linking [===================> ] 4/9\r (no-eol) (esc) (rust !)
42 linking [========================> ] 5/9\r (no-eol) (esc) (rust !)
43 linking [=============================> ] 6/9\r (no-eol) (esc) (rust !)
44 linking [==================================> ] 7/9\r (no-eol) (esc) (rust !)
45 linking [=======================================> ] 8/9\r (no-eol) (esc) (rust !)
46 linking [============================================>] 9/9\r (no-eol) (esc) (rust !)
37 \r (no-eol) (esc)
47 \r (no-eol) (esc)
38 \r (no-eol) (esc)
48 \r (no-eol) (esc)
39 updating [===========================================>] 1/1\r (no-eol) (esc)
49 updating [===========================================>] 1/1\r (no-eol) (esc)
@@ -50,32 +60,70 b" Preparing the 'main' repo which depends "
50 $ hg init main
60 $ hg init main
51 $ echo main > main/main
61 $ echo main > main/main
52 $ echo "sub1 = ../sub1" > main/.hgsub
62 $ echo "sub1 = ../sub1" > main/.hgsub
63
64 #if rust
53 $ hg clone sub1 main/sub1
65 $ hg clone sub1 main/sub1
54 \r (no-eol) (esc)
66 \r (no-eol) (esc)
55 linking [====> ] 1/8\r (no-eol) (esc)
67 linking [==> ] 1/11\r (no-eol) (esc)
56 linking [==========> ] 2/8\r (no-eol) (esc)
68 linking [======> ] 2/11\r (no-eol) (esc)
57 linking [===============> ] 3/8\r (no-eol) (esc)
69 linking [==========> ] 3/11\r (no-eol) (esc)
58 linking [=====================> ] 4/8\r (no-eol) (esc)
70 linking [==============> ] 4/11\r (no-eol) (esc)
59 linking [===========================> ] 5/8\r (no-eol) (esc)
71 linking [==================> ] 5/11\r (no-eol) (esc)
60 linking [================================> ] 6/8\r (no-eol) (esc)
72 linking [======================> ] 6/11\r (no-eol) (esc)
61 linking [======================================> ] 7/8\r (no-eol) (esc)
73 linking [==========================> ] 7/11\r (no-eol) (esc)
62 linking [============================================>] 8/8\r (no-eol) (esc)
74 linking [==============================> ] 8/11\r (no-eol) (esc)
75 linking [==================================> ] 9/11\r (no-eol) (esc)
76 linking [======================================> ] 10/11\r (no-eol) (esc)
77 linking [==========================================>] 11/11\r (no-eol) (esc)
63 \r (no-eol) (esc)
78 \r (no-eol) (esc)
64 \r (no-eol) (esc)
79 \r (no-eol) (esc)
65 updating [===========================================>] 3/3\r (no-eol) (esc)
80 updating [===========================================>] 3/3\r (no-eol) (esc)
66 \r (no-eol) (esc)
81 \r (no-eol) (esc)
67 \r (no-eol) (esc)
82 \r (no-eol) (esc)
68 linking [======> ] 1/6\r (no-eol) (esc)
83 linking [====> ] 1/9\r (no-eol) (esc)
69 linking [==============> ] 2/6\r (no-eol) (esc)
84 linking [=========> ] 2/9\r (no-eol) (esc)
70 linking [=====================> ] 3/6\r (no-eol) (esc)
85 linking [==============> ] 3/9\r (no-eol) (esc)
71 linking [=============================> ] 4/6\r (no-eol) (esc)
86 linking [===================> ] 4/9\r (no-eol) (esc)
72 linking [====================================> ] 5/6\r (no-eol) (esc)
87 linking [========================> ] 5/9\r (no-eol) (esc)
73 linking [============================================>] 6/6\r (no-eol) (esc)
88 linking [=============================> ] 6/9\r (no-eol) (esc)
89 linking [==================================> ] 7/9\r (no-eol) (esc)
90 linking [=======================================> ] 8/9\r (no-eol) (esc)
91 linking [============================================>] 9/9\r (no-eol) (esc)
74 updating [===========================================>] 1/1\r (no-eol) (esc)
92 updating [===========================================>] 1/1\r (no-eol) (esc)
75 \r (no-eol) (esc)
93 \r (no-eol) (esc)
76 updating to branch default
94 updating to branch default
77 cloning subrepo sub2 from $TESTTMP/sub2
95 cloning subrepo sub2 from $TESTTMP/sub2
78 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
96 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
97 #else
98 $ hg clone sub1 main/sub1
99 \r (no-eol) (esc)
100 linking [====> ] 1/9\r (no-eol) (esc)
101 linking [=========> ] 2/9\r (no-eol) (esc)
102 linking [==============> ] 3/9\r (no-eol) (esc)
103 linking [===================> ] 4/9\r (no-eol) (esc)
104 linking [========================> ] 5/9\r (no-eol) (esc)
105 linking [=============================> ] 6/9\r (no-eol) (esc)
106 linking [==================================> ] 7/9\r (no-eol) (esc)
107 linking [=======================================> ] 8/9\r (no-eol) (esc)
108 linking [============================================>] 9/9\r (no-eol) (esc)
109 \r (no-eol) (esc)
110 \r (no-eol) (esc)
111 updating [===========================================>] 3/3\r (no-eol) (esc)
112 \r (no-eol) (esc)
113 \r (no-eol) (esc)
114 linking [=====> ] 1/7\r (no-eol) (esc)
115 linking [===========> ] 2/7\r (no-eol) (esc)
116 linking [==================> ] 3/7\r (no-eol) (esc)
117 linking [========================> ] 4/7\r (no-eol) (esc)
118 linking [===============================> ] 5/7\r (no-eol) (esc)
119 linking [=====================================> ] 6/7\r (no-eol) (esc)
120 linking [============================================>] 7/7\r (no-eol) (esc)
121 updating [===========================================>] 1/1\r (no-eol) (esc)
122 \r (no-eol) (esc)
123 updating to branch default
124 cloning subrepo sub2 from $TESTTMP/sub2
125 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
126 #endif
79 $ hg add -R main
127 $ hg add -R main
80 adding main/.hgsub
128 adding main/.hgsub
81 adding main/main
129 adding main/main
@@ -152,44 +200,106 b' Cleaning both repositories, just as a cl'
152
200
153 Clone main
201 Clone main
154
202
203 #if rust
155 $ hg --config extensions.largefiles= clone main cloned
204 $ hg --config extensions.largefiles= clone main cloned
156 \r (no-eol) (esc)
205 \r (no-eol) (esc)
157 linking [====> ] 1/8\r (no-eol) (esc)
206 linking [====> ] 1/9\r (no-eol) (esc) (no-rust !)
158 linking [==========> ] 2/8\r (no-eol) (esc)
207 linking [=========> ] 2/9\r (no-eol) (esc) (no-rust !)
159 linking [===============> ] 3/8\r (no-eol) (esc)
208 linking [==============> ] 3/9\r (no-eol) (esc) (no-rust !)
160 linking [=====================> ] 4/8\r (no-eol) (esc)
209 linking [===================> ] 4/9\r (no-eol) (esc) (no-rust !)
161 linking [===========================> ] 5/8\r (no-eol) (esc)
210 linking [========================> ] 5/9\r (no-eol) (esc) (no-rust !)
162 linking [================================> ] 6/8\r (no-eol) (esc)
211 linking [=============================> ] 6/9\r (no-eol) (esc) (no-rust !)
163 linking [======================================> ] 7/8\r (no-eol) (esc)
212 linking [==================================> ] 7/9\r (no-eol) (esc) (no-rust !)
164 linking [============================================>] 8/8\r (no-eol) (esc)
213 linking [=======================================> ] 8/9\r (no-eol) (esc) (no-rust !)
214 linking [============================================>] 9/9\r (no-eol) (esc) (no-rust !)
215 linking [==> ] 1/11\r (no-eol) (esc) (rust !)
216 linking [======> ] 2/11\r (no-eol) (esc) (rust !)
217 linking [==========> ] 3/11\r (no-eol) (esc) (rust !)
218 linking [==============> ] 4/11\r (no-eol) (esc) (rust !)
219 linking [==================> ] 5/11\r (no-eol) (esc) (rust !)
220 linking [======================> ] 6/11\r (no-eol) (esc) (rust !)
221 linking [==========================> ] 7/11\r (no-eol) (esc) (rust !)
222 linking [==============================> ] 8/11\r (no-eol) (esc) (rust !)
223 linking [==================================> ] 9/11\r (no-eol) (esc) (rust !)
224 linking [======================================> ] 10/11\r (no-eol) (esc) (rust !)
225 linking [==========================================>] 11/11\r (no-eol) (esc) (rust !)
165 \r (no-eol) (esc)
226 \r (no-eol) (esc)
166 \r (no-eol) (esc)
227 \r (no-eol) (esc)
167 updating [===========================================>] 3/3\r (no-eol) (esc)
228 updating [===========================================>] 3/3\r (no-eol) (esc)
168 \r (no-eol) (esc)
229 \r (no-eol) (esc)
169 \r (no-eol) (esc)
230 \r (no-eol) (esc)
170 linking [====> ] 1/8\r (no-eol) (esc)
231 linking [==> ] 1/11\r (no-eol) (esc)
171 linking [==========> ] 2/8\r (no-eol) (esc)
232 linking [======> ] 2/11\r (no-eol) (esc)
172 linking [===============> ] 3/8\r (no-eol) (esc)
233 linking [==========> ] 3/11\r (no-eol) (esc)
173 linking [=====================> ] 4/8\r (no-eol) (esc)
234 linking [==============> ] 4/11\r (no-eol) (esc)
174 linking [===========================> ] 5/8\r (no-eol) (esc)
235 linking [==================> ] 5/11\r (no-eol) (esc)
175 linking [================================> ] 6/8\r (no-eol) (esc)
236 linking [======================> ] 6/11\r (no-eol) (esc)
176 linking [======================================> ] 7/8\r (no-eol) (esc)
237 linking [==========================> ] 7/11\r (no-eol) (esc)
177 linking [============================================>] 8/8\r (no-eol) (esc)
238 linking [==============================> ] 8/11\r (no-eol) (esc)
239 linking [==================================> ] 9/11\r (no-eol) (esc)
240 linking [======================================> ] 10/11\r (no-eol) (esc)
241 linking [==========================================>] 11/11\r (no-eol) (esc)
178 updating [===========================================>] 3/3\r (no-eol) (esc)
242 updating [===========================================>] 3/3\r (no-eol) (esc)
179 \r (no-eol) (esc)
243 \r (no-eol) (esc)
180 \r (no-eol) (esc)
244 \r (no-eol) (esc)
181 linking [======> ] 1/6\r (no-eol) (esc)
245 linking [====> ] 1/9\r (no-eol) (esc)
182 linking [==============> ] 2/6\r (no-eol) (esc)
246 linking [=========> ] 2/9\r (no-eol) (esc)
183 linking [=====================> ] 3/6\r (no-eol) (esc)
247 linking [==============> ] 3/9\r (no-eol) (esc)
184 linking [=============================> ] 4/6\r (no-eol) (esc)
248 linking [===================> ] 4/9\r (no-eol) (esc)
185 linking [====================================> ] 5/6\r (no-eol) (esc)
249 linking [========================> ] 5/9\r (no-eol) (esc)
186 linking [============================================>] 6/6\r (no-eol) (esc)
250 linking [=============================> ] 6/9\r (no-eol) (esc)
251 linking [==================================> ] 7/9\r (no-eol) (esc)
252 linking [=======================================> ] 8/9\r (no-eol) (esc)
253 linking [============================================>] 9/9\r (no-eol) (esc)
187 updating [===========================================>] 1/1\r (no-eol) (esc)
254 updating [===========================================>] 1/1\r (no-eol) (esc)
188 \r (no-eol) (esc)
255 \r (no-eol) (esc)
189 updating to branch default
256 updating to branch default
190 cloning subrepo sub1 from $TESTTMP/sub1
257 cloning subrepo sub1 from $TESTTMP/sub1
191 cloning subrepo sub1/sub2 from $TESTTMP/sub2
258 cloning subrepo sub1/sub2 from $TESTTMP/sub2
192 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
259 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
260 #else
261 $ hg --config extensions.largefiles= clone main cloned
262 \r (no-eol) (esc)
263 linking [====> ] 1/9\r (no-eol) (esc)
264 linking [=========> ] 2/9\r (no-eol) (esc)
265 linking [==============> ] 3/9\r (no-eol) (esc)
266 linking [===================> ] 4/9\r (no-eol) (esc)
267 linking [========================> ] 5/9\r (no-eol) (esc)
268 linking [=============================> ] 6/9\r (no-eol) (esc)
269 linking [==================================> ] 7/9\r (no-eol) (esc)
270 linking [=======================================> ] 8/9\r (no-eol) (esc)
271 linking [============================================>] 9/9\r (no-eol) (esc)
272 \r (no-eol) (esc)
273 \r (no-eol) (esc)
274 updating [===========================================>] 3/3\r (no-eol) (esc)
275 \r (no-eol) (esc)
276 \r (no-eol) (esc)
277 linking [====> ] 1/9\r (no-eol) (esc)
278 linking [=========> ] 2/9\r (no-eol) (esc)
279 linking [==============> ] 3/9\r (no-eol) (esc)
280 linking [===================> ] 4/9\r (no-eol) (esc)
281 linking [========================> ] 5/9\r (no-eol) (esc)
282 linking [=============================> ] 6/9\r (no-eol) (esc)
283 linking [==================================> ] 7/9\r (no-eol) (esc)
284 linking [=======================================> ] 8/9\r (no-eol) (esc)
285 linking [============================================>] 9/9\r (no-eol) (esc)
286 updating [===========================================>] 3/3\r (no-eol) (esc)
287 \r (no-eol) (esc)
288 \r (no-eol) (esc)
289 linking [=====> ] 1/7\r (no-eol) (esc)
290 linking [===========> ] 2/7\r (no-eol) (esc)
291 linking [==================> ] 3/7\r (no-eol) (esc)
292 linking [========================> ] 4/7\r (no-eol) (esc)
293 linking [===============================> ] 5/7\r (no-eol) (esc)
294 linking [=====================================> ] 6/7\r (no-eol) (esc)
295 linking [============================================>] 7/7\r (no-eol) (esc)
296 updating [===========================================>] 1/1\r (no-eol) (esc)
297 \r (no-eol) (esc)
298 updating to branch default
299 cloning subrepo sub1 from $TESTTMP/sub1
300 cloning subrepo sub1/sub2 from $TESTTMP/sub2
301 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
302 #endif
193
303
194 Largefiles is NOT enabled in the clone if the source repo doesn't require it
304 Largefiles is NOT enabled in the clone if the source repo doesn't require it
195 $ hg debugrequires -R cloned | grep largefiles
305 $ hg debugrequires -R cloned | grep largefiles
@@ -454,6 +454,65 b' cloned:'
454 #if hardlink
454 #if hardlink
455 $ hg clone -U . ../empty
455 $ hg clone -U . ../empty
456 \r (no-eol) (esc)
456 \r (no-eol) (esc)
457 linking [===> ] 1/10\r (no-eol) (esc) (no-rust !)
458 linking [=======> ] 2/10\r (no-eol) (esc) (no-rust !)
459 linking [===========> ] 3/10\r (no-eol) (esc) (no-rust !)
460 linking [================> ] 4/10\r (no-eol) (esc) (no-rust !)
461 linking [====================> ] 5/10\r (no-eol) (esc) (no-rust !)
462 linking [========================> ] 6/10\r (no-eol) (esc) (no-rust !)
463 linking [=============================> ] 7/10\r (no-eol) (esc) (no-rust !)
464 linking [=================================> ] 8/10\r (no-eol) (esc) (no-rust !)
465 linking [=====================================> ] 9/10\r (no-eol) (esc) (no-rust !)
466 linking [==========================================>] 10/10\r (no-eol) (esc) (no-rust !)
467 linking [==> ] 1/12\r (no-eol) (esc) (rust !)
468 linking [======> ] 2/12\r (no-eol) (esc) (rust !)
469 linking [=========> ] 3/12\r (no-eol) (esc) (rust !)
470 linking [=============> ] 4/12\r (no-eol) (esc) (rust !)
471 linking [================> ] 5/12\r (no-eol) (esc) (rust !)
472 linking [====================> ] 6/12\r (no-eol) (esc) (rust !)
473 linking [========================> ] 7/12\r (no-eol) (esc) (rust !)
474 linking [===========================> ] 8/12\r (no-eol) (esc) (rust !)
475 linking [===============================> ] 9/12\r (no-eol) (esc) (rust !)
476 linking [==================================> ] 10/12\r (no-eol) (esc) (rust !)
477 linking [======================================> ] 11/12\r (no-eol) (esc) (rust !)
478 linking [==========================================>] 12/12\r (no-eol) (esc) (rust !)
479 \r (no-eol) (esc)
480 #else
481 $ hg clone -U . ../empty
482 \r (no-eol) (esc)
483 linking [ <=> ] 1 (no-eol)
484 #endif
485
486 $ cd ../empty
487 #if hardlink
488 #if rust
489 $ hg archive --subrepos -r tip --prefix './' ../archive.tar.gz
490 \r (no-eol) (esc)
491 archiving [ ] 0/3\r (no-eol) (esc)
492 archiving [=============> ] 1/3\r (no-eol) (esc)
493 archiving [===========================> ] 2/3\r (no-eol) (esc)
494 archiving [==========================================>] 3/3\r (no-eol) (esc)
495 \r (no-eol) (esc)
496 \r (no-eol) (esc)
497 linking [==> ] 1/11\r (no-eol) (esc)
498 linking [======> ] 2/11\r (no-eol) (esc)
499 linking [==========> ] 3/11\r (no-eol) (esc)
500 linking [==============> ] 4/11\r (no-eol) (esc)
501 linking [==================> ] 5/11\r (no-eol) (esc)
502 linking [======================> ] 6/11\r (no-eol) (esc)
503 linking [==========================> ] 7/11\r (no-eol) (esc)
504 linking [==============================> ] 8/11\r (no-eol) (esc)
505 linking [==================================> ] 9/11\r (no-eol) (esc)
506 linking [======================================> ] 10/11\r (no-eol) (esc)
507 linking [==========================================>] 11/11\r (no-eol) (esc)
508 \r (no-eol) (esc)
509 \r (no-eol) (esc)
510 archiving (foo) [ ] 0/3\r (no-eol) (esc)
511 archiving (foo) [===========> ] 1/3\r (no-eol) (esc)
512 archiving (foo) [=======================> ] 2/3\r (no-eol) (esc)
513 archiving (foo) [====================================>] 3/3\r (no-eol) (esc)
514 \r (no-eol) (esc)
515 \r (no-eol) (esc)
457 linking [====> ] 1/9\r (no-eol) (esc)
516 linking [====> ] 1/9\r (no-eol) (esc)
458 linking [=========> ] 2/9\r (no-eol) (esc)
517 linking [=========> ] 2/9\r (no-eol) (esc)
459 linking [==============> ] 3/9\r (no-eol) (esc)
518 linking [==============> ] 3/9\r (no-eol) (esc)
@@ -464,14 +523,13 b' cloned:'
464 linking [=======================================> ] 8/9\r (no-eol) (esc)
523 linking [=======================================> ] 8/9\r (no-eol) (esc)
465 linking [============================================>] 9/9\r (no-eol) (esc)
524 linking [============================================>] 9/9\r (no-eol) (esc)
466 \r (no-eol) (esc)
525 \r (no-eol) (esc)
526 \r (no-eol) (esc)
527 archiving (foo/bar) [ ] 0/1\r (no-eol) (esc)
528 archiving (foo/bar) [================================>] 1/1\r (no-eol) (esc)
529 \r (no-eol) (esc)
530 cloning subrepo foo from $TESTTMP/repo/foo
531 cloning subrepo foo/bar from $TESTTMP/repo/foo/bar
467 #else
532 #else
468 $ hg clone -U . ../empty
469 \r (no-eol) (esc)
470 linking [ <=> ] 1 (no-eol)
471 #endif
472
473 $ cd ../empty
474 #if hardlink
475 $ hg archive --subrepos -r tip --prefix './' ../archive.tar.gz
533 $ hg archive --subrepos -r tip --prefix './' ../archive.tar.gz
476 \r (no-eol) (esc)
534 \r (no-eol) (esc)
477 archiving [ ] 0/3\r (no-eol) (esc)
535 archiving [ ] 0/3\r (no-eol) (esc)
@@ -480,14 +538,15 b' cloned:'
480 archiving [==========================================>] 3/3\r (no-eol) (esc)
538 archiving [==========================================>] 3/3\r (no-eol) (esc)
481 \r (no-eol) (esc)
539 \r (no-eol) (esc)
482 \r (no-eol) (esc)
540 \r (no-eol) (esc)
483 linking [====> ] 1/8\r (no-eol) (esc)
541 linking [====> ] 1/9\r (no-eol) (esc)
484 linking [==========> ] 2/8\r (no-eol) (esc)
542 linking [=========> ] 2/9\r (no-eol) (esc)
485 linking [===============> ] 3/8\r (no-eol) (esc)
543 linking [==============> ] 3/9\r (no-eol) (esc)
486 linking [=====================> ] 4/8\r (no-eol) (esc)
544 linking [===================> ] 4/9\r (no-eol) (esc)
487 linking [===========================> ] 5/8\r (no-eol) (esc)
545 linking [========================> ] 5/9\r (no-eol) (esc)
488 linking [================================> ] 6/8\r (no-eol) (esc)
546 linking [=============================> ] 6/9\r (no-eol) (esc)
489 linking [======================================> ] 7/8\r (no-eol) (esc)
547 linking [==================================> ] 7/9\r (no-eol) (esc)
490 linking [============================================>] 8/8\r (no-eol) (esc)
548 linking [=======================================> ] 8/9\r (no-eol) (esc)
549 linking [============================================>] 9/9\r (no-eol) (esc)
491 \r (no-eol) (esc)
550 \r (no-eol) (esc)
492 \r (no-eol) (esc)
551 \r (no-eol) (esc)
493 archiving (foo) [ ] 0/3\r (no-eol) (esc)
552 archiving (foo) [ ] 0/3\r (no-eol) (esc)
@@ -496,12 +555,13 b' cloned:'
496 archiving (foo) [====================================>] 3/3\r (no-eol) (esc)
555 archiving (foo) [====================================>] 3/3\r (no-eol) (esc)
497 \r (no-eol) (esc)
556 \r (no-eol) (esc)
498 \r (no-eol) (esc)
557 \r (no-eol) (esc)
499 linking [======> ] 1/6\r (no-eol) (esc)
558 linking [=====> ] 1/7\r (no-eol) (esc)
500 linking [==============> ] 2/6\r (no-eol) (esc)
559 linking [===========> ] 2/7\r (no-eol) (esc)
501 linking [=====================> ] 3/6\r (no-eol) (esc)
560 linking [==================> ] 3/7\r (no-eol) (esc)
502 linking [=============================> ] 4/6\r (no-eol) (esc)
561 linking [========================> ] 4/7\r (no-eol) (esc)
503 linking [====================================> ] 5/6\r (no-eol) (esc)
562 linking [===============================> ] 5/7\r (no-eol) (esc)
504 linking [============================================>] 6/6\r (no-eol) (esc)
563 linking [=====================================> ] 6/7\r (no-eol) (esc)
564 linking [============================================>] 7/7\r (no-eol) (esc)
505 \r (no-eol) (esc)
565 \r (no-eol) (esc)
506 \r (no-eol) (esc)
566 \r (no-eol) (esc)
507 archiving (foo/bar) [ ] 0/1\r (no-eol) (esc)
567 archiving (foo/bar) [ ] 0/1\r (no-eol) (esc)
@@ -509,6 +569,7 b' cloned:'
509 \r (no-eol) (esc)
569 \r (no-eol) (esc)
510 cloning subrepo foo from $TESTTMP/repo/foo
570 cloning subrepo foo from $TESTTMP/repo/foo
511 cloning subrepo foo/bar from $TESTTMP/repo/foo/bar
571 cloning subrepo foo/bar from $TESTTMP/repo/foo/bar
572 #endif
512 #else
573 #else
513 Note there's a slight output glitch on non-hardlink systems: the last
574 Note there's a slight output glitch on non-hardlink systems: the last
514 "linking" progress topic never gets closed, leading to slight output corruption on that platform.
575 "linking" progress topic never gets closed, leading to slight output corruption on that platform.
@@ -761,7 +761,8 b' Stream clone with basicstore'
761 $ hg clone --config experimental.changegroup3=True --stream -U \
761 $ hg clone --config experimental.changegroup3=True --stream -U \
762 > http://localhost:$HGPORT1 stream-clone-basicstore
762 > http://localhost:$HGPORT1 stream-clone-basicstore
763 streaming all changes
763 streaming all changes
764 28 files to transfer, * of data (glob)
764 29 files to transfer, * of data (glob) (no-rust !)
765 31 files to transfer, * of data (glob) (rust !)
765 transferred * in * seconds (*) (glob)
766 transferred * in * seconds (*) (glob)
766 $ hg -R stream-clone-basicstore verify -q
767 $ hg -R stream-clone-basicstore verify -q
767 $ cat port-1-errors.log
768 $ cat port-1-errors.log
@@ -770,7 +771,8 b' Stream clone with encodedstore'
770 $ hg clone --config experimental.changegroup3=True --stream -U \
771 $ hg clone --config experimental.changegroup3=True --stream -U \
771 > http://localhost:$HGPORT2 stream-clone-encodedstore
772 > http://localhost:$HGPORT2 stream-clone-encodedstore
772 streaming all changes
773 streaming all changes
773 28 files to transfer, * of data (glob)
774 29 files to transfer, * of data (glob) (no-rust !)
775 31 files to transfer, * of data (glob) (rust !)
774 transferred * in * seconds (*) (glob)
776 transferred * in * seconds (*) (glob)
775 $ hg -R stream-clone-encodedstore verify -q
777 $ hg -R stream-clone-encodedstore verify -q
776 $ cat port-2-errors.log
778 $ cat port-2-errors.log
@@ -779,15 +781,17 b' Stream clone with fncachestore'
779 $ hg clone --config experimental.changegroup3=True --stream -U \
781 $ hg clone --config experimental.changegroup3=True --stream -U \
780 > http://localhost:$HGPORT stream-clone-fncachestore
782 > http://localhost:$HGPORT stream-clone-fncachestore
781 streaming all changes
783 streaming all changes
782 22 files to transfer, * of data (glob)
784 23 files to transfer, * of data (glob) (no-rust !)
785 25 files to transfer, * of data (glob) (rust !)
783 transferred * in * seconds (*) (glob)
786 transferred * in * seconds (*) (glob)
784 $ hg -R stream-clone-fncachestore verify -q
787 $ hg -R stream-clone-fncachestore verify -q
785 $ cat port-0-errors.log
788 $ cat port-0-errors.log
786
789
787 Packed bundle
790 Packed bundle
788 $ hg -R deeprepo debugcreatestreamclonebundle repo-packed.hg
791 $ hg -R deeprepo debugcreatestreamclonebundle repo-packed.hg
789 writing 5330 bytes for 18 files (no-zstd !)
792 writing 5330 bytes for 19 files (no-zstd !)
790 writing 5400 bytes for 18 files (zstd !)
793 writing 5400 bytes for 19 files (zstd no-rust !)
794 writing 5654 bytes for 21 files (zstd rust !)
791 bundle requirements:.* treemanifest(,.*)? (re)
795 bundle requirements:.* treemanifest(,.*)? (re)
792 $ hg debugbundle --spec repo-packed.hg
796 $ hg debugbundle --spec repo-packed.hg
793 none-packed1;requirements%3D(.*%2C)?treemanifest(%2C.*)? (re)
797 none-packed1;requirements%3D(.*%2C)?treemanifest(%2C.*)? (re)
@@ -836,7 +836,10 b' generaldelta added to original requireme'
836 store directory has files we expect
836 store directory has files we expect
837
837
838 $ ls .hg/store
838 $ ls .hg/store
839 00changelog-????????.nd (glob) (rust !)
840 00changelog.d
839 00changelog.i
841 00changelog.i
842 00changelog.n (rust !)
840 00manifest.i
843 00manifest.i
841 data
844 data
842 data-s
845 data-s
@@ -860,7 +863,10 b' old store should be backed up'
860 $ ls -d .hg/upgradebackup.*/
863 $ ls -d .hg/upgradebackup.*/
861 .hg/upgradebackup.*/ (glob)
864 .hg/upgradebackup.*/ (glob)
862 $ ls .hg/upgradebackup.*/store
865 $ ls .hg/upgradebackup.*/store
866 00changelog-????????.nd (glob) (rust !)
867 00changelog.d
863 00changelog.i
868 00changelog.i
869 00changelog.n (rust !)
864 00manifest.i
870 00manifest.i
865 data
871 data
866 data-s
872 data-s
@@ -868,6 +874,7 b' old store should be backed up'
868 phaseroots
874 phaseroots
869 requires
875 requires
870 undo
876 undo
877 undo.backup.00changelog.n.bck (rust !)
871 undo.backup.fncache.bck
878 undo.backup.fncache.bck
872 undo.backupfiles
879 undo.backupfiles
873
880
General Comments 0
You need to be logged in to leave comments. Login now