Diff Project --invoke-diff-cmd part
From: Gabriela Gibson <gabriela.gibson_at_gmail.com>
Date: Thu, 11 Apr 2013 22:39:24 +0100
This patch plugs in a new option --invoke-diff-cmd into the existing
This addition allows the user to define a complex diff command, to be
svn diff --invoke-diff-cmd="kdiff3 -auto -o /home/g/log ---f1 ---f2 --L1
either on the command line(for example):
svn diff --invoke-diff-cmd="diff -y ---f1 ---f2"
which expands to "diff -y *from *to",
or, in the config file by adding
invoke-diff-cmd= diff -y ---f1 ---f2
where ---f1 ---f2 are file 1 and 2. and ---l1 ---l2 are labels.
What's missing:
* The merge part, --invoke-diff3-cmd.
* Tests. I will write them, but I have to spent some time reading
* This patch breaks the override --internal-diff for now, because
* I added the help blurb to subversion/svn/svn.c:340 but svn help is
Thanks for looking!
Gabriela
[[[
* subversion/include/svn_client.h
* subversion/include/svn_config.h
* subversion/include/svn_io.h
* subversion/libsvn_client/deprecated.c
* subversion/libsvn_client/diff.c
* subversion/libsvn_subr/config_file.c
* subversion/libsvn_subr/io.c
* subversion/svn/cl.h
* subversion/svn/diff-cmd.c
* subversion/svn/svn.c
|
This is an archived mail posted to the Subversion Dev mailing list.
This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.