# HG changeset patch # User Pierre-Yves David # Date 1547138219 -3600 # Node ID ac39cfb5bddd3e9ccd538e7c5810bbf96d556b65 # Parent b2e2f9fe7a4516e8c1f23adcc0b0c90e9a0865a6 test: adapt output to minor behavior change CORE-TEST-OUTPUT-UPDATE: bad05a6afdc8 diff -r b2e2f9fe7a45 -r ac39cfb5bddd tests/test-pullbundle.t --- a/tests/test-pullbundle.t Sat Jan 05 05:21:37 2019 +0100 +++ b/tests/test-pullbundle.t Thu Jan 10 17:36:59 2019 +0100 @@ -31,6 +31,7 @@ $ hg -R client pull server -r 1234 --debug --config devel.bundle2.debug=yes | grep -v 'add changeset' pulling from server + listing keys for "bookmarks" query 1; heads pullbundle-cache: "missing" set sliced into 6 subranges in *.* seconds (glob) 1024 changesets found @@ -39,8 +40,7 @@ 16 changesets found 2 changesets found 1 changesets found - listing keys for "bookmarks" - bundle2-output-bundle: "HG20", 9 parts total + bundle2-output-bundle: "HG20", 8 parts total bundle2-output: start emission of HG20 stream bundle2-output: bundle parameter: bundle2-output: start of parts @@ -85,20 +85,15 @@ bundle2-output: header chunk size: 41 bundle2-output: payload chunk size: 196 bundle2-output: closing payload chunk - bundle2-output: bundle part: "listkeys" - bundle2-output-part: "listkeys" (params: 1 mandatory) empty payload - bundle2-output: part 6: "LISTKEYS" - bundle2-output: header chunk size: 35 - bundle2-output: closing payload chunk bundle2-output: bundle part: "phase-heads" bundle2-output-part: "phase-heads" 24 bytes payload - bundle2-output: part 7: "PHASE-HEADS" + bundle2-output: part 6: "PHASE-HEADS" bundle2-output: header chunk size: 18 bundle2-output: payload chunk size: 24 bundle2-output: closing payload chunk bundle2-output: bundle part: "cache:rev-branch-cache" bundle2-output-part: "cache:rev-branch-cache" (advisory) streamed payload - bundle2-output: part 8: "cache:rev-branch-cache" + bundle2-output: part 7: "cache:rev-branch-cache" bundle2-output: header chunk size: 29 bundle2-output: payload chunk size: 24719 bundle2-output: closing payload chunk @@ -190,16 +185,9 @@ adding file changes added 1 changesets with 0 changes to 0 files bundle2-input-part: total payload size 196 - bundle2-input: part header size: 35 - bundle2-input: part type: "LISTKEYS" - bundle2-input: part id: "6" - bundle2-input: part parameters: 1 - bundle2-input: found a handler for part listkeys - bundle2-input-part: "listkeys" (params: 1 mandatory) supported - bundle2-input: payload chunk size: 0 bundle2-input: part header size: 18 bundle2-input: part type: "PHASE-HEADS" - bundle2-input: part id: "7" + bundle2-input: part id: "6" bundle2-input: part parameters: 0 bundle2-input: found a handler for part phase-heads bundle2-input-part: "phase-heads" supported @@ -208,7 +196,7 @@ bundle2-input-part: total payload size 24 bundle2-input: part header size: 29 bundle2-input: part type: "cache:rev-branch-cache" - bundle2-input: part id: "8" + bundle2-input: part id: "7" bundle2-input: part parameters: 0 bundle2-input: found a handler for part cache:rev-branch-cache bundle2-input-part: "cache:rev-branch-cache" (advisory) supported @@ -217,7 +205,7 @@ bundle2-input-part: total payload size 24719 bundle2-input: part header size: 0 bundle2-input: end of bundle2 stream - bundle2-input-bundle: 8 parts total + bundle2-input-bundle: 7 parts total checking for updated bookmarks updating the branch cache new changesets 1ea73414a91b:f864bc82f6a2