darkwiiplayer/darkrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix bug in vim git commands

Browse source 
Several commands that check out a new version of a file didn't jump to
the correct position afterwards.
This commit is contained in:
Talia 2019-11-18 13:36:08 +01:00
parent 42c3414378
commit bae0247305
1 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
git.vim
View file

@ -73,16 +73,16 @@ endfun
function! s:git_info() function! s:git_info()
if !exists("b:git_revision_hash") || !exists("b:git_original_file") if !exists("b:git_revision_hash") || !exists("b:git_original_file")
echo "Not a file@revision buffer!" echom "Working copy or not in any repo"
return return 0
end end
echo system("git show --no-patch ".b:git_revision_hash) echo system("git show --no-patch ".b:git_revision_hash)
endfun endfun
function! s:git_next() function! s:git_next()
if !exists("b:git_revision_hash") || !exists("b:git_original_file") if !exists("b:git_revision_hash") || !exists("b:git_original_file")
echo "Error 01: Not a file@revision buffer!" echom "Error 01: Not a file@revision buffer!"
return return 0
end end
let l:history = s:git_history() let l:history = s:git_history()
let l:idx = index(l:history, b:git_revision_hash) let l:idx = index(l:history, b:git_revision_hash)
@ -134,8 +134,6 @@ function! s:file_at_revision(rev)
silent exec "file ".l:ftail."@".a:rev silent exec "file ".l:ftail."@".a:rev
exec "r!git show ".a:rev.":".l:fname exec "r!git show ".a:rev.":".l:fname
1,1del 1,1del
let l:pos[0] = bufnr('.')
call setpos('.', l:pos)
setl nomodifiable setl nomodifiable
setl buftype=nofile setl buftype=nofile
setl bufhidden=delete setl bufhidden=delete
@ -143,6 +141,8 @@ function! s:file_at_revision(rev)
let b:git_original_file = l:fname let b:git_original_file = l:fname
let b:git_revision_hash = a:rev let b:git_revision_hash = a:rev
call setpos('.', l:pos)
endfun endfun
function! s:git_diff(...) function! s:git_diff(...)
@ -156,7 +156,7 @@ function! s:git_diff(...)
exec "normal \<C-w>\<C-p>" exec "normal \<C-w>\<C-p>"
diffthis diffthis
exec "normal \<C-w>\<C-p>" exec "normal \<C-w>\<C-p>"
cd l:wd exec "cd ".l:wd
else else
if exists("b:git_revision_hash") if exists("b:git_revision_hash")
call s:git_diff(get(s:git_history(), index(s:git_history(), b:git_revision_hash)+1, "NIL")) call s:git_diff(get(s:git_history(), index(s:git_history(), b:git_revision_hash)+1, "NIL"))
@ -175,10 +175,12 @@ endfun
command! -range Blame echom join(uniq(sort(<sid>git_blame(<line1>, <line2>))), ', ') command! -range Blame echom join(uniq(sort(<sid>git_blame(<line1>, <line2>))), ', ')
command! -range DBlame !git blame % -L <line1>,<line2> command! -range DBlame !git blame % -L <line1>,<line2>
command! GitNext try command! GitNext try
\| call s:gitroot() | call <sid>git_next() \| call <sid>gitroot()
\| GitInfo \| call <sid>git_next()
\| catch | echo 'Not a git repo!' \| catch
\| echo 'Not a git repo!'
\| endtry \| endtry
\| GitInfo
command! GitPrev call <sid>git_prev() command! GitPrev call <sid>git_prev()
\| GitInfo \| GitInfo
command! GitFirst call <sid>git_first() | call s:git_info() command! GitFirst call <sid>git_first() | call s:git_info()
@ -187,11 +189,13 @@ command! GitInfo call <sid>git_info()
command! -nargs=1 GitCheckout call <sid>file_at_revision(<f-args>) command! -nargs=1 GitCheckout call <sid>file_at_revision(<f-args>)
command! -nargs=? GitCompare try command! -nargs=? GitCompare try
\| call s:gitroot() | call <sid>git_diff(<f-args>) \| call s:gitroot() | call <sid>git_diff(<f-args>)
\| catch | echo 'Not a git repo!' \| catch
\| echo 'Not a git repo!'
\| endtry \| endtry
command! Uncommited try command! Uncommited try
\| call <sid>git_diff() \| call <sid>git_diff()
\| catch | echo 'Not a git repo!' \| catch
\| echo 'Not a git repo!'
\| endtry \| endtry
command! GitRoot call <SID>cd_git_root('.') command! GitRoot call <SID>cd_git_root('.')
command! ShowGitRoot try command! ShowGitRoot try