Re: [PATCH] mergetools: Simplify how we handle "vim" and "defaults"

2013-01-26 Thread Junio C Hamano
David Aguilar writes: >> I think that's much better. > > Would you like me to put this together into a proper patch? > > You can also squash it in (along with a removal of the > last line of the commit message) if you prefer. I was lazy and didn't want to think about rewriting your log message,

Re: [PATCH] mergetools: Simplify how we handle "vim" and "defaults"

2013-01-26 Thread David Aguilar
On Sat, Jan 26, 2013 at 9:07 PM, David Aguilar wrote: > On Sat, Jan 26, 2013 at 8:57 PM, Junio C Hamano wrote: >> John Keeping writes: >> >>> I'm not sure creating an 'include' directory actually buys us much over >>> declaring that 'vimdiff' is the real script and the others just source >>> it.

Re: [PATCH] mergetools: Simplify how we handle "vim" and "defaults"

2013-01-26 Thread David Aguilar
On Sat, Jan 26, 2013 at 8:57 PM, Junio C Hamano wrote: > John Keeping writes: > >> I'm not sure creating an 'include' directory actually buys us much over >> declaring that 'vimdiff' is the real script and the others just source >> it. > > Is 'include' really used for such a purpose? It only hou

Re: [PATCH] mergetools: Simplify how we handle "vim" and "defaults"

2013-01-26 Thread Junio C Hamano
John Keeping writes: > I'm not sure creating an 'include' directory actually buys us much over > declaring that 'vimdiff' is the real script and the others just source > it. Is 'include' really used for such a purpose? It only houses defaults.sh as far as I can see. As that defaults.sh file is

Re: [PATCH] mergetools: Simplify how we handle "vim" and "defaults"

2013-01-26 Thread John Keeping
On Sat, Jan 26, 2013 at 12:40:23PM -0800, David Aguilar wrote: > On Sat, Jan 26, 2013 at 4:12 AM, John Keeping wrote: > > On Fri, Jan 25, 2013 at 10:50:58PM -0800, David Aguilar wrote: > >> diff --git a/Makefile b/Makefile > >> index f69979e..3bc6eb5 100644 > >> --- a/Makefile > >> +++ b/Makefile

Re: [PATCH] mergetools: Simplify how we handle "vim" and "defaults"

2013-01-26 Thread David Aguilar
On Sat, Jan 26, 2013 at 4:12 AM, John Keeping wrote: > On Fri, Jan 25, 2013 at 10:50:58PM -0800, David Aguilar wrote: >> Remove the exceptions for "vim" and "defaults" in the mergetool library >> so that every filename in mergetools/ matches 1:1 with the name of a >> valid built-in tool. >> >> Mak

Re: [PATCH] mergetools: Simplify how we handle "vim" and "defaults"

2013-01-26 Thread John Keeping
On Fri, Jan 25, 2013 at 10:50:58PM -0800, David Aguilar wrote: > Remove the exceptions for "vim" and "defaults" in the mergetool library > so that every filename in mergetools/ matches 1:1 with the name of a > valid built-in tool. > > Make common functions available in $MERGE_TOOLS_DIR/include/. >