druckdev/dotfiles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

zsh:glog: Small fixes

Browse Source 
Commit hashes only contain letters from a-f.
Use heredoc for the fzf preview command for better readability.
This commit is contained in:
druckdev
2020-10-10 13:10:39 +02:00
parent f3938bd38d
commit 1a3a062309
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
.config/zsh/autoload/glog
View File

@@ -15,7 +15,7 @@ git rev-parse || return
local formatshort='--pretty=format:%C(yellow)%h %Creset%s%C(auto)%d' local formatshort='--pretty=format:%C(yellow)%h %Creset%s%C(auto)%d'
# Verbose format for the preview window on the right # Verbose format for the preview window on the right
# This array is stitched together with newlines later # This array is stitched together with newlines later
local format=( local -a format=(
'--pretty=format:%C(yellow)' # newline created by this eaten by %- '--pretty=format:%C(yellow)' # newline created by this eaten by %-
'%-commit: %H%C(auto)' # yellow commit hash '%-commit: %H%C(auto)' # yellow commit hash
'%-D%Cblue' # auto colored ref names (if any) '%-D%Cblue' # auto colored ref names (if any)
@@ -34,11 +34,20 @@ local format=(
local del_ansi='s/\[[0-9]{0,2}m//g' local del_ansi='s/\[[0-9]{0,2}m//g'
# Ignore the graph part at the beginning, then capture the commit hash and throw # Ignore the graph part at the beginning, then capture the commit hash and throw
# away the rest of the line. # away the rest of the line.
local commit_hash='s/^[ */\\|]*([a-z0-9]*).*$/\1/' local commit_hash='s/^[ */\\|]*([a-f0-9]+).*$/\1/'
local dateshort='--date=format:%F' # year local dateshort='--date=format:%F' # year
local date='--date=format:%F %T %z' # year time timezone local date='--date=format:%F %T %z' # year time timezone
local colors='--color=always' local colors='--color=always'
local fzf_preview_command
read -r -d '' fzf_preview_command <<EOT
out="\$(echo {} | sed -Ee "$del_ansi" -e "$commit_hash")"
if [[ "\$out" ]]; then
git show "${(j:%n:)format}" "$date" $colors "\$out" \
| diff-so-fancy
fi
EOT
local -A binds=( local -A binds=(
'ctrl-space' 'toggle-preview' 'ctrl-space' 'toggle-preview'
'ctrl-alt-j' 'preview-down' 'ctrl-alt-j' 'preview-down'
@@ -50,13 +59,7 @@ local -a fzf_args=(
# Expand the binds array in the format "key1:value1,key2:value2". # Expand the binds array in the format "key1:value1,key2:value2".
"--bind" "${(@kj:,:)binds/(#m)*/$MATCH:$binds[$MATCH]}" "--bind" "${(@kj:,:)binds/(#m)*/$MATCH:$binds[$MATCH]}"
# Execute git show on the commit as preview. # Execute git show on the commit as preview.
"--preview" " "--preview" "$fzf_preview_command"
out=\"\$(echo {} | sed -Ee \"$del_ansi\" -e \"$commit_hash\")\"
if [[ \"\$out\" ]]; then
git show \"${(j:%n:)format}\" \"$date\" $colors \"\$out\" \
| diff-so-fancy
fi
"
# Reverse the layout so that the newest commit is at the top. # Reverse the layout so that the newest commit is at the top.
"--reverse" "--reverse"
# Do not sort when typing to maintain the sorting by date. # Do not sort when typing to maintain the sorting by date.