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

Redo Uncommitted command to use file_at_revision()

Browse source
This commit is contained in:
Talia 2018-04-12 08:59:04 +02:00
parent d547733432
commit 6d1d2a3709
1 changed files with 17 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
vimrc
View file

@ -299,30 +299,6 @@ command! -nargs=* Hex call <sid>hex(<q-args>)
" === GIT STUFF === " " === GIT STUFF === "
function! s:uncommitted(...)
if a:0
let l:commit = a:1
else
let l:commit = "HEAD"
end
let l:filetype = &filetype
below new
set modifiable
exec "r!git show ".l:commit.":./#"
1,1del
au BufUnload <buffer> diffoff!
let &filetype = l:filetype
silent exec "file §".expand("#:t")."@".l:commit
set buftype=nofile
set bufhidden=delete
set nomodifiable
diffthis
exec "normal \<C-w>k"
diffthis
set foldlevel=999
endfun
command! -nargs=? Uncommitted call <sid>uncommitted(<f-args>)
function! s:git_history() function! s:git_history()
if exists("b:git_original_file") " Is this already a file@revision buffer? if exists("b:git_original_file") " Is this already a file@revision buffer?
let l:fname = b:git_original_file let l:fname = b:git_original_file
@ -411,8 +387,12 @@ function! s:file_at_revision(rev)
let l:ftype = &filetype let l:ftype = &filetype
ene! ene!
set modifiable
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
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
@ -420,20 +400,30 @@ 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
let l:pos[0] = bufnr('.')
call setpos('.', l:pos)
redraw
call s:git_info() call s:git_info()
endfun endfun
function! s:git_diff(revision)
diffthis
split
call s:file_at_revision(a:revision)
au BufUnload <buffer> diffoff!
diffthis
endfun
command! GitNext call <sid>git_next() command! GitNext call <sid>git_next()
command! GitPrev call <sid>git_prev() command! GitPrev call <sid>git_prev()
command! GitFirst call <sid>git_first() command! GitFirst call <sid>git_first()
command! GitLast call <sid>git_last() command! GitLast call <sid>git_last()
command! GitInfo call <sid>git_info() command! GitInfo call <sid>git_info()
command! -nargs=1 GitCheckout call <sid>file_at_revision(<f-args>)
command! -nargs=1 GitCompare call <sid>uncommitted(<f-args>)
command! Uncommitted call <sid>git_diff("HEAD")
" command! -nargs=1 GitAt call <sid>s:file_at_revision(<f-args>) " command! -nargs=1 GitAt call <sid>s:file_at_revision(<f-args>)
" Doesn't work for talos knows what reason " Doesn't work for talos knows what reason
" === FILE STUFF ===
function! s:unsaved() function! s:unsaved()
if &mod if &mod
let l:filetype = &filetype let l:filetype = &filetype