diff --git a/mercurial/bundle2.py b/mercurial/bundle2.py index 0b81fd0aa2a1cca856a1ef4e3382f70598a53b25_bWVyY3VyaWFsL2J1bmRsZTIucHk=..181ee2118a96c4b52bbd6d7b5a47e87f2e1d77e9_bWVyY3VyaWFsL2J1bmRsZTIucHk= 100644 --- a/mercurial/bundle2.py +++ b/mercurial/bundle2.py @@ -368,7 +368,7 @@ def __enter__(self): def func(): - itr = enumerate(self.unbundler.iterparts()) + itr = enumerate(self.unbundler.iterparts(), 1) for count, p in itr: self.count = count self.current = p diff --git a/tests/test-acl.t b/tests/test-acl.t index 0b81fd0aa2a1cca856a1ef4e3382f70598a53b25_dGVzdHMvdGVzdC1hY2wudA==..181ee2118a96c4b52bbd6d7b5a47e87f2e1d77e9_dGVzdHMvdGVzdC1hY2wudA== 100644 --- a/tests/test-acl.t +++ b/tests/test-acl.t @@ -134,10 +134,10 @@ bundle2-input-part: total payload size 1553 bundle2-input-part: "phase-heads" supported bundle2-input-part: total payload size 24 - bundle2-input-bundle: 4 parts total + bundle2-input-bundle: 5 parts total updating the branch cache added 3 changesets with 3 changes to 3 files bundle2-output-bundle: "HG20", 1 parts total bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload bundle2-input-bundle: no-transaction bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported @@ -138,10 +138,10 @@ updating the branch cache added 3 changesets with 3 changes to 3 files bundle2-output-bundle: "HG20", 1 parts total bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload bundle2-input-bundle: no-transaction bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported - bundle2-input-bundle: 0 parts total + bundle2-input-bundle: 1 parts total listing keys for "phases" repository tip rolled back to revision 0 (undo push) 0:6675d58eff77 @@ -201,10 +201,10 @@ bundle2-input-part: total payload size 1553 bundle2-input-part: "phase-heads" supported bundle2-input-part: total payload size 24 - bundle2-input-bundle: 4 parts total + bundle2-input-bundle: 5 parts total updating the branch cache added 3 changesets with 3 changes to 3 files bundle2-output-bundle: "HG20", 1 parts total bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload bundle2-input-bundle: no-transaction bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported @@ -205,10 +205,10 @@ updating the branch cache added 3 changesets with 3 changes to 3 files bundle2-output-bundle: "HG20", 1 parts total bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload bundle2-input-bundle: no-transaction bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported - bundle2-input-bundle: 0 parts total + bundle2-input-bundle: 1 parts total listing keys for "phases" repository tip rolled back to revision 0 (undo push) 0:6675d58eff77 @@ -278,10 +278,10 @@ bundle2-input-part: total payload size 1553 bundle2-input-part: "phase-heads" supported bundle2-input-part: total payload size 24 - bundle2-input-bundle: 4 parts total + bundle2-input-bundle: 5 parts total updating the branch cache added 3 changesets with 3 changes to 3 files bundle2-output-bundle: "HG20", 1 parts total bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload bundle2-input-bundle: no-transaction bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported @@ -282,10 +282,10 @@ updating the branch cache added 3 changesets with 3 changes to 3 files bundle2-output-bundle: "HG20", 1 parts total bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload bundle2-input-bundle: no-transaction bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported - bundle2-input-bundle: 0 parts total + bundle2-input-bundle: 1 parts total listing keys for "phases" repository tip rolled back to revision 0 (undo push) 0:6675d58eff77 @@ -350,7 +350,7 @@ error: pretxnchangegroup.acl hook failed: acl: user "fred" not allowed on "foo/file.txt" (changeset "ef1ea85a6374") bundle2-input-part: total payload size 1553 bundle2-input-part: total payload size 24 - bundle2-input-bundle: 4 parts total + bundle2-input-bundle: 5 parts total transaction abort! rollback completed abort: acl: user "fred" not allowed on "foo/file.txt" (changeset "ef1ea85a6374") @@ -422,7 +422,7 @@ error: pretxnchangegroup.acl hook failed: acl: user "fred" not allowed on "quux/file.py" (changeset "911600dab2ae") bundle2-input-part: total payload size 1553 bundle2-input-part: total payload size 24 - bundle2-input-bundle: 4 parts total + bundle2-input-bundle: 5 parts total transaction abort! rollback completed abort: acl: user "fred" not allowed on "quux/file.py" (changeset "911600dab2ae") @@ -491,7 +491,7 @@ error: pretxnchangegroup.acl hook failed: acl: user "barney" not allowed on "foo/file.txt" (changeset "ef1ea85a6374") bundle2-input-part: total payload size 1553 bundle2-input-part: total payload size 24 - bundle2-input-bundle: 4 parts total + bundle2-input-bundle: 5 parts total transaction abort! rollback completed abort: acl: user "barney" not allowed on "foo/file.txt" (changeset "ef1ea85a6374") @@ -565,7 +565,7 @@ error: pretxnchangegroup.acl hook failed: acl: user "fred" not allowed on "quux/file.py" (changeset "911600dab2ae") bundle2-input-part: total payload size 1553 bundle2-input-part: total payload size 24 - bundle2-input-bundle: 4 parts total + bundle2-input-bundle: 5 parts total transaction abort! rollback completed abort: acl: user "fred" not allowed on "quux/file.py" (changeset "911600dab2ae") @@ -638,7 +638,7 @@ error: pretxnchangegroup.acl hook failed: acl: user "fred" denied on "foo/Bar/file.txt" (changeset "f9cafe1212c8") bundle2-input-part: total payload size 1553 bundle2-input-part: total payload size 24 - bundle2-input-bundle: 4 parts total + bundle2-input-bundle: 5 parts total transaction abort! rollback completed abort: acl: user "fred" denied on "foo/Bar/file.txt" (changeset "f9cafe1212c8") @@ -708,7 +708,7 @@ error: pretxnchangegroup.acl hook failed: acl: user "barney" not allowed on "foo/file.txt" (changeset "ef1ea85a6374") bundle2-input-part: total payload size 1553 bundle2-input-part: total payload size 24 - bundle2-input-bundle: 4 parts total + bundle2-input-bundle: 5 parts total transaction abort! rollback completed abort: acl: user "barney" not allowed on "foo/file.txt" (changeset "ef1ea85a6374") @@ -787,10 +787,10 @@ acl: acl.allow.bookmarks not enabled acl: acl.deny.bookmarks not enabled acl: bookmark access granted: "ef1ea85a6374b77d6da9dcda9541f498f2d17df7" on bookmark "moving-bookmark" - bundle2-input-bundle: 6 parts total + bundle2-input-bundle: 7 parts total updating the branch cache added 1 changesets with 1 changes to 1 files bundle2-output-bundle: "HG20", 1 parts total bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload bundle2-input-bundle: no-transaction bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported @@ -791,10 +791,10 @@ updating the branch cache added 1 changesets with 1 changes to 1 files bundle2-output-bundle: "HG20", 1 parts total bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload bundle2-input-bundle: no-transaction bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported - bundle2-input-bundle: 0 parts total + bundle2-input-bundle: 1 parts total updating bookmark moving-bookmark listing keys for "phases" repository tip rolled back to revision 0 (undo push) @@ -873,7 +873,7 @@ acl: acl.allow.bookmarks not enabled acl: acl.deny.bookmarks enabled, 1 entries for user fred error: prepushkey.acl hook failed: acl: user "fred" denied on bookmark "moving-bookmark" (changeset "ef1ea85a6374b77d6da9dcda9541f498f2d17df7") - bundle2-input-bundle: 6 parts total + bundle2-input-bundle: 7 parts total transaction abort! rollback completed abort: acl: user "fred" denied on bookmark "moving-bookmark" (changeset "ef1ea85a6374b77d6da9dcda9541f498f2d17df7") @@ -958,10 +958,10 @@ bundle2-input-part: total payload size 1553 bundle2-input-part: "phase-heads" supported bundle2-input-part: total payload size 24 - bundle2-input-bundle: 4 parts total + bundle2-input-bundle: 5 parts total updating the branch cache added 3 changesets with 3 changes to 3 files bundle2-output-bundle: "HG20", 1 parts total bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload bundle2-input-bundle: no-transaction bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported @@ -962,10 +962,10 @@ updating the branch cache added 3 changesets with 3 changes to 3 files bundle2-output-bundle: "HG20", 1 parts total bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload bundle2-input-bundle: no-transaction bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported - bundle2-input-bundle: 0 parts total + bundle2-input-bundle: 1 parts total listing keys for "phases" repository tip rolled back to revision 0 (undo push) 0:6675d58eff77 @@ -1041,7 +1041,7 @@ error: pretxnchangegroup.acl hook failed: acl: user "wilma" not allowed on "quux/file.py" (changeset "911600dab2ae") bundle2-input-part: total payload size 1553 bundle2-input-part: total payload size 24 - bundle2-input-bundle: 4 parts total + bundle2-input-bundle: 5 parts total transaction abort! rollback completed abort: acl: user "wilma" not allowed on "quux/file.py" (changeset "911600dab2ae") @@ -1113,7 +1113,7 @@ error: pretxnchangegroup.acl hook raised an exception: [Errno *] * (glob) bundle2-input-part: total payload size 1553 bundle2-input-part: total payload size 24 - bundle2-input-bundle: 4 parts total + bundle2-input-bundle: 5 parts total transaction abort! rollback completed abort: $ENOENT$: '../acl.config' @@ -1198,7 +1198,7 @@ error: pretxnchangegroup.acl hook failed: acl: user "betty" not allowed on "quux/file.py" (changeset "911600dab2ae") bundle2-input-part: total payload size 1553 bundle2-input-part: total payload size 24 - bundle2-input-bundle: 4 parts total + bundle2-input-bundle: 5 parts total transaction abort! rollback completed abort: acl: user "betty" not allowed on "quux/file.py" (changeset "911600dab2ae") @@ -1286,10 +1286,10 @@ bundle2-input-part: total payload size 1553 bundle2-input-part: "phase-heads" supported bundle2-input-part: total payload size 24 - bundle2-input-bundle: 4 parts total + bundle2-input-bundle: 5 parts total updating the branch cache added 3 changesets with 3 changes to 3 files bundle2-output-bundle: "HG20", 1 parts total bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload bundle2-input-bundle: no-transaction bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported @@ -1290,10 +1290,10 @@ updating the branch cache added 3 changesets with 3 changes to 3 files bundle2-output-bundle: "HG20", 1 parts total bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload bundle2-input-bundle: no-transaction bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported - bundle2-input-bundle: 0 parts total + bundle2-input-bundle: 1 parts total listing keys for "phases" repository tip rolled back to revision 0 (undo push) 0:6675d58eff77 @@ -1374,10 +1374,10 @@ bundle2-input-part: total payload size 1553 bundle2-input-part: "phase-heads" supported bundle2-input-part: total payload size 24 - bundle2-input-bundle: 4 parts total + bundle2-input-bundle: 5 parts total updating the branch cache added 3 changesets with 3 changes to 3 files bundle2-output-bundle: "HG20", 1 parts total bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload bundle2-input-bundle: no-transaction bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported @@ -1378,10 +1378,10 @@ updating the branch cache added 3 changesets with 3 changes to 3 files bundle2-output-bundle: "HG20", 1 parts total bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload bundle2-input-bundle: no-transaction bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported - bundle2-input-bundle: 0 parts total + bundle2-input-bundle: 1 parts total listing keys for "phases" repository tip rolled back to revision 0 (undo push) 0:6675d58eff77 @@ -1455,7 +1455,7 @@ error: pretxnchangegroup.acl hook failed: acl: user "fred" denied on "foo/Bar/file.txt" (changeset "f9cafe1212c8") bundle2-input-part: total payload size 1553 bundle2-input-part: total payload size 24 - bundle2-input-bundle: 4 parts total + bundle2-input-bundle: 5 parts total transaction abort! rollback completed abort: acl: user "fred" denied on "foo/Bar/file.txt" (changeset "f9cafe1212c8") @@ -1539,10 +1539,10 @@ bundle2-input-part: total payload size 1553 bundle2-input-part: "phase-heads" supported bundle2-input-part: total payload size 24 - bundle2-input-bundle: 4 parts total + bundle2-input-bundle: 5 parts total updating the branch cache added 3 changesets with 3 changes to 3 files bundle2-output-bundle: "HG20", 1 parts total bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload bundle2-input-bundle: no-transaction bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported @@ -1543,10 +1543,10 @@ updating the branch cache added 3 changesets with 3 changes to 3 files bundle2-output-bundle: "HG20", 1 parts total bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload bundle2-input-bundle: no-transaction bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported - bundle2-input-bundle: 0 parts total + bundle2-input-bundle: 1 parts total listing keys for "phases" repository tip rolled back to revision 0 (undo push) 0:6675d58eff77 @@ -1622,7 +1622,7 @@ error: pretxnchangegroup.acl hook failed: acl: user "fred" denied on "foo/Bar/file.txt" (changeset "f9cafe1212c8") bundle2-input-part: total payload size 1553 bundle2-input-part: total payload size 24 - bundle2-input-bundle: 4 parts total + bundle2-input-bundle: 5 parts total transaction abort! rollback completed abort: acl: user "fred" denied on "foo/Bar/file.txt" (changeset "f9cafe1212c8") @@ -1748,10 +1748,10 @@ bundle2-input-part: total payload size 2068 bundle2-input-part: "phase-heads" supported bundle2-input-part: total payload size 48 - bundle2-input-bundle: 4 parts total + bundle2-input-bundle: 5 parts total updating the branch cache added 4 changesets with 4 changes to 4 files (+1 heads) bundle2-output-bundle: "HG20", 1 parts total bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload bundle2-input-bundle: no-transaction bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported @@ -1752,10 +1752,10 @@ updating the branch cache added 4 changesets with 4 changes to 4 files (+1 heads) bundle2-output-bundle: "HG20", 1 parts total bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload bundle2-input-bundle: no-transaction bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported - bundle2-input-bundle: 0 parts total + bundle2-input-bundle: 1 parts total listing keys for "phases" repository tip rolled back to revision 2 (undo push) 2:fb35475503ef @@ -1832,7 +1832,7 @@ error: pretxnchangegroup.acl hook failed: acl: user "astro" denied on branch "foobar" (changeset "e8fc755d4d82") bundle2-input-part: total payload size 2068 bundle2-input-part: total payload size 48 - bundle2-input-bundle: 4 parts total + bundle2-input-bundle: 5 parts total transaction abort! rollback completed abort: acl: user "astro" denied on branch "foobar" (changeset "e8fc755d4d82") @@ -1904,7 +1904,7 @@ error: pretxnchangegroup.acl hook failed: acl: user "astro" not allowed on branch "default" (changeset "ef1ea85a6374") bundle2-input-part: total payload size 2068 bundle2-input-part: total payload size 48 - bundle2-input-bundle: 4 parts total + bundle2-input-bundle: 5 parts total transaction abort! rollback completed abort: acl: user "astro" not allowed on branch "default" (changeset "ef1ea85a6374") @@ -1978,7 +1978,7 @@ error: pretxnchangegroup.acl hook failed: acl: user "astro" not allowed on branch "default" (changeset "ef1ea85a6374") bundle2-input-part: total payload size 2068 bundle2-input-part: total payload size 48 - bundle2-input-bundle: 4 parts total + bundle2-input-bundle: 5 parts total transaction abort! rollback completed abort: acl: user "astro" not allowed on branch "default" (changeset "ef1ea85a6374") @@ -2054,10 +2054,10 @@ bundle2-input-part: total payload size 2068 bundle2-input-part: "phase-heads" supported bundle2-input-part: total payload size 48 - bundle2-input-bundle: 4 parts total + bundle2-input-bundle: 5 parts total updating the branch cache added 4 changesets with 4 changes to 4 files (+1 heads) bundle2-output-bundle: "HG20", 1 parts total bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload bundle2-input-bundle: no-transaction bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported @@ -2058,10 +2058,10 @@ updating the branch cache added 4 changesets with 4 changes to 4 files (+1 heads) bundle2-output-bundle: "HG20", 1 parts total bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload bundle2-input-bundle: no-transaction bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported - bundle2-input-bundle: 0 parts total + bundle2-input-bundle: 1 parts total listing keys for "phases" repository tip rolled back to revision 2 (undo push) 2:fb35475503ef @@ -2145,10 +2145,10 @@ bundle2-input-part: total payload size 2068 bundle2-input-part: "phase-heads" supported bundle2-input-part: total payload size 48 - bundle2-input-bundle: 4 parts total + bundle2-input-bundle: 5 parts total updating the branch cache added 4 changesets with 4 changes to 4 files (+1 heads) bundle2-output-bundle: "HG20", 1 parts total bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload bundle2-input-bundle: no-transaction bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported @@ -2149,10 +2149,10 @@ updating the branch cache added 4 changesets with 4 changes to 4 files (+1 heads) bundle2-output-bundle: "HG20", 1 parts total bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload bundle2-input-bundle: no-transaction bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported - bundle2-input-bundle: 0 parts total + bundle2-input-bundle: 1 parts total listing keys for "phases" repository tip rolled back to revision 2 (undo push) 2:fb35475503ef @@ -2227,7 +2227,7 @@ error: pretxnchangegroup.acl hook failed: acl: user "george" denied on branch "default" (changeset "ef1ea85a6374") bundle2-input-part: total payload size 2068 bundle2-input-part: total payload size 48 - bundle2-input-bundle: 4 parts total + bundle2-input-bundle: 5 parts total transaction abort! rollback completed abort: acl: user "george" denied on branch "default" (changeset "ef1ea85a6374") @@ -2308,10 +2308,10 @@ bundle2-input-part: total payload size 2068 bundle2-input-part: "phase-heads" supported bundle2-input-part: total payload size 48 - bundle2-input-bundle: 4 parts total + bundle2-input-bundle: 5 parts total updating the branch cache added 4 changesets with 4 changes to 4 files (+1 heads) bundle2-output-bundle: "HG20", 1 parts total bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload bundle2-input-bundle: no-transaction bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported @@ -2312,10 +2312,10 @@ updating the branch cache added 4 changesets with 4 changes to 4 files (+1 heads) bundle2-output-bundle: "HG20", 1 parts total bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload bundle2-input-bundle: no-transaction bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported - bundle2-input-bundle: 0 parts total + bundle2-input-bundle: 1 parts total listing keys for "phases" repository tip rolled back to revision 2 (undo push) 2:fb35475503ef @@ -2384,7 +2384,7 @@ error: pretxnchangegroup.acl hook failed: acl: user "george" denied on branch "default" (changeset "ef1ea85a6374") bundle2-input-part: total payload size 2068 bundle2-input-part: total payload size 48 - bundle2-input-bundle: 4 parts total + bundle2-input-bundle: 5 parts total transaction abort! rollback completed abort: acl: user "george" denied on branch "default" (changeset "ef1ea85a6374") diff --git a/tests/test-bookmarks-pushpull.t b/tests/test-bookmarks-pushpull.t index 0b81fd0aa2a1cca856a1ef4e3382f70598a53b25_dGVzdHMvdGVzdC1ib29rbWFya3MtcHVzaHB1bGwudA==..181ee2118a96c4b52bbd6d7b5a47e87f2e1d77e9_dGVzdHMvdGVzdC1ib29rbWFya3MtcHVzaHB1bGwudA== 100644 --- a/tests/test-bookmarks-pushpull.t +++ b/tests/test-bookmarks-pushpull.t @@ -193,7 +193,7 @@ bundle2-input: payload chunk size: 0 bundle2-input: part header size: 0 bundle2-input: end of bundle2 stream - bundle2-input-bundle: 3 parts total + bundle2-input-bundle: 4 parts total running hook txnclose-bookmark.test: sh $TESTTMP/hook.sh test-hook-bookmark: W: 0000000000000000000000000000000000000000 -> bundle2-output-bundle: "HG20", 1 parts total @@ -219,7 +219,7 @@ bundle2-input: payload chunk size: 0 bundle2-input: part header size: 0 bundle2-input: end of bundle2 stream - bundle2-input-bundle: 0 parts total + bundle2-input-bundle: 1 parts total deleting remote bookmark W listing keys for "phases" [1] @@ -307,7 +307,7 @@ bundle2-input-part: total payload size 23 bundle2-input: part header size: 0 bundle2-input: end of bundle2 stream - bundle2-input-bundle: 3 parts total + bundle2-input-bundle: 4 parts total running hook txnclose-bookmark.test: sh $TESTTMP/hook.sh test-hook-bookmark: W: 0000000000000000000000000000000000000000 -> bundle2-output-bundle: "HG20", 0 parts total diff --git a/tests/test-bundle2-format.t b/tests/test-bundle2-format.t index 0b81fd0aa2a1cca856a1ef4e3382f70598a53b25_dGVzdHMvdGVzdC1idW5kbGUyLWZvcm1hdC50..181ee2118a96c4b52bbd6d7b5a47e87f2e1d77e9_dGVzdHMvdGVzdC1idW5kbGUyLWZvcm1hdC50 100644 --- a/tests/test-bundle2-format.t +++ b/tests/test-bundle2-format.t @@ -697,7 +697,7 @@ bundle2-input: payload chunk size: 0 bundle2-input: part header size: 0 bundle2-input: end of bundle2 stream - bundle2-input-bundle: 6 parts total + bundle2-input-bundle: 7 parts total 0 unread bytes 3 total verses sung diff --git a/tests/test-clone-uncompressed.t b/tests/test-clone-uncompressed.t index 0b81fd0aa2a1cca856a1ef4e3382f70598a53b25_dGVzdHMvdGVzdC1jbG9uZS11bmNvbXByZXNzZWQudA==..181ee2118a96c4b52bbd6d7b5a47e87f2e1d77e9_dGVzdHMvdGVzdC1jbG9uZS11bmNvbXByZXNzZWQudA== 100644 --- a/tests/test-clone-uncompressed.t +++ b/tests/test-clone-uncompressed.t @@ -259,7 +259,7 @@ bundle2-input-part: "listkeys" (params: 1 mandatory) supported bundle2-input-part: "phase-heads" supported bundle2-input-part: total payload size 24 - bundle2-input-bundle: 1 parts total + bundle2-input-bundle: 2 parts total checking for updated bookmarks (sent 5 HTTP requests and * bytes; received * bytes in responses) (glob) #endif @@ -281,7 +281,7 @@ transferred 96.5 KB in * seconds (* */sec) (glob) bundle2-input-part: total payload size 112094 bundle2-input-part: "listkeys" (params: 1 mandatory) supported - bundle2-input-bundle: 1 parts total + bundle2-input-bundle: 2 parts total checking for updated bookmarks (sent 3 HTTP requests and * bytes; received * bytes in responses) (glob) #endif diff --git a/tests/test-http.t b/tests/test-http.t index 0b81fd0aa2a1cca856a1ef4e3382f70598a53b25_dGVzdHMvdGVzdC1odHRwLnQ=..181ee2118a96c4b52bbd6d7b5a47e87f2e1d77e9_dGVzdHMvdGVzdC1odHRwLnQ= 100644 --- a/tests/test-http.t +++ b/tests/test-http.t @@ -345,7 +345,7 @@ bundle2-input-part: "output" (advisory) supported bundle2-input-part: total payload size 45 remote: added 1 changesets with 1 changes to 1 files - bundle2-input-bundle: 2 parts total + bundle2-input-bundle: 3 parts total preparing listkeys for "phases" sending listkeys command devel-peer-request: GET http://localhost:$HGPORT2/?cmd=listkeys diff --git a/tests/test-lfs-serve-access.t b/tests/test-lfs-serve-access.t index 0b81fd0aa2a1cca856a1ef4e3382f70598a53b25_dGVzdHMvdGVzdC1sZnMtc2VydmUtYWNjZXNzLnQ=..181ee2118a96c4b52bbd6d7b5a47e87f2e1d77e9_dGVzdHMvdGVzdC1sZnMtc2VydmUtYWNjZXNzLnQ= 100644 --- a/tests/test-lfs-serve-access.t +++ b/tests/test-lfs-serve-access.t @@ -111,7 +111,7 @@ bundle2-input-part: total payload size 24 bundle2-input-part: "cache:rev-branch-cache" (advisory) supported bundle2-input-part: total payload size 39 - bundle2-input-bundle: 3 parts total + bundle2-input-bundle: 4 parts total checking for updated bookmarks updating the branch cache added 1 changesets with 1 changes to 1 files diff --git a/tests/test-lfs-test-server.t b/tests/test-lfs-test-server.t index 0b81fd0aa2a1cca856a1ef4e3382f70598a53b25_dGVzdHMvdGVzdC1sZnMtdGVzdC1zZXJ2ZXIudA==..181ee2118a96c4b52bbd6d7b5a47e87f2e1d77e9_dGVzdHMvdGVzdC1sZnMtdGVzdC1zZXJ2ZXIudA== 100644 --- a/tests/test-lfs-test-server.t +++ b/tests/test-lfs-test-server.t @@ -139,10 +139,10 @@ bundle2-input-part: total payload size 617 bundle2-input-part: "phase-heads" supported bundle2-input-part: total payload size 24 - bundle2-input-bundle: 3 parts total + bundle2-input-bundle: 4 parts total updating the branch cache added 1 changesets with 1 changes to 1 files bundle2-output-bundle: "HG20", 1 parts total bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload bundle2-input-bundle: no-transaction bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported @@ -143,10 +143,10 @@ updating the branch cache added 1 changesets with 1 changes to 1 files bundle2-output-bundle: "HG20", 1 parts total bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload bundle2-input-bundle: no-transaction bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported - bundle2-input-bundle: 0 parts total + bundle2-input-bundle: 1 parts total listing keys for "phases" $ mv .hg/store/lfs_ .hg/store/lfs @@ -315,10 +315,10 @@ bundle2-input-part: total payload size 1315 bundle2-input-part: "phase-heads" supported bundle2-input-part: total payload size 24 - bundle2-input-bundle: 4 parts total + bundle2-input-bundle: 5 parts total updating the branch cache added 1 changesets with 3 changes to 3 files bundle2-output-bundle: "HG20", 1 parts total bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload bundle2-input-bundle: no-transaction bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported @@ -319,10 +319,10 @@ updating the branch cache added 1 changesets with 3 changes to 3 files bundle2-output-bundle: "HG20", 1 parts total bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload bundle2-input-bundle: no-transaction bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported - bundle2-input-bundle: 0 parts total + bundle2-input-bundle: 1 parts total listing keys for "phases" Clear the cache to force a download diff --git a/tests/test-narrow-widen-no-ellipsis.t b/tests/test-narrow-widen-no-ellipsis.t index 0b81fd0aa2a1cca856a1ef4e3382f70598a53b25_dGVzdHMvdGVzdC1uYXJyb3ctd2lkZW4tbm8tZWxsaXBzaXMudA==..181ee2118a96c4b52bbd6d7b5a47e87f2e1d77e9_dGVzdHMvdGVzdC1uYXJyb3ctd2lkZW4tbm8tZWxsaXBzaXMudA== 100644 --- a/tests/test-narrow-widen-no-ellipsis.t +++ b/tests/test-narrow-widen-no-ellipsis.t @@ -126,7 +126,7 @@ adding file changes adding widest/f revisions bundle2-input-part: total payload size * (glob) - bundle2-input-bundle: 0 parts total + bundle2-input-bundle: 1 parts total added 0 changesets with 1 changes to 1 files widest/f: narrowspec updated -> g getting widest/f diff --git a/tests/test-obsolete-changeset-exchange.t b/tests/test-obsolete-changeset-exchange.t index 0b81fd0aa2a1cca856a1ef4e3382f70598a53b25_dGVzdHMvdGVzdC1vYnNvbGV0ZS1jaGFuZ2VzZXQtZXhjaGFuZ2UudA==..181ee2118a96c4b52bbd6d7b5a47e87f2e1d77e9_dGVzdHMvdGVzdC1vYnNvbGV0ZS1jaGFuZ2VzZXQtZXhjaGFuZ2UudA== 100644 --- a/tests/test-obsolete-changeset-exchange.t +++ b/tests/test-obsolete-changeset-exchange.t @@ -176,7 +176,7 @@ bundle2-input-part: total payload size 24 bundle2-input-part: "cache:rev-branch-cache" (advisory) supported bundle2-input-part: total payload size 39 - bundle2-input-bundle: 3 parts total + bundle2-input-bundle: 4 parts total checking for updated bookmarks updating the branch cache added 1 changesets with 1 changes to 1 files (+1 heads) diff --git a/tests/test-rebase-conflicts.t b/tests/test-rebase-conflicts.t index 0b81fd0aa2a1cca856a1ef4e3382f70598a53b25_dGVzdHMvdGVzdC1yZWJhc2UtY29uZmxpY3RzLnQ=..181ee2118a96c4b52bbd6d7b5a47e87f2e1d77e9_dGVzdHMvdGVzdC1yZWJhc2UtY29uZmxpY3RzLnQ= 100644 --- a/tests/test-rebase-conflicts.t +++ b/tests/test-rebase-conflicts.t @@ -321,7 +321,7 @@ truncating cache/rbc-revs-v1 to 56 bundle2-input-part: "phase-heads" supported bundle2-input-part: total payload size 24 - bundle2-input-bundle: 2 parts total + bundle2-input-bundle: 3 parts total added 2 changesets with 2 changes to 1 files updating the branch cache invalid branch cache (served): tip differs diff --git a/tests/test-ssh.t b/tests/test-ssh.t index 0b81fd0aa2a1cca856a1ef4e3382f70598a53b25_dGVzdHMvdGVzdC1zc2gudA==..181ee2118a96c4b52bbd6d7b5a47e87f2e1d77e9_dGVzdHMvdGVzdC1zc2gudA== 100644 --- a/tests/test-ssh.t +++ b/tests/test-ssh.t @@ -546,7 +546,7 @@ bundle2-input-part: total payload size 45 bundle2-input-part: "phase-heads" supported bundle2-input-part: total payload size 72 - bundle2-input-bundle: 2 parts total + bundle2-input-bundle: 3 parts total checking for updated bookmarks $ cd $TESTTMP diff --git a/tests/test-stream-bundle-v2.t b/tests/test-stream-bundle-v2.t index 0b81fd0aa2a1cca856a1ef4e3382f70598a53b25_dGVzdHMvdGVzdC1zdHJlYW0tYnVuZGxlLXYyLnQ=..181ee2118a96c4b52bbd6d7b5a47e87f2e1d77e9_dGVzdHMvdGVzdC1zdHJlYW0tYnVuZGxlLXYyLnQ= 100644 --- a/tests/test-stream-bundle-v2.t +++ b/tests/test-stream-bundle-v2.t @@ -87,7 +87,7 @@ adding [c] rbc-revs-v1 (40 bytes) transferred 1.65 KB in \d\.\d seconds \(.*/sec\) (re) bundle2-input-part: total payload size 1840 - bundle2-input-bundle: 0 parts total + bundle2-input-bundle: 1 parts total updating the branch cache finished applying clone bundle query 1; heads @@ -100,7 +100,7 @@ bundle2-input-part: "listkeys" (params: 1 mandatory) supported bundle2-input-part: "phase-heads" supported bundle2-input-part: total payload size 24 - bundle2-input-bundle: 1 parts total + bundle2-input-bundle: 2 parts total checking for updated bookmarks updating to branch default resolving manifests @@ -143,7 +143,7 @@ adding [c] rbc-revs-v1 (40 bytes) transferred 1.65 KB in *.* seconds (*/sec) (glob) bundle2-input-part: total payload size 1840 - bundle2-input-bundle: 0 parts total + bundle2-input-bundle: 1 parts total updating the branch cache finished applying clone bundle query 1; heads @@ -156,7 +156,7 @@ bundle2-input-part: "listkeys" (params: 1 mandatory) supported bundle2-input-part: "phase-heads" supported bundle2-input-part: total payload size 24 - bundle2-input-bundle: 1 parts total + bundle2-input-bundle: 2 parts total checking for updated bookmarks updating to branch default resolving manifests