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

Make GitNext and GitPrev more robust

Browse source 
Instead of using an internally managed history, use a more complex call
of git log to figure out what revision to fetch a file from.
This commit is contained in:
Talia 2020-02-07 14:14:19 +01:00
parent 19252a52bb
commit 807679eb0b
1 changed files with 34 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
git.vim
View file

@ -57,6 +57,32 @@ function! s:git_history()
return l:hist return l:hist
endfun endfun
function! s:previous_commit()
if exists("b:git_original_file") " Is this already a file@revision buffer?
let l:fname = b:git_original_file
let l:revision = b:git_revision_hash
else
let l:fname = substitute(expand("%"), "\\\\", "/", "g")
let l:revision = 'HEAD'
end
let l:commit = system('git log --format="%h" -1 '.l:revision.'~1 '.l:fname)
return substitute(l:commit, "\n", "", "")
endfun
function! s:next_commit()
if exists("b:git_original_file") " Is this already a file@revision buffer?
let l:fname = b:git_original_file
let l:revision = b:git_revision_hash
else
let l:fname = substitute(expand("%"), "\\\\", "/", "g")
let l:revision = 'HEAD'
end
let l:commit = system('git log --format="%h" '.l:revision.'..HEAD '.l:fname.' | tail -2 | head -1')
return substitute(l:commit, "\n", "", "")
endfun
function! s:git_first() function! s:git_first()
if &modified if &modified
throw "File has unsaved modifications!" throw "File has unsaved modifications!"
@ -80,40 +106,20 @@ function! s:git_info()
endfun endfun
function! s:git_next() function! s:git_next()
if !exists("b:git_revision_hash") || !exists("b:git_original_file") let l:next = s:next_commit()
echom "Error 01: Not a file@revision buffer!" if l:next == ""
return 0 echom "No newer versions available! 😱"
end
let l:history = s:git_history()
let l:idx = index(l:history, b:git_revision_hash)
if l:idx == -1
echo "Error 02"
return
end
let l:new_revision = get(l:history, l:idx-1, "LAST")
if l:new_revision=="LAST"
throw "Already at last revision!"
else else
call s:file_at_revision(l:new_revision) call s:file_at_revision(l:next)
end end
endfun endfun
function! s:git_prev() function! s:git_prev()
if !exists("b:git_revision_hash") || !exists("b:git_original_file") let l:next = s:previous_commit()
let l:new_revision = s:git_history()[0] if l:next == ""
echom "No older versions available! 😱"
else else
let l:history = s:git_history() call s:file_at_revision(l:next)
let l:idx = index(l:history, b:git_revision_hash)
if l:idx == -1
echo "Error 03: cannot find revision ".b:git_revision_hash
return
end
let l:new_revision = get(l:history, l:idx+1, "FIRST")
end
if l:new_revision=="FIRST"
throw "Already at earliest revision!"
else
call s:file_at_revision(l:new_revision)
end end
endfun endfun