##// END OF EJS Templates
bundlespec: do not overwrite bundlespec value with the config one...
marmoute -
r50222:5bc3e76f default
parent child Browse files
Show More
@@ -1681,11 +1681,13 b' def bundle(ui, repo, fname, *dests, **op'
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,
@@ -1491,6 +1491,6 b' Test bundlespec overwrite default'
1491 1 changesets found
1491 1 changesets found
1492 $ hg debugbundle bundle-type-with-obs --part-type obsmarkers
1492 $ hg debugbundle bundle-type-with-obs --part-type obsmarkers
1493 Stream params: {Compression: BZ}
1493 Stream params: {Compression: BZ}
1494 obsmarkers -- {} (mandatory: True) (missing-correct-output !)
1494 obsmarkers -- {} (mandatory: True)
1495 version: 1 (50 bytes) (missing-correct-output !)
1495 version: 1 (50 bytes)
1496 1ea73414a91b0920940797d8fc6a11e447f8ea1e 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} (missing-correct-output !)
1496 1ea73414a91b0920940797d8fc6a11e447f8ea1e 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
General Comments 0
You need to be logged in to leave comments. Login now