[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: graphical diffs

From: Blair Zajac <blair_at_orcaware.com>
Date: 2002-11-12 19:43:38 CET

Karl Fogel wrote:
>
> Greg Dickie <greg@max-t.com> writes:
> > Is there an easy way to get a graphical diff from svn diff (eg: something
> > like svn xdiff or a way to substitute which binary runs with diff)?
>
> Not yet, but it would be an easy patch to write, once we've decided on
> the interface.
>
> Option #1 (simplest):
> Add a `--diff-program' option to svn. It specifies what program
> to run for diff. The program will always be passed two
> arguments, and additional options can be passed to it via `-x'
> as usual.
>
> Option #2 (a little more complex):
> First, implement option #1. Then also add a run-time config
> option that associates file regexps with diff commands. The
> default regexp is ".*", and it runs 'diff' of course. See
> http://subversion.tigris.org/issues/show_bug.cgi?id=668 for
> a related issue.
>
> Option #3 (maybe this is going too far):
> First, implement option #2. Then create a new property,
> `svn:diff', whose value is a diff program to run and all the
> options, for example "xdiff -b". If the program can be found in
> PATH, it is used for that file. Otherwise, the default diff
> program is used.

I was thinking along these lines.

Option #4
  In a configuration file, have a table where each row has a mime-type
  and an associated diffing program. Then when a diff is needed, svn
  goes through the table with the file's svn:mime-type value. This
  removed the need to maintain a separate property, such as svn:diff.

Blair

-- 
Blair Zajac <blair@orcaware.com>
Web and OS performance plots - http://www.orcaware.com/orca/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Nov 12 19:44:45 2002

This is an archived mail posted to the Subversion Dev mailing list.