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

Merge branch 'master' of http://github.com/nonumeros/kakoune

Browse Source
This commit is contained in:
Maxime Coste 2022-06-30 20:14:39 +10:00
commit 167929c15b
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
rc/tools/git.kak
View File

@ -29,6 +29,16 @@ hook -group git-status-highlight global WinSetOption filetype=git-status %{
hook -once -always window WinSetOption filetype=.* %{ remove-highlighter window/git-status } hook -once -always window WinSetOption filetype=.* %{ remove-highlighter window/git-status }
} }
hook -group git-show-branch-highlight global WinSetOption filetype=git-show-branch %{
require-module diff
add-highlighter window/git-show-branch group
add-highlighter window/git-show-branch/ regex '(\*)|(\+)|(!)' 1:red 2:green 3:green
add-highlighter window/git-show-branch/ regex '(!\D+\{0\}\])|(!\D+\{1\}\])|(!\D+\{2\}\])|(!\D+\{3\}\])' 1:red 2:green 3:yellow 4:blue
add-highlighter window/git-show-branch/ regex '(\B\+\D+\{0\}\])|(\B\+\D+\{1\}\])|(\B\+\D+\{2\}\])|(\B\+\D+\{3\}\])|(\B\+\D+\{1\}\^\])' 1:red 2:green 3:yellow 4:blue 5:magenta
hook -once -always window WinSetOption filetype=.* %{ remove-highlighter window/git-show-branch}
}
declare-option -hidden line-specs git_blame_flags declare-option -hidden line-specs git_blame_flags
declare-option -hidden line-specs git_diff_flags declare-option -hidden line-specs git_diff_flags
declare-option -hidden int-list git_hunk_list declare-option -hidden int-list git_hunk_list
@ -51,12 +61,13 @@ define-command -params 1.. \
next-hunk next-hunk
previous-hunk previous-hunk
show show
show-branch
show-diff show-diff
status status
update-diff update-diff
} -shell-script-candidates %{ } -shell-script-candidates %{
if [ $kak_token_to_complete -eq 0 ]; then if [ $kak_token_to_complete -eq 0 ]; then
printf "add\nrm\nblame\ncommit\ncheckout\ndiff\nhide-blame\nhide-diff\nlog\nnext-hunk\nprev-hunk\nshow\nshow-diff\ninit\nstatus\nupdate-diff\n" printf "add\nrm\nblame\ncommit\ncheckout\ndiff\nhide-blame\nhide-diff\nlog\nnext-hunk\nprev-hunk\nshow\nshow-branch\nshow-diff\ninit\nstatus\nupdate-diff\n"
else else
case "$1" in case "$1" in
commit) printf -- "--amend\n--no-edit\n--all\n--reset-author\n--fixup\n--squash\n"; git ls-files -m ;; commit) printf -- "--amend\n--no-edit\n--all\n--reset-author\n--fixup\n--squash\n"; git ls-files -m ;;
@ -81,6 +92,7 @@ define-command -params 1.. \
case "$1" in case "$1" in
diff) map_diff_goto_source=true; filetype=diff ;; diff) map_diff_goto_source=true; filetype=diff ;;
show) map_diff_goto_source=true; filetype=git-log ;; show) map_diff_goto_source=true; filetype=git-log ;;
show-branch) filetype=git-show-branch ;;
log) filetype=git-log ;; log) filetype=git-log ;;
status) filetype=git-status ;; status) filetype=git-status ;;
*) return 1 ;; *) return 1 ;;
@ -299,7 +311,7 @@ define-command -params 1.. \
} }
case "$1" in case "$1" in
show|log|diff|status) show|show-branch|log|diff|status)
show_git_cmd_output "$@" show_git_cmd_output "$@"
;; ;;
blame) blame)