vim/vim-fugitive
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Extract helper for robust tempname

Browse Source
This commit is contained in:
Tim Pope 2018-07-13 16:06:42 -04:00
parent 9bc425e943
commit 8df073165a
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
autoload/fugitive.vim
View File

@ -46,6 +46,14 @@ function! s:fnameescape(file) abort
endif endif
endfunction endfunction
function! s:tempname() abort
let temp = resolve(tempname())
if has('win32')
let temp = fnamemodify(fnamemodify(temp, ':h'), ':p').fnamemodify(temp, ':t')
endif
return temp
endfunction
function! s:throw(string) abort function! s:throw(string) abort
let v:errmsg = 'fugitive: '.a:string let v:errmsg = 'fugitive: '.a:string
throw v:errmsg throw v:errmsg
@ -1572,10 +1580,7 @@ function! s:Edit(cmd, bang, mods, ...) abort
diffupdate diffupdate
return 'redraw|echo '.string(':!'.git.' '.args) return 'redraw|echo '.string(':!'.git.' '.args)
else else
let temp = resolve(tempname()) let temp = s:tempname()
if has('win32')
let temp = fnamemodify(fnamemodify(temp, ':h'), ':p').fnamemodify(temp, ':t')
endif
let s:temp_files[s:cpath(temp)] = { 'dir': buffer.repo().dir(), 'args': arglist } let s:temp_files[s:cpath(temp)] = { 'dir': buffer.repo().dir(), 'args': arglist }
silent execute mods a:cmd temp silent execute mods a:cmd temp
if a:cmd =~# 'pedit' if a:cmd =~# 'pedit'
@ -2169,7 +2174,7 @@ function! s:Blame(bang,line1,line2,count,args) abort
if a:count if a:count
execute 'write !'.substitute(basecmd,' blame ',' blame -L '.a:line1.','.a:line2.' ','g') execute 'write !'.substitute(basecmd,' blame ',' blame -L '.a:line1.','.a:line2.' ','g')
else else
let error = resolve(tempname()) let error = s:tempname()
let temp = error.'.fugitiveblame' let temp = error.'.fugitiveblame'
if &shell =~# 'csh' if &shell =~# 'csh'
silent! execute '%write !('.basecmd.' > '.temp.') >& '.error silent! execute '%write !('.basecmd.' > '.temp.') >& '.error
@ -2209,9 +2214,6 @@ function! s:Blame(bang,line1,line2,count,args) abort
endif endif
let top = line('w0') + &scrolloff let top = line('w0') + &scrolloff
let current = line('.') let current = line('.')
if has('win32')
let temp = fnamemodify(fnamemodify(temp, ':h'), ':p').fnamemodify(temp, ':t')
endif
let s:temp_files[s:cpath(temp)] = { 'dir': s:repo().dir(), 'args': cmd } let s:temp_files[s:cpath(temp)] = { 'dir': s:repo().dir(), 'args': cmd }
exe 'keepalt leftabove vsplit '.temp exe 'keepalt leftabove vsplit '.temp
let b:fugitive_blamed_bufnr = bufnr let b:fugitive_blamed_bufnr = bufnr