David Aguilar [off-list ref] writes:
On Sun, Jan 27, 2013 at 6:08 PM, Junio C Hamano [off-list ref] wrote:
quoted
I think our works crossed, while I was tweaking the previous series
to push out as part of 'pu' you were already rerolling. Could you
compare this series with what I pushed out and see if anything you
missed? I think I fixed the (a && b || c && d) issue in the version
I pushed out, but it is still there in this series.
Ah, I see.
I can add the addition of preamble for use by show_tool_help()
as a follow up along with using a here-doc when printing.
I think the progression of the series is just fine as-is with the
new series you posted (I didn't amend the old one with all the
suggestions I made in the review, just only with the more important
ones that would affect correctness, so please consider that the
changes you have in this new round that I didn't have in 'pu' are
good ones to keep.
On Sun, Jan 27, 2013 at 6:27 PM, Junio C Hamano [off-list ref] wrote:
David Aguilar [off-list ref] writes:
quoted
On Sun, Jan 27, 2013 at 6:08 PM, Junio C Hamano [off-list ref] wrote:
quoted
I think our works crossed, while I was tweaking the previous series
to push out as part of 'pu' you were already rerolling. Could you
compare this series with what I pushed out and see if anything you
missed? I think I fixed the (a && b || c && d) issue in the version
I pushed out, but it is still there in this series.
Ah, I see.
I can add the addition of preamble for use by show_tool_help()
as a follow up along with using a here-doc when printing.
I think the progression of the series is just fine as-is with the
new series you posted (I didn't amend the old one with all the
suggestions I made in the review, just only with the more important
ones that would affect correctness, so please consider that the
changes you have in this new round that I didn't have in 'pu' are
good ones to keep.
Okay, cool, so no need to reroll, ya?
The one thing missing in my latest series was the fixed mode_ok()
which you corrected in cfb611b34089a0b5794f4ec453289a4764d94050.
Let me know if there's anything else I should send out or splice together.
John, I didn't completely address your question about keeping
the sort and prefix in show_tool_help() but I can stop poking at
it now in case you want to start looking at what it would take
to get custom tools listed in the --tool-help output.
--
David
On Sun, Jan 27, 2013 at 06:41:04PM -0800, David Aguilar wrote:
John, I didn't completely address your question about keeping
the sort and prefix in show_tool_help() but I can stop poking at
it now in case you want to start looking at what it would take
to get custom tools listed in the --tool-help output.
I've had a quick look and it's quite straightforward to build on top of
this to get an output format like this:
'git mergetool --tool-<tool>' may be set to one of the following:
araxis
gvimdiff
gvimdiff2
vimdiff
vimdiff2
user-defined:
mytool
The following tools are valid, but not currently available:
bc3
codecompare
deltawalker
diffuse
ecmerge
emerge
kdiff3
meld
opendiff
p4merge
tkdiff
tortoisemerge
xxdiff
user-defined:
mybrokentool
Some of the tools listed above only work in a windowed
environment. If run in a terminal-only session, they will fail.
I don't think the suffix form would be too hard either - it just
requires moving an explicit sort into the top-level shot_tool_help
function.
I'm going to hold off doing any more on this until da/mergetool-docs has
graduated to next since I think it will be easier to just build on that
rather than trying to put all the necessary pieces into place now.
John