re-enable gitgutter integration with new upstream function. resolves #154 and #153.

This commit is contained in:
Bailey Ling 2013-08-19 16:03:10 +00:00
parent 2a02afb918
commit de69bba26e
3 changed files with 3 additions and 31 deletions

View File

@ -128,7 +128,7 @@ function! airline#extensions#load()
call airline#extensions#undotree#init(s:ext)
endif
if g:airline_enable_hunks && exists('*GitGutterGetHunks')
if get(g:, 'airline_enable_hunks', 1) && exists('*GitGutterGetHunkSummary')
call airline#extensions#hunks#init(s:ext)
endif

View File

@ -2,35 +2,8 @@
" vim: et ts=2 sts=2 sw=2
function! airline#extensions#hunks#get_hunks()
if &ft == 'gitcommit'
return ''
endif
if get(g:, 'gitgutter_initialised', 0) && get(g:, 'gitgutter_enabled', 0)
let added = 0
let removed = 0
let changed = 0
let hunks = GitGutterGetHunks()
for hunk in hunks
if hunk[1] == 0 && hunk[3] > 0
let added += hunk[3]
elseif hunk[1] > 0 && hunk[3] == 0
let removed += hunk[1]
elseif hunk[1] > 0 && hunk[3] > 0
if hunk[1] == hunk[3]
let changed += hunk[3]
elseif hunk[1] < hunk[3]
let changed += hunk[1]
let added += (hunk[3] - hunk[1])
elseif hunk[1] > hunk[3]
let changed += hunk[3]
let removed += (hunk[1] - hunk[3])
endif
endif
endfor
return printf('+%s ~%s -%s ', added, changed, removed)
endif
return ''
let hunks = GitGutterGetHunkSummary()
return printf('+%s ~%s -%s ', hunks[0], hunks[1], hunks[2])
endfunction
function! airline#extensions#hunks#init(ext)

View File

@ -21,7 +21,6 @@ call s:check_defined('g:airline_enable_branch', 1)
call s:check_defined('g:airline_enable_syntastic', 1)
call s:check_defined('g:airline_enable_tagbar', 1)
call s:check_defined('g:airline_enable_csv', 1)
call s:check_defined('g:airline_enable_hunks', 0)
call s:check_defined('g:airline_detect_iminsert', 0)
call s:check_defined('g:airline_detect_modified', 1)
call s:check_defined('g:airline_detect_paste', 1)