Suggestion for another Diff Viewer

[RizwanK]

Would it be possible to add Changes.app as one of the diff engines for
Murky?

http://connectedflow.com/changes/

It provides a commandline tool, chdiff, that could be used to (easily)
launch the app, or the app can be called directly.

[Jens Alfke]

On Apr 8, 2010, at 9:03 PM, RizwanK wrote:

> Would it be possible to add Changes.app as one of the diff engines for Murky?

Anything is possible :) It would require writing some code, since there is no standard mechanism for invoking diff tools, but probably not very much. As they say, “patches are welcome”. At a minimum, you can file an issue on the tracker.

—Jens

[Erik Price]

I actually logged this issue and provided a patch about a year ago -
not sure if the approach is even remotely possible (or remotely
desirable) in the current codebase, though.

http://bitbucket.org/snej/murky/issue/26/support-custom-comparison-command

e

> --
> ---------------------------------------------------------------------------
> M U R K Y
> http://groups.google.com/group/murky-app
> To unsubscribe: mailto:murky-app+...@googlegroups.com
> ---------------------------------------------------------------------------

[Jens Alfke]

On Apr 9, 2010, at 3:16 PM, Erik Price wrote:

> I actually logged this issue and provided a patch about a year ago -

Oops, sorry for dropping that on the floor. :(

I’m actually in the middle of working on merge support, but I’ll take a look at your patch after I get that checked in.

—Jens

[Erik Price]

No prob, I can see how it would fall between the cracks since I never
really pushed on it (b/c the fix was working fine for me).

e

On Friday, April 9, 2010, Jens Alfke <je...@mooseyard.com> wrote:
>

> --
> ---------------------------------------------------------------------------
> M U R K Y
> http://groups.google.com/group/murky-app
> To unsubscribe: mailto:murky-app+...@googlegroups.com
> ---------------------------------------------------------------------------
>

> To unsubscribe, reply using "remove me" as the subject.
>

[Jens Alfke]

OK, I have (re)implemented back-end support for arbitrary GUI compare/merge tools. But there’s no support in the app for choosing different tools yet, and the config plist only lists opendiff so far (because that’s the only tool I own and can test with.) Both of these limitations should be pretty easy to fix, for me or someone else :)

As a bonus, the existing FileMerge support has been improved. See the commit log below.

—Jens

#173: 8dc6ef33ab18d6d28b3f123616f62952f61850cb
Date: April 11, 2010 12:50:42 PM PDT
By: Jens Alfke
Branch: default

Improved GUI file comparison:
* Code is abstracted into a new CompareTool class.
* Multiple tools (not just opendiff / FileMerge) can be configured by editing CompareTools.plist. This is part of #26, but the app code is still hardwired to use opendiff, though (see -[RepoController showComparisonFromRevision:...].)
* When comparing an uncommitted change, the Save command in FileMerge is activated, and will save the changes back to the working tree.
* New "Compare Conflicts" menu command that opens a 3-way merge of a conflicted uncommitted file. That is, it tells opendiff to show both conflicting versions and uses -merge to pass the common ancestor. Again, saving will save to the working tree. You can use the hidden bottom pane in FileMerge to make changes by hand.