quoting for other than place-holder in [merge-tools] section doesn't work
Created originally on Bitbucket by Katsunori FUJIWARA
For example, configuration below doesn't work correctly (maybe "invocation error"), even though it can work with extdiff:
#!
[merge-tools]
kdiff3.diffargs=--L1 "foo bar" --L2 "foo baz" $parent $child
As far as I confirm:
- configuration of each merge/diff tools is split by
shlex.split()
inhglib.difftools()
, and - split ones are joined by
' '.join()
invisdiff.launchtool()
, but - splitting isn't needed (there is no intermediate operation between them)
In visdiff.launchtool()
, place-holder arguments (e.g. $parent
and so on) are quoted by util.shellquote()
while re.sub()
, but others are not.
IMHO, like fixing for issue4463 of Mercurial, splitting by shlex.split()
should be avoided.