Mercurial > public > mercurial-scm > hg
comparison mercurial/configitems.py @ 48982:9dfbea54b680
partial-merge: add support for `.args` config (`$local` etc.)
It will be useful to be able to define custom command-line arguments
per partial merge tool just like we have for regular merge tools. In
particular, I expect the same binary to handle multiple languages, so
it will be useful to be able to pass some argument indicating the
language, or perhaps simply an argument defining a regex that's used
for finding lines to merge as a sorted set.
Differential Revision: https://phab.mercurial-scm.org/D12383
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Thu, 17 Mar 2022 11:19:06 -0700 |
parents | f3aafd785e65 |
children | 51565fedfe7f |
comparison
equal
deleted
inserted
replaced
48981:f3aafd785e65 | 48982:9dfbea54b680 |
---|---|
1599 generic=True, | 1599 generic=True, |
1600 priority=-1, | 1600 priority=-1, |
1601 experimental=True, | 1601 experimental=True, |
1602 ) | 1602 ) |
1603 coreconfigitem( | 1603 coreconfigitem( |
1604 b'partial-merge-tools', | |
1605 br'.*\.args', | |
1606 default=b"$local $base $other", | |
1607 generic=True, | |
1608 priority=-1, | |
1609 experimental=True, | |
1610 ) | |
1611 coreconfigitem( | |
1604 b'merge-tools', | 1612 b'merge-tools', |
1605 b'.*', | 1613 b'.*', |
1606 default=None, | 1614 default=None, |
1607 generic=True, | 1615 generic=True, |
1608 ) | 1616 ) |