tests/test-pullbundle.t
branchmercurial-4.3
changeset 4316 e6ee830c4f45
parent 4315 55ca0b6276e7
parent 4309 ef49e48da074
child 4361 a7998b9cfcaf
equal deleted inserted replaced
4315:55ca0b6276e7 4316:e6ee830c4f45
     1   $ . "$TESTDIR/testlib/pythonpath.sh"
       
     2 
       
     3   $ cat << EOF >> $HGRCPATH
       
     4   > [extensions]
       
     5   > # evolve is providing the stable range code
       
     6   > evolve=
       
     7   > pullbundle=
       
     8   > [experimental]
       
     9   > obshashrange.warm-cache=yes
       
    10   > EOF
       
    11 
       
    12 basic setup
       
    13 
       
    14   $ hg init server
       
    15   $ hg -R server debugbuilddag '.+898:branchpoint+352:mergepoint+267<branchpoint+145/mergepoint+467'
       
    16   $ hg init client
       
    17   $ hg init client2
       
    18   $ hg init client3
       
    19   $ hg init client4
       
    20 
       
    21 simple initial pull
       
    22 -------------------
       
    23 
       
    24   $ hg -R server log -G -T '{rev}:{node}\n' -r '0+1234+(::1234 and (merge() or branchpoint()))'
       
    25   o  1234:f864bc82f6a2f2ecb49b83722e0895f9d657b0dd
       
    26   :
       
    27   o  898:1388f909cd2b0685efd4e2ce076d198bce20922c
       
    28   :
       
    29   o  0:1ea73414a91b0920940797d8fc6a11e447f8ea1e
       
    30   
       
    31 
       
    32   $ hg -R client pull server -r 1234 --debug --config devel.bundle2.debug=yes | grep -v 'add changeset'
       
    33   pulling from server
       
    34   query 1; heads
       
    35   pullbundle-cache: "missing" set sliced into 6 subranges in *.* seconds (glob)
       
    36   1024 changesets found
       
    37   128 changesets found
       
    38   64 changesets found
       
    39   16 changesets found
       
    40   2 changesets found
       
    41   1 changesets found
       
    42   listing keys for "bookmarks"
       
    43   bundle2-output-bundle: "HG20", 8 parts total
       
    44   bundle2-output: start emission of HG20 stream
       
    45   bundle2-output: bundle parameter: 
       
    46   bundle2-output: start of parts
       
    47   bundle2-output: bundle part: "changegroup"
       
    48   bundle2-output-part: "changegroup" (params: 1 mandatory 1 advisory) streamed payload
       
    49   bundle2-output: part 0: "CHANGEGROUP"
       
    50   bundle2-output: header chunk size: 44
       
    51   bundle2-output: payload chunk size: 4096
       
    52   bundle2-output: payload chunk size: 4096
       
    53   bundle2-output: payload chunk size: 4096
       
    54   bundle2-output: payload chunk size: 4096
       
    55   bundle2-output: payload chunk size: 4096
       
    56   bundle2-output: payload chunk size: 4096
       
    57   bundle2-output: payload chunk size: 4096
       
    58   bundle2-output: payload chunk size: 4096
       
    59   bundle2-output: payload chunk size: 4096
       
    60   bundle2-output: payload chunk size: 4096
       
    61   bundle2-output: payload chunk size: 4096
       
    62   bundle2-output: payload chunk size: 4096
       
    63   bundle2-output: payload chunk size: 4096
       
    64   bundle2-output: payload chunk size: 4096
       
    65   bundle2-output: payload chunk size: 4096
       
    66   bundle2-output: payload chunk size: 4096
       
    67   bundle2-output: payload chunk size: 4096
       
    68   bundle2-output: payload chunk size: 4096
       
    69   bundle2-output: payload chunk size: 4096
       
    70   bundle2-output: payload chunk size: 4096
       
    71   bundle2-output: payload chunk size: 4096
       
    72   bundle2-output: payload chunk size: 4096
       
    73   bundle2-output: payload chunk size: 4096
       
    74   bundle2-output: payload chunk size: 4096
       
    75   bundle2-output: payload chunk size: 4096
       
    76   bundle2-output: payload chunk size: 4096
       
    77   bundle2-output: payload chunk size: 4096
       
    78   bundle2-output: payload chunk size: 4096
       
    79   bundle2-output: payload chunk size: 4096
       
    80   bundle2-output: payload chunk size: 4096
       
    81   bundle2-output: payload chunk size: 4096
       
    82   bundle2-output: payload chunk size: 4096
       
    83   bundle2-output: payload chunk size: 4096
       
    84   bundle2-output: payload chunk size: 4096
       
    85   bundle2-output: payload chunk size: 4096
       
    86   bundle2-output: payload chunk size: 4096
       
    87   bundle2-output: payload chunk size: 4096
       
    88   bundle2-output: payload chunk size: 4096
       
    89   bundle2-output: payload chunk size: 4096
       
    90   bundle2-output: payload chunk size: 4096
       
    91   bundle2-output: payload chunk size: 4096
       
    92   bundle2-output: payload chunk size: 4096
       
    93   bundle2-output: payload chunk size: 4096
       
    94   bundle2-output: payload chunk size: 4096
       
    95   bundle2-output: payload chunk size: 4096
       
    96   bundle2-output: payload chunk size: 1888
       
    97   bundle2-output: closing payload chunk
       
    98   bundle2-output: bundle part: "changegroup"
       
    99   bundle2-output-part: "changegroup" (params: 1 mandatory 1 advisory) streamed payload
       
   100   bundle2-output: part 1: "CHANGEGROUP"
       
   101   bundle2-output: header chunk size: 43
       
   102   bundle2-output: payload chunk size: 4096
       
   103   bundle2-output: payload chunk size: 4096
       
   104   bundle2-output: payload chunk size: 4096
       
   105   bundle2-output: payload chunk size: 4096
       
   106   bundle2-output: payload chunk size: 4096
       
   107   bundle2-output: payload chunk size: 3084
       
   108   bundle2-output: closing payload chunk
       
   109   bundle2-output: bundle part: "changegroup"
       
   110   bundle2-output-part: "changegroup" (params: 1 mandatory 1 advisory) streamed payload
       
   111   bundle2-output: part 2: "CHANGEGROUP"
       
   112   bundle2-output: header chunk size: 42
       
   113   bundle2-output: payload chunk size: 4096
       
   114   bundle2-output: payload chunk size: 4096
       
   115   bundle2-output: payload chunk size: 3596
       
   116   bundle2-output: closing payload chunk
       
   117   bundle2-output: bundle part: "changegroup"
       
   118   bundle2-output-part: "changegroup" (params: 1 mandatory 1 advisory) streamed payload
       
   119   bundle2-output: part 3: "CHANGEGROUP"
       
   120   bundle2-output: header chunk size: 42
       
   121   bundle2-output: payload chunk size: 2956
       
   122   bundle2-output: closing payload chunk
       
   123   bundle2-output: bundle part: "changegroup"
       
   124   bundle2-output-part: "changegroup" (params: 1 mandatory 1 advisory) streamed payload
       
   125   bundle2-output: part 4: "CHANGEGROUP"
       
   126   bundle2-output: header chunk size: 41
       
   127   bundle2-output: payload chunk size: 380
       
   128   bundle2-output: closing payload chunk
       
   129   bundle2-output: bundle part: "changegroup"
       
   130   bundle2-output-part: "changegroup" (params: 1 mandatory 1 advisory) streamed payload
       
   131   bundle2-output: part 5: "CHANGEGROUP"
       
   132   bundle2-output: header chunk size: 41
       
   133   bundle2-output: payload chunk size: 196
       
   134   bundle2-output: closing payload chunk
       
   135   bundle2-output: bundle part: "listkeys"
       
   136   bundle2-output-part: "listkeys" (params: 1 mandatory) empty payload
       
   137   bundle2-output: part 6: "LISTKEYS"
       
   138   bundle2-output: header chunk size: 35
       
   139   bundle2-output: closing payload chunk
       
   140   bundle2-output: bundle part: "phase-heads"
       
   141   bundle2-output-part: "phase-heads" 24 bytes payload
       
   142   bundle2-output: part 7: "PHASE-HEADS"
       
   143   bundle2-output: header chunk size: 18
       
   144   bundle2-output: payload chunk size: 24
       
   145   bundle2-output: closing payload chunk
       
   146   bundle2-output: end of bundle
       
   147   bundle2-input: start processing of HG20 stream
       
   148   bundle2-input: reading bundle2 stream parameters
       
   149   bundle2-input-bundle: with-transaction
       
   150   bundle2-input: start extraction of bundle2 parts
       
   151   bundle2-input: part header size: 44
       
   152   bundle2-input: part type: "CHANGEGROUP"
       
   153   bundle2-input: part id: "0"
       
   154   bundle2-input: part parameters: 2
       
   155   bundle2-input: found a handler for part changegroup
       
   156   bundle2-input-part: "changegroup" (params: 1 mandatory 1 advisory) supported
       
   157   adding changesets
       
   158   bundle2-input: payload chunk size: 4096
       
   159   bundle2-input: payload chunk size: 4096
       
   160   bundle2-input: payload chunk size: 4096
       
   161   bundle2-input: payload chunk size: 4096
       
   162   bundle2-input: payload chunk size: 4096
       
   163   bundle2-input: payload chunk size: 4096
       
   164   bundle2-input: payload chunk size: 4096
       
   165   bundle2-input: payload chunk size: 4096
       
   166   bundle2-input: payload chunk size: 4096
       
   167   bundle2-input: payload chunk size: 4096
       
   168   bundle2-input: payload chunk size: 4096
       
   169   bundle2-input: payload chunk size: 4096
       
   170   bundle2-input: payload chunk size: 4096
       
   171   bundle2-input: payload chunk size: 4096
       
   172   bundle2-input: payload chunk size: 4096
       
   173   bundle2-input: payload chunk size: 4096
       
   174   bundle2-input: payload chunk size: 4096
       
   175   bundle2-input: payload chunk size: 4096
       
   176   bundle2-input: payload chunk size: 4096
       
   177   bundle2-input: payload chunk size: 4096
       
   178   bundle2-input: payload chunk size: 4096
       
   179   bundle2-input: payload chunk size: 4096
       
   180   bundle2-input: payload chunk size: 4096
       
   181   bundle2-input: payload chunk size: 4096
       
   182   bundle2-input: payload chunk size: 4096
       
   183   bundle2-input: payload chunk size: 4096
       
   184   bundle2-input: payload chunk size: 4096
       
   185   bundle2-input: payload chunk size: 4096
       
   186   bundle2-input: payload chunk size: 4096
       
   187   bundle2-input: payload chunk size: 4096
       
   188   bundle2-input: payload chunk size: 4096
       
   189   bundle2-input: payload chunk size: 4096
       
   190   bundle2-input: payload chunk size: 4096
       
   191   bundle2-input: payload chunk size: 4096
       
   192   bundle2-input: payload chunk size: 4096
       
   193   bundle2-input: payload chunk size: 4096
       
   194   bundle2-input: payload chunk size: 4096
       
   195   bundle2-input: payload chunk size: 4096
       
   196   bundle2-input: payload chunk size: 4096
       
   197   bundle2-input: payload chunk size: 4096
       
   198   bundle2-input: payload chunk size: 4096
       
   199   bundle2-input: payload chunk size: 4096
       
   200   bundle2-input: payload chunk size: 4096
       
   201   bundle2-input: payload chunk size: 4096
       
   202   bundle2-input: payload chunk size: 4096
       
   203   bundle2-input: payload chunk size: 1888
       
   204   bundle2-input: payload chunk size: 0
       
   205   adding manifests
       
   206   adding file changes
       
   207   added 1024 changesets with 0 changes to 0 files
       
   208   bundle2-input-part: total payload size 186208
       
   209   bundle2-input: part header size: 43
       
   210   bundle2-input: part type: "CHANGEGROUP"
       
   211   bundle2-input: part id: "1"
       
   212   bundle2-input: part parameters: 2
       
   213   bundle2-input: found a handler for part changegroup
       
   214   bundle2-input-part: "changegroup" (params: 1 mandatory 1 advisory) supported
       
   215   adding changesets
       
   216   bundle2-input: payload chunk size: 4096
       
   217   bundle2-input: payload chunk size: 4096
       
   218   bundle2-input: payload chunk size: 4096
       
   219   bundle2-input: payload chunk size: 4096
       
   220   bundle2-input: payload chunk size: 4096
       
   221   bundle2-input: payload chunk size: 3084
       
   222   bundle2-input: payload chunk size: 0
       
   223   adding manifests
       
   224   adding file changes
       
   225   added 128 changesets with 0 changes to 0 files
       
   226   bundle2-input-part: total payload size 23564
       
   227   bundle2-input: part header size: 42
       
   228   bundle2-input: part type: "CHANGEGROUP"
       
   229   bundle2-input: part id: "2"
       
   230   bundle2-input: part parameters: 2
       
   231   bundle2-input: found a handler for part changegroup
       
   232   bundle2-input-part: "changegroup" (params: 1 mandatory 1 advisory) supported
       
   233   adding changesets
       
   234   bundle2-input: payload chunk size: 4096
       
   235   bundle2-input: payload chunk size: 4096
       
   236   bundle2-input: payload chunk size: 3596
       
   237   bundle2-input: payload chunk size: 0
       
   238   adding manifests
       
   239   adding file changes
       
   240   added 64 changesets with 0 changes to 0 files
       
   241   bundle2-input-part: total payload size 11788
       
   242   bundle2-input: part header size: 42
       
   243   bundle2-input: part type: "CHANGEGROUP"
       
   244   bundle2-input: part id: "3"
       
   245   bundle2-input: part parameters: 2
       
   246   bundle2-input: found a handler for part changegroup
       
   247   bundle2-input-part: "changegroup" (params: 1 mandatory 1 advisory) supported
       
   248   adding changesets
       
   249   bundle2-input: payload chunk size: 2956
       
   250   bundle2-input: payload chunk size: 0
       
   251   adding manifests
       
   252   adding file changes
       
   253   added 16 changesets with 0 changes to 0 files
       
   254   bundle2-input-part: total payload size 2956
       
   255   bundle2-input: part header size: 41
       
   256   bundle2-input: part type: "CHANGEGROUP"
       
   257   bundle2-input: part id: "4"
       
   258   bundle2-input: part parameters: 2
       
   259   bundle2-input: found a handler for part changegroup
       
   260   bundle2-input-part: "changegroup" (params: 1 mandatory 1 advisory) supported
       
   261   adding changesets
       
   262   bundle2-input: payload chunk size: 380
       
   263   bundle2-input: payload chunk size: 0
       
   264   adding manifests
       
   265   adding file changes
       
   266   added 2 changesets with 0 changes to 0 files
       
   267   bundle2-input-part: total payload size 380
       
   268   bundle2-input: part header size: 41
       
   269   bundle2-input: part type: "CHANGEGROUP"
       
   270   bundle2-input: part id: "5"
       
   271   bundle2-input: part parameters: 2
       
   272   bundle2-input: found a handler for part changegroup
       
   273   bundle2-input-part: "changegroup" (params: 1 mandatory 1 advisory) supported
       
   274   adding changesets
       
   275   bundle2-input: payload chunk size: 196
       
   276   bundle2-input: payload chunk size: 0
       
   277   adding manifests
       
   278   adding file changes
       
   279   added 1 changesets with 0 changes to 0 files
       
   280   bundle2-input-part: total payload size 196
       
   281   bundle2-input: part header size: 35
       
   282   bundle2-input: part type: "LISTKEYS"
       
   283   bundle2-input: part id: "6"
       
   284   bundle2-input: part parameters: 1
       
   285   bundle2-input: found a handler for part listkeys
       
   286   bundle2-input-part: "listkeys" (params: 1 mandatory) supported
       
   287   bundle2-input: payload chunk size: 0
       
   288   bundle2-input: part header size: 18
       
   289   bundle2-input: part type: "PHASE-HEADS"
       
   290   bundle2-input: part id: "7"
       
   291   bundle2-input: part parameters: 0
       
   292   bundle2-input: found a handler for part phase-heads
       
   293   bundle2-input-part: "phase-heads" supported
       
   294   bundle2-input: payload chunk size: 24
       
   295   bundle2-input: payload chunk size: 0
       
   296   bundle2-input-part: total payload size 24
       
   297   bundle2-input: part header size: 0
       
   298   bundle2-input: end of bundle2 stream
       
   299   bundle2-input-bundle: 7 parts total
       
   300   checking for updated bookmarks
       
   301   new changesets 1ea73414a91b:f864bc82f6a2
       
   302   updating the branch cache
       
   303   (run 'hg update' to get a working copy)
       
   304 
       
   305   $ touch oldbundles
       
   306   $ ls -1 server/.hg/cache/pullbundles > newbundles
       
   307   $ diff -u oldbundles newbundles
       
   308   --- oldbundles	* (glob)
       
   309   +++ newbundles	* (glob)
       
   310   @@ -0,0 +1,6 @@
       
   311   +02-467b6e370e816747e27de0d0b9237f4090a33656-0000001152skip-0000000064size.hg
       
   312   +02-540f762640ee62ca597ece26af725e6357e82805-0000000000skip-0000001024size.hg
       
   313   +02-63ded94ceab180ac2fa13e1f0beeb4d2265998a3-0000001232skip-0000000002size.hg
       
   314   +02-7f3a79522d6e904d52aea07c71e6cb612667e8f4-0000001216skip-0000000016size.hg
       
   315   +02-ee2deecf044fa5583f66188c9177b0f13332adc2-0000001024skip-0000000128size.hg
       
   316   +02-f864bc82f6a2f2ecb49b83722e0895f9d657b0dd-0000001234skip-0000000001size.hg
       
   317   [1]
       
   318 
       
   319 pull the other missing entries (multiple heads pulled)
       
   320 ------------------------------------------------------
       
   321 
       
   322   $ hg -R server log -G -T '{rev}:{node}\n' -r '1234+head()+(only(head(), 1234) and (merge() or branchpoint()))'
       
   323   o  2130:0f376356904fc8c1c6ceaac27990f2fd79b1f8c1
       
   324   :
       
   325   o    1663:1710092b3ab17a6d2ecad664580991a608537749
       
   326   |\
       
   327   | ~
       
   328   | o  1517:1dded5aafa0f8d548f6357cc2f8882dcc4489fbf
       
   329   |/
       
   330   o  1250:d83212ecaa436c80d6113cf915ba35e2db787e79
       
   331   :
       
   332   o  1234:f864bc82f6a2f2ecb49b83722e0895f9d657b0dd
       
   333   |
       
   334   ~
       
   335   $ hg -R client pull server --verbose
       
   336   pulling from server
       
   337   searching for changes
       
   338   all local heads known remotely
       
   339   pullbundle-cache: "missing" set sliced into 18 subranges in *.* seconds (glob)
       
   340   1 changesets found
       
   341   4 changesets found
       
   342   8 changesets found
       
   343   32 changesets found
       
   344   128 changesets found
       
   345   64 changesets found
       
   346   32 changesets found
       
   347   8 changesets found
       
   348   4 changesets found
       
   349   2 changesets found
       
   350   1 changesets found
       
   351   4 changesets found
       
   352   8 changesets found
       
   353   16 changesets found
       
   354   256 changesets found
       
   355   256 changesets found
       
   356   64 changesets found
       
   357   8 changesets found
       
   358   uncompressed size of bundle content:
       
   359        188 (changelog)
       
   360          4 (manifests)
       
   361   uncompressed size of bundle content:
       
   362        740 (changelog)
       
   363          4 (manifests)
       
   364   uncompressed size of bundle content:
       
   365       1476 (changelog)
       
   366          4 (manifests)
       
   367   uncompressed size of bundle content:
       
   368       5892 (changelog)
       
   369          4 (manifests)
       
   370   uncompressed size of bundle content:
       
   371      23556 (changelog)
       
   372          4 (manifests)
       
   373   uncompressed size of bundle content:
       
   374      11780 (changelog)
       
   375          4 (manifests)
       
   376   uncompressed size of bundle content:
       
   377       5892 (changelog)
       
   378          4 (manifests)
       
   379   uncompressed size of bundle content:
       
   380       1476 (changelog)
       
   381          4 (manifests)
       
   382   uncompressed size of bundle content:
       
   383        740 (changelog)
       
   384          4 (manifests)
       
   385   uncompressed size of bundle content:
       
   386        372 (changelog)
       
   387          4 (manifests)
       
   388   uncompressed size of bundle content:
       
   389        188 (changelog)
       
   390          4 (manifests)
       
   391   uncompressed size of bundle content:
       
   392        740 (changelog)
       
   393          4 (manifests)
       
   394   uncompressed size of bundle content:
       
   395       1476 (changelog)
       
   396          4 (manifests)
       
   397   uncompressed size of bundle content:
       
   398       2948 (changelog)
       
   399          4 (manifests)
       
   400   uncompressed size of bundle content:
       
   401      47108 (changelog)
       
   402          4 (manifests)
       
   403   uncompressed size of bundle content:
       
   404      47108 (changelog)
       
   405          4 (manifests)
       
   406   uncompressed size of bundle content:
       
   407      11780 (changelog)
       
   408          4 (manifests)
       
   409   uncompressed size of bundle content:
       
   410       1476 (changelog)
       
   411          4 (manifests)
       
   412   adding changesets
       
   413   adding manifests
       
   414   adding file changes
       
   415   added 1 changesets with 0 changes to 0 files
       
   416   adding changesets
       
   417   adding manifests
       
   418   adding file changes
       
   419   added 4 changesets with 0 changes to 0 files
       
   420   adding changesets
       
   421   adding manifests
       
   422   adding file changes
       
   423   added 8 changesets with 0 changes to 0 files
       
   424   adding changesets
       
   425   adding manifests
       
   426   adding file changes
       
   427   added 32 changesets with 0 changes to 0 files
       
   428   adding changesets
       
   429   adding manifests
       
   430   adding file changes
       
   431   added 128 changesets with 0 changes to 0 files
       
   432   adding changesets
       
   433   adding manifests
       
   434   adding file changes
       
   435   added 64 changesets with 0 changes to 0 files
       
   436   adding changesets
       
   437   adding manifests
       
   438   adding file changes
       
   439   added 32 changesets with 0 changes to 0 files
       
   440   adding changesets
       
   441   adding manifests
       
   442   adding file changes
       
   443   added 8 changesets with 0 changes to 0 files
       
   444   adding changesets
       
   445   adding manifests
       
   446   adding file changes
       
   447   added 4 changesets with 0 changes to 0 files
       
   448   adding changesets
       
   449   adding manifests
       
   450   adding file changes
       
   451   added 2 changesets with 0 changes to 0 files
       
   452   adding changesets
       
   453   adding manifests
       
   454   adding file changes
       
   455   added 1 changesets with 0 changes to 0 files (+1 heads)
       
   456   adding changesets
       
   457   adding manifests
       
   458   adding file changes
       
   459   added 4 changesets with 0 changes to 0 files
       
   460   adding changesets
       
   461   adding manifests
       
   462   adding file changes
       
   463   added 8 changesets with 0 changes to 0 files
       
   464   adding changesets
       
   465   adding manifests
       
   466   adding file changes
       
   467   added 16 changesets with 0 changes to 0 files
       
   468   adding changesets
       
   469   adding manifests
       
   470   adding file changes
       
   471   added 256 changesets with 0 changes to 0 files
       
   472   adding changesets
       
   473   adding manifests
       
   474   adding file changes
       
   475   added 256 changesets with 0 changes to 0 files
       
   476   adding changesets
       
   477   adding manifests
       
   478   adding file changes
       
   479   added 64 changesets with 0 changes to 0 files
       
   480   adding changesets
       
   481   adding manifests
       
   482   adding file changes
       
   483   added 8 changesets with 0 changes to 0 files
       
   484   new changesets 17185c1c22f1:0f376356904f
       
   485   (run 'hg heads' to see heads, 'hg merge' to merge)
       
   486 
       
   487   $ mv newbundles oldbundles
       
   488   $ ls -1 server/.hg/cache/pullbundles > newbundles
       
   489   $ diff -u oldbundles newbundles
       
   490   --- oldbundles	* (glob)
       
   491   +++ newbundles	* (glob)
       
   492   @@ -1,6 +1,24 @@
       
   493   +02-0f376356904fc8c1c6ceaac27990f2fd79b1f8c1-0000001856skip-0000000008size.hg
       
   494   +02-17185c1c22f1266b084daf7cfb07b6ebbfbc65ab-0000001235skip-0000000001size.hg
       
   495   +02-1dded5aafa0f8d548f6357cc2f8882dcc4489fbf-0000001516skip-0000000002size.hg
       
   496   +02-2dc4f1ab9029719714b8e0dde8e3725a5bb28472-0000001408skip-0000000064size.hg
       
   497   +02-2f0e261a08964bc1c607c0eda4978364c22a9b94-0000001504skip-0000000008size.hg
       
   498    02-467b6e370e816747e27de0d0b9237f4090a33656-0000001152skip-0000000064size.hg
       
   499   +02-484c46df3e41f371efd0ff74fa5221657527213f-0000001240skip-0000000008size.hg
       
   500   +02-4a6d0f7d07d060b026d9fc690cd89cd26af96e42-0000001248skip-0000000032size.hg
       
   501    02-540f762640ee62ca597ece26af725e6357e82805-0000000000skip-0000001024size.hg
       
   502    02-63ded94ceab180ac2fa13e1f0beeb4d2265998a3-0000001232skip-0000000002size.hg
       
   503   +02-694ef7e5b2984f1ec66c3d960799f4ff2459672c-0000001236skip-0000000004size.hg
       
   504    02-7f3a79522d6e904d52aea07c71e6cb612667e8f4-0000001216skip-0000000016size.hg
       
   505   +02-89fab188d2ce3c4cde6be031f2fc5b9b4ff248e3-0000000900skip-0000000004size.hg
       
   506   +02-97ede4832194ed56894374f2a1cc7a0022b486da-0000000904skip-0000000008size.hg
       
   507   +02-b2d350c94c26edbb783aaa21fc24f1fc65c30e74-0000001536skip-0000000256size.hg
       
   508   +02-bbd293bd171fd5b711d428db46940a72eca7a40f-0000001280skip-0000000128size.hg
       
   509   +02-c72277ff25807eb444fa48a60afb434d78c21f2f-0000000899skip-0000000001size.hg
       
   510   +02-da87a81c5310760f414a933e6550b7e8e60cf241-0000001792skip-0000000064size.hg
       
   511   +02-dba2fddbf3c28198659046674a512afd616a1519-0000001472skip-0000000032size.hg
       
   512   +02-e469a7aa5cce57653b6b02ff46c80b2d94d62629-0000000912skip-0000000016size.hg
       
   513   +02-e74670ea99533967c5d90da3ddbc0318cc1fd502-0000001280skip-0000000256size.hg
       
   514    02-ee2deecf044fa5583f66188c9177b0f13332adc2-0000001024skip-0000000128size.hg
       
   515    02-f864bc82f6a2f2ecb49b83722e0895f9d657b0dd-0000001234skip-0000000001size.hg
       
   516   +02-fb6c210a224903e81e5a8d2ee099cb0c9526ba8c-0000001512skip-0000000004size.hg
       
   517   [1]
       
   518 
       
   519 Same Pullin with a different client
       
   520 -----------------------------------
       
   521   $ hg -R server log -G -T '{rev}:{node}\n' -r '0+1234+(::1234 and (merge() or branchpoint()))'
       
   522   o  1234:f864bc82f6a2f2ecb49b83722e0895f9d657b0dd
       
   523   :
       
   524   o  898:1388f909cd2b0685efd4e2ce076d198bce20922c
       
   525   :
       
   526   o  0:1ea73414a91b0920940797d8fc6a11e447f8ea1e
       
   527   
       
   528 
       
   529   $ hg -R client2 pull server -r 1234 --verbose
       
   530   pulling from server
       
   531   pullbundle-cache: "missing" set sliced into 6 subranges in *.* seconds (glob)
       
   532   1024 changesets found in caches
       
   533   128 changesets found in caches
       
   534   64 changesets found in caches
       
   535   16 changesets found in caches
       
   536   2 changesets found in caches
       
   537   1 changesets found in caches
       
   538   adding changesets
       
   539   adding manifests
       
   540   adding file changes
       
   541   added 1024 changesets with 0 changes to 0 files
       
   542   adding changesets
       
   543   adding manifests
       
   544   adding file changes
       
   545   added 128 changesets with 0 changes to 0 files
       
   546   adding changesets
       
   547   adding manifests
       
   548   adding file changes
       
   549   added 64 changesets with 0 changes to 0 files
       
   550   adding changesets
       
   551   adding manifests
       
   552   adding file changes
       
   553   added 16 changesets with 0 changes to 0 files
       
   554   adding changesets
       
   555   adding manifests
       
   556   adding file changes
       
   557   added 2 changesets with 0 changes to 0 files
       
   558   adding changesets
       
   559   adding manifests
       
   560   adding file changes
       
   561   added 1 changesets with 0 changes to 0 files
       
   562   new changesets 1ea73414a91b:f864bc82f6a2
       
   563   (run 'hg update' to get a working copy)
       
   564 
       
   565   $ mv newbundles oldbundles
       
   566   $ ls -1 server/.hg/cache/pullbundles > newbundles
       
   567   $ diff -u oldbundles newbundles
       
   568 
       
   569   $ hg -R server log -G -T '{rev}:{node}\n' -r '1234+head()+(only(head(), 1234) and (merge() or branchpoint()))'
       
   570   o  2130:0f376356904fc8c1c6ceaac27990f2fd79b1f8c1
       
   571   :
       
   572   o    1663:1710092b3ab17a6d2ecad664580991a608537749
       
   573   |\
       
   574   | ~
       
   575   | o  1517:1dded5aafa0f8d548f6357cc2f8882dcc4489fbf
       
   576   |/
       
   577   o  1250:d83212ecaa436c80d6113cf915ba35e2db787e79
       
   578   :
       
   579   o  1234:f864bc82f6a2f2ecb49b83722e0895f9d657b0dd
       
   580   |
       
   581   ~
       
   582 
       
   583   $ hg -R client2 pull server --verbose
       
   584   pulling from server
       
   585   searching for changes
       
   586   all local heads known remotely
       
   587   pullbundle-cache: "missing" set sliced into 18 subranges in *.* seconds (glob)
       
   588   1 changesets found in caches
       
   589   4 changesets found in caches
       
   590   8 changesets found in caches
       
   591   32 changesets found in caches
       
   592   128 changesets found in caches
       
   593   64 changesets found in caches
       
   594   32 changesets found in caches
       
   595   8 changesets found in caches
       
   596   4 changesets found in caches
       
   597   2 changesets found in caches
       
   598   1 changesets found in caches
       
   599   4 changesets found in caches
       
   600   8 changesets found in caches
       
   601   16 changesets found in caches
       
   602   256 changesets found in caches
       
   603   256 changesets found in caches
       
   604   64 changesets found in caches
       
   605   8 changesets found in caches
       
   606   adding changesets
       
   607   adding manifests
       
   608   adding file changes
       
   609   added 1 changesets with 0 changes to 0 files
       
   610   adding changesets
       
   611   adding manifests
       
   612   adding file changes
       
   613   added 4 changesets with 0 changes to 0 files
       
   614   adding changesets
       
   615   adding manifests
       
   616   adding file changes
       
   617   added 8 changesets with 0 changes to 0 files
       
   618   adding changesets
       
   619   adding manifests
       
   620   adding file changes
       
   621   added 32 changesets with 0 changes to 0 files
       
   622   adding changesets
       
   623   adding manifests
       
   624   adding file changes
       
   625   added 128 changesets with 0 changes to 0 files
       
   626   adding changesets
       
   627   adding manifests
       
   628   adding file changes
       
   629   added 64 changesets with 0 changes to 0 files
       
   630   adding changesets
       
   631   adding manifests
       
   632   adding file changes
       
   633   added 32 changesets with 0 changes to 0 files
       
   634   adding changesets
       
   635   adding manifests
       
   636   adding file changes
       
   637   added 8 changesets with 0 changes to 0 files
       
   638   adding changesets
       
   639   adding manifests
       
   640   adding file changes
       
   641   added 4 changesets with 0 changes to 0 files
       
   642   adding changesets
       
   643   adding manifests
       
   644   adding file changes
       
   645   added 2 changesets with 0 changes to 0 files
       
   646   adding changesets
       
   647   adding manifests
       
   648   adding file changes
       
   649   added 1 changesets with 0 changes to 0 files (+1 heads)
       
   650   adding changesets
       
   651   adding manifests
       
   652   adding file changes
       
   653   added 4 changesets with 0 changes to 0 files
       
   654   adding changesets
       
   655   adding manifests
       
   656   adding file changes
       
   657   added 8 changesets with 0 changes to 0 files
       
   658   adding changesets
       
   659   adding manifests
       
   660   adding file changes
       
   661   added 16 changesets with 0 changes to 0 files
       
   662   adding changesets
       
   663   adding manifests
       
   664   adding file changes
       
   665   added 256 changesets with 0 changes to 0 files
       
   666   adding changesets
       
   667   adding manifests
       
   668   adding file changes
       
   669   added 256 changesets with 0 changes to 0 files
       
   670   adding changesets
       
   671   adding manifests
       
   672   adding file changes
       
   673   added 64 changesets with 0 changes to 0 files
       
   674   adding changesets
       
   675   adding manifests
       
   676   adding file changes
       
   677   added 8 changesets with 0 changes to 0 files
       
   678   new changesets 17185c1c22f1:0f376356904f
       
   679   (run 'hg heads' to see heads, 'hg merge' to merge)
       
   680 
       
   681   $ mv newbundles oldbundles
       
   682   $ ls -1 server/.hg/cache/pullbundles > newbundles
       
   683   $ diff -u oldbundles newbundles
       
   684 
       
   685 different pull with a different client
       
   686 --------------------------------------
       
   687 
       
   688   $ hg -R server log -G -T '{rev}:{node}\n' -r '87232049c8d1+0+1789+(::1789 and (merge() or branchpoint()))'
       
   689   o  2085:87232049c8d1f413105bf813b6bfc21da3e26a4f
       
   690   :
       
   691   o  1789:44e80141ad530a2aa085e9bd9b5311b57eff72ff
       
   692   :
       
   693   o    1663:1710092b3ab17a6d2ecad664580991a608537749
       
   694   |\
       
   695   o :  1250:d83212ecaa436c80d6113cf915ba35e2db787e79
       
   696   :/
       
   697   o  898:1388f909cd2b0685efd4e2ce076d198bce20922c
       
   698   :
       
   699   o  0:1ea73414a91b0920940797d8fc6a11e447f8ea1e
       
   700   
       
   701 
       
   702   $ hg -R client3 pull server -r 1789 --verbose
       
   703   pulling from server
       
   704   pullbundle-cache: "missing" set sliced into 9 subranges in *.* seconds (glob)
       
   705   1024 changesets found in caches
       
   706   227 changesets found
       
   707   29 changesets found
       
   708   128 changesets found
       
   709   64 changesets found
       
   710   32 changesets found
       
   711   16 changesets found
       
   712   2 changesets found
       
   713   1 changesets found
       
   714   uncompressed size of bundle content:
       
   715      41772 (changelog)
       
   716          4 (manifests)
       
   717   uncompressed size of bundle content:
       
   718       5340 (changelog)
       
   719          4 (manifests)
       
   720   uncompressed size of bundle content:
       
   721      23556 (changelog)
       
   722          4 (manifests)
       
   723   uncompressed size of bundle content:
       
   724      11780 (changelog)
       
   725          4 (manifests)
       
   726   adding changesets
       
   727   adding manifests
       
   728   adding file changes
       
   729   added 1024 changesets with 0 changes to 0 files
       
   730   adding changesets
       
   731   adding manifests
       
   732   adding file changes
       
   733   added 227 changesets with 0 changes to 0 files
       
   734   adding changesets
       
   735   adding manifests
       
   736   adding file changes
       
   737   added 29 changesets with 0 changes to 0 files (+1 heads)
       
   738   adding changesets
       
   739   adding manifests
       
   740   adding file changes
       
   741   added 128 changesets with 0 changes to 0 files (-1 heads)
       
   742   adding changesets
       
   743   uncompressed size of bundle content:
       
   744       5892 (changelog)
       
   745          4 (manifests)
       
   746   uncompressed size of bundle content:
       
   747       2948 (changelog)
       
   748          4 (manifests)
       
   749   uncompressed size of bundle content:
       
   750        372 (changelog)
       
   751          4 (manifests)
       
   752   uncompressed size of bundle content:
       
   753        188 (changelog)
       
   754          4 (manifests)
       
   755   adding manifests
       
   756   adding file changes
       
   757   added 64 changesets with 0 changes to 0 files
       
   758   adding changesets
       
   759   adding manifests
       
   760   adding file changes
       
   761   added 32 changesets with 0 changes to 0 files
       
   762   adding changesets
       
   763   adding manifests
       
   764   adding file changes
       
   765   added 16 changesets with 0 changes to 0 files
       
   766   adding changesets
       
   767   adding manifests
       
   768   adding file changes
       
   769   added 2 changesets with 0 changes to 0 files
       
   770   adding changesets
       
   771   adding manifests
       
   772   adding file changes
       
   773   added 1 changesets with 0 changes to 0 files
       
   774   new changesets 1ea73414a91b:44e80141ad53
       
   775   (run 'hg update' to get a working copy)
       
   776 
       
   777   $ mv newbundles oldbundles
       
   778   $ ls -1 server/.hg/cache/pullbundles > newbundles
       
   779   $ diff -u oldbundles newbundles
       
   780   --- oldbundles	* (glob)
       
   781   +++ newbundles	* (glob)
       
   782   @@ -3,20 +3,28 @@
       
   783    02-1dded5aafa0f8d548f6357cc2f8882dcc4489fbf-0000001516skip-0000000002size.hg
       
   784    02-2dc4f1ab9029719714b8e0dde8e3725a5bb28472-0000001408skip-0000000064size.hg
       
   785    02-2f0e261a08964bc1c607c0eda4978364c22a9b94-0000001504skip-0000000008size.hg
       
   786   +02-44e80141ad530a2aa085e9bd9b5311b57eff72ff-0000001522skip-0000000001size.hg
       
   787    02-467b6e370e816747e27de0d0b9237f4090a33656-0000001152skip-0000000064size.hg
       
   788    02-484c46df3e41f371efd0ff74fa5221657527213f-0000001240skip-0000000008size.hg
       
   789    02-4a6d0f7d07d060b026d9fc690cd89cd26af96e42-0000001248skip-0000000032size.hg
       
   790    02-540f762640ee62ca597ece26af725e6357e82805-0000000000skip-0000001024size.hg
       
   791   +02-59e60b258b18cde1e931cf30ce4ae62b49e37abd-0000001520skip-0000000002size.hg
       
   792    02-63ded94ceab180ac2fa13e1f0beeb4d2265998a3-0000001232skip-0000000002size.hg
       
   793    02-694ef7e5b2984f1ec66c3d960799f4ff2459672c-0000001236skip-0000000004size.hg
       
   794   +02-7a55a4d5ce324910842c893b56173cf2a847cb9d-0000001472skip-0000000032size.hg
       
   795    02-7f3a79522d6e904d52aea07c71e6cb612667e8f4-0000001216skip-0000000016size.hg
       
   796    02-89fab188d2ce3c4cde6be031f2fc5b9b4ff248e3-0000000900skip-0000000004size.hg
       
   797    02-97ede4832194ed56894374f2a1cc7a0022b486da-0000000904skip-0000000008size.hg
       
   798   +02-a4ab7df9d74053fb819c8a1c6a48ad605cc05f8a-0000001504skip-0000000016size.hg
       
   799    02-b2d350c94c26edbb783aaa21fc24f1fc65c30e74-0000001536skip-0000000256size.hg
       
   800    02-bbd293bd171fd5b711d428db46940a72eca7a40f-0000001280skip-0000000128size.hg
       
   801   +02-c12927fef661d2463043347101b90067c2961333-0000001280skip-0000000128size.hg
       
   802    02-c72277ff25807eb444fa48a60afb434d78c21f2f-0000000899skip-0000000001size.hg
       
   803   +02-d83212ecaa436c80d6113cf915ba35e2db787e79-0000001024skip-0000000227size.hg
       
   804    02-da87a81c5310760f414a933e6550b7e8e60cf241-0000001792skip-0000000064size.hg
       
   805    02-dba2fddbf3c28198659046674a512afd616a1519-0000001472skip-0000000032size.hg
       
   806   +02-dc714c3a5d080165292ba99b097567d0b95e5756-0000001408skip-0000000064size.hg
       
   807   +02-e469a7aa5cce57653b6b02ff46c80b2d94d62629-0000000899skip-0000000029size.hg
       
   808    02-e469a7aa5cce57653b6b02ff46c80b2d94d62629-0000000912skip-0000000016size.hg
       
   809    02-e74670ea99533967c5d90da3ddbc0318cc1fd502-0000001280skip-0000000256size.hg
       
   810    02-ee2deecf044fa5583f66188c9177b0f13332adc2-0000001024skip-0000000128size.hg
       
   811   [1]
       
   812 
       
   813   $ hg -R server log -G -T '{rev}:{node}\n' -r '1789+head()+parents(roots(only(head(), 1789)))+(only(head(), 1789) and (merge() or branchpoint()))'
       
   814   o  2130:0f376356904fc8c1c6ceaac27990f2fd79b1f8c1
       
   815   :
       
   816   o  1789:44e80141ad530a2aa085e9bd9b5311b57eff72ff
       
   817   :
       
   818   : o  1517:1dded5aafa0f8d548f6357cc2f8882dcc4489fbf
       
   819   :/
       
   820   o  1250:d83212ecaa436c80d6113cf915ba35e2db787e79
       
   821   |
       
   822   ~
       
   823 
       
   824   $ hg -R client3 pull server --verbose
       
   825   pulling from server
       
   826   searching for changes
       
   827   all local heads known remotely
       
   828   pullbundle-cache: "missing" set sliced into 16 subranges in *.* seconds (glob)
       
   829   1 changesets found
       
   830   4 changesets found
       
   831   8 changesets found
       
   832   16 changesets found
       
   833   128 changesets found in caches
       
   834   64 changesets found in caches
       
   835   32 changesets found in caches
       
   836   8 changesets found in caches
       
   837   4 changesets found in caches
       
   838   2 changesets found in caches
       
   839   1 changesets found
       
   840   4 changesets found
       
   841   8 changesets found
       
   842   256 changesets found in caches
       
   843   64 changesets found in caches
       
   844   8 changesets found in caches
       
   845   uncompressed size of bundle content:
       
   846        188 (changelog)
       
   847          4 (manifests)
       
   848   uncompressed size of bundle content:
       
   849        740 (changelog)
       
   850          4 (manifests)
       
   851   uncompressed size of bundle content:
       
   852       1476 (changelog)
       
   853          4 (manifests)
       
   854   uncompressed size of bundle content:
       
   855       2948 (changelog)
       
   856          4 (manifests)
       
   857   uncompressed size of bundle content:
       
   858        188 (changelog)
       
   859          4 (manifests)
       
   860   uncompressed size of bundle content:
       
   861        740 (changelog)
       
   862          4 (manifests)
       
   863   uncompressed size of bundle content:
       
   864       1476 (changelog)
       
   865          4 (manifests)
       
   866   adding changesets
       
   867   adding manifests
       
   868   adding file changes
       
   869   added 1 changesets with 0 changes to 0 files (+1 heads)
       
   870   adding changesets
       
   871   adding manifests
       
   872   adding file changes
       
   873   added 4 changesets with 0 changes to 0 files
       
   874   adding changesets
       
   875   adding manifests
       
   876   adding file changes
       
   877   added 8 changesets with 0 changes to 0 files
       
   878   adding changesets
       
   879   adding manifests
       
   880   adding file changes
       
   881   added 16 changesets with 0 changes to 0 files
       
   882   adding changesets
       
   883   adding manifests
       
   884   adding file changes
       
   885   added 128 changesets with 0 changes to 0 files
       
   886   adding changesets
       
   887   adding manifests
       
   888   adding file changes
       
   889   added 64 changesets with 0 changes to 0 files
       
   890   adding changesets
       
   891   adding manifests
       
   892   adding file changes
       
   893   added 32 changesets with 0 changes to 0 files
       
   894   adding changesets
       
   895   adding manifests
       
   896   adding file changes
       
   897   added 8 changesets with 0 changes to 0 files
       
   898   adding changesets
       
   899   adding manifests
       
   900   adding file changes
       
   901   added 4 changesets with 0 changes to 0 files
       
   902   adding changesets
       
   903   adding manifests
       
   904   adding file changes
       
   905   added 2 changesets with 0 changes to 0 files
       
   906   adding changesets
       
   907   adding manifests
       
   908   adding file changes
       
   909   added 1 changesets with 0 changes to 0 files
       
   910   adding changesets
       
   911   adding manifests
       
   912   adding file changes
       
   913   added 4 changesets with 0 changes to 0 files
       
   914   adding changesets
       
   915   adding manifests
       
   916   adding file changes
       
   917   added 8 changesets with 0 changes to 0 files
       
   918   adding changesets
       
   919   adding manifests
       
   920   adding file changes
       
   921   added 256 changesets with 0 changes to 0 files
       
   922   adding changesets
       
   923   adding manifests
       
   924   adding file changes
       
   925   added 64 changesets with 0 changes to 0 files
       
   926   adding changesets
       
   927   adding manifests
       
   928   adding file changes
       
   929   added 8 changesets with 0 changes to 0 files
       
   930   new changesets d1807e351389:0f376356904f
       
   931   (run 'hg heads' to see heads, 'hg merge' to merge)
       
   932 
       
   933   $ mv newbundles oldbundles
       
   934   $ ls -1 server/.hg/cache/pullbundles > newbundles
       
   935   $ diff -u oldbundles newbundles
       
   936   --- oldbundles	* (glob)
       
   937   +++ newbundles	* (glob)
       
   938   @@ -1,14 +1,17 @@
       
   939    02-0f376356904fc8c1c6ceaac27990f2fd79b1f8c1-0000001856skip-0000000008size.hg
       
   940    02-17185c1c22f1266b084daf7cfb07b6ebbfbc65ab-0000001235skip-0000000001size.hg
       
   941    02-1dded5aafa0f8d548f6357cc2f8882dcc4489fbf-0000001516skip-0000000002size.hg
       
   942   +02-1ed78f99f705cb819a02f1227c217728d008e461-0000001524skip-0000000004size.hg
       
   943    02-2dc4f1ab9029719714b8e0dde8e3725a5bb28472-0000001408skip-0000000064size.hg
       
   944    02-2f0e261a08964bc1c607c0eda4978364c22a9b94-0000001504skip-0000000008size.hg
       
   945    02-44e80141ad530a2aa085e9bd9b5311b57eff72ff-0000001522skip-0000000001size.hg
       
   946    02-467b6e370e816747e27de0d0b9237f4090a33656-0000001152skip-0000000064size.hg
       
   947    02-484c46df3e41f371efd0ff74fa5221657527213f-0000001240skip-0000000008size.hg
       
   948    02-4a6d0f7d07d060b026d9fc690cd89cd26af96e42-0000001248skip-0000000032size.hg
       
   949   +02-4a6d0f7d07d060b026d9fc690cd89cd26af96e42-0000001264skip-0000000016size.hg
       
   950    02-540f762640ee62ca597ece26af725e6357e82805-0000000000skip-0000001024size.hg
       
   951    02-59e60b258b18cde1e931cf30ce4ae62b49e37abd-0000001520skip-0000000002size.hg
       
   952   +02-5eaa75df73c454c1afff722301a4c73e897de94d-0000001256skip-0000000008size.hg
       
   953    02-63ded94ceab180ac2fa13e1f0beeb4d2265998a3-0000001232skip-0000000002size.hg
       
   954    02-694ef7e5b2984f1ec66c3d960799f4ff2459672c-0000001236skip-0000000004size.hg
       
   955    02-7a55a4d5ce324910842c893b56173cf2a847cb9d-0000001472skip-0000000032size.hg
       
   956   @@ -19,7 +22,10 @@
       
   957    02-b2d350c94c26edbb783aaa21fc24f1fc65c30e74-0000001536skip-0000000256size.hg
       
   958    02-bbd293bd171fd5b711d428db46940a72eca7a40f-0000001280skip-0000000128size.hg
       
   959    02-c12927fef661d2463043347101b90067c2961333-0000001280skip-0000000128size.hg
       
   960   +02-c232505f58fdf70bcf5f6ab6a555f23ffc74f761-0000001523skip-0000000001size.hg
       
   961    02-c72277ff25807eb444fa48a60afb434d78c21f2f-0000000899skip-0000000001size.hg
       
   962   +02-ca970a853ea24846035ccb324cc8de49ef768748-0000001252skip-0000000004size.hg
       
   963   +02-d1807e3513890ac71c2e8d10e9dc9a5b58b15d4b-0000001251skip-0000000001size.hg
       
   964    02-d83212ecaa436c80d6113cf915ba35e2db787e79-0000001024skip-0000000227size.hg
       
   965    02-da87a81c5310760f414a933e6550b7e8e60cf241-0000001792skip-0000000064size.hg
       
   966    02-dba2fddbf3c28198659046674a512afd616a1519-0000001472skip-0000000032size.hg
       
   967   @@ -27,6 +33,7 @@
       
   968    02-e469a7aa5cce57653b6b02ff46c80b2d94d62629-0000000899skip-0000000029size.hg
       
   969    02-e469a7aa5cce57653b6b02ff46c80b2d94d62629-0000000912skip-0000000016size.hg
       
   970    02-e74670ea99533967c5d90da3ddbc0318cc1fd502-0000001280skip-0000000256size.hg
       
   971   +02-e74670ea99533967c5d90da3ddbc0318cc1fd502-0000001528skip-0000000008size.hg
       
   972    02-ee2deecf044fa5583f66188c9177b0f13332adc2-0000001024skip-0000000128size.hg
       
   973    02-f864bc82f6a2f2ecb49b83722e0895f9d657b0dd-0000001234skip-0000000001size.hg
       
   974    02-fb6c210a224903e81e5a8d2ee099cb0c9526ba8c-0000001512skip-0000000004size.hg
       
   975   [1]
       
   976 
       
   977 Single pull coming after various cache warming
       
   978 ----------------------------------------------
       
   979 
       
   980   $ hg -R client4 pull --verbose server | grep -v 'add changeset'
       
   981   pulling from server
       
   982   requesting all changes
       
   983   pullbundle-cache: "missing" set sliced into 16 subranges in *.* seconds (glob)
       
   984   1024 changesets found in caches
       
   985   256 changesets found
       
   986   128 changesets found in caches
       
   987   64 changesets found in caches
       
   988   32 changesets found in caches
       
   989   8 changesets found in caches
       
   990   4 changesets found in caches
       
   991   2 changesets found in caches
       
   992   1 changesets found in caches
       
   993   4 changesets found in caches
       
   994   8 changesets found in caches
       
   995   16 changesets found in caches
       
   996   256 changesets found in caches
       
   997   256 changesets found in caches
       
   998   64 changesets found in caches
       
   999   8 changesets found in caches
       
  1000   uncompressed size of bundle content:
       
  1001      47108 (changelog)
       
  1002          4 (manifests)
       
  1003   adding changesets
       
  1004   adding manifests
       
  1005   adding file changes
       
  1006   added 1024 changesets with 0 changes to 0 files
       
  1007   adding changesets
       
  1008   adding manifests
       
  1009   adding file changes
       
  1010   added 256 changesets with 0 changes to 0 files
       
  1011   adding changesets
       
  1012   adding manifests
       
  1013   adding file changes
       
  1014   added 128 changesets with 0 changes to 0 files
       
  1015   adding changesets
       
  1016   adding manifests
       
  1017   adding file changes
       
  1018   added 64 changesets with 0 changes to 0 files
       
  1019   adding changesets
       
  1020   adding manifests
       
  1021   adding file changes
       
  1022   added 32 changesets with 0 changes to 0 files
       
  1023   adding changesets
       
  1024   adding manifests
       
  1025   adding file changes
       
  1026   added 8 changesets with 0 changes to 0 files
       
  1027   adding changesets
       
  1028   adding manifests
       
  1029   adding file changes
       
  1030   added 4 changesets with 0 changes to 0 files
       
  1031   adding changesets
       
  1032   adding manifests
       
  1033   adding file changes
       
  1034   added 2 changesets with 0 changes to 0 files
       
  1035   adding changesets
       
  1036   adding manifests
       
  1037   adding file changes
       
  1038   added 1 changesets with 0 changes to 0 files (+1 heads)
       
  1039   adding changesets
       
  1040   adding manifests
       
  1041   adding file changes
       
  1042   added 4 changesets with 0 changes to 0 files
       
  1043   adding changesets
       
  1044   adding manifests
       
  1045   adding file changes
       
  1046   added 8 changesets with 0 changes to 0 files
       
  1047   adding changesets
       
  1048   adding manifests
       
  1049   adding file changes
       
  1050   added 16 changesets with 0 changes to 0 files
       
  1051   adding changesets
       
  1052   adding manifests
       
  1053   adding file changes
       
  1054   added 256 changesets with 0 changes to 0 files
       
  1055   adding changesets
       
  1056   adding manifests
       
  1057   adding file changes
       
  1058   added 256 changesets with 0 changes to 0 files
       
  1059   adding changesets
       
  1060   adding manifests
       
  1061   adding file changes
       
  1062   added 64 changesets with 0 changes to 0 files
       
  1063   adding changesets
       
  1064   adding manifests
       
  1065   adding file changes
       
  1066   added 8 changesets with 0 changes to 0 files
       
  1067   new changesets 1ea73414a91b:0f376356904f
       
  1068   (run 'hg heads' to see heads, 'hg merge' to merge)
       
  1069 
       
  1070   $ mv newbundles oldbundles
       
  1071   $ ls -1 server/.hg/cache/pullbundles > newbundles
       
  1072   $ diff -u oldbundles newbundles
       
  1073   --- oldbundles	* (glob)
       
  1074   +++ newbundles	* (glob)
       
  1075   @@ -7,6 +7,7 @@
       
  1076    02-44e80141ad530a2aa085e9bd9b5311b57eff72ff-0000001522skip-0000000001size.hg
       
  1077    02-467b6e370e816747e27de0d0b9237f4090a33656-0000001152skip-0000000064size.hg
       
  1078    02-484c46df3e41f371efd0ff74fa5221657527213f-0000001240skip-0000000008size.hg
       
  1079   +02-4a6d0f7d07d060b026d9fc690cd89cd26af96e42-0000001024skip-0000000256size.hg
       
  1080    02-4a6d0f7d07d060b026d9fc690cd89cd26af96e42-0000001248skip-0000000032size.hg
       
  1081    02-4a6d0f7d07d060b026d9fc690cd89cd26af96e42-0000001264skip-0000000016size.hg
       
  1082    02-540f762640ee62ca597ece26af725e6357e82805-0000000000skip-0000001024size.hg
       
  1083   [1]
       
  1084 
       
  1085 Pull with piece "not linear from head"
       
  1086 --------------------------------------
       
  1087 
       
  1088   $ hg -R server log -G -T '{rev}:{node}\n' -r 'branchpoint() + merge() + head() + children(branchpoint())'
       
  1089   o  2130:0f376356904fc8c1c6ceaac27990f2fd79b1f8c1
       
  1090   :
       
  1091   o    1663:1710092b3ab17a6d2ecad664580991a608537749
       
  1092   |\
       
  1093   | o  1518:c72277ff25807eb444fa48a60afb434d78c21f2f
       
  1094   | |
       
  1095   | | o  1517:1dded5aafa0f8d548f6357cc2f8882dcc4489fbf
       
  1096   | | :
       
  1097   +---o  1251:d1807e3513890ac71c2e8d10e9dc9a5b58b15d4b
       
  1098   | |
       
  1099   o |  1250:d83212ecaa436c80d6113cf915ba35e2db787e79
       
  1100   : |
       
  1101   o |  899:c31a4e0cc28d677b8020e46aa3bb2fd5ee5b1a06
       
  1102   |/
       
  1103   o  898:1388f909cd2b0685efd4e2ce076d198bce20922c
       
  1104   |
       
  1105   ~
       
  1106 
       
  1107   $ hg init test-local-missing
       
  1108   $ hg -R test-local-missing pull server --rev 899 --rev 1518 --verbose
       
  1109   pulling from server
       
  1110   pullbundle-cache: "missing" set sliced into 5 subranges in *.* seconds (glob)
       
  1111   512 changesets found
       
  1112   256 changesets found
       
  1113   128 changesets found
       
  1114   4 changesets found
       
  1115   1 changesets found
       
  1116   uncompressed size of bundle content:
       
  1117      92968 (changelog)
       
  1118          4 (manifests)
       
  1119   uncompressed size of bundle content:
       
  1120      46596 (changelog)
       
  1121          4 (manifests)
       
  1122   uncompressed size of bundle content:
       
  1123      23300 (changelog)
       
  1124          4 (manifests)
       
  1125   uncompressed size of bundle content:
       
  1126        734 (changelog)
       
  1127          4 (manifests)
       
  1128   uncompressed size of bundle content:
       
  1129        186 (changelog)
       
  1130          4 (manifests)
       
  1131   adding changesets
       
  1132   adding manifests
       
  1133   adding file changes
       
  1134   added 512 changesets with 0 changes to 0 files
       
  1135   adding changesets
       
  1136   adding manifests
       
  1137   adding file changes
       
  1138   added 256 changesets with 0 changes to 0 files
       
  1139   adding changesets
       
  1140   adding manifests
       
  1141   adding file changes
       
  1142   added 128 changesets with 0 changes to 0 files
       
  1143   adding changesets
       
  1144   adding manifests
       
  1145   adding file changes
       
  1146   added 4 changesets with 0 changes to 0 files
       
  1147   adding changesets
       
  1148   adding manifests
       
  1149   adding file changes
       
  1150   added 1 changesets with 0 changes to 0 files (+1 heads)
       
  1151   new changesets 1ea73414a91b:c31a4e0cc28d
       
  1152   (run 'hg heads' to see heads, 'hg merge' to merge)
       
  1153   $ hg -R test-local-missing pull server --verbose
       
  1154   pulling from server
       
  1155   searching for changes
       
  1156   all local heads known remotely
       
  1157   pullbundle-cache: "missing" set sliced into 19 subranges in *.* seconds (glob)
       
  1158   4 changesets found
       
  1159   8 changesets found
       
  1160   16 changesets found
       
  1161   32 changesets found
       
  1162   64 changesets found
       
  1163   256 changesets found in caches
       
  1164   128 changesets found in caches
       
  1165   64 changesets found in caches
       
  1166   32 changesets found in caches
       
  1167   8 changesets found in caches
       
  1168   4 changesets found in caches
       
  1169   2 changesets found in caches
       
  1170   4 changesets found in caches
       
  1171   8 changesets found in caches
       
  1172   16 changesets found in caches
       
  1173   256 changesets found in caches
       
  1174   256 changesets found in caches
       
  1175   64 changesets found in caches
       
  1176   8 changesets found in caches
       
  1177   uncompressed size of bundle content:
       
  1178        732 (changelog)
       
  1179          4 (manifests)
       
  1180   uncompressed size of bundle content:
       
  1181       1460 (changelog)
       
  1182          4 (manifests)
       
  1183   uncompressed size of bundle content:
       
  1184       2916 (changelog)
       
  1185          4 (manifests)
       
  1186   uncompressed size of bundle content:
       
  1187       5828 (changelog)
       
  1188          4 (manifests)
       
  1189   uncompressed size of bundle content:
       
  1190      11700 (changelog)
       
  1191          4 (manifests)
       
  1192   adding changesets
       
  1193   adding manifests
       
  1194   adding file changes
       
  1195   added 4 changesets with 0 changes to 0 files
       
  1196   adding changesets
       
  1197   adding manifests
       
  1198   adding file changes
       
  1199   added 8 changesets with 0 changes to 0 files
       
  1200   adding changesets
       
  1201   adding manifests
       
  1202   adding file changes
       
  1203   added 16 changesets with 0 changes to 0 files
       
  1204   adding changesets
       
  1205   adding manifests
       
  1206   adding file changes
       
  1207   added 32 changesets with 0 changes to 0 files
       
  1208   adding changesets
       
  1209   adding manifests
       
  1210   adding file changes
       
  1211   added 64 changesets with 0 changes to 0 files
       
  1212   adding changesets
       
  1213   adding manifests
       
  1214   adding file changes
       
  1215   added 256 changesets with 0 changes to 0 files
       
  1216   adding changesets
       
  1217   adding manifests
       
  1218   adding file changes
       
  1219   added 128 changesets with 0 changes to 0 files
       
  1220   adding changesets
       
  1221   adding manifests
       
  1222   adding file changes
       
  1223   added 64 changesets with 0 changes to 0 files
       
  1224   adding changesets
       
  1225   adding manifests
       
  1226   adding file changes
       
  1227   added 32 changesets with 0 changes to 0 files
       
  1228   adding changesets
       
  1229   adding manifests
       
  1230   adding file changes
       
  1231   added 8 changesets with 0 changes to 0 files
       
  1232   adding changesets
       
  1233   adding manifests
       
  1234   adding file changes
       
  1235   added 4 changesets with 0 changes to 0 files
       
  1236   adding changesets
       
  1237   adding manifests
       
  1238   adding file changes
       
  1239   added 2 changesets with 0 changes to 0 files
       
  1240   adding changesets
       
  1241   adding manifests
       
  1242   adding file changes
       
  1243   added 4 changesets with 0 changes to 0 files
       
  1244   adding changesets
       
  1245   adding manifests
       
  1246   adding file changes
       
  1247   added 8 changesets with 0 changes to 0 files
       
  1248   adding changesets
       
  1249   adding manifests
       
  1250   adding file changes
       
  1251   added 16 changesets with 0 changes to 0 files
       
  1252   adding changesets
       
  1253   adding manifests
       
  1254   adding file changes
       
  1255   added 256 changesets with 0 changes to 0 files
       
  1256   adding changesets
       
  1257   adding manifests
       
  1258   adding file changes
       
  1259   added 256 changesets with 0 changes to 0 files
       
  1260   adding changesets
       
  1261   adding manifests
       
  1262   adding file changes
       
  1263   added 64 changesets with 0 changes to 0 files
       
  1264   adding changesets
       
  1265   adding manifests
       
  1266   adding file changes
       
  1267   added 8 changesets with 0 changes to 0 files
       
  1268   new changesets e600b80a2fc8:0f376356904f
       
  1269   (run 'hg update' to get a working copy)
       
  1270 
       
  1271 Test cache setting
       
  1272 ==================
       
  1273 
       
  1274 cache directory
       
  1275 ---------------
       
  1276 
       
  1277   $ mkdir bundle-cache
       
  1278   $ cat << EOF >> $HGRCPATH
       
  1279   > [pullbundle]
       
  1280   > cache-directory=$TESTTMP/bundle-cache
       
  1281   > EOF
       
  1282 
       
  1283   $ hg clone --pull server other-cache-directory
       
  1284   requesting all changes
       
  1285   pullbundle-cache: "missing" set sliced into 16 subranges in *.* seconds (glob)
       
  1286   adding changesets
       
  1287   adding manifests
       
  1288   adding file changes
       
  1289   added 1024 changesets with 0 changes to 0 files
       
  1290   adding changesets
       
  1291   adding manifests
       
  1292   adding file changes
       
  1293   added 256 changesets with 0 changes to 0 files
       
  1294   adding changesets
       
  1295   adding manifests
       
  1296   adding file changes
       
  1297   added 128 changesets with 0 changes to 0 files
       
  1298   adding changesets
       
  1299   adding manifests
       
  1300   adding file changes
       
  1301   added 64 changesets with 0 changes to 0 files
       
  1302   adding changesets
       
  1303   adding manifests
       
  1304   adding file changes
       
  1305   added 32 changesets with 0 changes to 0 files
       
  1306   adding changesets
       
  1307   adding manifests
       
  1308   adding file changes
       
  1309   added 8 changesets with 0 changes to 0 files
       
  1310   adding changesets
       
  1311   adding manifests
       
  1312   adding file changes
       
  1313   added 4 changesets with 0 changes to 0 files
       
  1314   adding changesets
       
  1315   adding manifests
       
  1316   adding file changes
       
  1317   added 2 changesets with 0 changes to 0 files
       
  1318   adding changesets
       
  1319   adding manifests
       
  1320   adding file changes
       
  1321   added 1 changesets with 0 changes to 0 files (+1 heads)
       
  1322   adding changesets
       
  1323   adding manifests
       
  1324   adding file changes
       
  1325   added 4 changesets with 0 changes to 0 files
       
  1326   adding changesets
       
  1327   adding manifests
       
  1328   adding file changes
       
  1329   added 8 changesets with 0 changes to 0 files
       
  1330   adding changesets
       
  1331   adding manifests
       
  1332   adding file changes
       
  1333   added 16 changesets with 0 changes to 0 files
       
  1334   adding changesets
       
  1335   adding manifests
       
  1336   adding file changes
       
  1337   added 256 changesets with 0 changes to 0 files
       
  1338   adding changesets
       
  1339   adding manifests
       
  1340   adding file changes
       
  1341   added 256 changesets with 0 changes to 0 files
       
  1342   adding changesets
       
  1343   adding manifests
       
  1344   adding file changes
       
  1345   added 64 changesets with 0 changes to 0 files
       
  1346   adding changesets
       
  1347   adding manifests
       
  1348   adding file changes
       
  1349   added 8 changesets with 0 changes to 0 files
       
  1350   new changesets 1ea73414a91b:0f376356904f
       
  1351   updating to branch default
       
  1352   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
       
  1353 
       
  1354   $ ls -1 bundle-cache
       
  1355   02-0f376356904fc8c1c6ceaac27990f2fd79b1f8c1-0000001856skip-0000000008size.hg
       
  1356   02-1dded5aafa0f8d548f6357cc2f8882dcc4489fbf-0000001516skip-0000000002size.hg
       
  1357   02-2dc4f1ab9029719714b8e0dde8e3725a5bb28472-0000001408skip-0000000064size.hg
       
  1358   02-2f0e261a08964bc1c607c0eda4978364c22a9b94-0000001504skip-0000000008size.hg
       
  1359   02-4a6d0f7d07d060b026d9fc690cd89cd26af96e42-0000001024skip-0000000256size.hg
       
  1360   02-540f762640ee62ca597ece26af725e6357e82805-0000000000skip-0000001024size.hg
       
  1361   02-89fab188d2ce3c4cde6be031f2fc5b9b4ff248e3-0000000900skip-0000000004size.hg
       
  1362   02-97ede4832194ed56894374f2a1cc7a0022b486da-0000000904skip-0000000008size.hg
       
  1363   02-b2d350c94c26edbb783aaa21fc24f1fc65c30e74-0000001536skip-0000000256size.hg
       
  1364   02-bbd293bd171fd5b711d428db46940a72eca7a40f-0000001280skip-0000000128size.hg
       
  1365   02-c72277ff25807eb444fa48a60afb434d78c21f2f-0000000899skip-0000000001size.hg
       
  1366   02-da87a81c5310760f414a933e6550b7e8e60cf241-0000001792skip-0000000064size.hg
       
  1367   02-dba2fddbf3c28198659046674a512afd616a1519-0000001472skip-0000000032size.hg
       
  1368   02-e469a7aa5cce57653b6b02ff46c80b2d94d62629-0000000912skip-0000000016size.hg
       
  1369   02-e74670ea99533967c5d90da3ddbc0318cc1fd502-0000001280skip-0000000256size.hg
       
  1370   02-fb6c210a224903e81e5a8d2ee099cb0c9526ba8c-0000001512skip-0000000004size.hg