Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • mercurial/mercurial-devel
1 result
Show changes
Commits on Source (6)
......@@ -702,5 +702,6 @@
upload
--verbose
--repository-url ${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/pypi
--skip-existing
wheels/*/*/*/*.whl
wheels/*/*.whl
......@@ -476,5 +476,6 @@
<path> is the real file system path content should be written to,
<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)
......@@ -480,5 +481,4 @@
self.register_file(path)
real_path = self.join(path)
dirname, basename = util.split(real_path)
if dirname not in known_directories:
util.makedirs(dirname, self.createmode, True)
......
......@@ -79,6 +79,20 @@
# replace: A -> B -> C -> D # chained 1 to 1 replacements
# split: A -> B, C # 1 to many
# prune: A, B, C # many to nothing
Special comment can also be used to control file content for some revision.
The example below create two extra files in A, update on in B and delete the
other on in C (using a special content to mark the deletion).
In all case the file matching the node name is created for all non-merge
commit.
C # A/file/path=content in A
| # A/other/file/path=content for another file
B # B/file/path=updated content in B
| # C/other/file/path=<deleted>
A
"""
import collections
......@@ -300,7 +314,10 @@
self._parents.append(repo[repo.nullid])
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):
return self._repo.commitctx(self)
......@@ -381,6 +398,6 @@
# parse comments to get extra file content instructions
files = collections.defaultdict(dict) # {(name, path): content}
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)):
content = content.replace(br'\n', b'\n').replace(br'\1', b'\1')
......@@ -385,6 +402,9 @@
for name, path, content in filere.findall(b'\n'.join(comments)):
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}
......
......@@ -666,7 +666,9 @@
return 0, 0
@checkvers("pygments", "Pygments version >= %s", ('2.5', '2.11', '2.14'))
@checkvers(
"pygments", "Pygments version >= %s", ('2.5', '2.11', '2.14', '2.19')
)
def has_pygments_range(v):
major, minor = v.split('.')[0:2]
return getpygmentsversion() >= (int(major), int(minor))
......
......@@ -242,8 +242,12 @@
> |\ # B/dir2/b = 34
> A B # C/dir1/c = 5
> # C/dir2/c = 6
> # A/to-be"deleted" = I am doomed.
> # B/to-be-deleted_too = The end is near.
> # C/to-be"deleted"=<deleted>
> # C/to-be-deleted_too = <deleted>
> # C/A = a
> # C/B = b
> EOS
$ hg log -G -T '{desc} {files}'
......@@ -245,7 +249,7 @@
> # C/A = a
> # C/B = b
> EOS
$ hg log -G -T '{desc} {files}'
o C A B dir1/c dir2/c
o C A B dir1/c dir2/c to-be"deleted" to-be-deleted_too
|\
......@@ -251,3 +255,3 @@
|\
| o B B dir2/b
| o B B dir2/b to-be-deleted_too
|
......@@ -253,3 +257,3 @@
|
o A A dir1/a
o A A dir1/a to-be"deleted"
......@@ -255,4 +259,33 @@
$ for r in `hg log -T '{rev} ' --rev "sort(all())"`; do
> hg log --rev $r -T "### {tags} ###\n";
> hg diff --change $r --stat;
> done
### A ###
A | 1 +
dir1/a | 2 ++
to-be"deleted" | 1 +
3 files changed, 4 insertions(+), 0 deletions(-)
### B ###
B | 1 +
dir2/b | 1 +
to-be-deleted_too | 1 +
3 files changed, 3 insertions(+), 0 deletions(-)
### C tip ###
A | 2 +-
B | 1 +
dir1/c | 1 +
dir2/b | 1 +
dir2/c | 1 +
to-be"deleted" | 1 -
6 files changed, 5 insertions(+), 2 deletions(-)
$ hg files -r C
A
B
dir1/a
dir1/c
dir2/b
dir2/c
$ for f in `hg files -r C`; do
> echo FILE "$f"
> hg cat -r C "$f"
......
......@@ -160,5 +160,6 @@
<span id="l4"><span class="sd"> where sieve (p:ns) = p : sieve [n | n &lt;- ns, mod n p /= 0]</span></span><a href="#l4"></a>
<span id="l5"><span class="sd">&quot;&quot;&quot;</span></span><a href="#l5"></a>
<span id="l6"></span><a href="#l6"></a>
<span id="l7"><span class="kn">import</span> <span class="nn">itertools</span></span><a href="#l7"></a>
<span id="l7"><span class="kn">import</span><span class="w"> </span><span class="nn">itertools</span></span><a href="#l7"></a> (pygments219 !)
<span id="l7"><span class="kn">import</span> <span class="nn">itertools</span></span><a href="#l7"></a> (no-pygments219 !)
<span id="l8"></span><a href="#l8"></a>
......@@ -164,4 +165,5 @@
<span id="l8"></span><a href="#l8"></a>
<span id="l9"><span class="kn">def</span> <span class="nf">primes</span><span class="p">():</span></span><a href="#l9"></a>
<span id="l9"><span class="kn">def</span><span class="w"> </span><span class="nf">primes</span><span class="p">():</span></span><a href="#l9"></a> (pygments219 !)
<span id="l9"><span class="kn">def</span> <span class="nf">primes</span><span class="p">():</span></span><a href="#l9"></a> (no-pygments219 !)
<span id="l10"><span class="w"> </span><span class="sd">&quot;&quot;&quot;Generate all primes.&quot;&quot;&quot;</span></span><a href="#l10"></a> (pygments214 !)
<span id="l10"> <span class="sd">&quot;&quot;&quot;Generate all primes.&quot;&quot;&quot;</span></span><a href="#l10"></a> (no-pygments214 !)
......@@ -166,6 +168,7 @@
<span id="l10"><span class="w"> </span><span class="sd">&quot;&quot;&quot;Generate all primes.&quot;&quot;&quot;</span></span><a href="#l10"></a> (pygments214 !)
<span id="l10"> <span class="sd">&quot;&quot;&quot;Generate all primes.&quot;&quot;&quot;</span></span><a href="#l10"></a> (no-pygments214 !)
<span id="l11"> <span class="kn">def</span> <span class="nf">sieve</span><span class="p">(</span><span class="n">ns</span><span class="p">):</span></span><a href="#l11"></a>
<span id="l11"> <span class="kn">def</span><span class="w"> </span><span class="nf">sieve</span><span class="p">(</span><span class="n">ns</span><span class="p">):</span></span><a href="#l11"></a> (pygments219 !)
<span id="l11"> <span class="kn">def</span> <span class="nf">sieve</span><span class="p">(</span><span class="n">ns</span><span class="p">):</span></span><a href="#l11"></a> (no-pygments219 !)
<span id="l12"> <span class="n">p</span> <span class="o">=</span> <span class="n">ns</span><span class="o">.</span><span class="n">next</span><span class="p">()</span></span><a href="#l12"></a>
<span id="l13"> <span class="c"># It is important to yield *here* in order to stop the</span></span><a href="#l13"></a>
<span id="l14"> <span class="c"># infinite recursion.</span></span><a href="#l14"></a>
......@@ -179,7 +182,8 @@
<span id="l22"> <span class="kn">return</span> <span class="n">itertools</span><span class="o">.</span><span class="n">chain</span><span class="p">([</span><span class="mi">2</span><span class="p">],</span> <span class="n">sieve</span><span class="p">(</span><span class="n">dropwhile</span><span class="p">(</span><span class="kn">lambda</span> <span class="n">n</span><span class="p">:</span> <span class="n">n</span> <span class="o">&lt;</span> <span class="mi">3</span><span class="p">,</span> <span class="n">odds</span><span class="p">)))</span></span><a href="#l22"></a>
<span id="l23"></span><a href="#l23"></a>
<span id="l24"><span class="kn">if</span> <span class="n">__name__</span> <span class="o">==</span> <span class="s">&quot;__main__&quot;</span><span class="p">:</span></span><a href="#l24"></a>
<span id="l25"> <span class="kn">import</span> <span class="nn">sys</span></span><a href="#l25"></a>
<span id="l25"> <span class="kn">import</span><span class="w"> </span><span class="nn">sys</span></span><a href="#l25"></a> (pygments219 !)
<span id="l25"> <span class="kn">import</span> <span class="nn">sys</span></span><a href="#l25"></a> (no-pygments219 !)
<span id="l26"> <span class="kn">try</span><span class="p">:</span></span><a href="#l26"></a>
<span id="l27"> <span class="n">n</span> <span class="o">=</span> <span class="nb">int</span><span class="p">(</span><span class="n">sys</span><span class="o">.</span><span class="n">argv</span><span class="p">[</span><span class="mi">1</span><span class="p">])</span></span><a href="#l27"></a>
<span id="l28"> <span class="kn">except</span> <span class="p">(</span><span class="ne">ValueError</span><span class="p">,</span> <span class="ne">IndexError</span><span class="p">):</span></span><a href="#l28"></a>
......@@ -439,7 +443,8 @@
<a href="/rev/687f2d169546">changeset</a>
</div>
</td>
<td class="source followlines-btn-parent"><a href="#l7"> 7</a> <span class="kn">import</span> <span class="nn">itertools</span></td>
<td class="source followlines-btn-parent"><a href="#l7"> 7</a> <span class="kn">import</span><span class="w"> </span><span class="nn">itertools</span></td> (pygments219 !)
<td class="source followlines-btn-parent"><a href="#l7"> 7</a> <span class="kn">import</span> <span class="nn">itertools</span></td> (no-pygments219 !)
</tr>
<tr id="l8" class="thisrev">
<td class="annotate parity0">
......@@ -473,7 +478,8 @@
<a href="/rev/687f2d169546">changeset</a>
</div>
</td>
<td class="source followlines-btn-parent"><a href="#l9"> 9</a> <span class="kn">def</span> <span class="nf">primes</span><span class="p">():</span></td>
<td class="source followlines-btn-parent"><a href="#l9"> 9</a> <span class="kn">def</span><span class="w"> </span><span class="nf">primes</span><span class="p">():</span></td> (pygments219 !)
<td class="source followlines-btn-parent"><a href="#l9"> 9</a> <span class="kn">def</span> <span class="nf">primes</span><span class="p">():</span></td> (no-pygments219 !)
</tr>
<tr id="l10" class="thisrev">
<td class="annotate parity0">
......@@ -508,7 +514,8 @@
<a href="/rev/687f2d169546">changeset</a>
</div>
</td>
<td class="source followlines-btn-parent"><a href="#l11"> 11</a> <span class="kn">def</span> <span class="nf">sieve</span><span class="p">(</span><span class="n">ns</span><span class="p">):</span></td>
<td class="source followlines-btn-parent"><a href="#l11"> 11</a> <span class="kn">def</span><span class="w"> </span><span class="nf">sieve</span><span class="p">(</span><span class="n">ns</span><span class="p">):</span></td> (pygments219 !)
<td class="source followlines-btn-parent"><a href="#l11"> 11</a> <span class="kn">def</span> <span class="nf">sieve</span><span class="p">(</span><span class="n">ns</span><span class="p">):</span></td> (no-pygments219 !)
</tr>
<tr id="l12" class="thisrev">
<td class="annotate parity0">
......@@ -746,7 +753,8 @@
<a href="/rev/687f2d169546">changeset</a>
</div>
</td>
<td class="source followlines-btn-parent"><a href="#l25"> 25</a> <span class="kn">import</span> <span class="nn">sys</span></td>
<td class="source followlines-btn-parent"><a href="#l25"> 25</a> <span class="kn">import</span><span class="w"> </span><span class="nn">sys</span></td> (pygments219 !)
<td class="source followlines-btn-parent"><a href="#l25"> 25</a> <span class="kn">import</span> <span class="nn">sys</span></td> (no-pygments219 !)
</tr>
<tr id="l26" class="thisrev">
<td class="annotate parity0">
......@@ -1022,7 +1030,8 @@
$ cat hg.pid >> $DAEMON_PIDS
$ get-with-headers.py localhost:$HGPORT 'file/tip/unknownfile' | grep l2
<span id="l2"><span class="k">def</span> <span class="nf">foo</span><span class="p">():</span></span><a href="#l2"></a>
<span id="l2"><span class="k">def</span><span class="w"> </span><span class="nf">foo</span><span class="p">():</span></span><a href="#l2"></a> (pygments219 !)
<span id="l2"><span class="k">def</span> <span class="nf">foo</span><span class="p">():</span></span><a href="#l2"></a> (no-pygments219 !)
We can prevent Pygments from falling back to a non filename-based
detection mode
......
......@@ -36,6 +36,8 @@
$ cp $HGRCPATH $TESTTMP/hgrc.orig
$ cat >> $HGRCPATH << EOF
> [ui]
> portablefilenames=abort
> [experimental]
> evolution.createmarkers=True
> evolution.exchange=True
......@@ -60,5 +62,5 @@
$ hg debugdrawdag <<'EOF'
> E
> |
> D
> D # D/ba"r=<deleted>
> |
......@@ -64,3 +66,3 @@
> |
> C
> C # C/ba"r=faz
> |
......@@ -66,5 +68,5 @@
> |
> B
> B # B/blu=fuz
> |
> A
> EOF
......@@ -72,9 +74,9 @@
$ hg bundle -a --type="none-v2;stream=$stream_version" bundle.hg
$ hg debugbundle bundle.hg
Stream params: {}
stream2 -- {bytecount: 1693, filecount: 12, 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: 1819, filecount: 14, requirements: generaldelta%2Crevlog-compression-zstd%2Crevlogv1%2Csparserevlog} (mandatory: True) (stream-v2 rust !)
stream2 -- {bytecount: 1908, filecount: 14, requirements: generaldelta%2Crevlogv1%2Csparserevlog} (mandatory: True) (stream-v2 no-zstd !)
stream2 -- {bytecount: 1911, filecount: 14, requirements: generaldelta%2Crevlog-compression-zstd%2Crevlogv1%2Csparserevlog} (mandatory: True) (stream-v2 zstd no-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%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 !)
......@@ -89,9 +91,9 @@
$ hg bundle -a --type="none-$bundle_format" bundle.hg
$ hg debugbundle bundle.hg
Stream params: {}
stream2 -- {bytecount: 1693, filecount: 12, 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: 1819, filecount: 14, requirements: generaldelta%2Crevlog-compression-zstd%2Crevlogv1%2Csparserevlog} (mandatory: True) (stream-v2 rust !)
stream2 -- {bytecount: 1908, filecount: 14, requirements: generaldelta%2Crevlogv1%2Csparserevlog} (mandatory: True) (stream-v2 no-zstd !)
stream2 -- {bytecount: 1911, filecount: 14, requirements: generaldelta%2Crevlog-compression-zstd%2Crevlogv1%2Csparserevlog} (mandatory: True) (stream-v2 zstd no-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%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 !)
......@@ -133,8 +135,8 @@
adding changesets
adding manifests
adding file changes
added 5 changesets with 5 changes to 5 files
new changesets 426bada5c675:9bc730a19041 (5 drafts)
added 5 changesets with 7 changes to 7 files
new changesets 426bada5c675:92165ab525bf (5 drafts)
known requirements
------------------
......@@ -193,8 +195,9 @@
bundle2-input-bundle: with-transaction
bundle2-input-part: "stream2" (params: 3 mandatory) supported
applying stream bundle
12 files to transfer, 1.65 KB of data (no-rust !)
14 files to transfer, 1.78 KB of data (rust !)
14 files to transfer, 1.86 KB of data (no-rust no-zstd !)
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 (?)
adding [s] data/A.i (66 bytes)
......@@ -202,4 +205,6 @@
adding [s] data/C.i (66 bytes)
adding [s] data/D.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)
......@@ -205,3 +210,5 @@
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 !)
......@@ -207,7 +214,7 @@
adding [s] 00changelog.n (62 bytes) (rust !)
adding [s] 00changelog-b875dfc5.nd (64 bytes) (rust !)
adding [s] 00changelog.d (275 bytes)
adding [s] 00changelog-b875dfc5.nd (128 bytes) (rust !)
adding [s] 00changelog.d (289 bytes)
adding [s] 00changelog.i (320 bytes)
adding [c] branch2-served (94 bytes)
adding [c] rbc-names-v2 (7 bytes)
adding [c] rbc-revs-v2 (40 bytes)
......@@ -210,11 +217,13 @@
adding [s] 00changelog.i (320 bytes)
adding [c] branch2-served (94 bytes)
adding [c] rbc-names-v2 (7 bytes)
adding [c] rbc-revs-v2 (40 bytes)
bundle2-input-part: total payload size 1857 (no-rust !)
bundle2-input-part: total payload size 2025 (rust !)
stream-cloned 12 files / 1.65 KB in * seconds (* */sec) (glob) (no-rust !)
stream-cloned 14 files / 1.78 KB in * seconds (* */sec) (glob) (rust !)
bundle2-input-part: total payload size 2099 (no-rust no-zstd !)
bundle2-input-part: total payload size 2102 (no-rust zstd !)
bundle2-input-part: total payload size 2337 (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
updating the branch cache
finished applying clone bundle
......@@ -233,7 +242,7 @@
updating to branch default
resolving manifests (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 !)
getting A (no-rust !)
B: remote created -> g (no-rust !)
......@@ -244,7 +253,9 @@
getting D (no-rust !)
E: remote created -> g (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
(sent 4 HTTP requests and * bytes; received * bytes in responses) (glob)
......@@ -261,8 +272,9 @@
bundle2-input-bundle: with-transaction
bundle2-input-part: "stream2" (params: 3 mandatory) supported
applying stream bundle
12 files to transfer, 1.65 KB of data (no-rust !)
14 files to transfer, 1.78 KB of data (rust !)
14 files to transfer, 1.86 KB of data (no-rust no-zstd !)
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 (?)
adding [s] data/A.i (66 bytes)
......@@ -270,4 +282,6 @@
adding [s] data/C.i (66 bytes)
adding [s] data/D.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)
......@@ -273,3 +287,5 @@
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 !)
......@@ -275,7 +291,7 @@
adding [s] 00changelog.n (62 bytes) (rust !)
adding [s] 00changelog-b875dfc5.nd (64 bytes) (rust !)
adding [s] 00changelog.d (275 bytes)
adding [s] 00changelog-b875dfc5.nd (128 bytes) (rust !)
adding [s] 00changelog.d (289 bytes)
adding [s] 00changelog.i (320 bytes)
adding [c] branch2-served (94 bytes)
adding [c] rbc-names-v2 (7 bytes)
adding [c] rbc-revs-v2 (40 bytes)
......@@ -278,11 +294,13 @@
adding [s] 00changelog.i (320 bytes)
adding [c] branch2-served (94 bytes)
adding [c] rbc-names-v2 (7 bytes)
adding [c] rbc-revs-v2 (40 bytes)
bundle2-input-part: total payload size 1857 (no-rust !)
bundle2-input-part: total payload size 2025 (rust !)
stream-cloned 12 files / 1.65 KB in * seconds (* */sec) (glob) (no-rust !)
stream-cloned 14 files / 1.78 KB in * seconds (* */sec) (glob) (rust !)
bundle2-input-part: total payload size 2099 (no-rust no-zstd !)
bundle2-input-part: total payload size 2102 (no-rust zstd !)
bundle2-input-part: total payload size 2337 (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
updating the branch cache
finished applying clone bundle
......@@ -301,7 +319,7 @@
updating to branch default
resolving manifests (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 !)
getting A (no-rust !)
B: remote created -> g (no-rust !)
......@@ -312,7 +330,9 @@
getting D (no-rust !)
E: remote created -> g (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
(sent 4 HTTP requests and * bytes; received * bytes in responses) (glob)
......@@ -327,7 +347,7 @@
bundle2-input-bundle: with-transaction
bundle2-input-part: "stream3-exp" (params: 1 mandatory) supported
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 (?)
adding [s] data/A.i (66 bytes)
......@@ -335,4 +355,6 @@
adding [s] data/C.i (66 bytes)
adding [s] data/D.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)
......@@ -338,3 +360,5 @@
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 !)
......@@ -340,7 +364,7 @@
adding [s] 00changelog.n (62 bytes) (rust !)
adding [s] 00changelog-b875dfc5.nd (64 bytes) (rust !)
adding [s] 00changelog.d (275 bytes)
adding [s] 00changelog-b875dfc5.nd (128 bytes) (rust !)
adding [s] 00changelog.d (289 bytes)
adding [s] 00changelog.i (320 bytes)
adding [c] branch2-served (94 bytes)
adding [c] rbc-names-v2 (7 bytes)
adding [c] rbc-revs-v2 (40 bytes)
......@@ -343,11 +367,13 @@
adding [s] 00changelog.i (320 bytes)
adding [c] branch2-served (94 bytes)
adding [c] rbc-names-v2 (7 bytes)
adding [c] rbc-revs-v2 (40 bytes)
stream-cloned 12 files / 1.65 KB in * seconds (* */sec) (glob) (no-rust !)
bundle2-input-part: total payload size 1869 (no-rust !)
stream-cloned 14 files / 1.78 KB in * seconds (* */sec) (glob) (rust !)
bundle2-input-part: total payload size 2037 (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 !)
bundle2-input-part: total payload size 2113 (no-rust no-zstd !)
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
updating the branch cache
finished applying clone bundle
......@@ -366,7 +392,7 @@
updating to branch default
resolving manifests (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 !)
getting A (no-rust !)
B: remote created -> g (no-rust !)
......@@ -377,7 +403,9 @@
getting D (no-rust !)
E: remote created -> g (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
(sent 4 HTTP requests and * bytes; received * bytes in responses) (glob)
......@@ -389,7 +417,7 @@
bundle2-input-bundle: with-transaction
bundle2-input-part: "stream3-exp" (params: 1 mandatory) supported
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 (?)
adding [s] data/A.i (66 bytes)
......@@ -397,4 +425,6 @@
adding [s] data/C.i (66 bytes)
adding [s] data/D.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)
......@@ -400,3 +430,5 @@
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 !)
......@@ -402,7 +434,7 @@
adding [s] 00changelog.n (62 bytes) (rust !)
adding [s] 00changelog-b875dfc5.nd (64 bytes) (rust !)
adding [s] 00changelog.d (275 bytes)
adding [s] 00changelog-b875dfc5.nd (128 bytes) (rust !)
adding [s] 00changelog.d (289 bytes)
adding [s] 00changelog.i (320 bytes)
adding [c] branch2-served (94 bytes)
adding [c] rbc-names-v2 (7 bytes)
adding [c] rbc-revs-v2 (40 bytes)
......@@ -405,11 +437,13 @@
adding [s] 00changelog.i (320 bytes)
adding [c] branch2-served (94 bytes)
adding [c] rbc-names-v2 (7 bytes)
adding [c] rbc-revs-v2 (40 bytes)
stream-cloned 12 files / 1.65 KB in * seconds (* */sec) (glob) (no-rust !)
bundle2-input-part: total payload size 1869 (no-rust !)
stream-cloned 14 files / 1.78 KB in * seconds (* */sec) (glob) (rust !)
bundle2-input-part: total payload size 2037 (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 !)
bundle2-input-part: total payload size 2113 (no-rust no-zstd !)
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
updating the branch cache
finished applying clone bundle
......@@ -428,7 +462,7 @@
updating to branch default
resolving manifests (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 !)
getting A (no-rust !)
B: remote created -> g (no-rust !)
......@@ -439,7 +473,9 @@
getting D (no-rust !)
E: remote created -> g (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
(sent 4 HTTP requests and * bytes; received * bytes in responses) (glob)
......