xenia/home
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix some uses of printf in git-tools.kak

Browse Source
This commit is contained in:
Maxime Coste 2016-05-09 13:52:54 +01:00
parent d3aff03062
commit b7cf5d6001
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
rc/extra/git-tools.kak
View File

@ -29,7 +29,7 @@ def -params 1.. \
-docstring %sh{printf '%%{Git wrapping helper\navailable commands:\n add\n rm\n blame\n commit\n checkout\n diff\n hide-blame\n log\n show\n show-diff\n status\n update-diff}'} \ -docstring %sh{printf '%%{Git wrapping helper\navailable commands:\n add\n rm\n blame\n commit\n checkout\n diff\n hide-blame\n log\n show\n show-diff\n status\n update-diff}'} \
-shell-completion %{ -shell-completion %{
shift $(expr ${kak_token_to_complete}) shift $(expr ${kak_token_to_complete})
prefix=$(printf %s\\n "${1}" | cut -c1-${kak_pos_in_token} 2>/dev/null) prefix=$(printf %s "${1}" | cut -c1-${kak_pos_in_token} 2>/dev/null)
( (
for cmd in add rm blame commit checkout diff hide-blame log show show-diff status update-diff; do for cmd in add rm blame commit checkout diff hide-blame log show show-diff status update-diff; do
expr "${cmd}" : "^\(${prefix}.*\)$" expr "${cmd}" : "^\(${prefix}.*\)$"
@ -48,7 +48,7 @@ def -params 1.. \
mkfifo ${output} mkfifo ${output}
( git "$@" > ${output} 2>&1 ) > /dev/null 2>&1 < /dev/null & ( git "$@" > ${output} 2>&1 ) > /dev/null 2>&1 < /dev/null &
printf %s\\n "eval -try-client '$kak_opt_docsclient' %{ printf %s "eval -try-client '$kak_opt_docsclient' %{
edit! -fifo ${output} *git* edit! -fifo ${output} *git*
set buffer filetype '${filetype}' set buffer filetype '${filetype}'
hook -group fifo buffer BufCloseFifo .* %{ hook -group fifo buffer BufCloseFifo .* %{
@ -60,7 +60,7 @@ def -params 1.. \
run_git_blame() { run_git_blame() {
( (
printf %s\\n "eval -client '$kak_client' %{ printf %s "eval -client '$kak_client' %{
try %{ addhl flag_lines GitBlame git_blame_flags } try %{ addhl flag_lines GitBlame git_blame_flags }
set buffer=$kak_bufname git_blame_flags '$kak_timestamp' set buffer=$kak_bufname git_blame_flags '$kak_timestamp'
}" | kak -p ${kak_session} }" | kak -p ${kak_session}
@ -132,13 +132,12 @@ def -params 1.. \
# fails, and generate COMMIT_EDITMSG # fails, and generate COMMIT_EDITMSG
GIT_EDITOR='' EDITOR='' git commit > /dev/null 2>&1 GIT_EDITOR='' EDITOR='' git commit > /dev/null 2>&1
msgfile="$(git rev-parse --git-dir)/COMMIT_EDITMSG" msgfile="$(git rev-parse --git-dir)/COMMIT_EDITMSG"
printf %s\\n "edit '$msgfile' printf %s "edit '$msgfile'
hook buffer BufWritePost '.*\Q$msgfile\E' %{ %sh{ hook buffer BufWritePost '.*\Q$msgfile\E' %{ %sh{
if git commit -F '$msgfile' --cleanup=strip $@ > /dev/null; then if git commit -F '$msgfile' --cleanup=strip $@ > /dev/null; then
printf %s\\n 'eval -client $kak_client echo -color Information Commit succeeded' printf %s 'eval -client $kak_client echo -color Information Commit succeeded; delbuf'
printf %s\\n 'delbuf'
else else
printf %s\\n 'eval -client $kak_client echo -color Error Commit failed' printf %s 'eval -client $kak_client echo -color Error Commit failed'
fi fi
} }" } }"
} }
@ -147,7 +146,7 @@ def -params 1.. \
show|log|diff|status) show_git_cmd_output "$@" ;; show|log|diff|status) show_git_cmd_output "$@" ;;
blame) shift; run_git_blame "$@" ;; blame) shift; run_git_blame "$@" ;;
hide-blame) hide-blame)
printf %s\\n "try %{ printf %s "try %{
set buffer=$kak_bufname git_blame_flags '' set buffer=$kak_bufname git_blame_flags ''
rmhl hlflags_git_blame_flags rmhl hlflags_git_blame_flags
}" }"
@ -165,19 +164,19 @@ def -params 1.. \
add) add)
name="${2:-${kak_buffile}}" name="${2:-${kak_buffile}}"
if git add -- "${name}" > /dev/null 2>&1; then if git add -- "${name}" > /dev/null 2>&1; then
printf %s\\n "echo -color Information 'git: added ${name}'" printf %s "echo -color Information 'git: added ${name}'"
else else
printf %s\\n "echo -color Error 'git: unable to add ${name}'" printf %s "echo -color Error 'git: unable to add ${name}'"
fi fi
;; ;;
rm) rm)
name="${2:-${kak_buffile}}" name="${2:-${kak_buffile}}"
if git rm -- "${name}" > /dev/null 2>&1; then if git rm -- "${name}" > /dev/null 2>&1; then
printf %s\\n "echo -color Information 'git: removed ${name}'" printf %s "echo -color Information 'git: removed ${name}'"
else else
printf %s\\n "echo -color Error 'git: unable to remove ${name}'" printf %s "echo -color Error 'git: unable to remove ${name}'"
fi fi
;; ;;
*) printf %s\\n "echo -color Error %{unknown git command '$1'}"; exit ;; *) printf %s "echo -color Error %{unknown git command '$1'}"; exit ;;
esac esac
}} }}