Mercurial > public > mercurial-scm > hg
comparison mercurial/configitems.py @ 39125:cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
For historical reason, Mercurial assumes capabilities of internal
merge tools as below while examining rules to decide merge tool,
regardless of actual capabilities of them.
=============== ====== ========
specified via binary symlinks
=============== ====== ========
--tool o o
HGMERGE o o
merge-patterns o (*) x (*)
ui.merge x (*) x (*)
=============== ====== ========
This causes:
- unintentional internal merge tool is chosen for binary files via
merge-patterns section of configuration file
- explicit configuration of internal merge tool for symlinks is
ignored unintentionally
But on the other hand, simple "check capability strictly" might break
backward compatibility (e.g. existing merge automations), because it
changes the result of merge tool selection.
Therefore, this patch adds config knob "merge.strict-capability-check"
to control whether capabilities of internal merge tools should be
checked strictly or not.
If this configuration is true, capabilities of internal merge tools
are checked strictly in (*) cases above.
author | FUJIWARA Katsunori <foozy@lares.dti.ne.jp> |
---|---|
date | Wed, 15 Aug 2018 22:24:50 +0900 |
parents | 7e75777e4a51 |
children | 7a9f15ed3b96 |
comparison
equal
deleted
inserted
replaced
39124:6618634e3325 | 39125:cded904f7acc |
---|---|
769 default='continue', | 769 default='continue', |
770 ) | 770 ) |
771 coreconfigitem('merge', 'preferancestor', | 771 coreconfigitem('merge', 'preferancestor', |
772 default=lambda: ['*'], | 772 default=lambda: ['*'], |
773 ) | 773 ) |
774 coreconfigitem('merge', 'strict-capability-check', | |
775 default=False, | |
776 ) | |
774 coreconfigitem('merge-tools', '.*', | 777 coreconfigitem('merge-tools', '.*', |
775 default=None, | 778 default=None, |
776 generic=True, | 779 generic=True, |
777 ) | 780 ) |
778 coreconfigitem('merge-tools', br'.*\.args$', | 781 coreconfigitem('merge-tools', br'.*\.args$', |