[PATCH 2 of 2 V2] extdiff: add --mode option

Yuya Nishihara yuya at tcha.org
Tue Jan 15 08:17:57 EST 2019


On Sun, 13 Jan 2019 22:05:53 -0800, Ludovic Chabant wrote:
> > I was just speaking about the current implementation (without your patch.)
> > Maybe I should say .gui flag isn't checked because the current extdiff never
> > spawns more than one processes at a time.
> 
> Yeah, and I meant that I don't understand what's the difference between one vs. multiple processes?

vimdiff wouldn't be usable unless the process is waited one by one, for example.
It's okay to spawn multiple GUI diff instances and wait them, but console
programs generally don't work in that way.

> > If the extdiff had the option to look for a diff tool from stock templates
> > (i.e. [diff-tools], [merge-tools], and maybe [extdiff]), alias could be
> > expressed as follows:
> > 
> >   [alias]
> >   bcomp = extdiff --tool bcomp --per-file
> > 
> > This should be good enough.
> 
> Yeah makes sense, I figured extdiff predated alias. And I would indeed like if we could clean up the way extdiff integrates with the rest of mercurial... it's not far off since, right now, "hg extdiff -p blah" will just run "blah" instead of first checking if there's a "merge-tools.blah" config... but I guess implementing that would qualify as a breaking change and wouldn't be acceptable?

Probably. That's why I used -t/--tool in example.


More information about the Mercurial-devel mailing list