Mercurial > public > mercurial-scm > hg
comparison mercurial/configitems.py @ 49167:7af798e497f5
filemerge: add configs to disable some or all partial merge tools
When rolling out partial merge tools to users, it's useful to be able
to easily turn one or all of them off if a problem is discovered. This
patch adds support for that. They can of course also be useful for
individual users to be able to temporarily turn off a tool they are
otherwise using.
Differential Revision: https://phab.mercurial-scm.org/D12588
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Tue, 26 Apr 2022 09:06:30 -0700 |
| parents | ea98850a136e |
| children | 2ab79873786e |
comparison
equal
deleted
inserted
replaced
| 49164:a932cad26d37 | 49167:7af798e497f5 |
|---|---|
| 1568 b'merge', | 1568 b'merge', |
| 1569 b'strict-capability-check', | 1569 b'strict-capability-check', |
| 1570 default=False, | 1570 default=False, |
| 1571 ) | 1571 ) |
| 1572 coreconfigitem( | 1572 coreconfigitem( |
| 1573 b'merge', | |
| 1574 b'disable-partial-tools', | |
| 1575 default=False, | |
| 1576 experimental=True, | |
| 1577 ) | |
| 1578 coreconfigitem( | |
| 1573 b'partial-merge-tools', | 1579 b'partial-merge-tools', |
| 1574 b'.*', | 1580 b'.*', |
| 1575 default=None, | 1581 default=None, |
| 1576 generic=True, | 1582 generic=True, |
| 1577 experimental=True, | 1583 experimental=True, |
| 1607 generic=True, | 1613 generic=True, |
| 1608 priority=-1, | 1614 priority=-1, |
| 1609 experimental=True, | 1615 experimental=True, |
| 1610 ) | 1616 ) |
| 1611 coreconfigitem( | 1617 coreconfigitem( |
| 1618 b'partial-merge-tools', | |
| 1619 br'.*\.disable', | |
| 1620 default=False, | |
| 1621 generic=True, | |
| 1622 priority=-1, | |
| 1623 experimental=True, | |
| 1624 ) | |
| 1625 coreconfigitem( | |
| 1612 b'merge-tools', | 1626 b'merge-tools', |
| 1613 b'.*', | 1627 b'.*', |
| 1614 default=None, | 1628 default=None, |
| 1615 generic=True, | 1629 generic=True, |
| 1616 ) | 1630 ) |