Skip to content

Commit

Permalink
Improve git color process logic. #15
Browse files Browse the repository at this point in the history
  • Loading branch information
@wfxr
wfxr committed Jan 18, 2019
1 parent 621676f commit c14ce93
Showing 1 changed file with 60 additions and 88 deletions.
148 changes: 60 additions & 88 deletions forgit.plugin.zsh
View file
Original file line number Diff line number Diff line change
@@ -1,62 +1,18 @@
forgit::fzf() {
FZF_DEFAULT_OPTS="
$FZF_DEFAULT_OPTS
--ansi
--height '80%'
--bind='alt-k:preview-up,alt-p:preview-up'
--bind='alt-j:preview-down,alt-n:preview-down'
--bind='ctrl-r:toggle-all'
--bind='ctrl-s:toggle-sort'
--bind='?:toggle-preview'
--preview-window='right:60%'
--bind='alt-w:toggle-preview-wrap'
$FORGIT_FZF_DEFAULT_OPTS
" fzf "$@"
}

forgit::color_to_grep_code() {
case "$1" in
black)
echo -E '\[30m'
;;
red)
echo -E '\[31m'
;;
green)
echo -E '\[32m'
;;
yellow)
echo -E '\[33m'
;;
blue)
echo -E '\[34m'
;;
magenta)
echo -E '\[35m'
;;
cyan)
echo -E '\[36m'
;;
white)
echo -E '\[97m'
;;
esac
}

forgit::warn() { printf "%b[Warn]%b %s\n" '\e[0;33m' '\e[0m' "$@" >&2; }
forgit::info() { printf "%b[Info]%b %s\n" '\e[0;32m' '\e[0m' "$@" >&2; }
forgit::inside_work_tree() { git rev-parse --is-inside-work-tree >/dev/null; }

# diff is fancy with diff-so-fancy!
# https://github.com/so-fancy/diff-so-fancy
hash diff-so-fancy &>/dev/null && forgit_fancy='|diff-so-fancy'
hash emojify &>/dev/null && forgit_emojify='|emojify'

forgit::inside_work_tree() {
git rev-parse --is-inside-work-tree >/dev/null
}
# https://github.com/wfxr/emoji-cli
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"
eval "git log --graph --color=always --format='%C(auto)%h%d %s %C(black)%C(bold)%cr' $@ $forgit_emojify" |
local 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($cmd |LESS='-R' less)" \
--bind="ctrl-y:execute-silent(echo {} |grep -o '[a-f0-9]\{7\}' |${FORGIT_COPY_CMD:-pbcopy})" \
Expand All @@ -66,8 +22,10 @@ forgit::log() {
# git diff viewer
forgit::diff() {
forgit::inside_work_tree || return 1
local cmd="git diff --color=always -- {} $forgit_emojify $forgit_fancy"
[[ $# -eq 0 ]] && local files=$(git rev-parse --show-toplevel) || local files="$@"
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)" \
Expand All @@ -77,14 +35,12 @@ forgit::diff() {
# git add selector
forgit::add() {
forgit::inside_work_tree || return 1
local added=${$(git config color.status.untracked):-red}
added=$(forgit::color_to_grep_code "$added")
local changed=${$(git config color.status.changed):-red}
changed=$(forgit::color_to_grep_code "$changed")
local unmerged=${$(git config color.status.unmerged):-red}
unmerged=$(forgit::color_to_grep_code "$unmerged")
local files=$(git -c color.status=always status --short |
grep -e "$added" -e "$changed" -e "$unmerged" |
local changed unmerged untracked files
changed=$(git config --get-color color.status.changed red)
unmerged=$(git config --get-color color.status.unmerged red)
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"|
awk '{printf "[%10s] ", $1; $1=""; print $0}' |
forgit::fzf -0 -m --nth 2..,.. \
--preview="git diff --color=always -- {-1} $forgit_emojify $forgit_fancy" |
Expand All @@ -97,9 +53,10 @@ forgit::add() {
# git checkout-restore selector
forgit::restore() {
forgit::inside_work_tree || return 1
local cmd="git diff --color=always -- {} $forgit_emojify $forgit_fancy"
local files=$(git ls-files --modified $(git rev-parse --show-toplevel)|
forgit::fzf -m -0 --preview="$cmd")
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
echo 'Nothing to restore.'
}
Expand All @@ -117,8 +74,9 @@ forgit::stash::show() {
# git clean selector
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.
local files=$(git clean -xdfn "$@"| awk '{print $3}'| forgit::fzf -m -0 |sed 's#/$##')
files=$(git clean -xdfn "$@"| awk '{print $3}'| forgit::fzf -m -0 |sed 's#/$##')
[[ -n "$files" ]] && echo "$files" |xargs -I{} git clean -xdf {}
echo 'Nothing to clean.'
}
Expand All @@ -128,16 +86,18 @@ export FORGIT_GI_REPO=~/.forgit/gi/repos/dvcs/gitignore # https://github.com/dvc

forgit:ignore() {
[ -d $FORGIT_GI_REPO ] || forgit::ignore::update
local preview="cat $FORGIT_GI_REPO/templates/{2}.gitignore 2>/dev/null"
local IFS=$'\n'
[[ $# -gt 0 ]] && args=($@) ||
args=($(forgit::ignore::list | nl -nrn -w4 -s' ' |
forgit::fzf -m --preview="$preview" --preview-window="right:70%" |awk '{print $2}'))
test -z "$args" && return 1
local options=('(1) Output to stdout'
'(2) Append to .gitignore'
'(3) Overwrite .gitignore')
local IFS preview args options opt
IFS=$'\n'
preview="cat $FORGIT_GI_REPO/templates/{2}.gitignore 2>/dev/null"
# shellcheck disable=SC2206,2207
args=($@) && [[ $# -eq 0 ]] && args=($(forgit::ignore::list | nl -nrn -w4 -s' ' |
forgit::fzf -m --preview="$preview" --preview-window="right:70%" | awk '{print $2}'))
[ ${#args[@]} -eq 0 ] && return 1
options=('(1) Output to stdout'
'(2) Append to .gitignore'
'(3) Overwrite .gitignore')
opt=$(printf '%s\n' "${options[@]}" |forgit::fzf +m |awk '{print $1}')
# shellcheck disable=SC2068
case "$opt" in
'(1)' )
forgit::ignore::get ${args[@]}
Expand Down Expand Up @@ -170,25 +130,37 @@ forgit::ignore::get() {
done
}
forgit::ignore::list() {
(for item in $FORGIT_GI_REPO/templates/*.gitignore; do
echo "${item##*/}"
done) | sed 's/.gitignore$//' | sort -f -u
find $FORGIT_GI_REPO/templates/*.gitignore -print |sed -e 's#.gitignore$##' -e 's#.*/##' | sort -fu
}
forgit::ignore::clean() {
setopt localoptions rmstarsilent
[[ -d $FORGIT_GI_REPO ]] && rm -rf $FORGIT_GI_REPO
}

forgit::warn() { printf "%b[Warn]%b %s\n" '\e[0;33m' '\e[0m' "$@" >&2; }
forgit::info() { printf "%b[Info]%b %s\n" '\e[0;32m' '\e[0m' "$@" >&2; }
forgit::fzf() {
FZF_DEFAULT_OPTS="
$FZF_DEFAULT_OPTS
--ansi
--height '80%'
--bind='alt-k:preview-up,alt-p:preview-up'
--bind='alt-j:preview-down,alt-n:preview-down'
--bind='ctrl-r:toggle-all'
--bind='ctrl-s:toggle-sort'
--bind='?:toggle-preview'
--preview-window='right:60%'
--bind='alt-w:toggle-preview-wrap'
$FORGIT_FZF_DEFAULT_OPTS
" fzf "$@"
}

# add aliases
# register aliases
# shellcheck disable=SC2139
if [[ -z "$FORGIT_NO_ALIASES" ]]; then
alias ${forgit_add:-ga}='forgit::add'
alias ${forgit_log:-glo}='forgit::log'
alias ${forgit_diff:-gd}='forgit::diff'
alias ${forgit_ignore:-gi}='forgit:ignore'
alias ${forgit_restore:-gcf}='forgit::restore'
alias ${forgit_clean:-gclean}='forgit::clean'
alias ${forgit_stash_show:-gss}='forgit::stash::show'
alias "${forgit_add:-ga}"='forgit::add'
alias "${forgit_log:-glo}"='forgit::log'
alias "${forgit_diff:-gd}"='forgit::diff'
alias "${forgit_ignore:-gi}"='forgit:ignore'
alias "${forgit_restore:-gcf}"='forgit::restore'
alias "${forgit_clean:-gclean}"='forgit::clean'
alias "${forgit_stash_show:-gss}"='forgit::stash::show'
fi

0 comments on commit c14ce93

Please sign in to comment.