Skip to content
Snippets Groups Projects
Commit b8491e36 authored by Pierre-Yves David's avatar Pierre-Yves David :octopus:
Browse files

stream: audit path on encoded path

In 5b8f6e198a6e, we wrongly called `vfs._auditpath` on the pre-encoding path, so
we would get abort on problem that the encoding is here to handle.

So we fix the problem (easily) and update the test to cover this (with
significantly more work).

We had to extend the capability of drawdag to support creating filename for
quote (invalid on windows) and file deletion.

Thanks to Matt Harbison for spotting this during the freeze.
parent 6e1eb721
No related branches found
No related tags found
No related merge requests found
Pipeline #101206 passed
...@@ -476,5 +476,6 @@ ...@@ -476,5 +476,6 @@
<path> is the real file system path content should be written to, <path> is the real file system path content should be written to,
<mode> is the file mode that need to be set if any. <mode> is the file mode that need to be set if any.
""" """
self._auditpath(path, b'wb') real_path = self.join(path)
self._auditpath(real_path, b'wb')
self.register_file(path) self.register_file(path)
...@@ -480,5 +481,4 @@ ...@@ -480,5 +481,4 @@
self.register_file(path) self.register_file(path)
real_path = self.join(path)
dirname, basename = util.split(real_path) dirname, basename = util.split(real_path)
if dirname not in known_directories: if dirname not in known_directories:
util.makedirs(dirname, self.createmode, True) util.makedirs(dirname, self.createmode, True)
......
...@@ -300,7 +300,10 @@ ...@@ -300,7 +300,10 @@
self._parents.append(repo[repo.nullid]) self._parents.append(repo[repo.nullid])
def filectx(self, key): def filectx(self, key):
return simplefilectx(key, self._added[key]) content = self._added.get(key)
if content is not None:
return simplefilectx(key, content)
return None
def commit(self): def commit(self):
return self._repo.commitctx(self) return self._repo.commitctx(self)
...@@ -381,6 +384,6 @@ ...@@ -381,6 +384,6 @@
# parse comments to get extra file content instructions # parse comments to get extra file content instructions
files = collections.defaultdict(dict) # {(name, path): content} files = collections.defaultdict(dict) # {(name, path): content}
comments = list(_getcomments(text)) comments = list(_getcomments(text))
filere = re.compile(br'^(\w+)/([\w/]+)\s*=\s*(.*)$', re.M) filere = re.compile(br'^(\w+)/([\w/"]+)\s*=\s*(.*)$', re.M)
for name, path, content in filere.findall(b'\n'.join(comments)): for name, path, content in filere.findall(b'\n'.join(comments)):
content = content.replace(br'\n', b'\n').replace(br'\1', b'\1') content = content.replace(br'\n', b'\n').replace(br'\1', b'\1')
...@@ -385,6 +388,9 @@ ...@@ -385,6 +388,9 @@
for name, path, content in filere.findall(b'\n'.join(comments)): for name, path, content in filere.findall(b'\n'.join(comments)):
content = content.replace(br'\n', b'\n').replace(br'\1', b'\1') content = content.replace(br'\n', b'\n').replace(br'\1', b'\1')
files[name][path] = content if content == b"<deleted>":
files[name][path] = None
else:
files[name][path] = content
committed = {None: repo.nullid} # {name: node} committed = {None: repo.nullid} # {name: node}
......
...@@ -36,6 +36,8 @@ ...@@ -36,6 +36,8 @@
$ cp $HGRCPATH $TESTTMP/hgrc.orig $ cp $HGRCPATH $TESTTMP/hgrc.orig
$ cat >> $HGRCPATH << EOF $ cat >> $HGRCPATH << EOF
> [ui]
> portablefilenames=abort
> [experimental] > [experimental]
> evolution.createmarkers=True > evolution.createmarkers=True
> evolution.exchange=True > evolution.exchange=True
...@@ -60,5 +62,5 @@ ...@@ -60,5 +62,5 @@
$ hg debugdrawdag <<'EOF' $ hg debugdrawdag <<'EOF'
> E > E
> | > |
> D > D # D/ba"r=<deleted>
> | > |
...@@ -64,3 +66,3 @@ ...@@ -64,3 +66,3 @@
> | > |
> C > C # C/ba"r=faz
> | > |
...@@ -66,5 +68,5 @@ ...@@ -66,5 +68,5 @@
> | > |
> B > B # B/blu=fuz
> | > |
> A > A
> EOF > EOF
...@@ -72,9 +74,9 @@ ...@@ -72,9 +74,9 @@
$ hg bundle -a --type="none-v2;stream=$stream_version" bundle.hg $ hg bundle -a --type="none-v2;stream=$stream_version" bundle.hg
$ hg debugbundle bundle.hg $ hg debugbundle bundle.hg
Stream params: {} Stream params: {}
stream2 -- {bytecount: 1693, filecount: 12, requirements: generaldelta%2Crevlogv1%2Csparserevlog} (mandatory: True) (stream-v2 no-zstd !) stream2 -- {bytecount: 1908, filecount: 14, requirements: generaldelta%2Crevlogv1%2Csparserevlog} (mandatory: True) (stream-v2 no-zstd !)
stream2 -- {bytecount: 1693, filecount: 12, requirements: generaldelta%2Crevlog-compression-zstd%2Crevlogv1%2Csparserevlog} (mandatory: True) (stream-v2 zstd no-rust !) stream2 -- {bytecount: 1911, filecount: 14, requirements: generaldelta%2Crevlog-compression-zstd%2Crevlogv1%2Csparserevlog} (mandatory: True) (stream-v2 zstd no-rust !)
stream2 -- {bytecount: 1819, filecount: 14, requirements: generaldelta%2Crevlog-compression-zstd%2Crevlogv1%2Csparserevlog} (mandatory: True) (stream-v2 rust !) stream2 -- {bytecount: 2103, filecount: 16, requirements: generaldelta%2Crevlog-compression-zstd%2Crevlogv1%2Csparserevlog} (mandatory: True) (stream-v2 rust !)
stream3-exp -- {requirements: generaldelta%2Crevlogv1%2Csparserevlog} (mandatory: True) (stream-v3 no-zstd !) stream3-exp -- {requirements: generaldelta%2Crevlogv1%2Csparserevlog} (mandatory: True) (stream-v3 no-zstd !)
stream3-exp -- {requirements: generaldelta%2Crevlog-compression-zstd%2Crevlogv1%2Csparserevlog} (mandatory: True) (stream-v3 zstd no-rust !) stream3-exp -- {requirements: generaldelta%2Crevlog-compression-zstd%2Crevlogv1%2Csparserevlog} (mandatory: True) (stream-v3 zstd no-rust !)
stream3-exp -- {requirements: generaldelta%2Crevlog-compression-zstd%2Crevlogv1%2Csparserevlog} (mandatory: True) (stream-v3 rust !) stream3-exp -- {requirements: generaldelta%2Crevlog-compression-zstd%2Crevlogv1%2Csparserevlog} (mandatory: True) (stream-v3 rust !)
...@@ -89,9 +91,9 @@ ...@@ -89,9 +91,9 @@
$ hg bundle -a --type="none-$bundle_format" bundle.hg $ hg bundle -a --type="none-$bundle_format" bundle.hg
$ hg debugbundle bundle.hg $ hg debugbundle bundle.hg
Stream params: {} Stream params: {}
stream2 -- {bytecount: 1693, filecount: 12, requirements: generaldelta%2Crevlogv1%2Csparserevlog} (mandatory: True) (stream-v2 no-zstd !) stream2 -- {bytecount: 1908, filecount: 14, requirements: generaldelta%2Crevlogv1%2Csparserevlog} (mandatory: True) (stream-v2 no-zstd !)
stream2 -- {bytecount: 1693, filecount: 12, requirements: generaldelta%2Crevlog-compression-zstd%2Crevlogv1%2Csparserevlog} (mandatory: True) (stream-v2 zstd no-rust !) stream2 -- {bytecount: 1911, filecount: 14, requirements: generaldelta%2Crevlog-compression-zstd%2Crevlogv1%2Csparserevlog} (mandatory: True) (stream-v2 zstd no-rust !)
stream2 -- {bytecount: 1819, filecount: 14, requirements: generaldelta%2Crevlog-compression-zstd%2Crevlogv1%2Csparserevlog} (mandatory: True) (stream-v2 rust !) stream2 -- {bytecount: 2103, filecount: 16, requirements: generaldelta%2Crevlog-compression-zstd%2Crevlogv1%2Csparserevlog} (mandatory: True) (stream-v2 rust !)
stream3-exp -- {requirements: generaldelta%2Crevlogv1%2Csparserevlog} (mandatory: True) (stream-v3 no-zstd !) stream3-exp -- {requirements: generaldelta%2Crevlogv1%2Csparserevlog} (mandatory: True) (stream-v3 no-zstd !)
stream3-exp -- {requirements: generaldelta%2Crevlog-compression-zstd%2Crevlogv1%2Csparserevlog} (mandatory: True) (stream-v3 zstd no-rust !) stream3-exp -- {requirements: generaldelta%2Crevlog-compression-zstd%2Crevlogv1%2Csparserevlog} (mandatory: True) (stream-v3 zstd no-rust !)
stream3-exp -- {requirements: generaldelta%2Crevlog-compression-zstd%2Crevlogv1%2Csparserevlog} (mandatory: True) (stream-v3 rust !) stream3-exp -- {requirements: generaldelta%2Crevlog-compression-zstd%2Crevlogv1%2Csparserevlog} (mandatory: True) (stream-v3 rust !)
...@@ -133,8 +135,8 @@ ...@@ -133,8 +135,8 @@
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 5 changesets with 5 changes to 5 files added 5 changesets with 7 changes to 7 files
new changesets 426bada5c675:9bc730a19041 (5 drafts) new changesets 426bada5c675:92165ab525bf (5 drafts)
known requirements known requirements
------------------ ------------------
...@@ -193,8 +195,9 @@ ...@@ -193,8 +195,9 @@
bundle2-input-bundle: with-transaction bundle2-input-bundle: with-transaction
bundle2-input-part: "stream2" (params: 3 mandatory) supported bundle2-input-part: "stream2" (params: 3 mandatory) supported
applying stream bundle applying stream bundle
12 files to transfer, 1.65 KB of data (no-rust !) 14 files to transfer, 1.86 KB of data (no-rust no-zstd !)
14 files to transfer, 1.78 KB of data (rust !) 14 files to transfer, 1.87 KB of data (no-rust zstd !)
16 files to transfer, 2.05 KB of data (rust !)
starting 4 threads for background file closing (?) starting 4 threads for background file closing (?)
starting 4 threads for background file closing (?) starting 4 threads for background file closing (?)
adding [s] data/A.i (66 bytes) adding [s] data/A.i (66 bytes)
...@@ -202,4 +205,6 @@ ...@@ -202,4 +205,6 @@
adding [s] data/C.i (66 bytes) adding [s] data/C.i (66 bytes)
adding [s] data/D.i (66 bytes) adding [s] data/D.i (66 bytes)
adding [s] data/E.i (66 bytes) adding [s] data/E.i (66 bytes)
adding [s] data/ba"r.i (68 bytes)
adding [s] data/blu.i (68 bytes)
adding [s] phaseroots (43 bytes) adding [s] phaseroots (43 bytes)
...@@ -205,3 +210,5 @@ ...@@ -205,3 +210,5 @@
adding [s] phaseroots (43 bytes) adding [s] phaseroots (43 bytes)
adding [s] 00manifest.i (584 bytes) adding [s] 00manifest.i (649 bytes) (no-zstd !)
adding [s] 00manifest.i (652 bytes) (zstd no-rust !)
adding [s] 00manifest.i (654 bytes) (zstd rust !)
adding [s] 00changelog.n (62 bytes) (rust !) adding [s] 00changelog.n (62 bytes) (rust !)
...@@ -207,7 +214,7 @@ ...@@ -207,7 +214,7 @@
adding [s] 00changelog.n (62 bytes) (rust !) adding [s] 00changelog.n (62 bytes) (rust !)
adding [s] 00changelog-b875dfc5.nd (64 bytes) (rust !) adding [s] 00changelog-b875dfc5.nd (128 bytes) (rust !)
adding [s] 00changelog.d (275 bytes) adding [s] 00changelog.d (289 bytes)
adding [s] 00changelog.i (320 bytes) adding [s] 00changelog.i (320 bytes)
adding [c] branch2-served (94 bytes) adding [c] branch2-served (94 bytes)
adding [c] rbc-names-v2 (7 bytes) adding [c] rbc-names-v2 (7 bytes)
adding [c] rbc-revs-v2 (40 bytes) adding [c] rbc-revs-v2 (40 bytes)
...@@ -210,11 +217,13 @@ ...@@ -210,11 +217,13 @@
adding [s] 00changelog.i (320 bytes) adding [s] 00changelog.i (320 bytes)
adding [c] branch2-served (94 bytes) adding [c] branch2-served (94 bytes)
adding [c] rbc-names-v2 (7 bytes) adding [c] rbc-names-v2 (7 bytes)
adding [c] rbc-revs-v2 (40 bytes) adding [c] rbc-revs-v2 (40 bytes)
bundle2-input-part: total payload size 1857 (no-rust !) bundle2-input-part: total payload size 2099 (no-rust no-zstd !)
bundle2-input-part: total payload size 2025 (rust !) bundle2-input-part: total payload size 2102 (no-rust zstd !)
stream-cloned 12 files / 1.65 KB in * seconds (* */sec) (glob) (no-rust !) bundle2-input-part: total payload size 2337 (rust !)
stream-cloned 14 files / 1.78 KB in * seconds (* */sec) (glob) (rust !) stream-cloned 14 files / 1.86 KB in * seconds (* */sec) (glob) (no-rust no-zstd !)
stream-cloned 14 files / 1.87 KB in * seconds (* */sec) (glob) (no-rust zstd !)
stream-cloned 16 files / 2.05 KB in * seconds (* */sec) (glob) (rust !)
bundle2-input-bundle: 1 parts total bundle2-input-bundle: 1 parts total
updating the branch cache updating the branch cache
finished applying clone bundle finished applying clone bundle
...@@ -233,7 +242,7 @@ ...@@ -233,7 +242,7 @@
updating to branch default updating to branch default
resolving manifests (no-rust !) resolving manifests (no-rust !)
branchmerge: False, force: False, partial: False (no-rust !) branchmerge: False, force: False, partial: False (no-rust !)
ancestor: 000000000000, local: 000000000000+, remote: 9bc730a19041 (no-rust !) ancestor: 000000000000, local: 000000000000+, remote: 92165ab525bf (no-rust !)
A: remote created -> g (no-rust !) A: remote created -> g (no-rust !)
getting A (no-rust !) getting A (no-rust !)
B: remote created -> g (no-rust !) B: remote created -> g (no-rust !)
...@@ -244,7 +253,9 @@ ...@@ -244,7 +253,9 @@
getting D (no-rust !) getting D (no-rust !)
E: remote created -> g (no-rust !) E: remote created -> g (no-rust !)
getting E (no-rust !) getting E (no-rust !)
5 files updated, 0 files merged, 0 files removed, 0 files unresolved blu: remote created -> g (no-rust !)
getting blu (no-rust !)
6 files updated, 0 files merged, 0 files removed, 0 files unresolved
updating the branch cache updating the branch cache
(sent 4 HTTP requests and * bytes; received * bytes in responses) (glob) (sent 4 HTTP requests and * bytes; received * bytes in responses) (glob)
...@@ -261,8 +272,9 @@ ...@@ -261,8 +272,9 @@
bundle2-input-bundle: with-transaction bundle2-input-bundle: with-transaction
bundle2-input-part: "stream2" (params: 3 mandatory) supported bundle2-input-part: "stream2" (params: 3 mandatory) supported
applying stream bundle applying stream bundle
12 files to transfer, 1.65 KB of data (no-rust !) 14 files to transfer, 1.86 KB of data (no-rust no-zstd !)
14 files to transfer, 1.78 KB of data (rust !) 14 files to transfer, 1.87 KB of data (no-rust zstd !)
16 files to transfer, 2.05 KB of data (rust !)
starting 4 threads for background file closing (?) starting 4 threads for background file closing (?)
starting 4 threads for background file closing (?) starting 4 threads for background file closing (?)
adding [s] data/A.i (66 bytes) adding [s] data/A.i (66 bytes)
...@@ -270,4 +282,6 @@ ...@@ -270,4 +282,6 @@
adding [s] data/C.i (66 bytes) adding [s] data/C.i (66 bytes)
adding [s] data/D.i (66 bytes) adding [s] data/D.i (66 bytes)
adding [s] data/E.i (66 bytes) adding [s] data/E.i (66 bytes)
adding [s] data/ba"r.i (68 bytes)
adding [s] data/blu.i (68 bytes)
adding [s] phaseroots (43 bytes) adding [s] phaseroots (43 bytes)
...@@ -273,3 +287,5 @@ ...@@ -273,3 +287,5 @@
adding [s] phaseroots (43 bytes) adding [s] phaseroots (43 bytes)
adding [s] 00manifest.i (584 bytes) adding [s] 00manifest.i (649 bytes) (no-zstd !)
adding [s] 00manifest.i (652 bytes) (zstd no-rust !)
adding [s] 00manifest.i (654 bytes) (zstd rust !)
adding [s] 00changelog.n (62 bytes) (rust !) adding [s] 00changelog.n (62 bytes) (rust !)
...@@ -275,7 +291,7 @@ ...@@ -275,7 +291,7 @@
adding [s] 00changelog.n (62 bytes) (rust !) adding [s] 00changelog.n (62 bytes) (rust !)
adding [s] 00changelog-b875dfc5.nd (64 bytes) (rust !) adding [s] 00changelog-b875dfc5.nd (128 bytes) (rust !)
adding [s] 00changelog.d (275 bytes) adding [s] 00changelog.d (289 bytes)
adding [s] 00changelog.i (320 bytes) adding [s] 00changelog.i (320 bytes)
adding [c] branch2-served (94 bytes) adding [c] branch2-served (94 bytes)
adding [c] rbc-names-v2 (7 bytes) adding [c] rbc-names-v2 (7 bytes)
adding [c] rbc-revs-v2 (40 bytes) adding [c] rbc-revs-v2 (40 bytes)
...@@ -278,11 +294,13 @@ ...@@ -278,11 +294,13 @@
adding [s] 00changelog.i (320 bytes) adding [s] 00changelog.i (320 bytes)
adding [c] branch2-served (94 bytes) adding [c] branch2-served (94 bytes)
adding [c] rbc-names-v2 (7 bytes) adding [c] rbc-names-v2 (7 bytes)
adding [c] rbc-revs-v2 (40 bytes) adding [c] rbc-revs-v2 (40 bytes)
bundle2-input-part: total payload size 1857 (no-rust !) bundle2-input-part: total payload size 2099 (no-rust no-zstd !)
bundle2-input-part: total payload size 2025 (rust !) bundle2-input-part: total payload size 2102 (no-rust zstd !)
stream-cloned 12 files / 1.65 KB in * seconds (* */sec) (glob) (no-rust !) bundle2-input-part: total payload size 2337 (rust !)
stream-cloned 14 files / 1.78 KB in * seconds (* */sec) (glob) (rust !) stream-cloned 14 files / 1.86 KB in * seconds (* */sec) (glob) (no-rust no-zstd !)
stream-cloned 14 files / 1.87 KB in * seconds (* */sec) (glob) (no-rust zstd !)
stream-cloned 16 files / 2.05 KB in * seconds (* */sec) (glob) (rust !)
bundle2-input-bundle: 1 parts total bundle2-input-bundle: 1 parts total
updating the branch cache updating the branch cache
finished applying clone bundle finished applying clone bundle
...@@ -301,7 +319,7 @@ ...@@ -301,7 +319,7 @@
updating to branch default updating to branch default
resolving manifests (no-rust !) resolving manifests (no-rust !)
branchmerge: False, force: False, partial: False (no-rust !) branchmerge: False, force: False, partial: False (no-rust !)
ancestor: 000000000000, local: 000000000000+, remote: 9bc730a19041 (no-rust !) ancestor: 000000000000, local: 000000000000+, remote: 92165ab525bf (no-rust !)
A: remote created -> g (no-rust !) A: remote created -> g (no-rust !)
getting A (no-rust !) getting A (no-rust !)
B: remote created -> g (no-rust !) B: remote created -> g (no-rust !)
...@@ -312,7 +330,9 @@ ...@@ -312,7 +330,9 @@
getting D (no-rust !) getting D (no-rust !)
E: remote created -> g (no-rust !) E: remote created -> g (no-rust !)
getting E (no-rust !) getting E (no-rust !)
5 files updated, 0 files merged, 0 files removed, 0 files unresolved blu: remote created -> g (no-rust !)
getting blu (no-rust !)
6 files updated, 0 files merged, 0 files removed, 0 files unresolved
updating the branch cache updating the branch cache
(sent 4 HTTP requests and * bytes; received * bytes in responses) (glob) (sent 4 HTTP requests and * bytes; received * bytes in responses) (glob)
...@@ -327,7 +347,7 @@ ...@@ -327,7 +347,7 @@
bundle2-input-bundle: with-transaction bundle2-input-bundle: with-transaction
bundle2-input-part: "stream3-exp" (params: 1 mandatory) supported bundle2-input-part: "stream3-exp" (params: 1 mandatory) supported
applying stream bundle applying stream bundle
11 entries to transfer 13 entries to transfer
starting 4 threads for background file closing (?) starting 4 threads for background file closing (?)
starting 4 threads for background file closing (?) starting 4 threads for background file closing (?)
adding [s] data/A.i (66 bytes) adding [s] data/A.i (66 bytes)
...@@ -335,4 +355,6 @@ ...@@ -335,4 +355,6 @@
adding [s] data/C.i (66 bytes) adding [s] data/C.i (66 bytes)
adding [s] data/D.i (66 bytes) adding [s] data/D.i (66 bytes)
adding [s] data/E.i (66 bytes) adding [s] data/E.i (66 bytes)
adding [s] data/ba"r.i (68 bytes)
adding [s] data/blu.i (68 bytes)
adding [s] phaseroots (43 bytes) adding [s] phaseroots (43 bytes)
...@@ -338,3 +360,5 @@ ...@@ -338,3 +360,5 @@
adding [s] phaseroots (43 bytes) adding [s] phaseroots (43 bytes)
adding [s] 00manifest.i (584 bytes) adding [s] 00manifest.i (649 bytes) (no-zstd !)
adding [s] 00manifest.i (652 bytes) (zstd no-rust !)
adding [s] 00manifest.i (654 bytes) (zstd rust !)
adding [s] 00changelog.n (62 bytes) (rust !) adding [s] 00changelog.n (62 bytes) (rust !)
...@@ -340,7 +364,7 @@ ...@@ -340,7 +364,7 @@
adding [s] 00changelog.n (62 bytes) (rust !) adding [s] 00changelog.n (62 bytes) (rust !)
adding [s] 00changelog-b875dfc5.nd (64 bytes) (rust !) adding [s] 00changelog-b875dfc5.nd (128 bytes) (rust !)
adding [s] 00changelog.d (275 bytes) adding [s] 00changelog.d (289 bytes)
adding [s] 00changelog.i (320 bytes) adding [s] 00changelog.i (320 bytes)
adding [c] branch2-served (94 bytes) adding [c] branch2-served (94 bytes)
adding [c] rbc-names-v2 (7 bytes) adding [c] rbc-names-v2 (7 bytes)
adding [c] rbc-revs-v2 (40 bytes) adding [c] rbc-revs-v2 (40 bytes)
...@@ -343,11 +367,13 @@ ...@@ -343,11 +367,13 @@
adding [s] 00changelog.i (320 bytes) adding [s] 00changelog.i (320 bytes)
adding [c] branch2-served (94 bytes) adding [c] branch2-served (94 bytes)
adding [c] rbc-names-v2 (7 bytes) adding [c] rbc-names-v2 (7 bytes)
adding [c] rbc-revs-v2 (40 bytes) adding [c] rbc-revs-v2 (40 bytes)
stream-cloned 12 files / 1.65 KB in * seconds (* */sec) (glob) (no-rust !) stream-cloned 14 files / 1.86 KB in * seconds (* */sec) (glob) (no-rust no-zstd !)
bundle2-input-part: total payload size 1869 (no-rust !) stream-cloned 14 files / 1.87 KB in * seconds (* */sec) (glob) (no-rust zstd !)
stream-cloned 14 files / 1.78 KB in * seconds (* */sec) (glob) (rust !) bundle2-input-part: total payload size 2113 (no-rust no-zstd !)
bundle2-input-part: total payload size 2037 (rust !) bundle2-input-part: total payload size 2116 (no-rust zstd !)
stream-cloned 16 files / 2.05 KB in * seconds (* */sec) (glob) (rust !)
bundle2-input-part: total payload size 2351 (rust !)
bundle2-input-bundle: 1 parts total bundle2-input-bundle: 1 parts total
updating the branch cache updating the branch cache
finished applying clone bundle finished applying clone bundle
...@@ -366,7 +392,7 @@ ...@@ -366,7 +392,7 @@
updating to branch default updating to branch default
resolving manifests (no-rust !) resolving manifests (no-rust !)
branchmerge: False, force: False, partial: False (no-rust !) branchmerge: False, force: False, partial: False (no-rust !)
ancestor: 000000000000, local: 000000000000+, remote: 9bc730a19041 (no-rust !) ancestor: 000000000000, local: 000000000000+, remote: 92165ab525bf (no-rust !)
A: remote created -> g (no-rust !) A: remote created -> g (no-rust !)
getting A (no-rust !) getting A (no-rust !)
B: remote created -> g (no-rust !) B: remote created -> g (no-rust !)
...@@ -377,7 +403,9 @@ ...@@ -377,7 +403,9 @@
getting D (no-rust !) getting D (no-rust !)
E: remote created -> g (no-rust !) E: remote created -> g (no-rust !)
getting E (no-rust !) getting E (no-rust !)
5 files updated, 0 files merged, 0 files removed, 0 files unresolved blu: remote created -> g (no-rust !)
getting blu (no-rust !)
6 files updated, 0 files merged, 0 files removed, 0 files unresolved
updating the branch cache updating the branch cache
(sent 4 HTTP requests and * bytes; received * bytes in responses) (glob) (sent 4 HTTP requests and * bytes; received * bytes in responses) (glob)
...@@ -389,7 +417,7 @@ ...@@ -389,7 +417,7 @@
bundle2-input-bundle: with-transaction bundle2-input-bundle: with-transaction
bundle2-input-part: "stream3-exp" (params: 1 mandatory) supported bundle2-input-part: "stream3-exp" (params: 1 mandatory) supported
applying stream bundle applying stream bundle
11 entries to transfer 13 entries to transfer
starting 4 threads for background file closing (?) starting 4 threads for background file closing (?)
starting 4 threads for background file closing (?) starting 4 threads for background file closing (?)
adding [s] data/A.i (66 bytes) adding [s] data/A.i (66 bytes)
...@@ -397,4 +425,6 @@ ...@@ -397,4 +425,6 @@
adding [s] data/C.i (66 bytes) adding [s] data/C.i (66 bytes)
adding [s] data/D.i (66 bytes) adding [s] data/D.i (66 bytes)
adding [s] data/E.i (66 bytes) adding [s] data/E.i (66 bytes)
adding [s] data/ba"r.i (68 bytes)
adding [s] data/blu.i (68 bytes)
adding [s] phaseroots (43 bytes) adding [s] phaseroots (43 bytes)
...@@ -400,3 +430,5 @@ ...@@ -400,3 +430,5 @@
adding [s] phaseroots (43 bytes) adding [s] phaseroots (43 bytes)
adding [s] 00manifest.i (584 bytes) adding [s] 00manifest.i (649 bytes) (no-zstd !)
adding [s] 00manifest.i (652 bytes) (zstd no-rust !)
adding [s] 00manifest.i (654 bytes) (zstd rust !)
adding [s] 00changelog.n (62 bytes) (rust !) adding [s] 00changelog.n (62 bytes) (rust !)
...@@ -402,7 +434,7 @@ ...@@ -402,7 +434,7 @@
adding [s] 00changelog.n (62 bytes) (rust !) adding [s] 00changelog.n (62 bytes) (rust !)
adding [s] 00changelog-b875dfc5.nd (64 bytes) (rust !) adding [s] 00changelog-b875dfc5.nd (128 bytes) (rust !)
adding [s] 00changelog.d (275 bytes) adding [s] 00changelog.d (289 bytes)
adding [s] 00changelog.i (320 bytes) adding [s] 00changelog.i (320 bytes)
adding [c] branch2-served (94 bytes) adding [c] branch2-served (94 bytes)
adding [c] rbc-names-v2 (7 bytes) adding [c] rbc-names-v2 (7 bytes)
adding [c] rbc-revs-v2 (40 bytes) adding [c] rbc-revs-v2 (40 bytes)
...@@ -405,11 +437,13 @@ ...@@ -405,11 +437,13 @@
adding [s] 00changelog.i (320 bytes) adding [s] 00changelog.i (320 bytes)
adding [c] branch2-served (94 bytes) adding [c] branch2-served (94 bytes)
adding [c] rbc-names-v2 (7 bytes) adding [c] rbc-names-v2 (7 bytes)
adding [c] rbc-revs-v2 (40 bytes) adding [c] rbc-revs-v2 (40 bytes)
stream-cloned 12 files / 1.65 KB in * seconds (* */sec) (glob) (no-rust !) stream-cloned 14 files / 1.86 KB in * seconds (* */sec) (glob) (no-rust no-zstd !)
bundle2-input-part: total payload size 1869 (no-rust !) stream-cloned 14 files / 1.87 KB in * seconds (* */sec) (glob) (no-rust zstd !)
stream-cloned 14 files / 1.78 KB in * seconds (* */sec) (glob) (rust !) bundle2-input-part: total payload size 2113 (no-rust no-zstd !)
bundle2-input-part: total payload size 2037 (rust !) bundle2-input-part: total payload size 2116 (no-rust zstd !)
stream-cloned 16 files / 2.05 KB in * seconds (* */sec) (glob) (rust !)
bundle2-input-part: total payload size 2351 (rust !)
bundle2-input-bundle: 1 parts total bundle2-input-bundle: 1 parts total
updating the branch cache updating the branch cache
finished applying clone bundle finished applying clone bundle
...@@ -428,7 +462,7 @@ ...@@ -428,7 +462,7 @@
updating to branch default updating to branch default
resolving manifests (no-rust !) resolving manifests (no-rust !)
branchmerge: False, force: False, partial: False (no-rust !) branchmerge: False, force: False, partial: False (no-rust !)
ancestor: 000000000000, local: 000000000000+, remote: 9bc730a19041 (no-rust !) ancestor: 000000000000, local: 000000000000+, remote: 92165ab525bf (no-rust !)
A: remote created -> g (no-rust !) A: remote created -> g (no-rust !)
getting A (no-rust !) getting A (no-rust !)
B: remote created -> g (no-rust !) B: remote created -> g (no-rust !)
...@@ -439,7 +473,9 @@ ...@@ -439,7 +473,9 @@
getting D (no-rust !) getting D (no-rust !)
E: remote created -> g (no-rust !) E: remote created -> g (no-rust !)
getting E (no-rust !) getting E (no-rust !)
5 files updated, 0 files merged, 0 files removed, 0 files unresolved blu: remote created -> g (no-rust !)
getting blu (no-rust !)
6 files updated, 0 files merged, 0 files removed, 0 files unresolved
updating the branch cache updating the branch cache
(sent 4 HTTP requests and * bytes; received * bytes in responses) (glob) (sent 4 HTTP requests and * bytes; received * bytes in responses) (glob)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment