diff tests/test-pullbundle.t @ 6483:e41b99cec0c2

tests: update tests output for changegroup3 becoming the new default

CORE-TEST-OUTPUT-UPDATE: 2cf264e9aa75

--- a/tests/test-pullbundle.t	Wed Mar 01 02:45:38 2023 +0100
+++ b/tests/test-pullbundle.t	Wed Mar 29 20:36:58 2023 -0300
@@ -53,37 +53,43 @@
   bundle2-output: payload chunk size: 32768
   bundle2-output: payload chunk size: 32768
   bundle2-output: payload chunk size: 32768
-  bundle2-output: payload chunk size: 22368
+  bundle2-output: payload chunk size: 22368 (no-default-cg3 !)
+  bundle2-output: payload chunk size: 24420 (default-cg3 !)
   bundle2-output: closing payload chunk
   bundle2-output: bundle part: "changegroup"
   bundle2-output-part: "changegroup" (params: 1 mandatory 1 advisory) streamed payload
   bundle2-output: part 1: "CHANGEGROUP"
   bundle2-output: header chunk size: 43
-  bundle2-output: payload chunk size: 23564
+  bundle2-output: payload chunk size: 23564 (no-default-cg3 !)
+  bundle2-output: payload chunk size: 23824 (default-cg3 !)
   bundle2-output: closing payload chunk
   bundle2-output: bundle part: "changegroup"
   bundle2-output-part: "changegroup" (params: 1 mandatory 1 advisory) streamed payload
   bundle2-output: part 2: "CHANGEGROUP"
   bundle2-output: header chunk size: 42
-  bundle2-output: payload chunk size: 11788
+  bundle2-output: payload chunk size: 11788 (no-default-cg3 !)
+  bundle2-output: payload chunk size: 11920 (default-cg3 !)
   bundle2-output: closing payload chunk
   bundle2-output: bundle part: "changegroup"
   bundle2-output-part: "changegroup" (params: 1 mandatory 1 advisory) streamed payload
   bundle2-output: part 3: "CHANGEGROUP"
   bundle2-output: header chunk size: 42
-  bundle2-output: payload chunk size: 2956
+  bundle2-output: payload chunk size: 2956 (no-default-cg3 !)
+  bundle2-output: payload chunk size: 2992 (default-cg3 !)
   bundle2-output: closing payload chunk
   bundle2-output: bundle part: "changegroup"
   bundle2-output-part: "changegroup" (params: 1 mandatory 1 advisory) streamed payload
   bundle2-output: part 4: "CHANGEGROUP"
   bundle2-output: header chunk size: 41
-  bundle2-output: payload chunk size: 380
+  bundle2-output: payload chunk size: 380 (no-default-cg3 !)
+  bundle2-output: payload chunk size: 388 (default-cg3 !)
   bundle2-output: closing payload chunk
   bundle2-output: bundle part: "changegroup"
   bundle2-output-part: "changegroup" (params: 1 mandatory 1 advisory) streamed payload
   bundle2-output: part 5: "CHANGEGROUP"
   bundle2-output: header chunk size: 41
-  bundle2-output: payload chunk size: 196
+  bundle2-output: payload chunk size: 196 (no-default-cg3 !)
+  bundle2-output: payload chunk size: 202 (default-cg3 !)
   bundle2-output: closing payload chunk
   bundle2-output: bundle part: "phase-heads"
   bundle2-output-part: "phase-heads" 24 bytes payload
@@ -108,11 +114,13 @@
   bundle2-input: payload chunk size: 32768
   bundle2-input: payload chunk size: 32768
   bundle2-input: payload chunk size: 32768
-  bundle2-input: payload chunk size: 22368
+  bundle2-input: payload chunk size: 22368 (no-default-cg3 !)
+  bundle2-input: payload chunk size: 24420 (default-cg3 !)
   bundle2-input: payload chunk size: 0
   adding manifests
   adding file changes
-  bundle2-input-part: total payload size 186208
+  bundle2-input-part: total payload size 186208 (no-default-cg3 !)
+  bundle2-input-part: total payload size 188260 (default-cg3 !)
   bundle2-input: part header size: 43
   bundle2-input: part type: "CHANGEGROUP"
   bundle2-input: part id: "1"
@@ -120,11 +128,13 @@
   bundle2-input: found a handler for part changegroup
   bundle2-input-part: "changegroup" (params: 1 mandatory 1 advisory) supported
   adding changesets
-  bundle2-input: payload chunk size: 23564
+  bundle2-input: payload chunk size: 23564 (no-default-cg3 !)
+  bundle2-input: payload chunk size: 23824 (default-cg3 !)
   bundle2-input: payload chunk size: 0
   adding manifests
   adding file changes
-  bundle2-input-part: total payload size 23564
+  bundle2-input-part: total payload size 23564 (no-default-cg3 !)
+  bundle2-input-part: total payload size 23824 (default-cg3 !)
   bundle2-input: part header size: 42
   bundle2-input: part type: "CHANGEGROUP"
   bundle2-input: part id: "2"
@@ -132,11 +142,13 @@
   bundle2-input: found a handler for part changegroup
   bundle2-input-part: "changegroup" (params: 1 mandatory 1 advisory) supported
   adding changesets
-  bundle2-input: payload chunk size: 11788
+  bundle2-input: payload chunk size: 11788 (no-default-cg3 !)
+  bundle2-input: payload chunk size: 11920 (default-cg3 !)
   bundle2-input: payload chunk size: 0
   adding manifests
   adding file changes
-  bundle2-input-part: total payload size 11788
+  bundle2-input-part: total payload size 11788 (no-default-cg3 !)
+  bundle2-input-part: total payload size 11920 (default-cg3 !)
   bundle2-input: part header size: 42
   bundle2-input: part type: "CHANGEGROUP"
   bundle2-input: part id: "3"
@@ -144,11 +156,13 @@
   bundle2-input: found a handler for part changegroup
   bundle2-input-part: "changegroup" (params: 1 mandatory 1 advisory) supported
   adding changesets
-  bundle2-input: payload chunk size: 2956
+  bundle2-input: payload chunk size: 2956 (no-default-cg3 !)
+  bundle2-input: payload chunk size: 2992 (default-cg3 !)
   bundle2-input: payload chunk size: 0
   adding manifests
   adding file changes
-  bundle2-input-part: total payload size 2956
+  bundle2-input-part: total payload size 2956 (no-default-cg3 !)
+  bundle2-input-part: total payload size 2992 (default-cg3 !)
   bundle2-input: part header size: 41
   bundle2-input: part type: "CHANGEGROUP"
   bundle2-input: part id: "4"
@@ -156,11 +170,13 @@
   bundle2-input: found a handler for part changegroup
   bundle2-input-part: "changegroup" (params: 1 mandatory 1 advisory) supported
   adding changesets
-  bundle2-input: payload chunk size: 380
+  bundle2-input: payload chunk size: 380 (no-default-cg3 !)
+  bundle2-input: payload chunk size: 388 (default-cg3 !)
   bundle2-input: payload chunk size: 0
   adding manifests
   adding file changes
-  bundle2-input-part: total payload size 380
+  bundle2-input-part: total payload size 380 (no-default-cg3 !)
+  bundle2-input-part: total payload size 388 (default-cg3 !)
   bundle2-input: part header size: 41
   bundle2-input: part type: "CHANGEGROUP"
   bundle2-input: part id: "5"
@@ -168,11 +184,13 @@
   bundle2-input: found a handler for part changegroup
   bundle2-input-part: "changegroup" (params: 1 mandatory 1 advisory) supported
   adding changesets
-  bundle2-input: payload chunk size: 196
+  bundle2-input: payload chunk size: 196 (no-default-cg3 !)
+  bundle2-input: payload chunk size: 202 (default-cg3 !)
   bundle2-input: payload chunk size: 0
   adding manifests
   adding file changes
-  bundle2-input-part: total payload size 196
+  bundle2-input-part: total payload size 196 (no-default-cg3 !)
+  bundle2-input-part: total payload size 202 (default-cg3 !)
   bundle2-input: part header size: 18
   bundle2-input: part type: "PHASE-HEADS"
   bundle2-input: part id: "6"
@@ -199,12 +217,12 @@
   --- oldbundles	* (glob)
   +++ newbundles	* (glob)
   @@ -0,0 +1,6 @@
-  +02-467b6e370e816747e27de0d0b9237f4090a33656-0000001152skip-0000000064size.hg
-  +02-540f762640ee62ca597ece26af725e6357e82805-0000000000skip-0000001024size.hg
-  +02-63ded94ceab180ac2fa13e1f0beeb4d2265998a3-0000001232skip-0000000002size.hg
-  +02-7f3a79522d6e904d52aea07c71e6cb612667e8f4-0000001216skip-0000000016size.hg
-  +02-ee2deecf044fa5583f66188c9177b0f13332adc2-0000001024skip-0000000128size.hg
-  +02-f864bc82f6a2f2ecb49b83722e0895f9d657b0dd-0000001234skip-0000000001size.hg
+  +0?-467b6e370e816747e27de0d0b9237f4090a33656-0000001152skip-0000000064size.hg (glob)
+  +0?-540f762640ee62ca597ece26af725e6357e82805-0000000000skip-0000001024size.hg (glob)
+  +0?-63ded94ceab180ac2fa13e1f0beeb4d2265998a3-0000001232skip-0000000002size.hg (glob)
+  +0?-7f3a79522d6e904d52aea07c71e6cb612667e8f4-0000001216skip-0000000016size.hg (glob)
+  +0?-ee2deecf044fa5583f66188c9177b0f13332adc2-0000001024skip-0000000128size.hg (glob)
+  +0?-f864bc82f6a2f2ecb49b83722e0895f9d657b0dd-0000001234skip-0000000001size.hg (glob)
   [1]
 
 pull the other missing entries (multiple heads pulled)
@@ -247,58 +265,76 @@
   64 changesets found
   8 changesets found
   uncompressed size of bundle content:
-       188 (changelog)
+       188 (changelog) (no-default-cg3 !)
+       190 (changelog) (default-cg3 !)
          4 (manifests)
   uncompressed size of bundle content:
-       740 (changelog)
+       740 (changelog) (no-default-cg3 !)
+       748 (changelog) (default-cg3 !)
          4 (manifests)
   uncompressed size of bundle content:
-      1476 (changelog)
+      1476 (changelog) (no-default-cg3 !)
+      1492 (changelog) (default-cg3 !)
          4 (manifests)
   uncompressed size of bundle content:
-      5892 (changelog)
+      5892 (changelog) (no-default-cg3 !)
+      5956 (changelog) (default-cg3 !)
          4 (manifests)
   uncompressed size of bundle content:
-     23556 (changelog)
+     23556 (changelog) (no-default-cg3 !)
+     23812 (changelog) (default-cg3 !)
          4 (manifests)
   uncompressed size of bundle content:
-     11780 (changelog)
+     11780 (changelog) (no-default-cg3 !)
+     11908 (changelog) (default-cg3 !)
          4 (manifests)
   uncompressed size of bundle content:
-      5892 (changelog)
+      5892 (changelog) (no-default-cg3 !)
+      5956 (changelog) (default-cg3 !)
          4 (manifests)
   uncompressed size of bundle content:
-      1476 (changelog)
+      1476 (changelog) (no-default-cg3 !)
+      1492 (changelog) (default-cg3 !)
          4 (manifests)
   uncompressed size of bundle content:
-       740 (changelog)
+       740 (changelog) (no-default-cg3 !)
+       748 (changelog) (default-cg3 !)
          4 (manifests)
   uncompressed size of bundle content:
-       372 (changelog)
+       372 (changelog) (no-default-cg3 !)
+       376 (changelog) (default-cg3 !)
          4 (manifests)
   uncompressed size of bundle content:
-       188 (changelog)
+       188 (changelog) (no-default-cg3 !)
+       190 (changelog) (default-cg3 !)
          4 (manifests)
   uncompressed size of bundle content:
-       740 (changelog)
+       740 (changelog) (no-default-cg3 !)
+       748 (changelog) (default-cg3 !)
          4 (manifests)
   uncompressed size of bundle content:
-      1476 (changelog)
+      1476 (changelog) (no-default-cg3 !)
+      1492 (changelog) (default-cg3 !)
          4 (manifests)
   uncompressed size of bundle content:
-      2948 (changelog)
+      2948 (changelog) (no-default-cg3 !)
+      2980 (changelog) (default-cg3 !)
          4 (manifests)
   uncompressed size of bundle content:
-     47108 (changelog)
+     47108 (changelog) (no-default-cg3 !)
+     47620 (changelog) (default-cg3 !)
          4 (manifests)
   uncompressed size of bundle content:
-     47108 (changelog)
+     47108 (changelog) (no-default-cg3 !)
+     47620 (changelog) (default-cg3 !)
          4 (manifests)
   uncompressed size of bundle content:
-     11780 (changelog)
+     11780 (changelog) (no-default-cg3 !)
+     11908 (changelog) (default-cg3 !)
          4 (manifests)
   uncompressed size of bundle content:
-      1476 (changelog)
+      1476 (changelog) (no-default-cg3 !)
+      1492 (changelog) (default-cg3 !)
          4 (manifests)
   adding changesets
   adding manifests
@@ -364,30 +400,30 @@
   --- oldbundles	* (glob)
   +++ newbundles	* (glob)
   @@ -1,6 +1,24 @@
-  +02-0f376356904fc8c1c6ceaac27990f2fd79b1f8c1-0000001856skip-0000000008size.hg
-  +02-17185c1c22f1266b084daf7cfb07b6ebbfbc65ab-0000001235skip-0000000001size.hg
-  +02-1dded5aafa0f8d548f6357cc2f8882dcc4489fbf-0000001516skip-0000000002size.hg
-  +02-2dc4f1ab9029719714b8e0dde8e3725a5bb28472-0000001408skip-0000000064size.hg
-  +02-2f0e261a08964bc1c607c0eda4978364c22a9b94-0000001504skip-0000000008size.hg
-   02-467b6e370e816747e27de0d0b9237f4090a33656-0000001152skip-0000000064size.hg
-  +02-484c46df3e41f371efd0ff74fa5221657527213f-0000001240skip-0000000008size.hg
-  +02-4a6d0f7d07d060b026d9fc690cd89cd26af96e42-0000001248skip-0000000032size.hg
-   02-540f762640ee62ca597ece26af725e6357e82805-0000000000skip-0000001024size.hg
-   02-63ded94ceab180ac2fa13e1f0beeb4d2265998a3-0000001232skip-0000000002size.hg
-  +02-694ef7e5b2984f1ec66c3d960799f4ff2459672c-0000001236skip-0000000004size.hg
-   02-7f3a79522d6e904d52aea07c71e6cb612667e8f4-0000001216skip-0000000016size.hg
-  +02-89fab188d2ce3c4cde6be031f2fc5b9b4ff248e3-0000000900skip-0000000004size.hg
-  +02-97ede4832194ed56894374f2a1cc7a0022b486da-0000000904skip-0000000008size.hg
-  +02-b2d350c94c26edbb783aaa21fc24f1fc65c30e74-0000001536skip-0000000256size.hg
-  +02-bbd293bd171fd5b711d428db46940a72eca7a40f-0000001280skip-0000000128size.hg
-  +02-c72277ff25807eb444fa48a60afb434d78c21f2f-0000000899skip-0000000001size.hg
-  +02-da87a81c5310760f414a933e6550b7e8e60cf241-0000001792skip-0000000064size.hg
-  +02-dba2fddbf3c28198659046674a512afd616a1519-0000001472skip-0000000032size.hg
-  +02-e469a7aa5cce57653b6b02ff46c80b2d94d62629-0000000912skip-0000000016size.hg
-  +02-e74670ea99533967c5d90da3ddbc0318cc1fd502-0000001280skip-0000000256size.hg
-   02-ee2deecf044fa5583f66188c9177b0f13332adc2-0000001024skip-0000000128size.hg
-   02-f864bc82f6a2f2ecb49b83722e0895f9d657b0dd-0000001234skip-0000000001size.hg
-  +02-fb6c210a224903e81e5a8d2ee099cb0c9526ba8c-0000001512skip-0000000004size.hg
+  +0?-0f376356904fc8c1c6ceaac27990f2fd79b1f8c1-0000001856skip-0000000008size.hg (glob)
+  +0?-17185c1c22f1266b084daf7cfb07b6ebbfbc65ab-0000001235skip-0000000001size.hg (glob)
+  +0?-1dded5aafa0f8d548f6357cc2f8882dcc4489fbf-0000001516skip-0000000002size.hg (glob)
+  +0?-2dc4f1ab9029719714b8e0dde8e3725a5bb28472-0000001408skip-0000000064size.hg (glob)
+  +0?-2f0e261a08964bc1c607c0eda4978364c22a9b94-0000001504skip-0000000008size.hg (glob)
+   0?-467b6e370e816747e27de0d0b9237f4090a33656-0000001152skip-0000000064size.hg (glob)
+  +0?-484c46df3e41f371efd0ff74fa5221657527213f-0000001240skip-0000000008size.hg (glob)
+  +0?-4a6d0f7d07d060b026d9fc690cd89cd26af96e42-0000001248skip-0000000032size.hg (glob)
+   0?-540f762640ee62ca597ece26af725e6357e82805-0000000000skip-0000001024size.hg (glob)
+   0?-63ded94ceab180ac2fa13e1f0beeb4d2265998a3-0000001232skip-0000000002size.hg (glob)
+  +0?-694ef7e5b2984f1ec66c3d960799f4ff2459672c-0000001236skip-0000000004size.hg (glob)
+   0?-7f3a79522d6e904d52aea07c71e6cb612667e8f4-0000001216skip-0000000016size.hg (glob)
+  +0?-89fab188d2ce3c4cde6be031f2fc5b9b4ff248e3-0000000900skip-0000000004size.hg (glob)
+  +0?-97ede4832194ed56894374f2a1cc7a0022b486da-0000000904skip-0000000008size.hg (glob)
+  +0?-b2d350c94c26edbb783aaa21fc24f1fc65c30e74-0000001536skip-0000000256size.hg (glob)
+  +0?-bbd293bd171fd5b711d428db46940a72eca7a40f-0000001280skip-0000000128size.hg (glob)
+  +0?-c72277ff25807eb444fa48a60afb434d78c21f2f-0000000899skip-0000000001size.hg (glob)
+  +0?-da87a81c5310760f414a933e6550b7e8e60cf241-0000001792skip-0000000064size.hg (glob)
+  +0?-dba2fddbf3c28198659046674a512afd616a1519-0000001472skip-0000000032size.hg (glob)
+  +0?-e469a7aa5cce57653b6b02ff46c80b2d94d62629-0000000912skip-0000000016size.hg (glob)
+  +0?-e74670ea99533967c5d90da3ddbc0318cc1fd502-0000001280skip-0000000256size.hg (glob)
+   0?-ee2deecf044fa5583f66188c9177b0f13332adc2-0000001024skip-0000000128size.hg (glob)
+   0?-f864bc82f6a2f2ecb49b83722e0895f9d657b0dd-0000001234skip-0000000001size.hg (glob)
+  +0?-fb6c210a224903e81e5a8d2ee099cb0c9526ba8c-0000001512skip-0000000004size.hg (glob)
   [1]
 
 Same Pullin with a different client
@@ -564,16 +600,20 @@
   2 changesets found
   1 changesets found
   uncompressed size of bundle content:
-     41772 (changelog)
+     41772 (changelog) (no-default-cg3 !)
+     42226 (changelog) (default-cg3 !)
          4 (manifests)
   uncompressed size of bundle content:
-      5340 (changelog)
+      5340 (changelog) (no-default-cg3 !)
+      5398 (changelog) (default-cg3 !)
          4 (manifests)
   uncompressed size of bundle content:
-     23556 (changelog)
+     23556 (changelog) (no-default-cg3 !)
+     23812 (changelog) (default-cg3 !)
          4 (manifests)
   uncompressed size of bundle content:
-     11780 (changelog)
+     11780 (changelog) (no-default-cg3 !)
+     11908 (changelog) (default-cg3 !)
          4 (manifests)
   adding changesets
   adding manifests
@@ -589,16 +629,20 @@
   adding file changes
   adding changesets
   uncompressed size of bundle content:
-      5892 (changelog)
+      5892 (changelog) (no-default-cg3 !)
+      5956 (changelog) (default-cg3 !)
          4 (manifests)
   uncompressed size of bundle content:
-      2948 (changelog)
+      2948 (changelog) (no-default-cg3 !)
+      2980 (changelog) (default-cg3 !)
          4 (manifests)
   uncompressed size of bundle content:
-       372 (changelog)
+       372 (changelog) (no-default-cg3 !)
+       376 (changelog) (default-cg3 !)
          4 (manifests)
   uncompressed size of bundle content:
-       188 (changelog)
+       188 (changelog) (no-default-cg3 !)
+       190 (changelog) (default-cg3 !)
          4 (manifests)
   adding manifests
   adding file changes
@@ -624,34 +668,34 @@
   --- oldbundles	* (glob)
   +++ newbundles	* (glob)
   @@ -3,20 +3,28 @@
-   02-1dded5aafa0f8d548f6357cc2f8882dcc4489fbf-0000001516skip-0000000002size.hg
-   02-2dc4f1ab9029719714b8e0dde8e3725a5bb28472-0000001408skip-0000000064size.hg
-   02-2f0e261a08964bc1c607c0eda4978364c22a9b94-0000001504skip-0000000008size.hg
-  +02-44e80141ad530a2aa085e9bd9b5311b57eff72ff-0000001522skip-0000000001size.hg
-   02-467b6e370e816747e27de0d0b9237f4090a33656-0000001152skip-0000000064size.hg
-   02-484c46df3e41f371efd0ff74fa5221657527213f-0000001240skip-0000000008size.hg
-   02-4a6d0f7d07d060b026d9fc690cd89cd26af96e42-0000001248skip-0000000032size.hg
-   02-540f762640ee62ca597ece26af725e6357e82805-0000000000skip-0000001024size.hg
-  +02-59e60b258b18cde1e931cf30ce4ae62b49e37abd-0000001520skip-0000000002size.hg
-   02-63ded94ceab180ac2fa13e1f0beeb4d2265998a3-0000001232skip-0000000002size.hg
-   02-694ef7e5b2984f1ec66c3d960799f4ff2459672c-0000001236skip-0000000004size.hg
-  +02-7a55a4d5ce324910842c893b56173cf2a847cb9d-0000001472skip-0000000032size.hg
-   02-7f3a79522d6e904d52aea07c71e6cb612667e8f4-0000001216skip-0000000016size.hg
-   02-89fab188d2ce3c4cde6be031f2fc5b9b4ff248e3-0000000900skip-0000000004size.hg
-   02-97ede4832194ed56894374f2a1cc7a0022b486da-0000000904skip-0000000008size.hg
-  +02-a4ab7df9d74053fb819c8a1c6a48ad605cc05f8a-0000001504skip-0000000016size.hg
-   02-b2d350c94c26edbb783aaa21fc24f1fc65c30e74-0000001536skip-0000000256size.hg
-   02-bbd293bd171fd5b711d428db46940a72eca7a40f-0000001280skip-0000000128size.hg
-  +02-c12927fef661d2463043347101b90067c2961333-0000001280skip-0000000128size.hg
-   02-c72277ff25807eb444fa48a60afb434d78c21f2f-0000000899skip-0000000001size.hg
-  +02-d83212ecaa436c80d6113cf915ba35e2db787e79-0000001024skip-0000000227size.hg
-   02-da87a81c5310760f414a933e6550b7e8e60cf241-0000001792skip-0000000064size.hg
-   02-dba2fddbf3c28198659046674a512afd616a1519-0000001472skip-0000000032size.hg
-  +02-dc714c3a5d080165292ba99b097567d0b95e5756-0000001408skip-0000000064size.hg
-  +02-e469a7aa5cce57653b6b02ff46c80b2d94d62629-0000000899skip-0000000029size.hg
-   02-e469a7aa5cce57653b6b02ff46c80b2d94d62629-0000000912skip-0000000016size.hg
-   02-e74670ea99533967c5d90da3ddbc0318cc1fd502-0000001280skip-0000000256size.hg
-   02-ee2deecf044fa5583f66188c9177b0f13332adc2-0000001024skip-0000000128size.hg
+   0?-1dded5aafa0f8d548f6357cc2f8882dcc4489fbf-0000001516skip-0000000002size.hg (glob)
+   0?-2dc4f1ab9029719714b8e0dde8e3725a5bb28472-0000001408skip-0000000064size.hg (glob)
+   0?-2f0e261a08964bc1c607c0eda4978364c22a9b94-0000001504skip-0000000008size.hg (glob)
+  +0?-44e80141ad530a2aa085e9bd9b5311b57eff72ff-0000001522skip-0000000001size.hg (glob)
+   0?-467b6e370e816747e27de0d0b9237f4090a33656-0000001152skip-0000000064size.hg (glob)
+   0?-484c46df3e41f371efd0ff74fa5221657527213f-0000001240skip-0000000008size.hg (glob)
+   0?-4a6d0f7d07d060b026d9fc690cd89cd26af96e42-0000001248skip-0000000032size.hg (glob)
+   0?-540f762640ee62ca597ece26af725e6357e82805-0000000000skip-0000001024size.hg (glob)
+  +0?-59e60b258b18cde1e931cf30ce4ae62b49e37abd-0000001520skip-0000000002size.hg (glob)
+   0?-63ded94ceab180ac2fa13e1f0beeb4d2265998a3-0000001232skip-0000000002size.hg (glob)
+   0?-694ef7e5b2984f1ec66c3d960799f4ff2459672c-0000001236skip-0000000004size.hg (glob)
+  +0?-7a55a4d5ce324910842c893b56173cf2a847cb9d-0000001472skip-0000000032size.hg (glob)
+   0?-7f3a79522d6e904d52aea07c71e6cb612667e8f4-0000001216skip-0000000016size.hg (glob)
+   0?-89fab188d2ce3c4cde6be031f2fc5b9b4ff248e3-0000000900skip-0000000004size.hg (glob)
+   0?-97ede4832194ed56894374f2a1cc7a0022b486da-0000000904skip-0000000008size.hg (glob)
+  +0?-a4ab7df9d74053fb819c8a1c6a48ad605cc05f8a-0000001504skip-0000000016size.hg (glob)
+   0?-b2d350c94c26edbb783aaa21fc24f1fc65c30e74-0000001536skip-0000000256size.hg (glob)
+   0?-bbd293bd171fd5b711d428db46940a72eca7a40f-0000001280skip-0000000128size.hg (glob)
+  +0?-c12927fef661d2463043347101b90067c2961333-0000001280skip-0000000128size.hg (glob)
+   0?-c72277ff25807eb444fa48a60afb434d78c21f2f-0000000899skip-0000000001size.hg (glob)
+  +0?-d83212ecaa436c80d6113cf915ba35e2db787e79-0000001024skip-0000000227size.hg (glob)
+   0?-da87a81c5310760f414a933e6550b7e8e60cf241-0000001792skip-0000000064size.hg (glob)
+   0?-dba2fddbf3c28198659046674a512afd616a1519-0000001472skip-0000000032size.hg (glob)
+  +0?-dc714c3a5d080165292ba99b097567d0b95e5756-0000001408skip-0000000064size.hg (glob)
+  +0?-e469a7aa5cce57653b6b02ff46c80b2d94d62629-0000000899skip-0000000029size.hg (glob)
+   0?-e469a7aa5cce57653b6b02ff46c80b2d94d62629-0000000912skip-0000000016size.hg (glob)
+   0?-e74670ea99533967c5d90da3ddbc0318cc1fd502-0000001280skip-0000000256size.hg (glob)
+   0?-ee2deecf044fa5583f66188c9177b0f13332adc2-0000001024skip-0000000128size.hg (glob)
   [1]
 
   $ hg -R server log -G -T '{rev}:{node}\n' -r '1789+head()+parents(roots(only(head(), 1789)))+(only(head(), 1789) and (merge() or branchpoint()))'
@@ -687,25 +731,32 @@
   64 changesets found in caches
   8 changesets found in caches
   uncompressed size of bundle content:
-       188 (changelog)
+       188 (changelog) (no-default-cg3 !)
+       190 (changelog) (default-cg3 !)
          4 (manifests)
   uncompressed size of bundle content:
-       740 (changelog)
+       740 (changelog) (no-default-cg3 !)
+       748 (changelog) (default-cg3 !)
          4 (manifests)
   uncompressed size of bundle content:
-      1476 (changelog)
+      1476 (changelog) (no-default-cg3 !)
+      1492 (changelog) (default-cg3 !)
          4 (manifests)
   uncompressed size of bundle content:
-      2948 (changelog)
+      2948 (changelog) (no-default-cg3 !)
+      2980 (changelog) (default-cg3 !)
          4 (manifests)
   uncompressed size of bundle content:
-       188 (changelog)
+       188 (changelog) (no-default-cg3 !)
+       190 (changelog) (default-cg3 !)
          4 (manifests)
   uncompressed size of bundle content:
-       740 (changelog)
+       740 (changelog) (no-default-cg3 !)
+       748 (changelog) (default-cg3 !)
          4 (manifests)
   uncompressed size of bundle content:
-      1476 (changelog)
+      1476 (changelog) (no-default-cg3 !)
+      1492 (changelog) (default-cg3 !)
          4 (manifests)
   adding changesets
   adding manifests
@@ -765,42 +816,42 @@
   --- oldbundles	* (glob)
   +++ newbundles	* (glob)
   @@ -1,14 +1,17 @@
-   02-0f376356904fc8c1c6ceaac27990f2fd79b1f8c1-0000001856skip-0000000008size.hg
-   02-17185c1c22f1266b084daf7cfb07b6ebbfbc65ab-0000001235skip-0000000001size.hg
-   02-1dded5aafa0f8d548f6357cc2f8882dcc4489fbf-0000001516skip-0000000002size.hg
-  +02-1ed78f99f705cb819a02f1227c217728d008e461-0000001524skip-0000000004size.hg
-   02-2dc4f1ab9029719714b8e0dde8e3725a5bb28472-0000001408skip-0000000064size.hg
-   02-2f0e261a08964bc1c607c0eda4978364c22a9b94-0000001504skip-0000000008size.hg
-   02-44e80141ad530a2aa085e9bd9b5311b57eff72ff-0000001522skip-0000000001size.hg
-   02-467b6e370e816747e27de0d0b9237f4090a33656-0000001152skip-0000000064size.hg
-   02-484c46df3e41f371efd0ff74fa5221657527213f-0000001240skip-0000000008size.hg
-   02-4a6d0f7d07d060b026d9fc690cd89cd26af96e42-0000001248skip-0000000032size.hg
-  +02-4a6d0f7d07d060b026d9fc690cd89cd26af96e42-0000001264skip-0000000016size.hg
-   02-540f762640ee62ca597ece26af725e6357e82805-0000000000skip-0000001024size.hg
-   02-59e60b258b18cde1e931cf30ce4ae62b49e37abd-0000001520skip-0000000002size.hg
-  +02-5eaa75df73c454c1afff722301a4c73e897de94d-0000001256skip-0000000008size.hg
-   02-63ded94ceab180ac2fa13e1f0beeb4d2265998a3-0000001232skip-0000000002size.hg
-   02-694ef7e5b2984f1ec66c3d960799f4ff2459672c-0000001236skip-0000000004size.hg
-   02-7a55a4d5ce324910842c893b56173cf2a847cb9d-0000001472skip-0000000032size.hg
+   0?-0f376356904fc8c1c6ceaac27990f2fd79b1f8c1-0000001856skip-0000000008size.hg (glob)
+   0?-17185c1c22f1266b084daf7cfb07b6ebbfbc65ab-0000001235skip-0000000001size.hg (glob)
+   0?-1dded5aafa0f8d548f6357cc2f8882dcc4489fbf-0000001516skip-0000000002size.hg (glob)
+  +0?-1ed78f99f705cb819a02f1227c217728d008e461-0000001524skip-0000000004size.hg (glob)
+   0?-2dc4f1ab9029719714b8e0dde8e3725a5bb28472-0000001408skip-0000000064size.hg (glob)
+   0?-2f0e261a08964bc1c607c0eda4978364c22a9b94-0000001504skip-0000000008size.hg (glob)
+   0?-44e80141ad530a2aa085e9bd9b5311b57eff72ff-0000001522skip-0000000001size.hg (glob)
+   0?-467b6e370e816747e27de0d0b9237f4090a33656-0000001152skip-0000000064size.hg (glob)
+   0?-484c46df3e41f371efd0ff74fa5221657527213f-0000001240skip-0000000008size.hg (glob)
+   0?-4a6d0f7d07d060b026d9fc690cd89cd26af96e42-0000001248skip-0000000032size.hg (glob)
+  +0?-4a6d0f7d07d060b026d9fc690cd89cd26af96e42-0000001264skip-0000000016size.hg (glob)
+   0?-540f762640ee62ca597ece26af725e6357e82805-0000000000skip-0000001024size.hg (glob)
+   0?-59e60b258b18cde1e931cf30ce4ae62b49e37abd-0000001520skip-0000000002size.hg (glob)
+  +0?-5eaa75df73c454c1afff722301a4c73e897de94d-0000001256skip-0000000008size.hg (glob)
+   0?-63ded94ceab180ac2fa13e1f0beeb4d2265998a3-0000001232skip-0000000002size.hg (glob)
+   0?-694ef7e5b2984f1ec66c3d960799f4ff2459672c-0000001236skip-0000000004size.hg (glob)
+   0?-7a55a4d5ce324910842c893b56173cf2a847cb9d-0000001472skip-0000000032size.hg (glob)
   @@ -19,7 +22,10 @@
-   02-b2d350c94c26edbb783aaa21fc24f1fc65c30e74-0000001536skip-0000000256size.hg
-   02-bbd293bd171fd5b711d428db46940a72eca7a40f-0000001280skip-0000000128size.hg
-   02-c12927fef661d2463043347101b90067c2961333-0000001280skip-0000000128size.hg
-  +02-c232505f58fdf70bcf5f6ab6a555f23ffc74f761-0000001523skip-0000000001size.hg
-   02-c72277ff25807eb444fa48a60afb434d78c21f2f-0000000899skip-0000000001size.hg
-  +02-ca970a853ea24846035ccb324cc8de49ef768748-0000001252skip-0000000004size.hg
-  +02-d1807e3513890ac71c2e8d10e9dc9a5b58b15d4b-0000001251skip-0000000001size.hg
-   02-d83212ecaa436c80d6113cf915ba35e2db787e79-0000001024skip-0000000227size.hg
-   02-da87a81c5310760f414a933e6550b7e8e60cf241-0000001792skip-0000000064size.hg
-   02-dba2fddbf3c28198659046674a512afd616a1519-0000001472skip-0000000032size.hg
+   0?-b2d350c94c26edbb783aaa21fc24f1fc65c30e74-0000001536skip-0000000256size.hg (glob)
+   0?-bbd293bd171fd5b711d428db46940a72eca7a40f-0000001280skip-0000000128size.hg (glob)
+   0?-c12927fef661d2463043347101b90067c2961333-0000001280skip-0000000128size.hg (glob)
+  +0?-c232505f58fdf70bcf5f6ab6a555f23ffc74f761-0000001523skip-0000000001size.hg (glob)
+   0?-c72277ff25807eb444fa48a60afb434d78c21f2f-0000000899skip-0000000001size.hg (glob)
+  +0?-ca970a853ea24846035ccb324cc8de49ef768748-0000001252skip-0000000004size.hg (glob)
+  +0?-d1807e3513890ac71c2e8d10e9dc9a5b58b15d4b-0000001251skip-0000000001size.hg (glob)
+   0?-d83212ecaa436c80d6113cf915ba35e2db787e79-0000001024skip-0000000227size.hg (glob)
+   0?-da87a81c5310760f414a933e6550b7e8e60cf241-0000001792skip-0000000064size.hg (glob)
+   0?-dba2fddbf3c28198659046674a512afd616a1519-0000001472skip-0000000032size.hg (glob)
   @@ -27,6 +33,7 @@
-   02-e469a7aa5cce57653b6b02ff46c80b2d94d62629-0000000899skip-0000000029size.hg
-   02-e469a7aa5cce57653b6b02ff46c80b2d94d62629-0000000912skip-0000000016size.hg
-   02-e74670ea99533967c5d90da3ddbc0318cc1fd502-0000001280skip-0000000256size.hg
-  +02-e74670ea99533967c5d90da3ddbc0318cc1fd502-0000001528skip-0000000008size.hg
-   02-ee2deecf044fa5583f66188c9177b0f13332adc2-0000001024skip-0000000128size.hg
-   02-f864bc82f6a2f2ecb49b83722e0895f9d657b0dd-0000001234skip-0000000001size.hg
-   02-fb6c210a224903e81e5a8d2ee099cb0c9526ba8c-0000001512skip-0000000004size.hg
+   0?-e469a7aa5cce57653b6b02ff46c80b2d94d62629-0000000899skip-0000000029size.hg (glob)
+   0?-e469a7aa5cce57653b6b02ff46c80b2d94d62629-0000000912skip-0000000016size.hg (glob)
+   0?-e74670ea99533967c5d90da3ddbc0318cc1fd502-0000001280skip-0000000256size.hg (glob)
+  +0?-e74670ea99533967c5d90da3ddbc0318cc1fd502-0000001528skip-0000000008size.hg (glob)
+   0?-ee2deecf044fa5583f66188c9177b0f13332adc2-0000001024skip-0000000128size.hg (glob)
+   0?-f864bc82f6a2f2ecb49b83722e0895f9d657b0dd-0000001234skip-0000000001size.hg (glob)
+   0?-fb6c210a224903e81e5a8d2ee099cb0c9526ba8c-0000001512skip-0000000004size.hg (glob)
   [1]
 
 Single pull coming after various cache warming
@@ -827,7 +878,8 @@
   64 changesets found in caches
   8 changesets found in caches
   uncompressed size of bundle content:
-     47108 (changelog)
+     47108 (changelog) (no-default-cg3 !)
+     47620 (changelog) (default-cg3 !)
          4 (manifests)
   adding changesets
   adding manifests
@@ -887,13 +939,13 @@
   --- oldbundles	* (glob)
   +++ newbundles	* (glob)
   @@ -7,6 +7,7 @@
-   02-44e80141ad530a2aa085e9bd9b5311b57eff72ff-0000001522skip-0000000001size.hg
-   02-467b6e370e816747e27de0d0b9237f4090a33656-0000001152skip-0000000064size.hg
-   02-484c46df3e41f371efd0ff74fa5221657527213f-0000001240skip-0000000008size.hg
-  +02-4a6d0f7d07d060b026d9fc690cd89cd26af96e42-0000001024skip-0000000256size.hg
-   02-4a6d0f7d07d060b026d9fc690cd89cd26af96e42-0000001248skip-0000000032size.hg
-   02-4a6d0f7d07d060b026d9fc690cd89cd26af96e42-0000001264skip-0000000016size.hg
-   02-540f762640ee62ca597ece26af725e6357e82805-0000000000skip-0000001024size.hg
+   0?-44e80141ad530a2aa085e9bd9b5311b57eff72ff-0000001522skip-0000000001size.hg (glob)
+   0?-467b6e370e816747e27de0d0b9237f4090a33656-0000001152skip-0000000064size.hg (glob)
+   0?-484c46df3e41f371efd0ff74fa5221657527213f-0000001240skip-0000000008size.hg (glob)
+  +0?-4a6d0f7d07d060b026d9fc690cd89cd26af96e42-0000001024skip-0000000256size.hg (glob)
+   0?-4a6d0f7d07d060b026d9fc690cd89cd26af96e42-0000001248skip-0000000032size.hg (glob)
+   0?-4a6d0f7d07d060b026d9fc690cd89cd26af96e42-0000001264skip-0000000016size.hg (glob)
+   0?-540f762640ee62ca597ece26af725e6357e82805-0000000000skip-0000001024size.hg (glob)
   [1]
 
 Pull with piece "not linear from head"
@@ -928,19 +980,24 @@
   4 changesets found
   1 changesets found
   uncompressed size of bundle content:
-     92968 (changelog)
+     92968 (changelog) (no-default-cg3 !)
+     93992 (changelog) (default-cg3 !)
          4 (manifests)
   uncompressed size of bundle content:
-     46596 (changelog)
+     46596 (changelog) (no-default-cg3 !)
+     47108 (changelog) (default-cg3 !)
          4 (manifests)
   uncompressed size of bundle content:
-     23300 (changelog)
+     23300 (changelog) (no-default-cg3 !)
+     23556 (changelog) (default-cg3 !)
          4 (manifests)
   uncompressed size of bundle content:
-       734 (changelog)
+       734 (changelog) (no-default-cg3 !)
+       742 (changelog) (default-cg3 !)
          4 (manifests)
   uncompressed size of bundle content:
-       186 (changelog)
+       186 (changelog) (no-default-cg3 !)
+       188 (changelog) (default-cg3 !)
          4 (manifests)
   adding changesets
   adding manifests
@@ -985,19 +1042,24 @@
   64 changesets found in caches
   8 changesets found in caches
   uncompressed size of bundle content:
-       732 (changelog)
+       732 (changelog) (no-default-cg3 !)
+       740 (changelog) (default-cg3 !)
          4 (manifests)
   uncompressed size of bundle content:
-      1460 (changelog)
+      1460 (changelog) (no-default-cg3 !)
+      1476 (changelog) (default-cg3 !)
          4 (manifests)
   uncompressed size of bundle content:
-      2916 (changelog)
+      2916 (changelog) (no-default-cg3 !)
+      2948 (changelog) (default-cg3 !)
          4 (manifests)
   uncompressed size of bundle content:
-      5828 (changelog)
+      5828 (changelog) (no-default-cg3 !)
+      5892 (changelog) (default-cg3 !)
          4 (manifests)
   uncompressed size of bundle content:
-     11700 (changelog)
+     11700 (changelog) (no-default-cg3 !)
+     11828 (changelog) (default-cg3 !)
          4 (manifests)
   adding changesets
   adding manifests
@@ -1129,22 +1191,22 @@
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   $ ls -1 bundle-cache
-  02-0f376356904fc8c1c6ceaac27990f2fd79b1f8c1-0000001856skip-0000000008size.hg
-  02-1dded5aafa0f8d548f6357cc2f8882dcc4489fbf-0000001516skip-0000000002size.hg
-  02-2dc4f1ab9029719714b8e0dde8e3725a5bb28472-0000001408skip-0000000064size.hg
-  02-2f0e261a08964bc1c607c0eda4978364c22a9b94-0000001504skip-0000000008size.hg
-  02-4a6d0f7d07d060b026d9fc690cd89cd26af96e42-0000001024skip-0000000256size.hg
-  02-540f762640ee62ca597ece26af725e6357e82805-0000000000skip-0000001024size.hg
-  02-89fab188d2ce3c4cde6be031f2fc5b9b4ff248e3-0000000900skip-0000000004size.hg
-  02-97ede4832194ed56894374f2a1cc7a0022b486da-0000000904skip-0000000008size.hg
-  02-b2d350c94c26edbb783aaa21fc24f1fc65c30e74-0000001536skip-0000000256size.hg
-  02-bbd293bd171fd5b711d428db46940a72eca7a40f-0000001280skip-0000000128size.hg
-  02-c72277ff25807eb444fa48a60afb434d78c21f2f-0000000899skip-0000000001size.hg
-  02-da87a81c5310760f414a933e6550b7e8e60cf241-0000001792skip-0000000064size.hg
-  02-dba2fddbf3c28198659046674a512afd616a1519-0000001472skip-0000000032size.hg
-  02-e469a7aa5cce57653b6b02ff46c80b2d94d62629-0000000912skip-0000000016size.hg
-  02-e74670ea99533967c5d90da3ddbc0318cc1fd502-0000001280skip-0000000256size.hg
-  02-fb6c210a224903e81e5a8d2ee099cb0c9526ba8c-0000001512skip-0000000004size.hg
+  0?-0f376356904fc8c1c6ceaac27990f2fd79b1f8c1-0000001856skip-0000000008size.hg (glob)
+  0?-1dded5aafa0f8d548f6357cc2f8882dcc4489fbf-0000001516skip-0000000002size.hg (glob)
+  0?-2dc4f1ab9029719714b8e0dde8e3725a5bb28472-0000001408skip-0000000064size.hg (glob)
+  0?-2f0e261a08964bc1c607c0eda4978364c22a9b94-0000001504skip-0000000008size.hg (glob)
+  0?-4a6d0f7d07d060b026d9fc690cd89cd26af96e42-0000001024skip-0000000256size.hg (glob)
+  0?-540f762640ee62ca597ece26af725e6357e82805-0000000000skip-0000001024size.hg (glob)
+  0?-89fab188d2ce3c4cde6be031f2fc5b9b4ff248e3-0000000900skip-0000000004size.hg (glob)
+  0?-97ede4832194ed56894374f2a1cc7a0022b486da-0000000904skip-0000000008size.hg (glob)
+  0?-b2d350c94c26edbb783aaa21fc24f1fc65c30e74-0000001536skip-0000000256size.hg (glob)
+  0?-bbd293bd171fd5b711d428db46940a72eca7a40f-0000001280skip-0000000128size.hg (glob)
+  0?-c72277ff25807eb444fa48a60afb434d78c21f2f-0000000899skip-0000000001size.hg (glob)
+  0?-da87a81c5310760f414a933e6550b7e8e60cf241-0000001792skip-0000000064size.hg (glob)
+  0?-dba2fddbf3c28198659046674a512afd616a1519-0000001472skip-0000000032size.hg (glob)
+  0?-e469a7aa5cce57653b6b02ff46c80b2d94d62629-0000000912skip-0000000016size.hg (glob)
+  0?-e74670ea99533967c5d90da3ddbc0318cc1fd502-0000001280skip-0000000256size.hg (glob)
+  0?-fb6c210a224903e81e5a8d2ee099cb0c9526ba8c-0000001512skip-0000000004size.hg (glob)
 
   $ hg debugpullbundlecacheoverlap -R server 'all()' | grep -v '^  '
   gathering 100 sample pulls within 2131 revisions