comparison mercurial/localrepo.py @ 41823:f6eff9e4de80

storage: introduce a `revlog.reuse-external-delta-parent` config As pointed in c59987ab96b4, we had no simple way to get a client to not blindly reuse the delta parent from a bundle. Instead one had to rely on a side effect of the deprecated `format.generaldelta` configuration. We introduce an explicit `revlog.reuse-external-delta-parent` configuration option (default to True) to control this behavior. If the option is not set, `format.generaldelta` still control this behavior. To test the new option, we convert a couple of place where `generaldelta` have been used for its side effects.
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Wed, 27 Feb 2019 10:49:25 +0100
parents 2e2076c8c25f
children 688fc33e105d
comparison
equal deleted inserted replaced
41822:169c386cc9d8 41823:f6eff9e4de80
750 750
751 deltabothparents = ui.configbool(b'storage', 751 deltabothparents = ui.configbool(b'storage',
752 b'revlog.optimize-delta-parent-choice') 752 b'revlog.optimize-delta-parent-choice')
753 options[b'deltabothparents'] = deltabothparents 753 options[b'deltabothparents'] = deltabothparents
754 754
755 options[b'lazydeltabase'] = not scmutil.gddeltaconfig(ui) 755 lazydeltabase = ui.configbool(b'storage',
756 b'revlog.reuse-external-delta-parent')
757 if lazydeltabase is None:
758 lazydeltabase = not scmutil.gddeltaconfig(ui)
759 options[b'lazydeltabase'] = lazydeltabase
756 760
757 chainspan = ui.configbytes(b'experimental', b'maxdeltachainspan') 761 chainspan = ui.configbytes(b'experimental', b'maxdeltachainspan')
758 if 0 <= chainspan: 762 if 0 <= chainspan:
759 options[b'maxdeltachainspan'] = chainspan 763 options[b'maxdeltachainspan'] = chainspan
760 764