Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/commands.py @ 49332:5bc3e76f919d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bundlespec: do not overwrite bundlespec value with the config one This is finally making the `obsolete` bundlespec paramater work.
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Tue, 24 May 2022 18:43:24 +0200
parents bf66f7a1e3f8
children 288de6f5d724
comparison
equal deleted inserted replaced
49331:3840d16595cf 49332:5bc3e76f919d
1679 1679
1680 # Bundling of obsmarker and phases is optional as not all clients 1680 # Bundling of obsmarker and phases is optional as not all clients
1681 # support the necessary features. 1681 # support the necessary features.
1682 cfg = ui.configbool 1682 cfg = ui.configbool
1683 obsolescence_cfg = cfg(b'experimental', b'evolution.bundle-obsmarker') 1683 obsolescence_cfg = cfg(b'experimental', b'evolution.bundle-obsmarker')
1684 bundlespec.set_param(b'obsolescence', obsolescence_cfg) 1684 bundlespec.set_param(b'obsolescence', obsolescence_cfg, overwrite=False)
1685 obs_mand_cfg = cfg(b'experimental', b'evolution.bundle-obsmarker:mandatory') 1685 obs_mand_cfg = cfg(b'experimental', b'evolution.bundle-obsmarker:mandatory')
1686 bundlespec.set_param(b'obsolescence-mandatory', obs_mand_cfg) 1686 bundlespec.set_param(
1687 b'obsolescence-mandatory', obs_mand_cfg, overwrite=False
1688 )
1687 phases_cfg = cfg(b'experimental', b'bundle-phases') 1689 phases_cfg = cfg(b'experimental', b'bundle-phases')
1688 bundlespec.set_param(b'phases', phases_cfg) 1690 bundlespec.set_param(b'phases', phases_cfg, overwrite=False)
1689 1691
1690 bundle2.writenewbundle( 1692 bundle2.writenewbundle(
1691 ui, 1693 ui,
1692 repo, 1694 repo,
1693 b'bundle', 1695 b'bundle',