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

git-tools: support git rm and avoid interpreting git output

Browse Source
This commit is contained in:
Maxime Coste 2015-05-23 10:56:52 +01:00
parent dd25dcc361
commit ccfb87ecf3
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
rc/git-tools.kak
View File

@ -23,12 +23,12 @@ decl line-flag-list git_blame_flags
decl line-flag-list git_diff_flags decl line-flag-list git_diff_flags
def -shell-params \ def -shell-params \
-docstring %sh{printf "%%{git wrapping helper\navailable commands:\n add\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=${1:0:${kak_pos_in_token}} prefix=${1:0:${kak_pos_in_token}}
( (
for cmd in add 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}.*\)$"
done done
) | grep -v '^$' ) | grep -v '^$'
@ -157,16 +157,24 @@ def -shell-params \
commit) shift; commit "$@" ;; commit) shift; commit "$@" ;;
checkout) checkout)
name="${2:-${kak_buffile}}" name="${2:-${kak_buffile}}"
git checkout "${name}" git checkout "${name}" > /dev/null 2>&1
;; ;;
add) add)
name="${2:-${kak_buffile}}" name="${2:-${kak_buffile}}"
if git add -- "${name}"; then if git add -- "${name}" > /dev/null 2>&1; then
echo "echo -color Information 'git: added ${name}'" echo "echo -color Information 'git: added ${name}'"
else else
echo "echo -color Error 'git: unable to add ${name}'" echo "echo -color Error 'git: unable to add ${name}'"
fi fi
;; ;;
rm)
name="${2:-${kak_buffile}}"
if git rm -- "${name}" > /dev/null 2>&1; then
echo "echo -color Information 'git: removed ${name}'"
else
echo "echo -color Error 'git: unable to remove ${name}'"
fi
;;
*) echo "echo -color Error %{unknown git command '$1'}"; exit ;; *) echo "echo -color Error %{unknown git command '$1'}"; exit ;;
esac esac
}} }}