Mercurial > public > mercurial-scm > hg
comparison mercurial/configitems.py @ 35907:9037c29e9f53
filemerge: support passing labels to external merge tools
This adds $labellocal, $labelother, and $labelbase to the replacement set for
merge-tools.<tool>.args config variables, and to the environment as HG_MY_LABEL,
HG_OTHER_LABEL, and HG_BASE_LABEL, respectively.
We also add merge-tools.<tool>.mergemarkers and
merge-tools.<tool>.mergemarkertemplate config variables as counterparts of
the variables available in [ui]. We are intentionally *not* respecting
ui.mergemarkers when calling out to external merge programs; too often the
default template will be too wide to display comfortably in most GUIs.
Differential Revision: https://phab.mercurial-scm.org/D2011
| author | Kyle Lippincott <spectral@google.com> |
|---|---|
| date | Wed, 17 Jan 2018 17:35:05 -0800 |
| parents | 178aacdc25db |
| children | 48a3a9283f09 |
comparison
equal
deleted
inserted
replaced
| 35906:cd2342302928 | 35907:9037c29e9f53 |
|---|---|
| 741 coreconfigitem('merge-tools', br'.*\.gui$', | 741 coreconfigitem('merge-tools', br'.*\.gui$', |
| 742 default=False, | 742 default=False, |
| 743 generic=True, | 743 generic=True, |
| 744 priority=-1, | 744 priority=-1, |
| 745 ) | 745 ) |
| 746 coreconfigitem('merge-tools', br'.*\.mergemarkers$', | |
| 747 default='basic', | |
| 748 generic=True, | |
| 749 priority=-1, | |
| 750 ) | |
| 751 coreconfigitem('merge-tools', br'.*\.mergemarkertemplate$', | |
| 752 default=dynamicdefault, # take from ui.mergemarkertemplate | |
| 753 generic=True, | |
| 754 priority=-1, | |
| 755 ) | |
| 746 coreconfigitem('merge-tools', br'.*\.priority$', | 756 coreconfigitem('merge-tools', br'.*\.priority$', |
| 747 default=0, | 757 default=0, |
| 748 generic=True, | 758 generic=True, |
| 749 priority=-1, | 759 priority=-1, |
| 750 ) | 760 ) |