diff --git a/mercurial/streamclone.py b/mercurial/streamclone.py index 6feb3b3029b5dbb5b9380db0740a54c0baf16195_bWVyY3VyaWFsL3N0cmVhbWNsb25lLnB5..ca17d31624ac6a3daa04c5ad961dc6ceb6b6f3c0_bWVyY3VyaWFsL3N0cmVhbWNsb25lLnB5 100644 --- a/mercurial/streamclone.py +++ b/mercurial/streamclone.py @@ -255,8 +255,10 @@ return repo.store.walk(matcher, phase=phase, obsolescence=obsolescence) -def _report_transferred(repo, start_time: float, byte_count: int): - """common utility to report time it took to download the stream bundle""" +def _report_transferred( + repo, start_time: float, file_count: int, byte_count: int +): + """common utility to report time it took to apply the stream bundle""" elapsed = util.timer() - start_time if elapsed <= 0: elapsed = 0.001 @@ -260,5 +262,5 @@ elapsed = util.timer() - start_time if elapsed <= 0: elapsed = 0.001 - m = _(b'transferred %s in %.1f seconds (%s/sec)\n') + m = _(b'stream-cloned %d files / %s in %.1f seconds (%s/sec)\n') m %= ( @@ -264,4 +266,5 @@ m %= ( + file_count, util.bytecount(byte_count), elapsed, util.bytecount(byte_count / elapsed), @@ -448,6 +451,7 @@ # nesting occurs also in ordinary case (e.g. enabling # clonebundles). + total_file_count = 0 with repo.transaction(b'clone'): with repo.svfs.backgroundclosing(repo.ui, expectedcount=filecount): for i in range(filecount): @@ -476,6 +480,7 @@ # for backwards compat, name was partially encoded path = store.decodedir(name) with repo.svfs(path, b'w', backgroundclose=True) as ofp: + total_file_count += 1 for chunk in util.filechunkiter(fp, limit=size): progress.increment(step=len(chunk)) ofp.write(chunk) @@ -485,7 +490,7 @@ repo.invalidate(clearfilecache=True) progress.complete() - _report_transferred(repo, start, bytecount) + _report_transferred(repo, start, total_file_count, bytecount) def readbundle1header(fp) -> tuple[int, int, Set[bytes]]: @@ -1110,7 +1115,7 @@ repo.invalidate(clearfilecache=True) progress.complete() - _report_transferred(repo, start, byte_count) + _report_transferred(repo, start, filecount, byte_count) def consumev3(repo, fp) -> None: @@ -1143,7 +1148,7 @@ raise error.ProgrammingError( 'repo.vfs must not be added to vfsmap for security reasons' ) - + total_file_count = 0 with repo.transaction(b'clone'): ctxs = (vfs.backgroundclosing(repo.ui) for vfs in vfsmap.values()) with nested(*ctxs): @@ -1152,6 +1157,7 @@ if filecount == 0: if repo.ui.debugflag: repo.ui.debug(b'entry with no files [%d]\n' % (i)) + total_file_count += filecount for i in range(filecount): src = util.readexactly(fp, 1) vfs = vfsmap[src] @@ -1176,7 +1182,7 @@ repo.invalidate(clearfilecache=True) progress.complete() - _report_transferred(repo, start, bytes_transferred) + _report_transferred(repo, start, total_file_count, bytes_transferred) def applybundlev2( diff --git a/tests/test-bundle.t b/tests/test-bundle.t index 6feb3b3029b5dbb5b9380db0740a54c0baf16195_dGVzdHMvdGVzdC1idW5kbGUudA==..ca17d31624ac6a3daa04c5ad961dc6ceb6b6f3c0_dGVzdHMvdGVzdC1idW5kbGUudA== 100644 --- a/tests/test-bundle.t +++ b/tests/test-bundle.t @@ -492,8 +492,8 @@ 9 files to transfer, 2.85 KB of data (rust !) pretxnopen: 000000000000 pretxnclose: aa35859c02ea - transferred 2.60 KB in * seconds (* */sec) (glob) (no-rust !) - transferred 2.85 KB in * seconds (* */sec) (glob) (rust !) + stream-cloned 7 files / 2.60 KB in * seconds (* */sec) (glob) (no-rust !) + stream-cloned 9 files / 2.85 KB in * seconds (* */sec) (glob) (rust !) txnclose: aa35859c02ea (for safety, confirm visibility of streamclone-ed changes by another diff --git a/tests/test-clone-stream-revlog-split.t b/tests/test-clone-stream-revlog-split.t index 6feb3b3029b5dbb5b9380db0740a54c0baf16195_dGVzdHMvdGVzdC1jbG9uZS1zdHJlYW0tcmV2bG9nLXNwbGl0LnQ=..ca17d31624ac6a3daa04c5ad961dc6ceb6b6f3c0_dGVzdHMvdGVzdC1jbG9uZS1zdHJlYW0tcmV2bG9nLXNwbGl0LnQ= 100644 --- a/tests/test-clone-stream-revlog-split.t +++ b/tests/test-clone-stream-revlog-split.t @@ -124,8 +124,10 @@ adding [c] rbc-names-v2 (7 bytes) adding [c] rbc-revs-v2 (24 bytes) updating the branch cache - transferred 2.11 KB in * seconds (* */sec) (glob) (no-rust !) - transferred 2.29 KB in * seconds (* */sec) (glob) (rust !) + stream-cloned 8 files / 2.11 KB in * seconds (* */sec) (glob) (no-rust stream-bundle2-v2 !) + stream-cloned 9 files / 2.11 KB in * seconds (* */sec) (glob) (no-rust stream-bundle2-v3 !) + stream-cloned 10 files / 2.29 KB in * seconds (* */sec) (glob) (rust stream-bundle2-v2 !) + stream-cloned 11 files / 2.29 KB in * seconds (* */sec) (glob) (rust stream-bundle2-v3 !) bundle2-input-part: total payload size 2285 (stream-bundle2-v2 no-rust !) bundle2-input-part: total payload size 2518 (stream-bundle2-v2 rust !) bundle2-input-part: total payload size 2313 (stream-bundle2-v3 no-rust !) diff --git a/tests/test-clone-stream.t b/tests/test-clone-stream.t index 6feb3b3029b5dbb5b9380db0740a54c0baf16195_dGVzdHMvdGVzdC1jbG9uZS1zdHJlYW0udA==..ca17d31624ac6a3daa04c5ad961dc6ceb6b6f3c0_dGVzdHMvdGVzdC1jbG9uZS1zdHJlYW0udA== 100644 --- a/tests/test-clone-stream.t +++ b/tests/test-clone-stream.t @@ -191,5 +191,5 @@ $ hg clone --stream -U http://localhost:$HGPORT clone1 streaming all changes 1091 files to transfer, 102 KB of data (no-zstd !) - transferred 102 KB in * seconds (* */sec) (glob) (no-zstd !) + stream-cloned 1091 files / 102 KB in * seconds (* */sec) (glob) (no-zstd !) 1091 files to transfer, 98.8 KB of data (zstd !) @@ -195,5 +195,5 @@ 1091 files to transfer, 98.8 KB of data (zstd !) - transferred 98.8 KB in * seconds (* */sec) (glob) (zstd !) + stream-cloned 1091 files / 98.8 KB in * seconds (* */sec) (glob) (zstd !) searching for changes no changes found #endif @@ -201,5 +201,5 @@ $ hg clone --stream -U http://localhost:$HGPORT clone1 streaming all changes 1094 files to transfer, 102 KB of data (no-zstd !) - transferred 102 KB in * seconds (* */sec) (glob) (no-zstd !) + stream-cloned 1094 files / 102 KB in * seconds (* */sec) (glob) (no-zstd !) 1094 files to transfer, 98.9 KB of data (zstd no-rust !) @@ -205,3 +205,3 @@ 1094 files to transfer, 98.9 KB of data (zstd no-rust !) - transferred 98.9 KB in * seconds (* */sec) (glob) (zstd no-rust !) + stream-cloned 1094 files / 98.9 KB in * seconds (* */sec) (glob) (zstd no-rust !) 1096 files to transfer, 99.0 KB of data (zstd rust !) @@ -207,8 +207,8 @@ 1096 files to transfer, 99.0 KB of data (zstd rust !) - transferred 99.0 KB in * seconds (* */sec) (glob) (zstd rust !) + stream-cloned 1096 files / 99.0 KB in * seconds (* */sec) (glob) (zstd rust !) #endif #if stream-bundle2-v3 $ hg clone --stream -U http://localhost:$HGPORT clone1 streaming all changes 1093 entries to transfer @@ -209,12 +209,12 @@ #endif #if stream-bundle2-v3 $ hg clone --stream -U http://localhost:$HGPORT clone1 streaming all changes 1093 entries to transfer - transferred 102 KB in * seconds (* */sec) (glob) (no-zstd !) - transferred 98.9 KB in * seconds (* */sec) (glob) (zstd no-rust !) - transferred 99.0 KB in * seconds (* */sec) (glob) (zstd rust !) + stream-cloned 1094 files / 102 KB in * seconds (* */sec) (glob) (no-zstd !) + stream-cloned 1094 files / 98.9 KB in * seconds (* */sec) (glob) (zstd no-rust !) + stream-cloned 1096 files / 99.0 KB in * seconds (* */sec) (glob) (zstd rust !) #endif #if no-stream-legacy @@ -257,7 +257,7 @@ streaming all changes * files to transfer* (glob) (no-stream-bundle2-v3 !) * entries to transfer (glob) (stream-bundle2-v3 !) - transferred * KB in * seconds (* */sec) (glob) + stream-cloned * files / * KB in * seconds (* */sec) (glob) searching for changes (stream-legacy !) no changes found (stream-legacy !) @@ -304,7 +304,7 @@ streaming all changes * files to transfer* (glob) (no-stream-bundle2-v3 !) * entries to transfer (glob) (stream-bundle2-v3 !) - transferred * KB in * seconds (* */sec) (glob) + stream-cloned * files / * KB in * seconds (* */sec) (glob) searching for changes (stream-legacy !) no changes found (stream-legacy !) @@ -463,7 +463,7 @@ 1097 files to transfer, * KB of data (glob) (stream-bundle2-v2 no-rust !) 1099 files to transfer, * KB of data (glob) (stream-bundle2-v2 rust !) 1096 entries to transfer (stream-bundle2-v3 !) - transferred * KB in * seconds (* */sec) (glob) + stream-cloned * files / * KB in * seconds (* */sec) (glob) searching for changes (stream-legacy !) no changes found (stream-legacy !) updating to branch default @@ -491,7 +491,7 @@ 1097 files to transfer, * KB of data (glob) (stream-bundle2-v2 no-rust !) 1099 files to transfer, * KB of data (glob) (stream-bundle2-v2 rust !) 1096 entries to transfer (stream-bundle2-v3 !) - transferred * KB in * seconds (* */sec) (glob) + stream-cloned * files * KB in * seconds (* */sec) (glob) searching for changes (stream-legacy !) no changes found (stream-legacy !) updating to branch default @@ -514,11 +514,9 @@ $ hg clone --stream http://localhost:$HGPORT phase-no-publish streaming all changes - 1091 files to transfer, * KB of data (glob) (stream-legacy !) - 1098 files to transfer, * KB of data (glob) (stream-bundle2-v2 no-rust !) - 1100 files to transfer, * KB of data (glob) (stream-bundle2-v2 rust !) - 1097 entries to transfer (stream-bundle2-v3 !) - transferred * KB in * seconds (* */sec) (glob) + * files to transfer, * KB of data (glob) (no-stream-bundle2-v3 !) + * entries to transfer (glob) (stream-bundle2-v3 !) + stream-cloned * / * KB in * seconds (* */sec) (glob) searching for changes (stream-legacy !) no changes found (stream-legacy !) updating to branch default @@ -578,7 +576,7 @@ 1099 files to transfer, * KB of data (glob) (stream-bundle2-v2 no-rust !) 1101 files to transfer, * KB of data (glob) (stream-bundle2-v2 rust !) 1098 entries to transfer (no-stream-bundle2-v2 !) - transferred * KB in * seconds (* */sec) (glob) + stream-cloned * files / * KB in * seconds (* */sec) (glob) $ hg -R with-obsolescence log -T '{rev}: {phase}\n' 2: draft 1: draft diff --git a/tests/test-clonebundles.t b/tests/test-clonebundles.t index 6feb3b3029b5dbb5b9380db0740a54c0baf16195_dGVzdHMvdGVzdC1jbG9uZWJ1bmRsZXMudA==..ca17d31624ac6a3daa04c5ad961dc6ceb6b6f3c0_dGVzdHMvdGVzdC1jbG9uZWJ1bmRsZXMudA== 100644 --- a/tests/test-clonebundles.t +++ b/tests/test-clonebundles.t @@ -397,10 +397,8 @@ $ hg clone -U http://localhost:$HGPORT stream-clone-no-spec applying clone bundle from http://localhost:$HGPORT1/packed.hg - 5 files to transfer, 613 bytes of data (no-rust !) - transferred 613 bytes in * seconds (* */sec) (glob) (no-rust !) - 7 files to transfer, 739 bytes of data (rust !) - transferred 739 bytes in * seconds (* */sec) (glob) (rust !) + * files to transfer, * bytes of data (glob) + stream-cloned * files / * bytes in * seconds (* */sec) (glob) finished applying clone bundle searching for changes no changes found @@ -414,7 +412,7 @@ $ hg clone -U http://localhost:$HGPORT stream-clone-vanilla-spec applying clone bundle from http://localhost:$HGPORT1/packed.hg * files to transfer, * bytes of data (glob) - transferred * bytes in * seconds (* */sec) (glob) + stream-cloned * files / * bytes in * seconds (* */sec) (glob) finished applying clone bundle searching for changes no changes found @@ -428,7 +426,7 @@ $ hg clone -U http://localhost:$HGPORT stream-clone-supported-requirements applying clone bundle from http://localhost:$HGPORT1/packed.hg * files to transfer, * bytes of data (glob) - transferred * bytes in * seconds (* */sec) (glob) + stream-cloned * files / * bytes in * seconds (* */sec) (glob) finished applying clone bundle searching for changes no changes found @@ -575,7 +573,7 @@ (you may want to report this to the server operator) streaming all changes * files to transfer, * bytes of data (glob) - transferred * bytes in * seconds (* */sec) (glob) + stream-cloned * files / * bytes in * seconds (* */sec) (glob) A manifest with a stream clone but no BUNDLESPEC @@ -588,7 +586,7 @@ (you may want to report this to the server operator) streaming all changes * files to transfer, * bytes of data (glob) - transferred * bytes in * seconds (* */sec) (glob) + stream-cloned * files / * bytes in * seconds (* */sec) (glob) A manifest with a gzip bundle and a stream clone @@ -600,7 +598,7 @@ $ hg clone -U --stream http://localhost:$HGPORT uncompressed-gzip-packed applying clone bundle from http://localhost:$HGPORT1/packed.hg * files to transfer, * bytes of data (glob) - transferred * bytes in * seconds (* */sec) (glob) + stream-cloned * files / * bytes in * seconds (* */sec) (glob) finished applying clone bundle searching for changes no changes found @@ -615,7 +613,7 @@ $ hg clone -U --stream http://localhost:$HGPORT uncompressed-gzip-packed-requirements applying clone bundle from http://localhost:$HGPORT1/packed.hg * files to transfer, * bytes of data (glob) - transferred * bytes in * seconds (* */sec) (glob) + stream-cloned * files / * bytes in * seconds (* */sec) (glob) finished applying clone bundle searching for changes no changes found @@ -632,7 +630,7 @@ (you may want to report this to the server operator) streaming all changes * files to transfer, * bytes of data (glob) - transferred * bytes in * seconds (* */sec) (glob) + stream-cloned * files / * bytes in * seconds (* */sec) (glob) Test clone bundle retrieved through bundle2 diff --git a/tests/test-http-bundle1.t b/tests/test-http-bundle1.t index 6feb3b3029b5dbb5b9380db0740a54c0baf16195_dGVzdHMvdGVzdC1odHRwLWJ1bmRsZTEudA==..ca17d31624ac6a3daa04c5ad961dc6ceb6b6f3c0_dGVzdHMvdGVzdC1odHRwLWJ1bmRsZTEudA== 100644 --- a/tests/test-http-bundle1.t +++ b/tests/test-http-bundle1.t @@ -38,10 +38,8 @@ #if no-reposimplestore $ hg clone --stream http://localhost:$HGPORT/ copy 2>&1 streaming all changes - 7 files to transfer, 606 bytes of data (no-zstd !) - 7 files to transfer, 608 bytes of data (zstd no-rust !) - 9 files to transfer, 734 bytes of data (zstd rust !) - transferred * bytes in * seconds (*/sec) (glob) + * files to transfer, * bytes of data (glob) + stream-cloned * files / * bytes in * seconds (*/sec) (glob) searching for changes no changes found updating to branch default @@ -219,10 +217,8 @@ #if no-reposimplestore $ hg clone http://user:pass@localhost:$HGPORT2/ dest 2>&1 streaming all changes - 8 files to transfer, 916 bytes of data (no-zstd !) - 8 files to transfer, 919 bytes of data (zstd no-rust !) - 10 files to transfer, 1.02 KB of data (zstd rust !) - transferred * in * seconds (*/sec) (glob) + * files to transfer, * of data (glob) + stream-cloned * files / * in * seconds (*/sec) (glob) searching for changes no changes found updating to branch default @@ -379,9 +375,7 @@ $ hg clone --stream --noupdate http://localhost:$HGPORT1/ test-stream-clone streaming all changes * files to transfer, * of data (glob) - transferred 1.36 KB in * seconds (* */sec) (glob) (no-zstd !) - transferred 1.38 KB in * seconds (* */sec) (glob) (zstd no-rust !) - transferred 1.56 KB in * seconds (* */sec) (glob) (zstd rust !) + stream-cloned * files / * KB in * seconds (* */sec) (glob) searching for changes no changes found #endif diff --git a/tests/test-http-proxy.t b/tests/test-http-proxy.t index 6feb3b3029b5dbb5b9380db0740a54c0baf16195_dGVzdHMvdGVzdC1odHRwLXByb3h5LnQ=..ca17d31624ac6a3daa04c5ad961dc6ceb6b6f3c0_dGVzdHMvdGVzdC1odHRwLXByb3h5LnQ= 100644 --- a/tests/test-http-proxy.t +++ b/tests/test-http-proxy.t @@ -16,10 +16,8 @@ $ http_proxy=http://localhost:$HGPORT1/ hg --config http_proxy.always=True clone --stream http://localhost:$HGPORT/ b streaming all changes - 7 files to transfer, 412 bytes of data (reporevlogstore no-rust !) - 9 files to transfer, 538 bytes of data (reporevlogstore rust !) - 4 files to transfer, 330 bytes of data (reposimplestore !) - transferred * bytes in * seconds (*/sec) (glob) + * files to transfer, * bytes of data (glob) + stream-cloned * files / * bytes in * seconds (*/sec) (glob) updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ cd b diff --git a/tests/test-http.t b/tests/test-http.t index 6feb3b3029b5dbb5b9380db0740a54c0baf16195_dGVzdHMvdGVzdC1odHRwLnQ=..ca17d31624ac6a3daa04c5ad961dc6ceb6b6f3c0_dGVzdHMvdGVzdC1odHRwLnQ= 100644 --- a/tests/test-http.t +++ b/tests/test-http.t @@ -29,10 +29,8 @@ #if no-reposimplestore $ hg clone --stream http://localhost:$HGPORT/ copy 2>&1 streaming all changes - 10 files to transfer, 715 bytes of data (no-zstd !) - 10 files to transfer, 717 bytes of data (zstd no-rust !) - 12 files to transfer, 843 bytes of data (zstd rust !) - transferred * bytes in * seconds (*/sec) (glob) + * files to transfer, * bytes of data (glob) + stream-cloned * files / * bytes in * seconds (*/sec) (glob) updating to branch default 4 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg verify -R copy -q @@ -255,9 +253,8 @@ #if no-reposimplestore $ hg clone http://user:pass@localhost:$HGPORT2/ dest 2>&1 streaming all changes - 11 files to transfer, 1.01 KB of data (no-rust !) - 13 files to transfer, 1.13 KB of data (rust !) - transferred * KB in * seconds (*/sec) (glob) + * files to transfer, * KB of data (glob) + stream-cloned * files / * KB in * seconds (*/sec) (glob) updating to branch default 5 files updated, 0 files merged, 0 files removed, 0 files unresolved #endif @@ -519,7 +516,7 @@ $ hg clone --stream --noupdate http://localhost:$HGPORT1/ test-stream-clone streaming all changes * files to transfer, * of data (glob) - transferred * in * seconds (*/sec) (glob) + stream-cloned * files / * in * seconds (*/sec) (glob) $ cat error.log #endif diff --git a/tests/test-narrow-clone-stream.t b/tests/test-narrow-clone-stream.t index 6feb3b3029b5dbb5b9380db0740a54c0baf16195_dGVzdHMvdGVzdC1uYXJyb3ctY2xvbmUtc3RyZWFtLnQ=..ca17d31624ac6a3daa04c5ad961dc6ceb6b6f3c0_dGVzdHMvdGVzdC1uYXJyb3ctY2xvbmUtc3RyZWFtLnQ= 100644 --- a/tests/test-narrow-clone-stream.t +++ b/tests/test-narrow-clone-stream.t @@ -51,7 +51,7 @@ $ hg clone --narrow ssh://user@dummy/master narrow --noupdate --include "dir/src/F10" --stream streaming all changes * files to transfer, * KB of data (glob) - transferred * KB in * seconds (* */sec) (glob) + stream-cloned * files / * KB in * seconds (* */sec) (glob) $ cd narrow $ ls -A diff --git a/tests/test-remotefilelog-bgprefetch.t b/tests/test-remotefilelog-bgprefetch.t index 6feb3b3029b5dbb5b9380db0740a54c0baf16195_dGVzdHMvdGVzdC1yZW1vdGVmaWxlbG9nLWJncHJlZmV0Y2gudA==..ca17d31624ac6a3daa04c5ad961dc6ceb6b6f3c0_dGVzdHMvdGVzdC1yZW1vdGVmaWxlbG9nLWJncHJlZmV0Y2gudA== 100644 --- a/tests/test-remotefilelog-bgprefetch.t +++ b/tests/test-remotefilelog-bgprefetch.t @@ -30,5 +30,5 @@ $ hgcloneshallow ssh://user@dummy/master shallow --noupdate streaming all changes 3 files to transfer, 776 bytes of data (no-zstd !) - transferred 776 bytes in * seconds (*/sec) (glob) (no-zstd !) + stream-cloned 3 files / 776 bytes in * seconds (*/sec) (glob) (no-zstd !) 3 files to transfer, 784 bytes of data (zstd no-rust !) @@ -34,3 +34,3 @@ 3 files to transfer, 784 bytes of data (zstd no-rust !) - transferred 784 bytes in * seconds (*/sec) (glob) (zstd no-rust !) + stream-cloned 3 files / 784 bytes in * seconds (*/sec) (glob) (zstd no-rust !) 5 files to transfer, 911 bytes of data (rust !) @@ -36,5 +36,5 @@ 5 files to transfer, 911 bytes of data (rust !) - transferred 911 bytes in * seconds (*/sec) (glob) (rust !) + stream-cloned 5 files / 911 bytes in * seconds (*/sec) (glob) (rust !) searching for changes no changes found diff --git a/tests/test-remotefilelog-clone-tree.t b/tests/test-remotefilelog-clone-tree.t index 6feb3b3029b5dbb5b9380db0740a54c0baf16195_dGVzdHMvdGVzdC1yZW1vdGVmaWxlbG9nLWNsb25lLXRyZWUudA==..ca17d31624ac6a3daa04c5ad961dc6ceb6b6f3c0_dGVzdHMvdGVzdC1yZW1vdGVmaWxlbG9nLWNsb25lLXRyZWUudA== 100644 --- a/tests/test-remotefilelog-clone-tree.t +++ b/tests/test-remotefilelog-clone-tree.t @@ -21,5 +21,5 @@ $ hgcloneshallow ssh://user@dummy/master shallow --noupdate streaming all changes 5 files to transfer, 449 bytes of data (no-rust !) - transferred 449 bytes in * seconds (*/sec) (glob) (no-rust !) + stream-cloned 5 files / 449 bytes in * seconds (*/sec) (glob) (no-rust !) 7 files to transfer, 575 bytes of data (rust !) @@ -25,5 +25,5 @@ 7 files to transfer, 575 bytes of data (rust !) - transferred 575 bytes in *.* seconds (*) (glob) (rust !) + stream-cloned 7 files / 575 bytes in *.* seconds (*) (glob) (rust !) searching for changes no changes found $ cd shallow @@ -68,5 +68,5 @@ $ hgcloneshallow ssh://user@dummy/shallow shallow2 --noupdate streaming all changes 6 files to transfer, 1008 bytes of data (no-rust !) - transferred 1008 bytes in * seconds (*/sec) (glob) (no-rust !) + stream-cloned 6 files / 1008 bytes in * seconds (*/sec) (glob) (no-rust !) 8 files to transfer, 1.11 KB of data (rust !) @@ -72,5 +72,5 @@ 8 files to transfer, 1.11 KB of data (rust !) - transferred 1.11 KB in * seconds (* */sec) (glob) (rust !) + stream-cloned 8 files / 1.11 KB in * seconds (* */sec) (glob) (rust !) searching for changes no changes found $ cd shallow2 diff --git a/tests/test-remotefilelog-clone.t b/tests/test-remotefilelog-clone.t index 6feb3b3029b5dbb5b9380db0740a54c0baf16195_dGVzdHMvdGVzdC1yZW1vdGVmaWxlbG9nLWNsb25lLnQ=..ca17d31624ac6a3daa04c5ad961dc6ceb6b6f3c0_dGVzdHMvdGVzdC1yZW1vdGVmaWxlbG9nLWNsb25lLnQ= 100644 --- a/tests/test-remotefilelog-clone.t +++ b/tests/test-remotefilelog-clone.t @@ -17,10 +17,8 @@ $ hgcloneshallow ssh://user@dummy/master shallow --noupdate streaming all changes - 3 files to transfer, 227 bytes of data (no-rust !) - transferred 227 bytes in * seconds (*/sec) (glob) (no-rust !) - 5 files to transfer, 353 bytes of data (rust !) - transferred 353 bytes in *.* seconds (*) (glob) (rust !) + * to transfer, * bytes of data (glob) + stream-cloned * files / * bytes in * seconds (*/sec) (glob) searching for changes no changes found $ cd shallow @@ -57,10 +55,8 @@ $ hgcloneshallow ssh://user@dummy/shallow shallow2 --noupdate streaming all changes - 4 files to transfer, 564 bytes of data (no-rust !) - transferred 564 bytes in * seconds (*/sec) (glob) (no-rust !) - 6 files to transfer, 690 bytes of data (rust !) - transferred 690 bytes in * seconds (*/sec) (glob) (rust !) + * to transfer, * bytes of data (glob) + stream-cloned * files / * bytes in * seconds (*/sec) (glob) searching for changes no changes found $ cd shallow2 diff --git a/tests/test-remotefilelog-log.t b/tests/test-remotefilelog-log.t index 6feb3b3029b5dbb5b9380db0740a54c0baf16195_dGVzdHMvdGVzdC1yZW1vdGVmaWxlbG9nLWxvZy50..ca17d31624ac6a3daa04c5ad961dc6ceb6b6f3c0_dGVzdHMvdGVzdC1yZW1vdGVmaWxlbG9nLWxvZy50 100644 --- a/tests/test-remotefilelog-log.t +++ b/tests/test-remotefilelog-log.t @@ -21,5 +21,5 @@ $ hgcloneshallow ssh://user@dummy/master shallow --noupdate streaming all changes 3 files to transfer, 473 bytes of data (no-rust !) - transferred 473 bytes in * seconds (*/sec) (glob) (no-rust !) + stream-cloned 3 files / 473 bytes in * seconds (*/sec) (glob) (no-rust !) 5 files to transfer, 599 bytes of data (rust !) @@ -25,5 +25,5 @@ 5 files to transfer, 599 bytes of data (rust !) - transferred 599 bytes in * seconds (*/sec) (glob) (rust !) + stream-cloned 5 files / 599 bytes in * seconds (*/sec) (glob) (rust !) searching for changes no changes found $ cd shallow diff --git a/tests/test-remotefilelog-partial-shallow.t b/tests/test-remotefilelog-partial-shallow.t index 6feb3b3029b5dbb5b9380db0740a54c0baf16195_dGVzdHMvdGVzdC1yZW1vdGVmaWxlbG9nLXBhcnRpYWwtc2hhbGxvdy50..ca17d31624ac6a3daa04c5ad961dc6ceb6b6f3c0_dGVzdHMvdGVzdC1yZW1vdGVmaWxlbG9nLXBhcnRpYWwtc2hhbGxvdy50 100644 --- a/tests/test-remotefilelog-partial-shallow.t +++ b/tests/test-remotefilelog-partial-shallow.t @@ -19,5 +19,5 @@ $ hg clone --shallow ssh://user@dummy/master shallow --noupdate --config remotefilelog.includepattern=foo streaming all changes 4 files to transfer, 336 bytes of data (no-zstd !) - transferred 336 bytes in * seconds (* */sec) (glob) (no-zstd !) + stream-cloned 4 files / 336 bytes in * seconds (* */sec) (glob) (no-zstd !) 4 files to transfer, 338 bytes of data (zstd no-rust !) @@ -23,3 +23,3 @@ 4 files to transfer, 338 bytes of data (zstd no-rust !) - transferred 338 bytes in * seconds (* */sec) (glob) (zstd no-rust !) + stream-cloned 4 files / 338 bytes in * seconds (* */sec) (glob) (zstd no-rust !) 6 files to transfer, 464 bytes of data (zstd rust !) @@ -25,5 +25,5 @@ 6 files to transfer, 464 bytes of data (zstd rust !) - transferred 464 bytes in * seconds (*/sec) (glob) (zstd rust !) + stream-cloned 6 files / 464 bytes in * seconds (*/sec) (glob) (zstd rust !) searching for changes no changes found $ cat >> shallow/.hg/hgrc <<EOF diff --git a/tests/test-remotefilelog-prefetch.t b/tests/test-remotefilelog-prefetch.t index 6feb3b3029b5dbb5b9380db0740a54c0baf16195_dGVzdHMvdGVzdC1yZW1vdGVmaWxlbG9nLXByZWZldGNoLnQ=..ca17d31624ac6a3daa04c5ad961dc6ceb6b6f3c0_dGVzdHMvdGVzdC1yZW1vdGVmaWxlbG9nLXByZWZldGNoLnQ= 100644 --- a/tests/test-remotefilelog-prefetch.t +++ b/tests/test-remotefilelog-prefetch.t @@ -23,5 +23,5 @@ $ hgcloneshallow ssh://user@dummy/master shallow --noupdate streaming all changes 3 files to transfer, 528 bytes of data (no-zstd !) - transferred 528 bytes in * seconds (* */sec) (glob) (no-zstd !) + stream-cloned 3 files / 528 bytes in * seconds (* */sec) (glob) (no-zstd !) 3 files to transfer, 532 bytes of data (zstd no-rust !) @@ -27,3 +27,3 @@ 3 files to transfer, 532 bytes of data (zstd no-rust !) - transferred 532 bytes in * seconds (* */sec) (glob) (zstd no-rust !) + stream-cloned 3 files / 532 bytes in * seconds (* */sec) (glob) (zstd no-rust !) 5 files to transfer, 659 bytes of data (zstd rust !) @@ -29,5 +29,5 @@ 5 files to transfer, 659 bytes of data (zstd rust !) - transferred 659 bytes in * seconds (*/sec) (glob) (zstd rust !) + stream-cloned 5 files / 659 bytes in * seconds (*/sec) (glob) (zstd rust !) searching for changes no changes found $ cd shallow @@ -169,5 +169,5 @@ $ hgcloneshallow ssh://user@dummy/master shallow2 streaming all changes 3 files to transfer, 528 bytes of data (no-zstd !) - transferred 528 bytes in * seconds * (glob) (no-zstd !) + stream-cloned 3 files / 528 bytes in * seconds * (glob) (no-zstd !) 3 files to transfer, 532 bytes of data (zstd no-rust !) @@ -173,3 +173,3 @@ 3 files to transfer, 532 bytes of data (zstd no-rust !) - transferred 532 bytes in * seconds (* */sec) (glob) (zstd no-rust !) + stream-cloned 3 files / 532 bytes in * seconds (* */sec) (glob) (zstd no-rust !) 5 files to transfer, 659 bytes of data (zstd rust !) @@ -175,5 +175,5 @@ 5 files to transfer, 659 bytes of data (zstd rust !) - transferred 659 bytes in * seconds (*/sec) (glob) (zstd rust !) + stream-cloned 5 files / 659 bytes in * seconds (*/sec) (glob) (zstd rust !) searching for changes no changes found updating to branch default diff --git a/tests/test-remotefilelog-sparse.t b/tests/test-remotefilelog-sparse.t index 6feb3b3029b5dbb5b9380db0740a54c0baf16195_dGVzdHMvdGVzdC1yZW1vdGVmaWxlbG9nLXNwYXJzZS50..ca17d31624ac6a3daa04c5ad961dc6ceb6b6f3c0_dGVzdHMvdGVzdC1yZW1vdGVmaWxlbG9nLXNwYXJzZS50 100644 --- a/tests/test-remotefilelog-sparse.t +++ b/tests/test-remotefilelog-sparse.t @@ -23,5 +23,5 @@ $ hgcloneshallow ssh://user@dummy/master shallow --noupdate streaming all changes 3 files to transfer, 527 bytes of data (no-zstd !) - transferred 527 bytes in * seconds (* */sec) (glob) (no-zstd !) + stream-cloned 3 files / 527 bytes in * seconds (* */sec) (glob) (no-zstd !) 3 files to transfer, 534 bytes of data (zstd no-rust !) @@ -27,3 +27,3 @@ 3 files to transfer, 534 bytes of data (zstd no-rust !) - transferred 534 bytes in * seconds (* */sec) (glob) (zstd no-rust !) + stream-cloned 3 files / 534 bytes in * seconds (* */sec) (glob) (zstd no-rust !) 5 files to transfer, 660 bytes of data (zstd rust !) @@ -29,5 +29,5 @@ 5 files to transfer, 660 bytes of data (zstd rust !) - transferred 660 bytes in * seconds (*/sec) (glob) (zstd rust !) + stream-cloned 5 files / 660 bytes in * seconds (*/sec) (glob) (zstd rust !) searching for changes no changes found $ cd shallow @@ -77,12 +77,8 @@ $ hgcloneshallow ssh://user@dummy/master shallow2 streaming all changes - 3 files to transfer, 527 bytes of data (no-zstd !) - transferred 527 bytes in * seconds (*) (glob) (no-zstd !) - 3 files to transfer, 534 bytes of data (zstd no-rust !) - transferred 534 bytes in * seconds (* */sec) (glob) (zstd no-rust !) - 5 files to transfer, 660 bytes of data (zstd rust !) - transferred 660 bytes in * seconds (*/sec) (glob) (zstd rust !) + * files to transfer, * bytes of data (glob) + stream-cloned * files / * bytes in * seconds (*) (glob) searching for changes no changes found updating to branch default diff --git a/tests/test-remotefilelog-tags.t b/tests/test-remotefilelog-tags.t index 6feb3b3029b5dbb5b9380db0740a54c0baf16195_dGVzdHMvdGVzdC1yZW1vdGVmaWxlbG9nLXRhZ3MudA==..ca17d31624ac6a3daa04c5ad961dc6ceb6b6f3c0_dGVzdHMvdGVzdC1yZW1vdGVmaWxlbG9nLXRhZ3MudA== 100644 --- a/tests/test-remotefilelog-tags.t +++ b/tests/test-remotefilelog-tags.t @@ -19,5 +19,5 @@ $ hg clone --shallow ssh://user@dummy/master shallow --noupdate --config remotefilelog.excludepattern=.hgtags streaming all changes 4 files to transfer, 662 bytes of data (no-zstd !) - transferred 662 bytes in * seconds (* */sec) (glob) (no-zstd !) + stream-cloned 4 files / 662 bytes in * seconds (* */sec) (glob) (no-zstd !) 4 files to transfer, 665 bytes of data (zstd no-rust !) @@ -23,3 +23,3 @@ 4 files to transfer, 665 bytes of data (zstd no-rust !) - transferred 665 bytes in * seconds (* */sec) (glob) (zstd no-rust !) + stream-cloned 4 files / 665 bytes in * seconds (* */sec) (glob) (zstd no-rust !) 6 files to transfer, 791 bytes of data (zstd rust !) @@ -25,5 +25,5 @@ 6 files to transfer, 791 bytes of data (zstd rust !) - transferred 791 bytes in * seconds (*/sec) (glob) (zstd rust !) + stream-cloned 6 files / 791 bytes in * seconds (*/sec) (glob) (zstd rust !) searching for changes no changes found $ cat >> shallow/.hg/hgrc <<EOF diff --git a/tests/test-remotefilelog-wireproto.t b/tests/test-remotefilelog-wireproto.t index 6feb3b3029b5dbb5b9380db0740a54c0baf16195_dGVzdHMvdGVzdC1yZW1vdGVmaWxlbG9nLXdpcmVwcm90by50..ca17d31624ac6a3daa04c5ad961dc6ceb6b6f3c0_dGVzdHMvdGVzdC1yZW1vdGVmaWxlbG9nLXdpcmVwcm90by50 100644 --- a/tests/test-remotefilelog-wireproto.t +++ b/tests/test-remotefilelog-wireproto.t @@ -26,5 +26,5 @@ $ hgcloneshallow ssh://user@dummy/master shallow --noupdate streaming all changes 3 files to transfer, 908 bytes of data (no-rust !) - transferred 908 bytes in * seconds (*/sec) (glob) (no-rust !) + stream-cloned 3 files / 908 bytes in * seconds (*/sec) (glob) (no-rust !) 5 files to transfer, 1.01 KB of data (rust !) @@ -30,5 +30,5 @@ 5 files to transfer, 1.01 KB of data (rust !) - transferred 1.01 KB in * seconds (* */sec) (glob) (rust !) + stream-cloned 5 files / 1.01 KB in * seconds (* */sec) (glob) (rust !) searching for changes no changes found $ cd shallow diff --git a/tests/test-ssh-bundle1.t b/tests/test-ssh-bundle1.t index 6feb3b3029b5dbb5b9380db0740a54c0baf16195_dGVzdHMvdGVzdC1zc2gtYnVuZGxlMS50..ca17d31624ac6a3daa04c5ad961dc6ceb6b6f3c0_dGVzdHMvdGVzdC1zc2gtYnVuZGxlMS50 100644 --- a/tests/test-ssh-bundle1.t +++ b/tests/test-ssh-bundle1.t @@ -62,12 +62,8 @@ $ hg clone --stream ssh://user@dummy/remote local-stream streaming all changes - 5 files to transfer, 602 bytes of data (no-zstd !) - transferred 602 bytes in * seconds (*) (glob) (no-zstd !) - 5 files to transfer, 621 bytes of data (zstd no-rust !) - transferred 621 bytes in * seconds (* */sec) (glob) (zstd no-rust !) - 7 files to transfer, 747 bytes of data (zstd rust !) - transferred 747 bytes in * seconds (*/sec) (glob) (zstd rust !) + * files to transfer, * bytes of data (glob) + stream-cloned * files * bytes in * seconds (*/sec) (glob) searching for changes no changes found updating to branch default @@ -83,12 +79,8 @@ $ hg -R local-stream book mybook $ hg clone --stream ssh://user@dummy/local-stream stream2 streaming all changes - 5 files to transfer, 602 bytes of data (no-zstd !) - transferred 602 bytes in * seconds (*) (glob) (no-zstd !) - 5 files to transfer, 621 bytes of data (zstd no-rust !) - transferred 621 bytes in * seconds (* */sec) (glob) (zstd no-rust !) - 7 files to transfer, 747 bytes of data (zstd rust !) - transferred 747 bytes in * seconds (*/sec) (glob) (zstd rust !) + * files to transfer, * bytes of data (glob) + stream-cloned * files * bytes in * seconds (*/sec) (glob) searching for changes no changes found updating to branch default diff --git a/tests/test-ssh.t b/tests/test-ssh.t index 6feb3b3029b5dbb5b9380db0740a54c0baf16195_dGVzdHMvdGVzdC1zc2gudA==..ca17d31624ac6a3daa04c5ad961dc6ceb6b6f3c0_dGVzdHMvdGVzdC1zc2gudA== 100644 --- a/tests/test-ssh.t +++ b/tests/test-ssh.t @@ -54,11 +54,8 @@ $ hg clone --stream ssh://user@dummy/remote local-stream streaming all changes - 9 files to transfer, 827 bytes of data (no-zstd !) - transferred 827 bytes in * seconds (*) (glob) (no-zstd !) - 9 files to transfer, 846 bytes of data (zstd no-rust !) - 11 files to transfer, 972 bytes of data (zstd rust !) - transferred * bytes in * seconds (* */sec) (glob) (zstd !) + * files to transfer, * bytes of data (glob) + stream-cloned * bytes in * seconds (* */sec) (glob) updating to branch default 2 files updated, 0 files merged, 0 files removed, 0 files unresolved $ cd local-stream @@ -72,9 +69,8 @@ $ hg -R local-stream book mybook $ hg clone --stream ssh://user@dummy/local-stream stream2 streaming all changes - 12 files to transfer, * of data (glob) (no-rust !) - 14 files to transfer, * of data (glob) (rust !) - transferred * in * seconds (*) (glob) + * files to transfer, * of data (glob) + stream-cloned * files / * in * seconds (*) (glob) updating to branch default 2 files updated, 0 files merged, 0 files removed, 0 files unresolved $ cd stream2 diff --git a/tests/test-stream-bundle-v2.t b/tests/test-stream-bundle-v2.t index 6feb3b3029b5dbb5b9380db0740a54c0baf16195_dGVzdHMvdGVzdC1zdHJlYW0tYnVuZGxlLXYyLnQ=..ca17d31624ac6a3daa04c5ad961dc6ceb6b6f3c0_dGVzdHMvdGVzdC1zdHJlYW0tYnVuZGxlLXYyLnQ= 100644 --- a/tests/test-stream-bundle-v2.t +++ b/tests/test-stream-bundle-v2.t @@ -132,5 +132,5 @@ adding [c] branch2-served (94 bytes) adding [c] rbc-names-v2 (7 bytes) adding [c] rbc-revs-v2 (40 bytes) - transferred 1.65 KB in * seconds (* */sec) (glob) (no-rust !) + stream-cloned 12 files / 1.65 KB in * seconds (* */sec) (glob) (no-rust !) bundle2-input-part: total payload size 1857 (no-rust !) @@ -136,5 +136,5 @@ bundle2-input-part: total payload size 1857 (no-rust !) - transferred 1.78 KB in * seconds (* */sec) (glob) (rust !) + stream-cloned 14 files / 1.78 KB in * seconds (* */sec) (glob) (rust !) bundle2-input-part: total payload size 2025 (rust !) bundle2-input-bundle: 1 parts total updating the branch cache @@ -195,5 +195,5 @@ adding [c] branch2-served (94 bytes) adding [c] rbc-names-v2 (7 bytes) adding [c] rbc-revs-v2 (40 bytes) - transferred 1.65 KB in * seconds (* */sec) (glob) (no-rust !) + stream-cloned 12 files / 1.65 KB in * seconds (* */sec) (glob) (no-rust !) bundle2-input-part: total payload size 1857 (no-rust !) @@ -199,5 +199,5 @@ bundle2-input-part: total payload size 1857 (no-rust !) - transferred 1.78 KB in * seconds (* */sec) (glob) (rust !) + stream-cloned 14 files / 1.78 KB in * seconds (* */sec) (glob) (rust !) bundle2-input-part: total payload size 2025 (rust !) bundle2-input-bundle: 1 parts total updating the branch cache @@ -260,5 +260,5 @@ adding [c] branch2-served (94 bytes) adding [c] rbc-names-v2 (7 bytes) adding [c] rbc-revs-v2 (40 bytes) - transferred 1.65 KB in * seconds (* */sec) (glob) (no-rust !) + stream-cloned 12 files / 1.65 KB in * seconds (* */sec) (glob) (no-rust !) bundle2-input-part: total payload size 1869 (no-rust !) @@ -264,5 +264,5 @@ bundle2-input-part: total payload size 1869 (no-rust !) - transferred 1.78 KB in * seconds (* */sec) (glob) (rust !) + stream-cloned 14 files / 1.78 KB in * seconds (* */sec) (glob) (rust !) bundle2-input-part: total payload size 2037 (rust !) bundle2-input-bundle: 1 parts total updating the branch cache @@ -322,5 +322,5 @@ adding [c] branch2-served (94 bytes) adding [c] rbc-names-v2 (7 bytes) adding [c] rbc-revs-v2 (40 bytes) - transferred 1.65 KB in * seconds (* */sec) (glob) (no-rust !) + stream-cloned 12 files / 1.65 KB in * seconds (* */sec) (glob) (no-rust !) bundle2-input-part: total payload size 1869 (no-rust !) @@ -326,5 +326,5 @@ bundle2-input-part: total payload size 1869 (no-rust !) - transferred 1.78 KB in * seconds (* */sec) (glob) (rust !) + stream-cloned 14 files / 1.78 KB in * seconds (* */sec) (glob) (rust !) bundle2-input-part: total payload size 2037 (rust !) bundle2-input-bundle: 1 parts total updating the branch cache diff --git a/tests/test-treemanifest.t b/tests/test-treemanifest.t index 6feb3b3029b5dbb5b9380db0740a54c0baf16195_dGVzdHMvdGVzdC10cmVlbWFuaWZlc3QudA==..ca17d31624ac6a3daa04c5ad961dc6ceb6b6f3c0_dGVzdHMvdGVzdC10cmVlbWFuaWZlc3QudA== 100644 --- a/tests/test-treemanifest.t +++ b/tests/test-treemanifest.t @@ -761,9 +761,8 @@ $ hg clone --config experimental.changegroup3=True --stream -U \ > http://localhost:$HGPORT1 stream-clone-basicstore streaming all changes - 24 files to transfer, * of data (glob) (no-rust !) - 26 files to transfer, * of data (glob) (rust !) - transferred * in * seconds (*) (glob) + * files to transfer, * of data (glob) + stream-cloned * files / * in * seconds (*) (glob) $ hg -R stream-clone-basicstore verify -q $ cat port-1-errors.log @@ -771,9 +770,8 @@ $ hg clone --config experimental.changegroup3=True --stream -U \ > http://localhost:$HGPORT2 stream-clone-encodedstore streaming all changes - 24 files to transfer, * of data (glob) (no-rust !) - 26 files to transfer, * of data (glob) (rust !) - transferred * in * seconds (*) (glob) + * files to transfer, * of data (glob) + stream-cloned * files / * in * seconds (*) (glob) $ hg -R stream-clone-encodedstore verify -q $ cat port-2-errors.log @@ -781,9 +779,8 @@ $ hg clone --config experimental.changegroup3=True --stream -U \ > http://localhost:$HGPORT stream-clone-fncachestore streaming all changes - 23 files to transfer, * of data (glob) (no-rust !) - 25 files to transfer, * of data (glob) (rust !) - transferred * in * seconds (*) (glob) + * files to transfer, * of data (glob) + stream-cloned * files / * in * seconds (*) (glob) $ hg -R stream-clone-fncachestore verify -q $ cat port-0-errors.log