Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for multi-file edits #2359

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add support for multi-file edits #2359

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
69 changes: 42 additions & 27 deletions autoload/fugitive.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3443,33 +3443,37 @@ function! s:RunEdit(state, tmp, job) abort
endif
call remove(a:state, 'request')
let sentinel = a:state.file . '.edit'
let file = FugitiveVimPath(readfile(sentinel, '', 1)[0])
try
if !&equalalways && a:state.mods !~# '\<\d*tab\>' && 3 > (a:state.mods =~# '\<vert' ? winwidth(0) : winheight(0))
let noequalalways = 1
setglobal equalalways
endif
let mods = s:Mods(a:state.mods, 'SpanOrigin')
exe substitute(mods, '\<tab\>', '-tab', 'g') 'keepalt split' s:fnameescape(file)
finally
if exists('l:noequalalways')
setglobal noequalalways
endif
endtry
set bufhidden=wipe
call s:InitializeBuffer(a:state)
let bufnr = bufnr('')
let s:edit_jobs[bufnr] = [a:state, a:tmp, a:job, sentinel]
call fugitive#DidChange(a:state.git_dir)
if bufnr == bufnr('') && !exists('g:fugitive_event')
let files = readfile(sentinel, '')
call writefile([len(files)], sentinel)
for file in reverse(files)
let file = FugitiveVimPath(file)
try
let g:fugitive_event = a:state.git_dir
let g:fugitive_result = a:state
exe s:DoAutocmd('User FugitiveEditor')
if !&equalalways && a:state.mods !~# '\<\d*tab\>' && 3 > (a:state.mods =~# '\<vert' ? winwidth(0) : winheight(0))
let noequalalways = 1
setglobal equalalways
endif
let mods = s:Mods(a:state.mods, 'SpanOrigin')
exe substitute(mods, '\<tab\>', '-tab', 'g') 'keepalt split' s:fnameescape(file)
finally
unlet! g:fugitive_event g:fugitive_result
if exists('l:noequalalways')
setglobal noequalalways
endif
endtry
endif
set bufhidden=wipe
call s:InitializeBuffer(a:state)
let bufnr = bufnr('')
let s:edit_jobs[bufnr] = [a:state, a:tmp, a:job, sentinel]
call fugitive#DidChange(a:state.git_dir)
if bufnr == bufnr('') && !exists('g:fugitive_event')
try
let g:fugitive_event = a:state.git_dir
let g:fugitive_result = a:state
exe s:DoAutocmd('User FugitiveEditor')
finally
unlet! g:fugitive_event g:fugitive_result
endtry
endif
endfor
return 1
endfunction

Expand Down Expand Up @@ -3623,6 +3627,9 @@ if !exists('s:edit_jobs')
endif
function! s:RunWait(state, tmp, job, ...) abort
if a:0 && filereadable(a:1)
if a:0 > 1 && a:2 > 0
return ''
endif
call delete(a:1)
endif
try
Expand Down Expand Up @@ -3725,8 +3732,16 @@ function! s:RunBufDelete(bufnr) abort
endif
if has_key(s:edit_jobs, a:bufnr) |
call add(s:resume_queue, remove(s:edit_jobs, a:bufnr))
call feedkeys("\<C-\>\<C-N>:redraw!|call delete(" . string(s:resume_queue[-1][0].file . '.edit') .
\ ")|call fugitive#Resume()|checktime\r", 'n')
let sentinel = s:resume_queue[-1][0].file . '.edit'
let active_buffers = str2nr(readfile(sentinel, '', 1)[0]) - 1
call add(s:resume_queue[-1], active_buffers)
if active_buffers < 1
call feedkeys("\<C-\>\<C-N>:redraw!|call delete(" . string(sentinel) .
\ ")|call fugitive#Resume()|checktime\r", 'n')
else
call writefile([active_buffers], sentinel)
call fugitive#Resume()
endif
endif
endfunction

Expand Down Expand Up @@ -3940,7 +3955,7 @@ function! fugitive#Command(line1, line2, range, bang, mods, arg, ...) abort
let env.FUGITIVE = state.file
let editor = 'sh ' . s:TempScript(
\ '[ -f "$FUGITIVE.exit" ] && cat "$FUGITIVE.exit" >&2 && exit 1',
\ 'echo "$1" > "$FUGITIVE.edit"',
\ 'for arg; do echo "$arg" >> "$FUGITIVE.edit"; done',
\ 'printf "\033]51;fugitive:edit\007" >&2',
\ 'while [ -f "$FUGITIVE.edit" -a ! -f "$FUGITIVE.exit" ]; do sleep 0.05 2>/dev/null || sleep 1; done',
\ 'exit 0')
Expand Down