utils-code/wfxr.forgit
1
0
Fork 0
mirror of https://github.com/wfxr/forgit.git synced 2026-09-10 07:16:23 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Add variable FORGIT_ENTER_PAGER

Browse source 
The pager used on fzf enter key binding commands was hardcoded to
"LESS='-r' less". Transfer this to a variable in order to reduce code
duplication and make it configurable.
This commit is contained in:
carlfriedrich 2022-08-01 13:32:28 +02:00
parent 85ccdd3f80
commit 25e1a2e277
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
conf.d/forgit.plugin.fish
View file

@ -37,6 +37,7 @@ set -g forgit_pager "$FORGIT_PAGER"
set -g forgit_show_pager "$FORGIT_SHOW_PAGER"
set -g forgit_diff_pager "$FORGIT_DIFF_PAGER"
set -g forgit_ignore_pager "$FORGIT_IGNORE_PAGER"
set -g forgit_enter_pager "$FORGIT_ENTER_PAGER"
set -g forgit_log_format "$FORGIT_LOG_FORMAT"
set -x FORGIT_INSTALL_DIR (dirname (dirname (status -f)))
@ -45,6 +46,7 @@ test -z "$forgit_pager"; and set -g forgit_pager (git config
test -z "$forgit_show_pager"; and set -g forgit_show_pager (git config pager.show || echo "$forgit_pager")
test -z "$forgit_diff_pager"; and set -g forgit_diff_pager (git config pager.diff || echo "$forgit_pager")
test -z "$forgit_ignore_pager"; and set -g forgit_ignore_pager (type -q bat >/dev/null 2>&1 && echo 'bat -l gitignore --color=always' || echo 'cat')
test -z "$forgit_enter_pager"; and set -g forgit_enter_pager "env LESS='-r' less"
test -z "$forgit_log_format"; and set -g forgit_log_format "-%C(auto)%h%d %s %C(black)%C(bold)%cr%Creset"
test -z "$forgit_fullscreen_context"; and set -g forgit_fullscreen_context "10"
test -z "$forgit_preview_context"; and set -g forgit_preview_context "3"
@ -69,7 +71,7 @@ function forgit::log -d "git commit viewer"
set opts "
$FORGIT_FZF_DEFAULT_OPTS
+s +m --tiebreak=index
--bind=\"enter:execute($enter_cmd |env LESS='-r' less)\"
--bind=\"enter:execute($enter_cmd | $forgit_enter_pager)\"
--bind=\"ctrl-y:execute-silent(echo {} | $forgit_extract_sha | $copy_cmd)\"
--preview=\"$preview_cmd\"
$FORGIT_LOG_FZF_OPTS
@ -122,7 +124,7 @@ function forgit::diff -d "git diff viewer" --argument-names arg1 arg2
set opts "
$FORGIT_FZF_DEFAULT_OPTS
+m -0 --bind=\"enter:execute($enter_cmd | env LESS='-r' less)\"
+m -0 --bind=\"enter:execute($enter_cmd | $forgit_enter_pager)\"
--preview=\"$preview_cmd\"
$FORGIT_DIFF_FZF_OPTS
--prompt=\"$commits > \"
@ -329,7 +331,7 @@ function forgit::stash::show -d "git stash viewer"
set preview "echo {} |cut -d: -f1 |xargs -I% git stash show --color=always --ext-diff % |$forgit_diff_pager"
set opts "
$FORGIT_FZF_DEFAULT_OPTS
+s +m -0 --tiebreak=index --bind=\"enter:execute($preview |env LESS='-r' less)\"
+s +m -0 --tiebreak=index --bind=\"enter:execute($preview | $forgit_enter_pager)\"
--preview=\"$preview\"
$FORGIT_STASH_FZF_OPTS
"

7
forgit.plugin.zsh
View file

@ -26,6 +26,7 @@ forgit_show_pager=${FORGIT_SHOW_PAGER:-$(git config pager.show || echo "$forgit_
forgit_diff_pager=${FORGIT_DIFF_PAGER:-$(git config pager.diff || echo "$forgit_pager")}
forgit_ignore_pager=${FORGIT_IGNORE_PAGER:-$(hash bat &>/dev/null && echo 'bat -l gitignore --color=always' || echo 'cat')}
forgit_blame_pager=${FORGIT_BLAME_PAGER:-$(git config pager.blame || echo "$forgit_pager")}
forgit_enter_pager=${FORGIT_ENTER_PAGER:-"LESS='-r' less"}
forgit_log_format=${FORGIT_LOG_FORMAT:-%C(auto)%h%d %s %C(black)%C(bold)%cr%Creset}
forgit_fullscreen_context=${FORGIT_FULLSCREEN_CONTEXT:-10}
@ -41,7 +42,7 @@ forgit::log() {
opts="
$FORGIT_FZF_DEFAULT_OPTS
+s +m --tiebreak=index
--bind=\"enter:execute($enter_cmd | LESS='-r' less)\"
--bind=\"enter:execute($enter_cmd | $forgit_enter_pager)\"
--bind=\"ctrl-y:execute-silent(echo {} | $forgit_extract_sha | ${FORGIT_COPY_CMD:-pbcopy})\"
--preview=\"$preview_cmd\"
$FORGIT_LOG_FZF_OPTS
@ -74,7 +75,7 @@ forgit::diff() {
enter_cmd="$get_files | xargs -I% git diff --color=always -U$forgit_fullscreen_context $commits -- % | $forgit_diff_pager"
opts="
$FORGIT_FZF_DEFAULT_OPTS
+m -0 --bind=\"enter:execute($enter_cmd | LESS='-r' less)\"
+m -0 --bind=\"enter:execute($enter_cmd | $forgit_enter_pager)\"
--preview=\"$preview_cmd\"
$FORGIT_DIFF_FZF_OPTS
--prompt=\"$commits > \"
@ -145,7 +146,7 @@ forgit::stash::show() {
cmd="echo {} |cut -d: -f1 |xargs -I% git stash show --color=always --ext-diff % |$forgit_diff_pager"
opts="
$FORGIT_FZF_DEFAULT_OPTS
+s +m -0 --tiebreak=index --bind=\"enter:execute($cmd | LESS='-r' less)\"
+s +m -0 --tiebreak=index --bind=\"enter:execute($cmd | $forgit_enter_pager)\"
--preview=\"$cmd\"
$FORGIT_STASH_FZF_OPTS
"