m-vim_plugins/vim-fugitive
1
0
Fork 0
mirror of https://github.com/tpope/vim-fugitive.git synced 2025-11-16 15:23:51 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Handle return to temp files more gracefully

Browse Source
This commit is contained in:
Tim Pope
2011-08-19 02:21:33 -04:00
parent f21ebfb2ee
commit 4a20d8802e
1 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
plugin/fugitive.vim
View File

@@ -1315,7 +1315,6 @@ function! s:Blame(bang,line1,line2,count,args) abort
call s:throw('unsupported option') call s:throw('unsupported option')
endif endif
call map(a:args,'s:sub(v:val,"^\\ze[^-]","-")') call map(a:args,'s:sub(v:val,"^\\ze[^-]","-")')
let git_dir = s:repo().dir()
let cmd = ['--no-pager', 'blame', '--show-number'] + a:args let cmd = ['--no-pager', 'blame', '--show-number'] + a:args
if s:buffer().commit() =~# '\D\|..' if s:buffer().commit() =~# '\D\|..'
let cmd += [s:buffer().commit()] let cmd += [s:buffer().commit()]
@@ -1360,19 +1359,16 @@ function! s:Blame(bang,line1,line2,count,args) abort
setlocal scrollbind nowrap nofoldenable setlocal scrollbind nowrap nofoldenable
let top = line('w0') + &scrolloff let top = line('w0') + &scrolloff
let current = line('.') let current = line('.')
let s:temp_files[temp] = s:repo().dir()
exe 'leftabove vsplit '.temp exe 'leftabove vsplit '.temp
let b:git_dir = git_dir
let b:fugitive_type = 'blame'
let b:fugitive_blamed_bufnr = bufnr let b:fugitive_blamed_bufnr = bufnr
let w:fugitive_leave = restore let w:fugitive_leave = restore
let b:fugitive_blame_arguments = join(a:args,' ') let b:fugitive_blame_arguments = join(a:args,' ')
call s:Detect(expand('%:p'))
execute top execute top
normal! zt normal! zt
execute current execute current
execute "vertical resize ".(match(getline('.'),'\s\+\d\+)')+1) execute "vertical resize ".(match(getline('.'),'\s\+\d\+)')+1)
setlocal nomodified nomodifiable bufhidden=delete nonumber scrollbind nowrap foldcolumn=0 nofoldenable filetype=fugitiveblame setlocal nomodified nomodifiable nonumber scrollbind nowrap foldcolumn=0 nofoldenable filetype=fugitiveblame
nnoremap <buffer> <silent> q :<C-U>bdelete<CR>
nnoremap <buffer> <silent> <CR> :<C-U>exe <SID>BlameJump('')<CR> nnoremap <buffer> <silent> <CR> :<C-U>exe <SID>BlameJump('')<CR>
nnoremap <buffer> <silent> P :<C-U>exe <SID>BlameJump('^'.v:count1)<CR> nnoremap <buffer> <silent> P :<C-U>exe <SID>BlameJump('^'.v:count1)<CR>
nnoremap <buffer> <silent> ~ :<C-U>exe <SID>BlameJump('~'.v:count1)<CR> nnoremap <buffer> <silent> ~ :<C-U>exe <SID>BlameJump('~'.v:count1)<CR>
@@ -1878,6 +1874,23 @@ augroup fugitive_files
autocmd FileType git call s:JumpInit() autocmd FileType git call s:JumpInit()
augroup END augroup END
" }}}1
" Temp files {{{1
let s:temp_files = {}
augroup fugitive_temp
autocmd!
autocmd BufNewFile,BufReadPost *
\ if has_key(s:temp_files,expand('<amatch>:p')) |
\ let b:git_dir = s:temp_files[expand('<amatch>:p')] |
\ let b:git_type = 'temp' |
\ call s:Detect(expand('<amatch>:p')) |
\ setlocal bufhidden=delete |
\ nnoremap <buffer> <silent> q :<C-U>bdelete<CR> |
\ endif
augroup END
" }}}1 " }}}1
" Go to file {{{1 " Go to file {{{1