Comments on: Vim Diff http://tekrat.com/2008/02/21/vim-diff/ Thu, 18 Mar 2010 23:08:47 +0000 http://wordpress.org/?v=2.7.1 hourly 1 By: shire http://tekrat.com/2008/02/21/vim-diff/comment-page-1/#comment-6471 shire Thu, 14 May 2009 21:56:30 +0000 http://tekrat.com/2008/02/21/vim-diff/#comment-6471 Happy you like it Richard, although I'm not sure on vi but good luck! ;-) Happy you like it Richard, although I’m not sure on vi but good luck! ;-)

]]> By: Richard Lynch http://tekrat.com/2008/02/21/vim-diff/comment-page-1/#comment-6469 Richard Lynch Thu, 14 May 2009 18:04:45 +0000 http://tekrat.com/2008/02/21/vim-diff/#comment-6469 I LOVE THIS!!! I know I'm late to the party, but I don't know how I missed this fabulous vim plugin. I only wish it worked in plain old 'vi' which is what I use by habit. Or maybe I can just append it to .exrc? I'll give that a shot. Anyway, thanks Brian for this "how did I live without it" tool! I LOVE THIS!!!

I know I’m late to the party, but I don’t know how I missed this fabulous vim plugin.

I only wish it worked in plain old ‘vi’ which is what I use by habit.

Or maybe I can just append it to .exrc?

I’ll give that a shot.

Anyway, thanks Brian for this “how did I live without it” tool!

]]> By: shire http://tekrat.com/2008/02/21/vim-diff/comment-page-1/#comment-1473 shire Sat, 16 Aug 2008 02:21:45 +0000 http://tekrat.com/2008/02/21/vim-diff/#comment-1473 Due to the interest in this the new official home for this code is on GitHub! per Greg's previous post: http://github.com/ghewgill/vim-scmdiff/ Make changes via the GitHub interfaces (fork/pull etc), or email us! Due to the interest in this the new official home for this code is on GitHub!

per Greg’s previous post:
http://github.com/ghewgill/vim-scmdiff/

Make changes via the GitHub interfaces (fork/pull etc), or email us!

]]> By: shire http://tekrat.com/2008/02/21/vim-diff/comment-page-1/#comment-1463 shire Tue, 12 Aug 2008 20:39:00 +0000 http://tekrat.com/2008/02/21/vim-diff/#comment-1463 Is there enough interest here to setup an central repro somewhere wiht a few accounts for the ppl here? (github or I can setup something on tekrat.com). That way everyone can commit to one spot? Has anoyone played with keeping the deleted lines present in some way? Another change: There's probably a better way to do this than what I have below but it seems like we should be detecting the SCM automatically as much as possible. Something like this should at least work for detecting git/svn. diff --git a/scmdiff.vim b/scmdiff.vim index 4811bcf..042e8cd 100644 --- a/scmdiff.vim +++ b/scmdiff.vim @@ -1,7 +1,3 @@ -if !exists("g:scmDiffCommand") - let g:scmDiffCommand = 'git' -endif - if exists("loadedScmDiff") || &cp finish endif @@ -36,6 +32,18 @@ endfunction function! s:scmDiff(...) + let cmdOut = system("git status") + if !exists("g:scmDiffCommand") && !v:shell_error + let g:scmDiffCommand = 'git' + endif + let cmdOut = system("svn info") + if !exists("g:scmDiffCommand") && !v:shell_error + let g:scmDiffCommand = 'svn' + endif + if !exists("g:scmDiffCommand") + let g:scmDiffCommand = 'git' + endif + if exists('b:scmDiffOn') && b:scmDiffOn == 1 let b:scmDiffOn = 0 set nodiff Is there enough interest here to setup an central repro somewhere wiht a few accounts for the ppl here? (github or I can setup something on tekrat.com). That way everyone can commit to one spot?

Has anoyone played with keeping the deleted lines present in some way?

Another change: There’s probably a better way to do this than what I have below but it seems like we should be detecting the SCM automatically as much as possible. Something like this should at least work for detecting git/svn.

diff –git a/scmdiff.vim b/scmdiff.vim
index 4811bcf..042e8cd 100644
— a/scmdiff.vim
+++ b/scmdiff.vim
@@ -1,7 +1,3 @@
-if !exists(”g:scmDiffCommand”)
- let g:scmDiffCommand = ‘git’
-endif
-
if exists(”loadedScmDiff”) || &cp
finish
endif
@@ -36,6 +32,18 @@ endfunction

