expose cleaner api to determine empty head.

This commit is contained in:
Bailey Ling 2013-12-03 05:32:54 +00:00
parent ed7111b1ff
commit 0966b693d9
2 changed files with 14 additions and 4 deletions

View File

@ -14,7 +14,7 @@ let s:empty_message = get(g:, 'airline#extensions#branch#empty_message',
\ get(g:, 'airline_branch_empty_message', '')) \ get(g:, 'airline_branch_empty_message', ''))
let s:symbol = get(g:, 'airline#extensions#branch#symbol', g:airline_symbols.branch) let s:symbol = get(g:, 'airline#extensions#branch#symbol', g:airline_symbols.branch)
function! airline#extensions#branch#get_head() function! airline#extensions#branch#head()
let head = '' let head = ''
if s:has_fugitive && !exists('b:mercurial_dir') if s:has_fugitive && !exists('b:mercurial_dir')
@ -42,6 +42,13 @@ function! airline#extensions#branch#get_head()
endif endif
return empty(head) || !s:check_in_path() return empty(head) || !s:check_in_path()
\ ? ''
\ : head
endfunction
function! airline#extensions#branch#get_head()
let head = airline#extensions#branch#head()
return empty(head)
\ ? s:empty_message \ ? s:empty_message
\ : printf('%s%s', empty(s:symbol) ? '' : s:symbol.(g:airline_symbols.space), head) \ : printf('%s%s', empty(s:symbol) ? '' : s:symbol.(g:airline_symbols.space), head)
endfunction endfunction

View File

@ -16,10 +16,13 @@ function! s:get_hunks_signify()
return [] return []
endfunction endfunction
function! s:is_branch_empty()
return get(g:, 'airline#extensions#branch#enabled', 1) && empty(airline#extensions#branch#head())
endfunction
function! s:get_hunks_gitgutter() function! s:get_hunks_gitgutter()
if !get(g:, 'gitgutter_enabled', 0) || airline#extensions#branch#get_head() == if !get(g:, 'gitgutter_enabled', 0) || s:is_branch_empty()
\ get(g:, 'airline#extensions#branch#empty_message', get(g:, 'airline_branch_empty_message', '')) return ''
return ''
endif endif
return GitGutterGetHunkSummary() return GitGutterGetHunkSummary()
endfunction endfunction