From dc203d70c26ab86346ba383c7289e0c8a2703017 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Tue, 28 May 2019 15:41:45 +0300 Subject: [PATCH 1/4] Enable configuring preview command for every cmd Former-commit-id: b6f1476d86f15432b7cf1901ba0ccbdad186a52f --- forgit.plugin.zsh | 37 +++++++++++++++++++++++++++++-------- 1 file changed, 29 insertions(+), 8 deletions(-) diff --git a/forgit.plugin.zsh b/forgit.plugin.zsh index a7b213b..b1824f9 100755 --- a/forgit.plugin.zsh +++ b/forgit.plugin.zsh @@ -12,25 +12,33 @@ hash emojify &>/dev/null && forgit_emojify='|emojify' # git commit viewer forgit::log() { forgit::inside_work_tree || return 1 - local cmd="echo {} |grep -o '[a-f0-9]\{7\}' |head -1 |xargs -I% git show --color=always % $* $forgit_emojify $forgit_fancy" + if [ -z "$FORGIT_LOG_PREVIEW" ]; then + local preview_cmd="echo {} |grep -o '[a-f0-9]\{7\}' |head -1 |xargs -I% git show --color=always % $* $forgit_emojify $forgit_fancy" + else + local preview_cmd="$FORGIT_LOG_PREVIEW" + fi eval "git log --graph --color=always --format='%C(auto)%h%d %s %C(black)%C(bold)%cr' $* $forgit_emojify" | forgit::fzf +s +m --tiebreak=index \ --bind="enter:execute($cmd |LESS='-R' less)" \ --bind="ctrl-y:execute-silent(echo {} |grep -o '[a-f0-9]\{7\}' |${FORGIT_COPY_CMD:-pbcopy})" \ - --preview="$cmd" + --preview="$preview_cmd" } # git diff viewer forgit::diff() { forgit::inside_work_tree || return 1 + if [ -z "$FORGIT_DIFF_PREVIEW" ]; then + local preview_cmd="git diff --color=always -- {} $forgit_emojify $forgit_fancy" + else + local preview_cmd="$FORGIT_DIFF_PREVIEW" + fi local cmd files - cmd="git diff --color=always -- {} $forgit_emojify $forgit_fancy" files="$*" [[ $# -eq 0 ]] && files=$(git rev-parse --show-toplevel) git ls-files --modified "$files"| forgit::fzf +m -0 \ --bind="enter:execute($cmd |LESS='-R' less)" \ - --preview="$cmd" + --preview="$preview_cmd" } # git add selector @@ -42,9 +50,14 @@ forgit::add() { untracked=$(git config --get-color color.status.untracked red) files=$(git -c color.status=always status --short | grep -F -e "$changed" -e "$unmerged" -e "$untracked"| + if [ -z "$FORGIT_ADD_PREVIEW" ]; then + local preview_cmd="git diff --color=always -- {-1} $forgit_emojify $forgit_fancy" + else + local preview_cmd="$FORGIT_ADD_PREVIEW" + fi awk '{printf "[%10s] ", $1; $1=""; print $0}' | forgit::fzf -0 -m --nth 2..,.. \ - --preview="git diff --color=always -- {-1} $forgit_emojify $forgit_fancy" | + --preview="$preview_cmd" | cut -d] -f2 | sed 's/.* -> //') # for rename case [[ -n "$files" ]] && echo "$files" |xargs -I{} git add {} && git status --short && return @@ -54,8 +67,12 @@ forgit::add() { # git checkout-restore selector forgit::restore() { forgit::inside_work_tree || return 1 + if [ -z "$FORGIT_RESTORE_PREVIEW" ]; then + local preview_cmd="git diff --color=always -- {} $forgit_emojify $forgit_fancy" + else + local preview_cmd="$FORGIT_RESTORE_PREVIEW" + fi local cmd files - cmd="git diff --color=always -- {} $forgit_emojify $forgit_fancy" files="$(git ls-files --modified "$(git rev-parse --show-toplevel)"| forgit::fzf -m -0 --preview="$cmd")" [[ -n "$files" ]] && echo "$files" |xargs -I{} git checkout {} && git status --short && return @@ -65,11 +82,15 @@ forgit::restore() { # git stash viewer forgit::stash::show() { forgit::inside_work_tree || return 1 - local cmd="git stash show \$(echo {}| cut -d: -f1) --color=always --ext-diff $forgit_fancy" + if [ -z "$FORGIT_STASH_PREVIEW" ]; then + local preview_cmd="git stash show \$(echo {}| cut -d: -f1) --color=always --ext-diff $forgit_fancy" + else + local preview_cmd="$FORGIT_STASH_PREVIEW" + fi git stash list | forgit::fzf +s +m -0 --tiebreak=index \ --bind="enter:execute($cmd |LESS='-R' less)" \ - --preview="$cmd" + --preview="$preview_cmd" } # git clean selector From 908bcdb548be718538c6e7c0be67c2bb30542959 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Wed, 29 May 2019 06:39:43 +0300 Subject: [PATCH 2/4] Fix some more bindings and preview commands Former-commit-id: cf54db9c721fc2fd9bf8e7894c4813afd8500f36 --- forgit.plugin.zsh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/forgit.plugin.zsh b/forgit.plugin.zsh index b1824f9..1f60c61 100755 --- a/forgit.plugin.zsh +++ b/forgit.plugin.zsh @@ -19,7 +19,7 @@ forgit::log() { fi eval "git log --graph --color=always --format='%C(auto)%h%d %s %C(black)%C(bold)%cr' $* $forgit_emojify" | forgit::fzf +s +m --tiebreak=index \ - --bind="enter:execute($cmd |LESS='-R' less)" \ + --bind="enter:execute($preview_cmd |LESS='-R' less)" \ --bind="ctrl-y:execute-silent(echo {} |grep -o '[a-f0-9]\{7\}' |${FORGIT_COPY_CMD:-pbcopy})" \ --preview="$preview_cmd" } @@ -37,7 +37,7 @@ forgit::diff() { [[ $# -eq 0 ]] && files=$(git rev-parse --show-toplevel) git ls-files --modified "$files"| forgit::fzf +m -0 \ - --bind="enter:execute($cmd |LESS='-R' less)" \ + --bind="enter:execute($preview_cmd |LESS='-R' less)" \ --preview="$preview_cmd" } @@ -74,7 +74,7 @@ forgit::restore() { fi local cmd files files="$(git ls-files --modified "$(git rev-parse --show-toplevel)"| - forgit::fzf -m -0 --preview="$cmd")" + forgit::fzf -m -0 --preview="$preview_cmd")" [[ -n "$files" ]] && echo "$files" |xargs -I{} git checkout {} && git status --short && return echo 'Nothing to restore.' } @@ -89,7 +89,7 @@ forgit::stash::show() { fi git stash list | forgit::fzf +s +m -0 --tiebreak=index \ - --bind="enter:execute($cmd |LESS='-R' less)" \ + --bind="enter:execute($preview_cmd |LESS='-R' less)" \ --preview="$preview_cmd" } @@ -116,7 +116,7 @@ forgit::ignore() { cmd="$cat $FORGIT_GI_TEMPLATES/{2}{,.gitignore} 2>/dev/null" # shellcheck disable=SC2206,2207 IFS=$'\n' args=($@) && [[ $# -eq 0 ]] && args=($(forgit::ignore::list | nl -nrn -w4 -s' ' | - forgit::fzf -m --preview="$cmd" --preview-window="right:70%" | awk '{print $2}')) + forgit::fzf -m --preview="$preview_cmd" --preview-window="right:70%" | awk '{print $2}')) [ ${#args[@]} -eq 0 ] && return 1 # shellcheck disable=SC2068 if hash bat &>/dev/null; then From e766a62ed58c427753acf41f38a18ea59b6841c5 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Wed, 29 May 2019 09:22:55 +0300 Subject: [PATCH 3/4] Use a more general usage env vars to add opts Former-commit-id: bd48b08e4ab27f9c4c512c698db8bfac778b48e2 --- forgit.plugin.zsh | 47 ++++++++++++++++------------------------------- 1 file changed, 16 insertions(+), 31 deletions(-) diff --git a/forgit.plugin.zsh b/forgit.plugin.zsh index 1f60c61..9a1a14b 100755 --- a/forgit.plugin.zsh +++ b/forgit.plugin.zsh @@ -12,33 +12,27 @@ hash emojify &>/dev/null && forgit_emojify='|emojify' # git commit viewer forgit::log() { forgit::inside_work_tree || return 1 - if [ -z "$FORGIT_LOG_PREVIEW" ]; then - local preview_cmd="echo {} |grep -o '[a-f0-9]\{7\}' |head -1 |xargs -I% git show --color=always % $* $forgit_emojify $forgit_fancy" - else - local preview_cmd="$FORGIT_LOG_PREVIEW" - fi + local preview_cmd="echo {} |grep -o '[a-f0-9]\{7\}' |head -1 |xargs -I% git show --color=always % $* $forgit_emojify $forgit_fancy" eval "git log --graph --color=always --format='%C(auto)%h%d %s %C(black)%C(bold)%cr' $* $forgit_emojify" | forgit::fzf +s +m --tiebreak=index \ --bind="enter:execute($preview_cmd |LESS='-R' less)" \ --bind="ctrl-y:execute-silent(echo {} |grep -o '[a-f0-9]\{7\}' |${FORGIT_COPY_CMD:-pbcopy})" \ - --preview="$preview_cmd" + --preview="$preview_cmd" \ + "$FORGIT_LOG_FZF_OPTS" } # git diff viewer forgit::diff() { forgit::inside_work_tree || return 1 - if [ -z "$FORGIT_DIFF_PREVIEW" ]; then - local preview_cmd="git diff --color=always -- {} $forgit_emojify $forgit_fancy" - else - local preview_cmd="$FORGIT_DIFF_PREVIEW" - fi + local preview_cmd="git diff --color=always -- {} $forgit_emojify $forgit_fancy" local cmd files files="$*" [[ $# -eq 0 ]] && files=$(git rev-parse --show-toplevel) git ls-files --modified "$files"| forgit::fzf +m -0 \ --bind="enter:execute($preview_cmd |LESS='-R' less)" \ - --preview="$preview_cmd" + --preview="$preview_cmd" \ + "$FORGIT_DIFF_FZF_OPTS" } # git add selector @@ -50,14 +44,11 @@ forgit::add() { untracked=$(git config --get-color color.status.untracked red) files=$(git -c color.status=always status --short | grep -F -e "$changed" -e "$unmerged" -e "$untracked"| - if [ -z "$FORGIT_ADD_PREVIEW" ]; then - local preview_cmd="git diff --color=always -- {-1} $forgit_emojify $forgit_fancy" - else - local preview_cmd="$FORGIT_ADD_PREVIEW" - fi + local preview_cmd="git diff --color=always -- {-1} $forgit_emojify $forgit_fancy" awk '{printf "[%10s] ", $1; $1=""; print $0}' | forgit::fzf -0 -m --nth 2..,.. \ --preview="$preview_cmd" | + "$FORGIT_ADD_FZF_OPTS" | cut -d] -f2 | sed 's/.* -> //') # for rename case [[ -n "$files" ]] && echo "$files" |xargs -I{} git add {} && git status --short && return @@ -67,14 +58,11 @@ forgit::add() { # git checkout-restore selector forgit::restore() { forgit::inside_work_tree || return 1 - if [ -z "$FORGIT_RESTORE_PREVIEW" ]; then - local preview_cmd="git diff --color=always -- {} $forgit_emojify $forgit_fancy" - else - local preview_cmd="$FORGIT_RESTORE_PREVIEW" - fi + local preview_cmd="git diff --color=always -- {} $forgit_emojify $forgit_fancy" local cmd files files="$(git ls-files --modified "$(git rev-parse --show-toplevel)"| - forgit::fzf -m -0 --preview="$preview_cmd")" + forgit::fzf -m -0 --preview="$preview_cmd" | + "$FORGIT_RESTORE_FZF_OPTS")" [[ -n "$files" ]] && echo "$files" |xargs -I{} git checkout {} && git status --short && return echo 'Nothing to restore.' } @@ -82,15 +70,12 @@ forgit::restore() { # git stash viewer forgit::stash::show() { forgit::inside_work_tree || return 1 - if [ -z "$FORGIT_STASH_PREVIEW" ]; then - local preview_cmd="git stash show \$(echo {}| cut -d: -f1) --color=always --ext-diff $forgit_fancy" - else - local preview_cmd="$FORGIT_STASH_PREVIEW" - fi + local preview_cmd="git stash show \$(echo {}| cut -d: -f1) --color=always --ext-diff $forgit_fancy" git stash list | forgit::fzf +s +m -0 --tiebreak=index \ --bind="enter:execute($preview_cmd |LESS='-R' less)" \ - --preview="$preview_cmd" + --preview="$preview_cmd" \ + "$FORGIT_STASH_FZF_OPTS" } # git clean selector @@ -113,10 +98,10 @@ forgit::ignore() { local IFS cmd args cat # https://github.com/sharkdp/bat.git hash bat &>/dev/null && cat='bat -l gitignore --color=always' || cat="cat" - cmd="$cat $FORGIT_GI_TEMPLATES/{2}{,.gitignore} 2>/dev/null" + local preview_cmd="$cat $FORGIT_GI_TEMPLATES/{2}{,.gitignore} 2>/dev/null" # shellcheck disable=SC2206,2207 IFS=$'\n' args=($@) && [[ $# -eq 0 ]] && args=($(forgit::ignore::list | nl -nrn -w4 -s' ' | - forgit::fzf -m --preview="$preview_cmd" --preview-window="right:70%" | awk '{print $2}')) + forgit::fzf -m --preview-window="right:70%" --preview="$preview_cmd" "$FORGIT_IGNORE_FZF_OPTS" | awk '{print $2}')) [ ${#args[@]} -eq 0 ] && return 1 # shellcheck disable=SC2068 if hash bat &>/dev/null; then From e15849c990edb16b9a617138b2cf31ee59a09a08 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Wed, 29 May 2019 09:32:17 +0300 Subject: [PATCH 4/4] Add documentation and align it with actual functionality Former-commit-id: 827d1e56a33801464ed4dd44bf64fa01e127671f --- README.md | 11 +++++++++++ forgit.plugin.zsh | 4 ++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 852d1fc..5797600 100644 --- a/README.md +++ b/README.md @@ -114,6 +114,17 @@ FORGIT_FZF_DEFAULT_OPTS=" --height '80%' " ``` + +You can also customize options fzf will use for each command individually: + +- `ga`: `FORGIT_ADD_FZF_OPTS` +- `glo`: `FORGIT_LOG_FZF_OPTS` +- `gi`: `FORGIT_IGNORE_FZF_OPTS` +- `gd`: `FORGIT_DIFF_FZF_OPTS` +- `gcf`: `FORGIT_CHECKOUT_FZF_OPTS` +- `gss`: `FORGIT_STASH_FZF_OPTS` +- `gclean`: `FORGIT_CLEAN_FZF_OPTS` + ## Optional - [`diff-so-fancy`](https://github.com/so-fancy/diff-so-fancy): Improve the `git diff` output. diff --git a/forgit.plugin.zsh b/forgit.plugin.zsh index 9a1a14b..30ea15f 100755 --- a/forgit.plugin.zsh +++ b/forgit.plugin.zsh @@ -62,7 +62,7 @@ forgit::restore() { local cmd files files="$(git ls-files --modified "$(git rev-parse --show-toplevel)"| forgit::fzf -m -0 --preview="$preview_cmd" | - "$FORGIT_RESTORE_FZF_OPTS")" + "$FORGIT_CHECKOUT_FZF_OPTS")" [[ -n "$files" ]] && echo "$files" |xargs -I{} git checkout {} && git status --short && return echo 'Nothing to restore.' } @@ -83,7 +83,7 @@ forgit::clean() { forgit::inside_work_tree || return 1 local files # Note: Postfix '/' in directory path should be removed. Otherwise the directory itself will not be removed. - files=$(git clean -xdfn "$@"| awk '{print $3}'| forgit::fzf -m -0 |sed 's#/$##') + files=$(git clean -xdfn "$@"| awk '{print $3}'| forgit::fzf -m -0 "$FORGIT_CLEAN_FZF_OPTS" |sed 's#/$##') [[ -n "$files" ]] && echo "$files" |xargs -I{} git clean -xdf {} echo 'Nothing to clean.' }