[PATCH 2 of 2 V2] extdiff: add --mode option
Ludovic Chabant
ludovic at chabant.com
Mon Jan 14 01:05:53 EST 2019
> 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?
> AFAIK, it duplicates alias functionality because there wasn't no [alias]
> when the extdiff extension was introduced. And I think that's the major
> reason why the extdiff is still an extension. It can't be trivially ported
> to a core command.
>
> 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?
> You can turn off the --per-file by --no-per-file. A separate --dir option
> isn't needed as long as --no-per-file == --dir. See hg help flags.
Ah right I forgot about the "no" flags... it still feels a bit awkward to use IMHO (since you have to remember the implementation of the alias or extdiff in order to remember to cancel a specific flag) but I can live with that.
--
l u d o .
. 8 0 17 80
More information about the Mercurial-devel
mailing list