Mercurial > public > mercurial-scm > hg
diff mercurial/commands.py @ 49327:5bc3e76f919d
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 | 79b2c98ab7b4 |
line wrap: on
line diff
--- a/mercurial/commands.py Tue May 17 18:14:32 2022 +0100 +++ b/mercurial/commands.py Tue May 24 18:43:24 2022 +0200 @@ -1681,11 +1681,13 @@ # support the necessary features. cfg = ui.configbool obsolescence_cfg = cfg(b'experimental', b'evolution.bundle-obsmarker') - bundlespec.set_param(b'obsolescence', obsolescence_cfg) + bundlespec.set_param(b'obsolescence', obsolescence_cfg, overwrite=False) obs_mand_cfg = cfg(b'experimental', b'evolution.bundle-obsmarker:mandatory') - bundlespec.set_param(b'obsolescence-mandatory', obs_mand_cfg) + bundlespec.set_param( + b'obsolescence-mandatory', obs_mand_cfg, overwrite=False + ) phases_cfg = cfg(b'experimental', b'bundle-phases') - bundlespec.set_param(b'phases', phases_cfg) + bundlespec.set_param(b'phases', phases_cfg, overwrite=False) bundle2.writenewbundle( ui,