I am starting to use Subversion on Linux. svn diff
gives a very cryptic view—very, very unfriendly to eyes. How do I interpret its output? And more importantly, is there a way to view the difference in vimdiff kind of neat style, where both files will open side by side?
Edit the file $HOME/.subversion/config
so it contains the line:
diff-cmd = <your favorite diff application>
Some diff apps support svn. For example, diff-cmd = meld
should work fine. However, vimdiff
is not one of them. The reason for that is that svn diff
gives the files to be compared as 6th and 7th arguments, and not as 1st and 2nd as usual. So what most people do in this situation is this:
Create a wrapper script :
#!/bin/sh
/usr/bin/vimdiff ${6} ${7}
Save it, for example, at $HOME/bin/svndiffwrap.sh
Do not forget to make it executable chmod +x $HOME/bin/svndiffwrap.sh
.
Make it the svn diff command :
in $HOME/.subversion/config
:
diff-cmd = /home/<username>/bin/svndiffwrap.sh
Note : Some svn clients do not support paths that uses $HOME
environment variable. So it is useful to specify full path.
Found it at: http://blog.tplus1.com/index.php/2007/08/29/how-to-use-vimdiff-as-the-subversion-diff-tool/
This blog post takes the script directly from the SVN book external diff tools example :
diffwrap.sh
#!/bin/sh
# Configure your favorite diff program here.
DIFF="/usr/local/bin/vimdiff"
# Subversion provides the paths we need as the sixth and seventh
# parameters.
LEFT=${6}
RIGHT=${7}
# Call the diff command (change the following line to make sense for
# your merge program).
$DIFF $LEFT $RIGHT
# Return an errorcode of 0 if no differences were detected, 1 if some were.
# Any other errorcode will be treated as fatal.
Note: This assumes that your vimdiff
is in /usr/local/bin
, for me, in Fedora, it was in /usr/bin
. If you can't find it run:
$ whereis vimdiff
Then in ~/.subversion/config
:
[helpers]
...
diff-cmd = /home/<username>/bin/diffwrap.sh
vimdiff <(svn diff)
<()
is referred to as process substitution which creates a pseudo file from the output of svn diff
for vimdiff
to consume.
You can create a shell alias like so: alias svndiff='vimdiff <(svn diff)'
PS - this is the simplest solution I have yet to find; it changed my life (relatively speaking)!
I like having the revision and file in the statusline when using vimdiff with svn so I use the following:
svnvimdiff.sh
#!/bin/bash
/usr/bin/vim -R -d -f --nofork -n -c "let F1='${5//$'\t'/ }' | set statusline=%{F1} | let F2='${3//$'\t'/ }' | setlocal statusline=%{F2}" ${6} ${7}
explanation:
Add/change diff-cmd in $HOME/.subversion/config
diff-cmd = /yourpath/svnvimdiff.sh
Or use it inline:
svn diff --diff-cmd /yourpath/svnvimdiff <file>
VCSCommand可以为您完成 - 安装插件,导航到该文件,然后按<Leader>cv
Follow these step
Install colordiff eg: for Ubuntu sudo apt-get install colordiff
Now you can just try svn diff output to colordiff: svn diff -r Rev1:Rev2 file | colordiff
Add following code into your bash profile (~/.bashrc or ~/.bash_profile) to easily access.
svndiff() { svn diff "${@}" | colordiff }
source bash profile.
source ~/.basrc Now it's ready use... You can just see the svn diff in your terminal most effectively.
eg: svndiff
I use tkdiff and tkcvs for svn. Nice side by side view.
The base of each file is stored in .svn folder so you can write small script to launch vimdiff or mgdiff to give a path in .svn folder against which to compare your file. This won't require you to make vimdiff default diff command for svn.
The technical post webpages of this site follow the CC BY-SA 4.0 protocol. If you need to reprint, please indicate the site URL or the original address.Any question please contact:yoyou2525@163.com.