Re: [PATCH] mergetool--lib: add support for p4merge

From: David Aguilar <davvid@gmail.com>
Date: Oct 28, 2009, 09:36 UTC
Message-ID: <20091028093655.GC90780@gmail.com>
In-Reply-To: <76718490910280221u4e1d3e78me7f9b0b45f590e56@mail.gmail.com>

On Wed, Oct 28, 2009 at 02:21:46AM -0700, Jay Soffian wrote:

Show 11 quoted lines

> 
> But, in my testing, for things to work properly I needed to use
> launchp4merge per:
> 
> http://kb.perforce.com/AllPerforceApplications/StandAloneClients/P4merge/CommandLineP..rgeOnMacOsX
> 
> And I also found things didn't work properly unless I provided an absolute path.
> 
> (Aside, the "right" way to launch p4merge, at least on 10.6 would be:
> 
> /usr/bin/open -b com.perforce.p4merge -W -n --args <args to p4merge...>

:(

I tested on 10.5, so there's definitely some difference in behavior since difftool.p4merge.path is all that was needed here (with an absolute path as I mentioned).

> This way OS X's launch services would find p4merge.app wherever it is
> on the user's system. But, I think some of these options to open are
> 10.6 specific and in practice looking in /Applications and
> $HOME/Applications I think is a sane enough default.)

We've stayed away from hard-coding any platform-specific paths in mergetool--lib in the past. It's a practicality thing -- trying to guess all of the possible installation locations is simply untenable.

Here's an old thread where we talked about this in the context of ecmerge:

http://thread.gmane.org/gmane.comp.version-control.git/118125/focus=118182

Let me know what you think.

-- 
		David