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

Combine unstaged and untracked files into one section

Browse Source 
Is this a good idea?  Let's find out!
This commit is contained in:
Tim Pope
2018-12-27 18:05:29 -05:00
parent 86990ef899
commit 0850600021
1 changed files with 12 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
autoload/fugitive.vim
View File

@@ -1443,7 +1443,7 @@ function! fugitive#BufReadStatus() abort
let branch = head let branch = head
endif endif
let [staged, unstaged, untracked] = [[], [], []] let [staged, unstaged] = [[], []]
let i = 0 let i = 0
while i < len(output) while i < len(output)
let line = output[i] let line = output[i]
@@ -1454,14 +1454,10 @@ function! fugitive#BufReadStatus() abort
let files = output[i] . ' -> ' . file let files = output[i] . ' -> ' . file
let i += 1 let i += 1
endif endif
if line[0] ==# '?'
call add(untracked, {'type': 'File', 'status': '?', 'filename': file})
continue
endif
if line[0] !~# '[ ?!#]' if line[0] !~# '[ ?!#]'
call add(staged, {'type': 'File', 'status': line[0], 'filename': (line[0] =~# '[RC]' ? files : file)}) call add(staged, {'type': 'File', 'status': line[0], 'filename': (line[0] =~# '[RC]' ? files : file)})
endif endif
if line[1] !~# '[ ?!#]' if line[1] !~# '[ !#]'
call add(unstaged, {'type': 'File', 'status': line[1], 'filename': (line[1] =~# '[RC]' ? files : file)}) call add(unstaged, {'type': 'File', 'status': line[1], 'filename': (line[1] =~# '[RC]' ? files : file)})
endif endif
endwhile endwhile
@@ -1508,7 +1504,6 @@ function! fugitive#BufReadStatus() abort
if push !=# pull if push !=# pull
call s:AddHeader('Push', push) call s:AddHeader('Push', push)
endif endif
call s:AddSection('Untracked', untracked)
call s:AddSection('Unstaged', unstaged) call s:AddSection('Unstaged', unstaged)
call s:AddSection('Staged', staged) call s:AddSection('Staged', staged)
call s:AddSection('Unpushed to ' . push, unpushed) call s:AddSection('Unpushed to ' . push, unpushed)
@@ -1993,7 +1988,7 @@ function! s:StageUndo() abort
if !empty(hash) if !empty(hash)
if info.status ==# 'U' if info.status ==# 'U'
call s:TreeChomp('rm', './' . info.filename) call s:TreeChomp('rm', './' . info.filename)
elseif info.section ==# 'Untracked' elseif info.status ==# '?'
call s:TreeChomp('clean', '-f', './' . info.filename) call s:TreeChomp('clean', '-f', './' . info.filename)
elseif info.section ==# 'Unstaged' elseif info.section ==# 'Unstaged'
call s:TreeChomp('checkout', './' . info.filename) call s:TreeChomp('checkout', './' . info.filename)
@@ -2027,17 +2022,18 @@ function! s:StageDiff(diff) abort
endfunction endfunction
function! s:StageDiffEdit() abort function! s:StageDiffEdit() abort
let info = s:StageInfo(line('.'))
let [filename, section] = s:StageFileSection(line('.')) let [filename, section] = s:StageFileSection(line('.'))
let arg = (filename ==# '' ? '.' : filename) let arg = (empty(info.filename) ? '.' : info.filename)
if section ==# 'Staged' if info.section ==# 'Staged'
return 'Git! diff --no-ext-diff --cached '.s:shellesc(arg) return 'Git! diff --no-ext-diff --cached '.s:shellesc(arg)
elseif section ==# 'Untracked' elseif info.status ==# '?'
call s:TreeChomp('add', '--intent-to-add', './' . arg) call s:TreeChomp('add', '--intent-to-add', './' . arg)
if arg ==# '.' if arg ==# '.'
silent! edit! silent! edit!
1 1
if !search('^Unstaged','W') if !search('^Unstaged','W')
call search(':$','W') call search('^Staged','W')
endif endif
else else
call s:StageReloadSeek([filename, 'Staged'], line('.'), line('.')) call s:StageReloadSeek([filename, 'Staged'], line('.'), line('.'))
@@ -2061,17 +2057,13 @@ function! s:StageToggle(lnum1,lnum2) abort
call s:TreeChomp('reset','-q') call s:TreeChomp('reset','-q')
silent! edit! silent! edit!
1 1
if !search('^Untracked','W') call search('^Unstaged','W')
call search('^Unstaged','W')
endif
return '' return ''
elseif info.section ==# 'Unstaged' elseif info.status ==# 'Unstaged'
call s:TreeChomp('add','-u') call s:TreeChomp('add','.')
silent! edit! silent! edit!
1 1
if !search('^Untracked','W') call search('^Staged','W')
call search('^Staged','W')
endif
return '' return ''
elseif info.section ==# 'Unpushed' && len(info.commit) elseif info.section ==# 'Unpushed' && len(info.commit)
let remote = matchstr(info.heading, 'to \zs[^/]\+\ze/') let remote = matchstr(info.heading, 'to \zs[^/]\+\ze/')
@@ -2084,12 +2076,6 @@ function! s:StageToggle(lnum1,lnum2) abort
elseif info.section ==# 'Unpulled' elseif info.section ==# 'Unpulled'
call feedkeys(':Grebase ' . info.commit) call feedkeys(':Grebase ' . info.commit)
return '' return ''
elseif info.section ==# 'Untracked'
call s:TreeChomp('add', '.')
silent! edit!
1
call search('^Unstaged\|^Staged','W')
return ''
endif endif
endif endif
let filename = info.filename let filename = info.filename
@@ -2133,8 +2119,6 @@ function! s:StagePatch(lnum1,lnum2) abort
return 'Git reset --patch' return 'Git reset --patch'
elseif empty(filename) && section ==# 'Unstaged' elseif empty(filename) && section ==# 'Unstaged'
return 'Git add --patch' return 'Git add --patch'
elseif empty(filename) && section ==# 'Untracked'
return 'Git add -N .'
elseif filename ==# '' elseif filename ==# ''
continue continue
endif endif