function! s:scmDiff(…)

+ let cmdOut = system(”git status”)
+ if !exists(”g:scmDiffCommand”) && !v:shell_error
+ let g:scmDiffCommand = ‘git’
+ endif
+ let cmdOut = system(”svn info”)
+ if !exists(”g:scmDiffCommand”) && !v:shell_error
+ let g:scmDiffCommand = ’svn’
+ endif
+ if !exists(”g:scmDiffCommand”)
+ let g:scmDiffCommand = ‘git’
+ endif
+
if exists(’b:scmDiffOn’) && b:scmDiffOn == 1
let b:scmDiffOn = 0
set nodiff

]]> By: Greg Hewgill http://tekrat.com/2008/02/21/vim-diff/comment-page-1/#comment-1457 Greg Hewgill Sun, 10 Aug 2008 11:40:31 +0000 http://tekrat.com/2008/02/21/vim-diff/#comment-1457 I have posted an updated version at http://github.com/ghewgill/vim-scmdiff/ which avoids the "2,9999 bdelete" problem, among other improvements. I have posted an updated version at http://github.com/ghewgill/vim-scmdiff/ which avoids the “2,9999 bdelete” problem, among other improvements.

]]> By: Lars http://tekrat.com/2008/02/21/vim-diff/comment-page-1/#comment-210 Lars Sat, 28 Jun 2008 15:38:13 +0000 http://tekrat.com/2008/02/21/vim-diff/#comment-210 Anyone made a version that would work with multiple buffers open (not closing unrelated buffers)? I really like this script, but it's usually unusable for me when it behaves this way. I'm using MacVim BTW if that's relevant. Anyone made a version that would work with multiple buffers open (not closing unrelated buffers)? I really like this script, but it’s usually unusable for me when it behaves this way. I’m using MacVim BTW if that’s relevant.

]]> By: Jonty http://tekrat.com/2008/02/21/vim-diff/comment-page-1/#comment-200 Jonty Fri, 28 Mar 2008 00:08:03 +0000 http://tekrat.com/2008/02/21/vim-diff/#comment-200 Aha! That'll be it, I only tested it in a single buffer instance. More fool me. Aha! That’ll be it, I only tested it in a single buffer instance. More fool me.

]]> By: Jonas http://tekrat.com/2008/02/21/vim-diff/comment-page-1/#comment-199 Jonas Thu, 27 Mar 2008 22:17:35 +0000 http://tekrat.com/2008/02/21/vim-diff/#comment-199 7.1.138. But it might be due to the fact that I'm normally using multiple buffers, and the plugin is only run once so it won't set the variable in all buffers, AFAIK. 7.1.138. But it might be due to the fact that I’m normally using multiple buffers, and the plugin is only run once so it won’t set the variable in all buffers, AFAIK.

]]> By: Jonty http://tekrat.com/2008/02/21/vim-diff/comment-page-1/#comment-198 Jonty Thu, 27 Mar 2008 21:04:49 +0000 http://tekrat.com/2008/02/21/vim-diff/#comment-198 Jonas, aha, now you make sense! Odd that it died for you - what version of vim are you using? (I'll fix it in the linked version tomorrow morning) Jonas, aha, now you make sense! Odd that it died for you - what version of vim are you using?

(I’ll fix it in the linked version tomorrow morning)

]]> By: Jonas http://tekrat.com/2008/02/21/vim-diff/comment-page-1/#comment-197 Jonas Thu, 27 Mar 2008 17:55:45 +0000 http://tekrat.com/2008/02/21/vim-diff/#comment-197 Sorry, manual diffs from (lack of) memory aren't very reliable. There are two "let b:scmDiffOn = 0" (not "= 1" as I said before), I removed the first one so there are only two places where it sets that variable. My problem was that for some reason it barfed in s:scmDiff() since that variable wasn't set (hence the if exists()). Sorry, manual diffs from (lack of) memory aren’t very reliable. There are two “let b:scmDiffOn = 0″ (not “= 1″ as I said before), I removed the first one so there are only two places where it sets that variable. My problem was that for some reason it barfed in s:scmDiff() since that variable wasn’t set (hence the if exists()).

]]>