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

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



El 21/11/2007, a las 14:10, Toby White escribió:

(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

-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]

  Powered by Linux