Re: [PATCH 0/2] Custom low-level merge driver support.

Martin Waitz [off-list ref] writes:

On Wed, Apr 18, 2007 at 12:48:48PM +0200, Johannes Schindelin wrote:

quoted

On Wed, 18 Apr 2007, Junio C Hamano wrote:

quoted

	[merge]
		driver = ancient merge %A %O %B

Why not do something like

	[merge.driver]
		ancient = merge %A %O %B

or

[merge "ancient"]
	driver = merge %A %O %B

Actually, I've considered the latter.

Johannes's goes against the usual three-level configuration
variable naming rules.  If you have 'user definable' part in the
name, that should be at the second level.

Which yours does.

The only reason I did not do it your way was because we would
need to have three lines per driver (one [merge "foo"] section
per driver, a "driver" line, and a blank line for readability
after that), which at the time I wrote it felt a bit wasteful,
and it was late.  But I think I like yours much better.

It probably is trivial to change the rule before it hits 'next'.

hoi :)

On Wed, Apr 18, 2007 at 08:56:25AM -0700, Junio C Hamano wrote:

The only reason I did not do it your way was because we would
need to have three lines per driver (one [merge "foo"] section
per driver, a "driver" line, and a blank line for readability
after that), which at the time I wrote it felt a bit wasteful,
and it was late.

perhaps we can extend the config syntax to also support an entry
on the same line as the category:

	[merge "ancient"] driver=merge...

This would allow an one-line merge driver definition and would play
nice with your [attr] macro definition.

Perhaps we should also add the = to macro definitions?

	[attr] binary=nocrlf nodiff merge=binary

Hmm, but then we would get multiple meanings for "=" on the same line,
so nevermind.

Or use some whitespace:

	[attr] binary = nocrlf nodiff merge=binary

Does this look better?

-- 
Martin Waitz