--- a/hgext/zeroconf/Zeroconf.py Mon Aug 02 08:05:13 2021 -0400
+++ b/hgext/zeroconf/Zeroconf.py Wed Aug 25 15:15:19 2021 +0200
@@ -770,7 +770,7 @@
def writeString(self, value, length):
"""Writes a string to the packet"""
- format = b'!' + str(length) + b's'
+ format = '!' + str(length) + 's'
self.data.append(struct.pack(format, value))
self.size += length
--- a/mercurial/cext/revlog.c Mon Aug 02 08:05:13 2021 -0400
+++ b/mercurial/cext/revlog.c Wed Aug 25 15:15:19 2021 +0200
@@ -452,9 +452,10 @@
static PyObject *index_append(indexObject *self, PyObject *obj)
{
uint64_t offset_flags, sidedata_offset;
- int rev, comp_len, uncomp_len, base_rev, link_rev, parent_1, parent_2;
+ int rev, comp_len, uncomp_len, base_rev, link_rev, parent_1, parent_2,
+ sidedata_comp_len;
char data_comp_mode, sidedata_comp_mode;
- Py_ssize_t c_node_id_len, sidedata_comp_len;
+ Py_ssize_t c_node_id_len;
const char *c_node_id;
char comp_field;
char *data;
@@ -534,9 +535,9 @@
static PyObject *index_replace_sidedata_info(indexObject *self, PyObject *args)
{
uint64_t offset_flags, sidedata_offset;
- int rev;
+ Py_ssize_t rev;
+ int sidedata_comp_len;
char comp_mode;
- Py_ssize_t sidedata_comp_len;
char *data;
#if LONG_MAX == 0x7fffffffL
const char *const sidedata_format = PY23("nKiKB", "nKiKB");
--- a/mercurial/streamclone.py Mon Aug 02 08:05:13 2021 -0400
+++ b/mercurial/streamclone.py Wed Aug 25 15:15:19 2021 +0200
@@ -821,9 +821,11 @@
dst_vfs = dst_vfs_map[k]
src_path = src_vfs.join(path)
dst_path = dst_vfs.join(path)
- dirname = dst_vfs.dirname(path)
- if not dst_vfs.exists(dirname):
- dst_vfs.makedirs(dirname)
+ # We cannot use dirname and makedirs of dst_vfs here because the store
+ # encoding confuses them. See issue 6581 for details.
+ dirname = os.path.dirname(dst_path)
+ if not os.path.exists(dirname):
+ util.makedirs(dirname)
dst_vfs.register_file(path)
# XXX we could use the #nb_bytes argument.
util.copyfile(
--- a/mercurial/windows.py Mon Aug 02 08:05:13 2021 -0400
+++ b/mercurial/windows.py Wed Aug 25 15:15:19 2021 +0200
@@ -616,7 +616,16 @@
def readlink(pathname):
- return pycompat.fsencode(os.readlink(pycompat.fsdecode(pathname)))
+ path = pycompat.fsdecode(pathname)
+ try:
+ link = os.readlink(path)
+ except ValueError as e:
+ # On py2, os.readlink() raises an AttributeError since it is
+ # unsupported. On py3, reading a non-link raises a ValueError. Simply
+ # treat this as the error the locking code has been expecting up to now
+ # until an effort can be made to enable symlink support on Windows.
+ raise AttributeError(e)
+ return pycompat.fsencode(link)
def removedirs(name):
--- a/rust/hgcli/pyoxidizer.bzl Mon Aug 02 08:05:13 2021 -0400
+++ b/rust/hgcli/pyoxidizer.bzl Wed Aug 25 15:15:19 2021 +0200
@@ -44,6 +44,17 @@
# We do not prepend the values because the Mercurial library wants to be in
# the front of the sys.path to avoid picking up other installations.
sys.path.extend(extra_path.split(os.pathsep))
+# Add user site to sys.path to load extensions without the full path
+if os.name == 'nt':
+ vi = sys.version_info
+ sys.path.append(
+ os.path.join(
+ os.environ['APPDATA'],
+ 'Python',
+ 'Python%d%d' % (vi[0], vi[1]),
+ 'site-packages',
+ )
+ )
import hgdemandimport;
hgdemandimport.enable();
from mercurial import dispatch;
--- a/tests/common-pattern.py Mon Aug 02 08:05:13 2021 -0400
+++ b/tests/common-pattern.py Wed Aug 25 15:15:19 2021 +0200
@@ -115,6 +115,14 @@
br'(.*file:/)/?(/\$TESTTMP.*)',
lambda m: m.group(1) + b'*' + m.group(2) + b' (glob)',
),
+ # `hg clone --stream` output
+ (
+ br'transferred (\S+?) KB in \S+? seconds \(.+?/sec\)(?: \(glob\))?(.*)',
+ lambda m: (
+ br'transferred %s KB in * seconds (* */sec) (glob)%s'
+ % (m.group(1), m.group(2))
+ ),
+ ),
]
# Various platform error strings, keyed on a common replacement string
--- a/tests/test-bundle.t Mon Aug 02 08:05:13 2021 -0400
+++ b/tests/test-bundle.t Wed Aug 25 15:15:19 2021 +0200
@@ -403,7 +403,7 @@
6 files to transfer, 2.60 KB of data
pretxnopen: 000000000000
pretxnclose: aa35859c02ea
- transferred 2.60 KB in *.* seconds (* */sec) (glob)
+ transferred 2.60 KB in * seconds (* */sec) (glob)
txnclose: aa35859c02ea
(for safety, confirm visibility of streamclone-ed changes by another
--- a/tests/test-clone-stream.t Mon Aug 02 08:05:13 2021 -0400
+++ b/tests/test-clone-stream.t Wed Aug 25 15:15:19 2021 +0200
@@ -94,7 +94,12 @@
$ echo foo > store/CélesteVille_is_a_Capital_City
-All all that
+name causing issue6581
+
+ $ mkdir --parents container/isam-build-centos7/
+ $ touch container/isam-build-centos7/bazel-coverage-generator-sandboxfs-compatibility-0758e3e4f6057904d44399bd666faba9e7f40686.patch
+
+Add all that
$ hg add .
adding 00changelog-ab349180a0405010.nd
@@ -103,6 +108,7 @@
adding 00changelog.n
adding 00manifest.d
adding 00manifest.i
+ adding container/isam-build-centos7/bazel-coverage-generator-sandboxfs-compatibility-0758e3e4f6057904d44399bd666faba9e7f40686.patch
adding data/foo.d
adding data/foo.i
adding data/foo.n
@@ -172,7 +178,16 @@
$ hg clone server local-clone
updating to branch default
- 1087 files updated, 0 files merged, 0 files removed, 0 files unresolved
+ 1088 files updated, 0 files merged, 0 files removed, 0 files unresolved
+
+Check that the clone went well
+
+ $ hg verify -R local-clone
+ checking changesets
+ checking manifests
+ crosschecking files in changesets and manifests
+ checking files
+ checked 3 changesets with 1088 changes to 1088 files
Check uncompressed
==================
@@ -232,8 +247,8 @@
adding changesets
adding manifests
adding file changes
- added 3 changesets with 1087 changes to 1087 files
- new changesets 96ee1d7354c4:42e820400e84
+ added 3 changesets with 1088 changes to 1088 files
+ new changesets 96ee1d7354c4:5223b5e3265f
$ get-with-headers.py $LOCALIP:$HGPORT '?cmd=getbundle' content-type --bodyfile body --hgproto 0.2 --requestheader "x-hgarg-1=bundlecaps=HG20%2Cbundle2%3DHG20%250Abookmarks%250Achangegroup%253D01%252C02%250Adigests%253Dmd5%252Csha1%252Csha512%250Aerror%253Dabort%252Cunsupportedcontent%252Cpushraced%252Cpushkey%250Ahgtagsfnodes%250Alistkeys%250Aphases%253Dheads%250Apushkey%250Aremote-changegroup%253Dhttp%252Chttps&cg=0&common=0000000000000000000000000000000000000000&heads=c17445101a72edac06facd130d14808dfbd5c7c2&stream=1"
200 Script output follows
@@ -299,8 +314,8 @@
adding changesets
adding manifests
adding file changes
- added 3 changesets with 1087 changes to 1087 files
- new changesets 96ee1d7354c4:42e820400e84
+ added 3 changesets with 1088 changes to 1088 files
+ new changesets 96ee1d7354c4:5223b5e3265f
$ get-with-headers.py $LOCALIP:$HGPORT '?cmd=getbundle' content-type --bodyfile body --hgproto 0.2 --requestheader "x-hgarg-1=bundlecaps=HG20%2Cbundle2%3DHG20%250Abookmarks%250Achangegroup%253D01%252C02%250Adigests%253Dmd5%252Csha1%252Csha512%250Aerror%253Dabort%252Cunsupportedcontent%252Cpushraced%252Cpushkey%250Ahgtagsfnodes%250Alistkeys%250Aphases%253Dheads%250Apushkey%250Aremote-changegroup%253Dhttp%252Chttps&cg=0&common=0000000000000000000000000000000000000000&heads=c17445101a72edac06facd130d14808dfbd5c7c2&stream=1"
200 Script output follows
@@ -330,10 +345,10 @@
#if stream-legacy
$ hg clone --stream -U http://localhost:$HGPORT clone1
streaming all changes
- 1089 files to transfer, 101 KB of data (no-zstd !)
- transferred 101 KB in * seconds (*/sec) (glob) (no-zstd !)
- 1089 files to transfer, 98.5 KB of data (zstd !)
- transferred 98.5 KB in * seconds (*/sec) (glob) (zstd !)
+ 1090 files to transfer, 102 KB of data (no-zstd !)
+ transferred 102 KB in * seconds (* */sec) (glob) (no-zstd !)
+ 1090 files to transfer, 98.8 KB of data (zstd !)
+ transferred 98.8 KB in * seconds (* */sec) (glob) (zstd !)
searching for changes
no changes found
$ cat server/errors.txt
@@ -341,10 +356,10 @@
#if stream-bundle2
$ hg clone --stream -U http://localhost:$HGPORT clone1
streaming all changes
- 1092 files to transfer, 101 KB of data (no-zstd !)
- transferred 101 KB in * seconds (*/sec) (glob) (no-zstd !)
- 1092 files to transfer, 98.6 KB of data (zstd !)
- transferred 98.6 KB in * seconds (* */sec) (glob) (zstd !)
+ 1093 files to transfer, 102 KB of data (no-zstd !)
+ transferred 102 KB in * seconds (* */sec) (glob) (no-zstd !)
+ 1093 files to transfer, 98.9 KB of data (zstd !)
+ transferred 98.9 KB in * seconds (* */sec) (glob) (zstd !)
$ ls -1 clone1/.hg/cache
branch2-base
@@ -369,12 +384,12 @@
#if no-zstd no-rust
$ f --size --hex --bytes 256 body
- body: size=118737
+ body: size=119153
0000: 04 6e 6f 6e 65 48 47 32 30 00 00 00 00 00 00 00 |.noneHG20.......|
0010: 80 07 53 54 52 45 41 4d 32 00 00 00 00 03 00 09 |..STREAM2.......|
0020: 06 09 04 0c 44 62 79 74 65 63 6f 75 6e 74 31 30 |....Dbytecount10|
- 0030: 33 38 33 34 66 69 6c 65 63 6f 75 6e 74 31 30 39 |3834filecount109|
- 0040: 32 72 65 71 75 69 72 65 6d 65 6e 74 73 64 6f 74 |2requirementsdot|
+ 0030: 34 31 31 35 66 69 6c 65 63 6f 75 6e 74 31 30 39 |4115filecount109|
+ 0040: 33 72 65 71 75 69 72 65 6d 65 6e 74 73 64 6f 74 |3requirementsdot|
0050: 65 6e 63 6f 64 65 25 32 43 66 6e 63 61 63 68 65 |encode%2Cfncache|
0060: 25 32 43 67 65 6e 65 72 61 6c 64 65 6c 74 61 25 |%2Cgeneraldelta%|
0070: 32 43 72 65 76 6c 6f 67 76 31 25 32 43 73 70 61 |2Crevlogv1%2Cspa|
@@ -389,12 +404,12 @@
#endif
#if zstd no-rust
$ f --size --hex --bytes 256 body
- body: size=115921
+ body: size=116340
0000: 04 6e 6f 6e 65 48 47 32 30 00 00 00 00 00 00 00 |.noneHG20.......|
0010: 9a 07 53 54 52 45 41 4d 32 00 00 00 00 03 00 09 |..STREAM2.......|
0020: 06 09 04 0c 5e 62 79 74 65 63 6f 75 6e 74 31 30 |....^bytecount10|
- 0030: 30 39 39 32 66 69 6c 65 63 6f 75 6e 74 31 30 39 |0992filecount109|
- 0040: 32 72 65 71 75 69 72 65 6d 65 6e 74 73 64 6f 74 |2requirementsdot|
+ 0030: 31 32 37 36 66 69 6c 65 63 6f 75 6e 74 31 30 39 |1276filecount109|
+ 0040: 33 72 65 71 75 69 72 65 6d 65 6e 74 73 64 6f 74 |3requirementsdot|
0050: 65 6e 63 6f 64 65 25 32 43 66 6e 63 61 63 68 65 |encode%2Cfncache|
0060: 25 32 43 67 65 6e 65 72 61 6c 64 65 6c 74 61 25 |%2Cgeneraldelta%|
0070: 32 43 72 65 76 6c 6f 67 2d 63 6f 6d 70 72 65 73 |2Crevlog-compres|
@@ -409,12 +424,12 @@
#endif
#if zstd rust no-dirstate-v2
$ f --size --hex --bytes 256 body
- body: size=115942
+ body: size=116361
0000: 04 6e 6f 6e 65 48 47 32 30 00 00 00 00 00 00 00 |.noneHG20.......|
0010: af 07 53 54 52 45 41 4d 32 00 00 00 00 03 00 09 |..STREAM2.......|
0020: 06 09 04 0c 73 62 79 74 65 63 6f 75 6e 74 31 30 |....sbytecount10|
- 0030: 30 39 39 32 66 69 6c 65 63 6f 75 6e 74 31 30 39 |0992filecount109|
- 0040: 32 72 65 71 75 69 72 65 6d 65 6e 74 73 64 6f 74 |2requirementsdot|
+ 0030: 31 32 37 36 66 69 6c 65 63 6f 75 6e 74 31 30 39 |1276filecount109|
+ 0040: 33 72 65 71 75 69 72 65 6d 65 6e 74 73 64 6f 74 |3requirementsdot|
0050: 65 6e 63 6f 64 65 25 32 43 66 6e 63 61 63 68 65 |encode%2Cfncache|
0060: 25 32 43 67 65 6e 65 72 61 6c 64 65 6c 74 61 25 |%2Cgeneraldelta%|
0070: 32 43 70 65 72 73 69 73 74 65 6e 74 2d 6e 6f 64 |2Cpersistent-nod|
@@ -453,20 +468,20 @@
#if stream-legacy
$ hg clone --uncompressed -U http://localhost:$HGPORT clone1-uncompressed
streaming all changes
- 1089 files to transfer, 101 KB of data (no-zstd !)
- transferred 101 KB in * seconds (*/sec) (glob) (no-zstd !)
- 1089 files to transfer, 98.5 KB of data (zstd !)
- transferred 98.5 KB in * seconds (*/sec) (glob) (zstd !)
+ 1090 files to transfer, 102 KB of data (no-zstd !)
+ transferred 102 KB in * seconds (* */sec) (glob) (no-zstd !)
+ 1090 files to transfer, 98.8 KB of data (zstd !)
+ transferred 98.8 KB in * seconds (* */sec) (glob) (zstd !)
searching for changes
no changes found
#endif
#if stream-bundle2
$ hg clone --uncompressed -U http://localhost:$HGPORT clone1-uncompressed
streaming all changes
- 1092 files to transfer, 101 KB of data (no-zstd !)
- transferred 101 KB in * seconds (* */sec) (glob) (no-zstd !)
- 1092 files to transfer, 98.6 KB of data (zstd !)
- transferred 98.6 KB in * seconds (* */sec) (glob) (zstd !)
+ 1093 files to transfer, 102 KB of data (no-zstd !)
+ transferred 102 KB in * seconds (* */sec) (glob) (no-zstd !)
+ 1093 files to transfer, 98.9 KB of data (zstd !)
+ transferred 98.9 KB in * seconds (* */sec) (glob) (zstd !)
#endif
Clone with background file closing enabled
@@ -478,12 +493,12 @@
sending branchmap command
streaming all changes
sending stream_out command
- 1089 files to transfer, 101 KB of data (no-zstd !)
- 1089 files to transfer, 98.5 KB of data (zstd !)
+ 1090 files to transfer, 102 KB of data (no-zstd !)
+ 1090 files to transfer, 98.8 KB of data (zstd !)
starting 4 threads for background file closing
updating the branch cache
- transferred 101 KB in * seconds (*/sec) (glob) (no-zstd !)
- transferred 98.5 KB in * seconds (*/sec) (glob) (zstd !)
+ transferred 102 KB in * seconds (* */sec) (glob) (no-zstd !)
+ transferred 98.8 KB in * seconds (* */sec) (glob) (zstd !)
query 1; heads
sending batch command
searching for changes
@@ -510,15 +525,15 @@
bundle2-input-bundle: with-transaction
bundle2-input-part: "stream2" (params: 3 mandatory) supported
applying stream bundle
- 1092 files to transfer, 101 KB of data (no-zstd !)
- 1092 files to transfer, 98.6 KB of data (zstd !)
+ 1093 files to transfer, 102 KB of data (no-zstd !)
+ 1093 files to transfer, 98.9 KB of data (zstd !)
starting 4 threads for background file closing
starting 4 threads for background file closing
updating the branch cache
- transferred 101 KB in * seconds (* */sec) (glob) (no-zstd !)
- bundle2-input-part: total payload size 118568 (no-zstd !)
- transferred 98.6 KB in * seconds (* */sec) (glob) (zstd !)
- bundle2-input-part: total payload size 115726 (zstd !)
+ transferred 102 KB in * seconds (* */sec) (glob) (no-zstd !)
+ bundle2-input-part: total payload size 118984 (no-zstd !)
+ transferred 98.9 KB in * seconds (* */sec) (glob) (zstd !)
+ bundle2-input-part: total payload size 116145 (zstd !)
bundle2-input-part: "listkeys" (params: 1 mandatory) supported
bundle2-input-bundle: 2 parts total
checking for updated bookmarks
@@ -550,20 +565,20 @@
#if stream-legacy
$ hg clone --stream -U http://localhost:$HGPORT secret-allowed
streaming all changes
- 1089 files to transfer, 101 KB of data (no-zstd !)
- transferred 101 KB in * seconds (*/sec) (glob) (no-zstd !)
- 1089 files to transfer, 98.5 KB of data (zstd !)
- transferred 98.5 KB in * seconds (*/sec) (glob) (zstd !)
+ 1090 files to transfer, 102 KB of data (no-zstd !)
+ transferred 102 KB in * seconds (* */sec) (glob) (no-zstd !)
+ 1090 files to transfer, 98.8 KB of data (zstd !)
+ transferred 98.8 KB in * seconds (* */sec) (glob) (zstd !)
searching for changes
no changes found
#endif
#if stream-bundle2
$ hg clone --stream -U http://localhost:$HGPORT secret-allowed
streaming all changes
- 1092 files to transfer, 101 KB of data (no-zstd !)
- transferred 101 KB in * seconds (* */sec) (glob) (no-zstd !)
- 1092 files to transfer, 98.6 KB of data (zstd !)
- transferred 98.6 KB in * seconds (* */sec) (glob) (zstd !)
+ 1093 files to transfer, 102 KB of data (no-zstd !)
+ transferred 102 KB in * seconds (* */sec) (glob) (no-zstd !)
+ 1093 files to transfer, 98.9 KB of data (zstd !)
+ transferred 98.9 KB in * seconds (* */sec) (glob) (zstd !)
#endif
$ killdaemons.py
@@ -702,33 +717,33 @@
#if stream-legacy
$ hg clone --stream http://localhost:$HGPORT with-bookmarks
streaming all changes
- 1089 files to transfer, 101 KB of data (no-zstd !)
- transferred 101 KB in * seconds (*) (glob) (no-zstd !)
- 1089 files to transfer, 98.5 KB of data (zstd !)
- transferred 98.5 KB in * seconds (*/sec) (glob) (zstd !)
+ 1090 files to transfer, 102 KB of data (no-zstd !)
+ transferred 102 KB in * seconds (* */sec) (glob) (no-zstd !)
+ 1090 files to transfer, 98.8 KB of data (zstd !)
+ transferred 98.8 KB in * seconds (* */sec) (glob) (zstd !)
searching for changes
no changes found
updating to branch default
- 1087 files updated, 0 files merged, 0 files removed, 0 files unresolved
+ 1088 files updated, 0 files merged, 0 files removed, 0 files unresolved
#endif
#if stream-bundle2
$ hg clone --stream http://localhost:$HGPORT with-bookmarks
streaming all changes
- 1095 files to transfer, 102 KB of data (no-zstd !)
+ 1096 files to transfer, 102 KB of data (no-zstd !)
transferred 102 KB in * seconds (* */sec) (glob) (no-zstd !)
- 1095 files to transfer, 98.8 KB of data (zstd !)
- transferred 98.8 KB in * seconds (* */sec) (glob) (zstd !)
+ 1096 files to transfer, 99.1 KB of data (zstd !)
+ transferred 99.1 KB in * seconds (* */sec) (glob) (zstd !)
updating to branch default
- 1087 files updated, 0 files merged, 0 files removed, 0 files unresolved
+ 1088 files updated, 0 files merged, 0 files removed, 0 files unresolved
#endif
$ hg verify -R with-bookmarks
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
- checked 3 changesets with 1087 changes to 1087 files
+ checked 3 changesets with 1088 changes to 1088 files
$ hg -R with-bookmarks bookmarks
- some-bookmark 2:42e820400e84
+ some-bookmark 2:5223b5e3265f
Stream repository with phases
-----------------------------
@@ -743,31 +758,31 @@
#if stream-legacy
$ hg clone --stream http://localhost:$HGPORT phase-publish
streaming all changes
- 1089 files to transfer, 101 KB of data (no-zstd !)
- transferred 101 KB in * seconds (*) (glob) (no-zstd !)
- 1089 files to transfer, 98.5 KB of data (zstd !)
- transferred 98.5 KB in * seconds (*/sec) (glob) (zstd !)
+ 1090 files to transfer, 102 KB of data (no-zstd !)
+ transferred 102 KB in * seconds (* */sec) (glob) (no-zstd !)
+ 1090 files to transfer, 98.8 KB of data (zstd !)
+ transferred 98.8 KB in * seconds (* */sec) (glob) (zstd !)
searching for changes
no changes found
updating to branch default
- 1087 files updated, 0 files merged, 0 files removed, 0 files unresolved
+ 1088 files updated, 0 files merged, 0 files removed, 0 files unresolved
#endif
#if stream-bundle2
$ hg clone --stream http://localhost:$HGPORT phase-publish
streaming all changes
- 1095 files to transfer, 102 KB of data (no-zstd !)
+ 1096 files to transfer, 102 KB of data (no-zstd !)
transferred 102 KB in * seconds (* */sec) (glob) (no-zstd !)
- 1095 files to transfer, 98.8 KB of data (zstd !)
- transferred 98.8 KB in * seconds (* */sec) (glob) (zstd !)
+ 1096 files to transfer, 99.1 KB of data (zstd !)
+ transferred 99.1 KB in * seconds (* */sec) (glob) (zstd !)
updating to branch default
- 1087 files updated, 0 files merged, 0 files removed, 0 files unresolved
+ 1088 files updated, 0 files merged, 0 files removed, 0 files unresolved
#endif
$ hg verify -R phase-publish
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
- checked 3 changesets with 1087 changes to 1087 files
+ checked 3 changesets with 1088 changes to 1088 files
$ hg -R phase-publish phase -r 'all()'
0: public
1: public
@@ -790,14 +805,14 @@
$ hg clone --stream http://localhost:$HGPORT phase-no-publish
streaming all changes
- 1089 files to transfer, 101 KB of data (no-zstd !)
- transferred 101 KB in * seconds (* */sec) (glob) (no-zstd !)
- 1089 files to transfer, 98.5 KB of data (zstd !)
- transferred 98.5 KB in * seconds (*/sec) (glob) (zstd !)
+ 1090 files to transfer, 102 KB of data (no-zstd !)
+ transferred 102 KB in * seconds (* */sec) (glob) (no-zstd !)
+ 1090 files to transfer, 98.8 KB of data (zstd !)
+ transferred 98.8 KB in * seconds (* */sec) (glob) (zstd !)
searching for changes
no changes found
updating to branch default
- 1087 files updated, 0 files merged, 0 files removed, 0 files unresolved
+ 1088 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg -R phase-no-publish phase -r 'all()'
0: public
1: public
@@ -806,12 +821,12 @@
#if stream-bundle2
$ hg clone --stream http://localhost:$HGPORT phase-no-publish
streaming all changes
- 1096 files to transfer, 102 KB of data (no-zstd !)
+ 1097 files to transfer, 102 KB of data (no-zstd !)
transferred 102 KB in * seconds (* */sec) (glob) (no-zstd !)
- 1096 files to transfer, 98.8 KB of data (zstd !)
- transferred 98.8 KB in * seconds (* */sec) (glob) (zstd !)
+ 1097 files to transfer, 99.1 KB of data (zstd !)
+ transferred 99.1 KB in * seconds (* */sec) (glob) (zstd !)
updating to branch default
- 1087 files updated, 0 files merged, 0 files removed, 0 files unresolved
+ 1088 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg -R phase-no-publish phase -r 'all()'
0: draft
1: draft
@@ -822,7 +837,7 @@
checking manifests
crosschecking files in changesets and manifests
checking files
- checked 3 changesets with 1087 changes to 1087 files
+ checked 3 changesets with 1088 changes to 1088 files
$ killdaemons.py
@@ -861,22 +876,22 @@
$ hg clone -U --stream http://localhost:$HGPORT with-obsolescence
streaming all changes
- 1097 files to transfer, 102 KB of data (no-zstd !)
+ 1098 files to transfer, 102 KB of data (no-zstd !)
transferred 102 KB in * seconds (* */sec) (glob) (no-zstd !)
- 1097 files to transfer, 99.2 KB of data (zstd !)
- transferred 99.2 KB in * seconds (* */sec) (glob) (zstd !)
+ 1098 files to transfer, 99.5 KB of data (zstd !)
+ transferred 99.5 KB in * seconds (* */sec) (glob) (zstd !)
$ hg -R with-obsolescence log -T '{rev}: {phase}\n'
2: draft
1: draft
0: draft
$ hg debugobsolete -R with-obsolescence
- e53e122156df12330d3a0b72351e3a84bfd14195 0 {42e820400e843bc479ad36068ff772a69c8affe9} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 8c206a663911c1f97f2f9d7382e417ae55872cfa 0 {5223b5e3265f0df40bb743da62249413d74ac70f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
$ hg verify -R with-obsolescence
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
- checked 4 changesets with 1088 changes to 1087 files
+ checked 4 changesets with 1089 changes to 1088 files
$ hg clone -U --stream --config experimental.evolution=0 http://localhost:$HGPORT with-obsolescence-no-evolution
streaming all changes
--- a/tests/test-http-bundle1.t Mon Aug 02 08:05:13 2021 -0400
+++ b/tests/test-http-bundle1.t Wed Aug 25 15:15:19 2021 +0200
@@ -385,7 +385,8 @@
$ hg clone --stream --noupdate http://localhost:$HGPORT1/ test-stream-clone
streaming all changes
* files to transfer, * of data (glob)
- transferred * in * seconds (* KB/sec) (glob)
+ transferred 1.36 KB in * seconds (* */sec) (glob) (no-zstd !)
+ transferred 1.38 KB in * seconds (* */sec) (glob) (zstd !)
searching for changes
no changes found
#endif
--- a/tests/test-stream-bundle-v2.t Mon Aug 02 08:05:13 2021 -0400
+++ b/tests/test-stream-bundle-v2.t Wed Aug 25 15:15:19 2021 +0200
@@ -91,7 +91,7 @@
adding [c] branch2-served (94 bytes)
adding [c] rbc-names-v1 (7 bytes)
adding [c] rbc-revs-v1 (40 bytes)
- transferred 1.65 KB in \d\.\d seconds \(.*/sec\) (re)
+ transferred 1.65 KB in * seconds (* */sec) (glob)
bundle2-input-part: total payload size 1840
bundle2-input-bundle: 1 parts total
updating the branch cache
@@ -148,7 +148,7 @@
adding [c] branch2-served (94 bytes)
adding [c] rbc-names-v1 (7 bytes)
adding [c] rbc-revs-v1 (40 bytes)
- transferred 1.65 KB in *.* seconds (*/sec) (glob)
+ transferred 1.65 KB in * seconds (* */sec) (glob)
bundle2-input-part: total payload size 1840
bundle2-input-bundle: 1 parts total
updating the branch cache