1646 if complevel is None: |
1646 if complevel is None: |
1647 complevel = ui.configint(b'experimental', b'bundlecomplevel') |
1647 complevel = ui.configint(b'experimental', b'bundlecomplevel') |
1648 if complevel is not None: |
1648 if complevel is not None: |
1649 compopts[b'level'] = complevel |
1649 compopts[b'level'] = complevel |
1650 |
1650 |
1651 # Allow overriding the bundling of obsmarker in phases through |
1651 # Bundling of obsmarker and phases is optional as not all clients |
1652 # configuration while we don't have a bundle version that include them |
1652 # support the necessary features. |
1653 if repo.ui.configbool(b'experimental', b'evolution.bundle-obsmarker'): |
1653 cfg = ui.configbool |
1654 bundlespec.contentopts[b'obsolescence'] = True |
1654 contentopts = { |
1655 if repo.ui.configbool(b'experimental', b'bundle-phases'): |
1655 b'obsolescence': cfg(b'experimental', b'evolution.bundle-obsmarker'), |
1656 bundlespec.contentopts[b'phases'] = True |
1656 b'obsolescence-mandatory': cfg( |
|
1657 b'experimental', b'evolution.bundle-obsmarker:mandatory' |
|
1658 ), |
|
1659 b'phases': cfg(b'experimental', b'bundle-phases'), |
|
1660 } |
|
1661 bundlespec.contentopts.update(contentopts) |
1657 |
1662 |
1658 bundle2.writenewbundle( |
1663 bundle2.writenewbundle( |
1659 ui, |
1664 ui, |
1660 repo, |
1665 repo, |
1661 b'bundle', |
1666 b'bundle', |