Skip to content
Snippets Groups Projects
Commit 32fb1e17 authored by Jérôme Reybert's avatar Jérôme Reybert Committed by GitHub
Browse files

Merge pull request #127 from argshook/dev/issue_123

refactor: multiple `s:print` calls into one to print given list
parents 6ff86fd0 92b408d7
No related branches found
No related tags found
No related merge requests found
...@@ -67,20 +67,24 @@ endfunction ...@@ -67,20 +67,24 @@ endfunction
function! s:mg_get_info() function! s:mg_get_info()
let branch=magit#utils#system(g:magit_git_cmd . " rev-parse --abbrev-ref HEAD") let branch=magit#utils#system(g:magit_git_cmd . " rev-parse --abbrev-ref HEAD")
let commit=magit#utils#system(g:magit_git_cmd . " show -s --oneline") let commit=magit#utils#system(g:magit_git_cmd . " show -s --oneline")
call s:print(g:magit_sections.info)
call s:print(magit#utils#underline(g:magit_sections.info)) let output = [
call s:print('') \ g:magit_sections.info,
call s:print(g:magit_section_info.cur_repo . ': ' . magit#git#top_dir()) \ magit#utils#underline(g:magit_sections.info),
call s:print(g:magit_section_info.cur_branch . ': ' . magit#utils#strip(branch)) \ '',
call s:print(g:magit_section_info.cur_commit . ': ' . magit#utils#strip(commit)) \ g:magit_section_info.cur_repo . ': ' . magit#git#top_dir(),
\ g:magit_section_info.cur_branch . ': ' . magit#utils#strip(branch),
\ g:magit_section_info.cur_commit . ': ' . magit#utils#strip(commit)
\ ]
if ( b:magit_current_commit_mode != '' ) if ( b:magit_current_commit_mode != '' )
call s:print(g:magit_section_info.commit_mode . ': ' let output += [g:magit_section_info.commit_mode . ': '
\ . g:magit_commit_mode[b:magit_current_commit_mode]) \ . g:magit_commit_mode[b:magit_current_commit_mode]]
endif endif
call s:print('')
call s:print('Press ? to display help') let output += ['', 'Press ? to display help', '', '']
call s:print('')
call s:print('') call s:print(output)
endfunction endfunction
" s:mg_display_files: display in current buffer files, filtered by some " s:mg_display_files: display in current buffer files, filtered by some
...@@ -178,9 +182,10 @@ let b:magit_current_commit_msg = [] ...@@ -178,9 +182,10 @@ let b:magit_current_commit_msg = []
" 'CC': prepare a brand new commit message " 'CC': prepare a brand new commit message
" 'CA': get the last commit message " 'CA': get the last commit message
function! s:mg_get_commit_section() function! s:mg_get_commit_section()
let output = []
if ( b:magit_current_commit_mode != '' ) if ( b:magit_current_commit_mode != '' )
call s:print(g:magit_sections.commit) let output += [g:magit_sections.commit, magit#utils#underline(g:magit_sections.commit)]
call s:print(magit#utils#underline(g:magit_sections.commit))
let git_dir=magit#git#git_dir() let git_dir=magit#git#git_dir()
" refresh the COMMIT_EDITMSG file " refresh the COMMIT_EDITMSG file
...@@ -194,14 +199,15 @@ function! s:mg_get_commit_section() ...@@ -194,14 +199,15 @@ function! s:mg_get_commit_section()
if ( filereadable(git_dir . 'COMMIT_EDITMSG') ) if ( filereadable(git_dir . 'COMMIT_EDITMSG') )
let comment_char=magit#git#get_config("core.commentChar", '#') let comment_char=magit#git#get_config("core.commentChar", '#')
let commit_msg=filter(readfile(git_dir . 'COMMIT_EDITMSG'), 'v:val !~ "^' . comment_char . '"') let commit_msg=filter(readfile(git_dir . 'COMMIT_EDITMSG'), 'v:val !~ "^' . comment_char . '"')
call s:print(commit_msg) let output += commit_msg
endif endif
if ( !empty(b:magit_current_commit_msg) ) if ( !empty(b:magit_current_commit_msg) )
call s:print(b:magit_current_commit_msg) let output += b:magit_current_commit_msg
endif endif
call s:print('') let output += ['', '']
call s:print('')
endif endif
call s:print(output)
endfunction endfunction
" s:mg_search_block: helper function, to get start and end line of a block, " s:mg_search_block: helper function, to get start and end line of a block,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment