tests/test-generaldelta.t
changeset 49220 3376b5d9a697
parent 48879 9987d14ad63f
child 49221 75d0775dce7f
equal deleted inserted replaced
49219:0a86cb154e83 49220:3376b5d9a697
   103   new changesets 0ea3fcf9d01d:bba78d330d9c
   103   new changesets 0ea3fcf9d01d:bba78d330d9c
   104   updating to branch default
   104   updating to branch default
   105   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
   105   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
   106   $ hg -R repo debugdeltachain -m
   106   $ hg -R repo debugdeltachain -m
   107       rev  chain# chainlen     prev   delta       size    rawsize  chainsize     ratio   lindist extradist extraratio
   107       rev  chain# chainlen     prev   delta       size    rawsize  chainsize     ratio   lindist extradist extraratio
   108         0       1        1       -1    base        104        135        104   0.77037       104         0    0.00000 (no-zstd !)
   108         0       1        1       -1    base        10?        135        10?   0.7????       10?         0    0.00000 (glob)
   109         1       1        2        0    prev         57        135        161   1.19259       161         0    0.00000 (no-zstd !)
   109         1       1        2        0    prev         57        135        1??   1.?????       16?         0    0.00000 (glob)
   110         2       1        3        1    prev         57        135        218   1.61481       218         0    0.00000 (no-zstd !)
   110         2       1        3        1    prev         57        135        2??   1.6????       2??         0    0.00000 (glob)
   111         0       1        1       -1    base        107        135        107   0.79259       107         0    0.00000 (zstd !)
       
   112         1       1        2        0    prev         57        135        164   1.21481       164         0    0.00000 (zstd !)
       
   113         2       1        3        1    prev         57        135        221   1.63704       221         0    0.00000 (zstd !)
       
   114         3       2        1       -1    base        104        135        104   0.77037       104         0    0.00000
   111         3       2        1       -1    base        104        135        104   0.77037       104         0    0.00000
   115   $ hg -R usegd debugdeltachain -m
   112   $ hg -R usegd debugdeltachain -m
   116       rev  chain# chainlen     prev   delta       size    rawsize  chainsize     ratio   lindist extradist extraratio
   113       rev  chain# chainlen     prev   delta       size    rawsize  chainsize     ratio   lindist extradist extraratio
   117         0       1        1       -1    base        104        135        104   0.77037       104         0    0.00000 (no-zstd !)
   114         0       1        1       -1    base        10?        135        10?   0.7????       10?         0    0.00000 (glob)
   118         1       1        2        0      p1         57        135        161   1.19259       161         0    0.00000 (no-zstd !)
   115         1       1        2        0      p1         57        135        16?   1.?????       16?         0    0.00000 (glob)
   119         2       1        3        1    prev         57        135        218   1.61481       218         0    0.00000 (no-zstd !)
   116         2       1        3        1    prev         57        135        2??   1.6????       2??         0    0.00000 (glob)
   120         3       1        2        0      p1         57        135        161   1.19259       275       114    0.70807 (no-zstd !)
   117         3       1        2        0      p1         57        135        16?   1.?????       27?       114    0.????? (glob)
   121         0       1        1       -1    base        107        135        107   0.79259       107         0    0.00000 (zstd !)
       
   122         1       1        2        0      p1         57        135        164   1.21481       164         0    0.00000 (zstd !)
       
   123         2       1        3        1    prev         57        135        221   1.63704       221         0    0.00000 (zstd !)
       
   124         3       1        2        0      p1         57        135        164   1.21481       278       114    0.69512 (zstd !)
       
   125   $ hg -R full debugdeltachain -m
   118   $ hg -R full debugdeltachain -m
   126       rev  chain# chainlen     prev   delta       size    rawsize  chainsize     ratio   lindist extradist extraratio
   119       rev  chain# chainlen     prev   delta       size    rawsize  chainsize     ratio   lindist extradist extraratio
   127         0       1        1       -1    base        104        135        104   0.77037       104         0    0.00000 (no-zstd !)
   120         0       1        1       -1    base        10?        135        10?   0.7????       10?         0    0.00000 (glob)
   128         1       1        2        0      p1         57        135        161   1.19259       161         0    0.00000 (no-zstd !)
   121         1       1        2        0      p1         57        135        16?   1.?????       16?         0    0.00000 (glob)
   129         2       1        2        0      p1         57        135        161   1.19259       218        57    0.35404 (no-zstd !)
   122         2       1        2        0      p1         57        135        16?   1.?????       2??        57    0.3???? (glob)
   130         3       1        2        0      p1         57        135        161   1.19259       275       114    0.70807 (no-zstd !)
   123         3       1        2        0      p1         57        135        16?   1.?????       27?       114    0.????? (glob)
   131         0       1        1       -1    base        107        135        107   0.79259       107         0    0.00000 (zstd !)
       
   132         1       1        2        0      p1         57        135        164   1.21481       164         0    0.00000 (zstd !)
       
   133         2       1        2        0      p1         57        135        164   1.21481       221        57    0.34756 (zstd !)
       
   134         3       1        2        0      p1         57        135        164   1.21481       278       114    0.69512 (zstd !)
       
   135 
   124 
   136 Test revlog.optimize-delta-parent-choice
   125 Test revlog.optimize-delta-parent-choice
   137 
   126 
   138   $ hg init --config format.generaldelta=1 aggressive
   127   $ hg init --config format.generaldelta=1 aggressive
   139   $ cd aggressive
   128   $ cd aggressive
   150 - Verify non-aggressive merge uses p1 (commit 1) as delta parent
   139 - Verify non-aggressive merge uses p1 (commit 1) as delta parent
   151   $ hg merge -q 0
   140   $ hg merge -q 0
   152   $ hg commit -q -m merge
   141   $ hg commit -q -m merge
   153   $ hg debugdeltachain -m
   142   $ hg debugdeltachain -m
   154       rev  chain# chainlen     prev   delta       size    rawsize  chainsize     ratio   lindist extradist extraratio
   143       rev  chain# chainlen     prev   delta       size    rawsize  chainsize     ratio   lindist extradist extraratio
   155         0       1        1       -1    base         59        215         59   0.27442        59         0    0.00000 (no-zstd !)
   144         0       1        1       -1    base         ??        215         ??   0.?????        ??         0    0.00000 (glob)
   156         1       1        2        0    prev         61         86        120   1.39535       120         0    0.00000 (no-zstd !)
   145         1       1        2        0    prev         ??         86        1??   1.?????       1??         0    0.00000 (glob)
   157         2       1        2        0      p2         62        301        121   0.40199       182        61    0.50413 (no-zstd !)
   146         2       1        2        0      p2         ??        301        1??   0.4????       ???        ??    0.5???? (glob)
   158         0       1        1       -1    base         68        215         68   0.31628        68         0    0.00000 (zstd !)
       
   159         1       1        2        0    prev         70         86        138   1.60465       138         0    0.00000 (zstd !)
       
   160         2       1        2        0      p2         68        301        136   0.45183       206        70    0.51471 (zstd !)
       
   161 
   147 
   162   $ hg strip -q -r . --config extensions.strip=
   148   $ hg strip -q -r . --config extensions.strip=
   163 
   149 
   164 - Verify aggressive merge uses p2 (commit 0) as delta parent
   150 - Verify aggressive merge uses p2 (commit 0) as delta parent
   165   $ hg up -q -C 1
   151   $ hg up -q -C 1
   166   $ hg merge -q 0
   152   $ hg merge -q 0
   167   $ hg commit -q -m merge --config storage.revlog.optimize-delta-parent-choice=yes
   153   $ hg commit -q -m merge --config storage.revlog.optimize-delta-parent-choice=yes
   168   $ hg debugdeltachain -m
   154   $ hg debugdeltachain -m
   169       rev  chain# chainlen     prev   delta       size    rawsize  chainsize     ratio   lindist extradist extraratio
   155       rev  chain# chainlen     prev   delta       size    rawsize  chainsize     ratio   lindist extradist extraratio
   170         0       1        1       -1    base         59        215         59   0.27442        59         0    0.00000 (no-zstd !)
   156         0       1        1       -1    base         ??        215         ??   0.?????        ??         0    0.00000 (glob)
   171         1       1        2        0    prev         61         86        120   1.39535       120         0    0.00000 (no-zstd !)
   157         1       1        2        0    prev         ??         86        1??   1.?????       1??         0    0.00000 (glob)
   172         2       1        2        0      p2         62        301        121   0.40199       182        61    0.50413 (no-zstd !)
   158         2       1        2        0      p2         ??        301        1??   0.4????       ???        ??    0.5???? (glob)
   173         0       1        1       -1    base         68        215         68   0.31628        68         0    0.00000 (zstd !)
       
   174         1       1        2        0    prev         70         86        138   1.60465       138         0    0.00000 (zstd !)
       
   175         2       1        2        0      p2         68        301        136   0.45183       206        70    0.51471 (zstd !)
       
   176 
   159 
   177 Test that strip bundle use bundle2
   160 Test that strip bundle use bundle2
   178   $ hg --config extensions.strip= strip .
   161   $ hg --config extensions.strip= strip .
   179   0 files updated, 0 files merged, 5 files removed, 0 files unresolved
   162   0 files updated, 0 files merged, 5 files removed, 0 files unresolved
   180   saved backup bundle to $TESTTMP/aggressive/.hg/strip-backup/1c5d4dc9a8b8-6c68e60c-backup.hg
   163   saved backup bundle to $TESTTMP/aggressive/.hg/strip-backup/1c5d4dc9a8b8-6c68e60c-backup.hg
   281        44       3       27       43      p1         58       1242       1555   1.25201      1555         0    0.00000
   264        44       3       27       43      p1         58       1242       1555   1.25201      1555         0    0.00000
   282        45       3       28       44      p1         58       1288       1613   1.25233      1613         0    0.00000
   265        45       3       28       44      p1         58       1288       1613   1.25233      1613         0    0.00000
   283        46       3       29       45      p1         58       1334       1671   1.25262      1671         0    0.00000
   266        46       3       29       45      p1         58       1334       1671   1.25262      1671         0    0.00000
   284        47       3       30       46      p1         58       1380       1729   1.25290      1729         0    0.00000
   267        47       3       30       46      p1         58       1380       1729   1.25290      1729         0    0.00000
   285        48       3       31       47      p1         58       1426       1787   1.25316      1787         0    0.00000
   268        48       3       31       47      p1         58       1426       1787   1.25316      1787         0    0.00000
   286        49       4        1       -1    base        197        316        197   0.62342       197         0    0.00000 (no-zstd !)
   269        49       4        1       -1    base        ???        316        ???   0.6????       ???         0    0.00000 (glob)
   287        50       4        2       49      p1         58        362        255   0.70442       255         0    0.00000 (no-zstd !)
   270        50       4        2       49      p1         58        362        2??   0.7????       2??         0    0.00000 (glob)
   288        51       4        3       50    prev        356        594        611   1.02862       611         0    0.00000 (no-zstd !)
   271        51       4        3       50    prev        3??        5??        6??   1.0????       6??         0    0.00000 (glob)
   289        52       4        4       51      p1         58        640        669   1.04531       669         0    0.00000 (no-zstd !)
   272        52       4        4       51      p1         58        640        6??   1.0????       6??         0    0.00000 (glob)
   290        49       4        1       -1    base        205        316        205   0.64873       205         0    0.00000 (zstd !)
       
   291        50       4        2       49      p1         58        362        263   0.72652       263         0    0.00000 (zstd !)
       
   292        51       4        3       50    prev        366        594        629   1.05892       629         0    0.00000 (zstd no-bigendian !)
       
   293        52       4        4       51      p1         58        640        687   1.07344       687         0    0.00000 (zstd no-bigendian !)
       
   294        51       4        3       50    prev        367        594        630   1.06061       630         0    0.00000 (zstd bigendian !)
       
   295        52       4        4       51      p1         58        640        688   1.07500       688         0    0.00000 (zstd bigendian !)
       
   296        53       5        1       -1    base          0          0          0   0.00000         0         0    0.00000
   273        53       5        1       -1    base          0          0          0   0.00000         0         0    0.00000
   297        54       6        1       -1    base        369        640        369   0.57656       369         0    0.00000 (no-zstd !)
   274        54       6        1       -1    base        3??        640        3??   0.5????       3??         0    0.00000 (glob)
   298        54       6        1       -1    base        375        640        375   0.58594       375         0    0.00000 (zstd no-bigendian !)
       
   299        54       6        1       -1    base        376        640        376   0.58750       376         0    0.00000 (zstd bigendian !)
       
   300   $ hg clone --pull source-repo --config experimental.maxdeltachainspan=2800 relax-chain --config format.generaldelta=yes
   275   $ hg clone --pull source-repo --config experimental.maxdeltachainspan=2800 relax-chain --config format.generaldelta=yes
   301   requesting all changes
   276   requesting all changes
   302   adding changesets
   277   adding changesets
   303   adding manifests
   278   adding manifests
   304   adding file changes
   279   adding file changes
   355        44       3       27       43      p1         58       1242       1555   1.25201      1555         0    0.00000
   330        44       3       27       43      p1         58       1242       1555   1.25201      1555         0    0.00000
   356        45       3       28       44      p1         58       1288       1613   1.25233      1613         0    0.00000
   331        45       3       28       44      p1         58       1288       1613   1.25233      1613         0    0.00000
   357        46       3       29       45      p1         58       1334       1671   1.25262      1671         0    0.00000
   332        46       3       29       45      p1         58       1334       1671   1.25262      1671         0    0.00000
   358        47       3       30       46      p1         58       1380       1729   1.25290      1729         0    0.00000
   333        47       3       30       46      p1         58       1380       1729   1.25290      1729         0    0.00000
   359        48       3       31       47      p1         58       1426       1787   1.25316      1787         0    0.00000
   334        48       3       31       47      p1         58       1426       1787   1.25316      1787         0    0.00000
   360        49       4        1       -1    base        197        316        197   0.62342       197         0    0.00000 (no-zstd !)
   335        49       4        1       -1    base        ???        316        ???   0.6????       ???         0    0.00000 (glob)
   361        50       4        2       49      p1         58        362        255   0.70442       255         0    0.00000 (no-zstd !)
   336        50       4        2       49      p1         58        362        2??   0.7????       2??         0    0.00000 (glob)
   362        51       2       13       17      p1         58        594        739   1.24411      2781      2042    2.76319 (no-zstd !)
   337        51       2       13       17      p1         58        594        739   1.24411      278?      20??    2.7???? (glob)
   363        52       5        1       -1    base        369        640        369   0.57656       369         0    0.00000 (no-zstd !)
   338        52       5        1       -1    base        3??        640        3??   0.5????       3??         0    0.00000 (glob)
   364        49       4        1       -1    base        205        316        205   0.64873       205         0    0.00000 (zstd !)
       
   365        50       4        2       49      p1         58        362        263   0.72652       263         0    0.00000 (zstd !)
       
   366        51       2       13       17      p1         58        594        739   1.24411      2789      2050    2.77402 (zstd !)
       
   367        52       5        1       -1    base        375        640        375   0.58594       375         0    0.00000 (zstd no-bigendian !)
       
   368        52       5        1       -1    base        376        640        376   0.58750       376         0    0.00000 (zstd bigendian !)
       
   369        53       6        1       -1    base          0          0          0   0.00000         0         0    0.00000
   339        53       6        1       -1    base          0          0          0   0.00000         0         0    0.00000
   370        54       7        1       -1    base        369        640        369   0.57656       369         0    0.00000 (no-zstd !)
   340        54       7        1       -1    base        3??        640        3??   0.5????       3??         0    0.00000 (glob)
   371        54       7        1       -1    base        375        640        375   0.58594       375         0    0.00000 (zstd no-bigendian !)
       
   372        54       7        1       -1    base        376        640        376   0.58750       376         0    0.00000 (zstd bigendian !)
       
   373   $ hg clone --pull source-repo --config experimental.maxdeltachainspan=0 noconst-chain --config format.usegeneraldelta=yes --config storage.revlog.reuse-external-delta-parent=no
   341   $ hg clone --pull source-repo --config experimental.maxdeltachainspan=0 noconst-chain --config format.usegeneraldelta=yes --config storage.revlog.reuse-external-delta-parent=no
   374   requesting all changes
   342   requesting all changes
   375   adding changesets
   343   adding changesets
   376   adding manifests
   344   adding manifests
   377   adding file changes
   345   adding file changes
   433        49       1        7        5      p1         58        316        389   1.23101      2857      2468    6.34447
   401        49       1        7        5      p1         58        316        389   1.23101      2857      2468    6.34447
   434        50       1        8       49      p1         58        362        447   1.23481      2915      2468    5.52125
   402        50       1        8       49      p1         58        362        447   1.23481      2915      2468    5.52125
   435        51       2       13       17      p1         58        594        739   1.24411      2642      1903    2.57510
   403        51       2       13       17      p1         58        594        739   1.24411      2642      1903    2.57510
   436        52       2       14       51      p1         58        640        797   1.24531      2700      1903    2.38770
   404        52       2       14       51      p1         58        640        797   1.24531      2700      1903    2.38770
   437        53       4        1       -1    base          0          0          0   0.00000         0         0    0.00000
   405        53       4        1       -1    base          0          0          0   0.00000         0         0    0.00000
   438        54       5        1       -1    base        369        640        369   0.57656       369         0    0.00000 (no-zstd !)
   406        54       5        1       -1    base        3??        640        3??   0.5????       3??         0    0.00000 (glob)
   439        54       5        1       -1    base        375        640        375   0.58594       375         0    0.00000 (zstd no-bigendian !)
       
   440        54       5        1       -1    base        376        640        376   0.58750       376         0    0.00000 (zstd bigendian !)