diff --git a/mercurial/streamclone.py b/mercurial/streamclone.py index ca17d31624ac6a3daa04c5ad961dc6ceb6b6f3c0_bWVyY3VyaWFsL3N0cmVhbWNsb25lLnB5..2e82bd50978c40fab76d986006a7267e8e9a71f6_bWVyY3VyaWFsL3N0cmVhbWNsb25lLnB5 100644 --- a/mercurial/streamclone.py +++ b/mercurial/streamclone.py @@ -1115,6 +1115,10 @@ repo.invalidate(clearfilecache=True) progress.complete() + # acknowledge the end of the bundle2 part, this help aligning + # sequential and parallel behavior. + remains = fp.read(1) + assert not remains _report_transferred(repo, start, filecount, byte_count) diff --git a/tests/test-clone-stream-revlog-split.t b/tests/test-clone-stream-revlog-split.t index ca17d31624ac6a3daa04c5ad961dc6ceb6b6f3c0_dGVzdHMvdGVzdC1jbG9uZS1zdHJlYW0tcmV2bG9nLXNwbGl0LnQ=..2e82bd50978c40fab76d986006a7267e8e9a71f6_dGVzdHMvdGVzdC1jbG9uZS1zdHJlYW0tcmV2bG9nLXNwbGl0LnQ= 100644 --- a/tests/test-clone-stream-revlog-split.t +++ b/tests/test-clone-stream-revlog-split.t @@ -124,5 +124,4 @@ adding [c] rbc-names-v2 (7 bytes) adding [c] rbc-revs-v2 (24 bytes) updating the branch cache - 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 !) @@ -128,7 +127,6 @@ 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 !) bundle2-input-part: total payload size 2546 (stream-bundle2-v3 rust !) @@ -130,8 +128,10 @@ 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 !) bundle2-input-part: total payload size 2546 (stream-bundle2-v3 rust !) + stream-cloned 8 files / 2.11 KB in * seconds (* */sec) (glob) (no-rust stream-bundle2-v2 !) + stream-cloned 10 files / 2.29 KB in * seconds (* */sec) (glob) (rust stream-bundle2-v2 !) bundle2-input-part: "listkeys" (params: 1 mandatory) supported bundle2-input-bundle: 2 parts total checking for updated bookmarks diff --git a/tests/test-stream-bundle-v2.t b/tests/test-stream-bundle-v2.t index ca17d31624ac6a3daa04c5ad961dc6ceb6b6f3c0_dGVzdHMvdGVzdC1zdHJlYW0tYnVuZGxlLXYyLnQ=..2e82bd50978c40fab76d986006a7267e8e9a71f6_dGVzdHMvdGVzdC1zdHJlYW0tYnVuZGxlLXYyLnQ= 100644 --- a/tests/test-stream-bundle-v2.t +++ b/tests/test-stream-bundle-v2.t @@ -132,4 +132,6 @@ 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 !) @@ -135,3 +137,2 @@ stream-cloned 12 files / 1.65 KB in * seconds (* */sec) (glob) (no-rust !) - bundle2-input-part: total payload size 1857 (no-rust !) stream-cloned 14 files / 1.78 KB in * seconds (* */sec) (glob) (rust !) @@ -137,5 +138,4 @@ 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 finished applying clone bundle @@ -195,4 +195,6 @@ 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 !) @@ -198,3 +200,2 @@ stream-cloned 12 files / 1.65 KB in * seconds (* */sec) (glob) (no-rust !) - bundle2-input-part: total payload size 1857 (no-rust !) stream-cloned 14 files / 1.78 KB in * seconds (* */sec) (glob) (rust !) @@ -200,5 +201,4 @@ 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 finished applying clone bundle