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

Introduce variable "forgit_log_preview_options"

Browse source 
This reduces code duplication.
This commit is contained in:
carlfriedrich 2022-08-03 18:08:55 +02:00
parent 85ccdd3f80
commit 1e080b0e72
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -49,6 +49,8 @@ test -z "$forgit_log_format"; and set -g forgit_log_format "-%C(auto)%
test -z "$forgit_fullscreen_context"; and set -g forgit_fullscreen_context "10"
test -z "$forgit_preview_context"; and set -g forgit_preview_context "3"
set -g forgit_log_preview_options "--graph --pretty=format:'$forgit_log_format' --color=always --abbrev-commit --date=relative"
# optional render emoji characters (https://github.com/wfxr/emoji-cli)
type -q emojify >/dev/null 2>&1 && set -g forgit_emojify '|emojify'
@ -270,7 +272,7 @@ end
function forgit::branch::delete -d "git checkout branch deleter"
forgit::inside_work_tree || return 1
set preview "git log {1} --graph --pretty=format:'$forgit_log_format' --color=always --abbrev-commit --date=relative"
set preview "git log {1} $forgit_log_preview_options"
set opts "
$FORGIT_FZF_DEFAULT_OPTS
@ -303,7 +305,7 @@ function forgit::checkout::branch -d "git checkout branch selector" --argument-n
return $checkout_status
end
set preview "git log {1} --graph --pretty=format:'$forgit_log_format' --color=always --abbrev-commit --date=relative"
set preview "git log {1} $forgit_log_preview_options"
set opts "
$FORGIT_FZF_DEFAULT_OPTS

7
forgit.plugin.zsh
View file

@ -28,6 +28,7 @@ forgit_ignore_pager=${FORGIT_IGNORE_PAGER:-$(hash bat &>/dev/null && echo 'bat -
forgit_blame_pager=${FORGIT_BLAME_PAGER:-$(git config pager.blame || echo "$forgit_pager")}
forgit_log_format=${FORGIT_LOG_FORMAT:-%C(auto)%h%d %s %C(black)%C(bold)%cr%Creset}
forgit_log_preview_options="--graph --pretty=format:'$forgit_log_format' --color=always --abbrev-commit --date=relative"
forgit_fullscreen_context=${FORGIT_FULLSCREEN_CONTEXT:-10}
forgit_preview_context=${FORGIT_PREVIEW_CONTEXT:-3}
@ -255,7 +256,7 @@ forgit::checkout::branch() {
[[ $# -ne 0 ]] && { git checkout -b "$@"; return $?; }
local cmd preview opts branch
cmd="git branch --color=always --all | LC_ALL=C sort -k1.1,1.1 -rs"
preview="git log {1} --graph --pretty=format:'$forgit_log_format' --color=always --abbrev-commit --date=relative"
preview="git log {1} $forgit_log_preview_options"
opts="
$FORGIT_FZF_DEFAULT_OPTS
+s +m --tiebreak=index --header-lines=1
@ -284,7 +285,7 @@ forgit::checkout::tag() {
[[ $# -ne 0 ]] && { git checkout "$@"; return $?; }
local cmd opts preview
cmd="git tag -l --sort=-v:refname"
preview="git log {1} --graph --pretty=format:'$forgit_log_format' --color=always --abbrev-commit --date=relative"
preview="git log {1} $forgit_log_preview_options"
opts="
$FORGIT_FZF_DEFAULT_OPTS
+s +m --tiebreak=index
@ -318,7 +319,7 @@ forgit::checkout::commit() {
forgit::branch::delete() {
forgit::inside_work_tree || return 1
local preview opts cmd branches
preview="git log {1} --graph --pretty=format:'$forgit_log_format' --color=always --abbrev-commit --date=relative"
preview="git log {1} $forgit_log_preview_options"
opts="
$FORGIT_FZF_DEFAULT_OPTS