git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: Using Filemerge.app as a git-diff viewer

From
Wincent Colaiuta <win@wincent.com>
Date
Nov 21, 2007, 13:28 UTC
Message-ID
<4455F263-251E-4B04-9F61-A26A3548B316@wincent.com>
In-Reply-To
<47442E57.8010004@cam.ac.uk>
El 21/11/2007, a las 14:10, Toby White escribió:
Show 6 quoted lines
> (Wincent pointed out its flaws better than me. Basically,
> opendiff is not really diff-like enough.)
>
> And in any case, that launches Filemerge repeatedly
> on every file separately, which makes reviewing a large diff
> time-consuming and not very helpful.

I know it's not much help to you right now, but when I first asked about a side-by-side diff viewer back in September I explored creating a wrapper using GIT_EXTERNAL_DIFF and was basically unsatisfied with the results.

So I decided to write a very simple native Cocoa app (I'm working on Mac OS X); it was to be a diff viewer and nothing more (not a repository browser). I was able to spend a few hours on it back in September but then other things came up so I haven't been able to finish it, but I do intend to come back to it when time permits. You can browse the work in progress at:

<http://git.wincent.com/gdiff.git>

Basically consists of a fast Ragel-generated state machine for parsing git-diff output, patches and email messages, and the beginnings of a UI. But like I said, not much help to you right now as it can't yet be used to do anything useful. My goal for it is to provide a nice experience, above all when reviewing patches on a mailing list (ie. where your local repository doesn't have the proposed commits in it yet). In fact, even when run from outside of any Git repo I want it to at least show the known parts of the files (the context) and provide a shaded background for the unknown bits.

Cheers, Wincent

Previous: Toby WhiteNext: Jeff King
Message 8 of 9 in “Using Filemerge.app as a git-diff viewer”
  1. Toby WhiteNov 21, 2007
  2. Jonathan del StrotherNov 21, 2007
  3. Jeff KingNov 21, 2007
  4. Wincent ColaiutaNov 21, 2007
  5. Jeff KingNov 21, 2007
  6. Jakub NarebskiNov 21, 2007
  7. Toby WhiteNov 21, 2007
  8. Wincent ColaiutaNov 21, 2007
  9. Jeff KingNov 21, 2007

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.