mirror of
https://github.com/wfxr/forgit.git
synced 2026-09-10 15:26:16 -04:00
ff0c6fd639
when using forgit for the first time, the .forgit folder is not created. forgit::ignore::update, which git glone the repo, was executed only if the folder existed, so now it execute only if the .forgit don't exist. also, there some weird things in the logic with forgit::ignore::update, some part of the code it not running in any case, since the if test -d in the fonction is called in a fonction which is called only if the folder don't exist, or i miss something ?
372 lines
11 KiB
Fish
Executable file
372 lines
11 KiB
Fish
Executable file
#!/usr/local/bin/fish
|
|
# MIT (c) Chris Apple
|
|
|
|
function forgit::warn
|
|
printf "%b[Warn]%b %s\n" '\e[0;33m' '\e[0m' "$argv" >&2;
|
|
end
|
|
|
|
function forgit::info
|
|
printf "%b[Info]%b %s\n" '\e[0;32m' '\e[0m' "$argv" >&2;
|
|
end
|
|
|
|
function forgit::inside_work_tree
|
|
git rev-parse --is-inside-work-tree >/dev/null;
|
|
end
|
|
|
|
set forgit_pager "$FORGIT_PAGER"
|
|
set forgit_show_pager "$FORGIT_SHOW_PAGER"
|
|
set forgit_diff_pager "$FORGIT_DIFF_PAGER"
|
|
|
|
test -z "$forgit_pager"; and set forgit_pager (git config core.pager || echo 'cat')
|
|
test -z "$forgit_show_pager"; and set forgit_show_pager (git config pager.show || echo "$forgit_pager")
|
|
test -z "$forgit_diff_pager"; and set forgit_diff_pager (git config pager.diff || echo "$forgit_pager")
|
|
|
|
# https://github.com/wfxr/emoji-cli
|
|
type -q emojify >/dev/null 2>&1 && set forgit_emojify '|emojify'
|
|
|
|
# git commit viewer
|
|
function forgit::log
|
|
forgit::inside_work_tree || return 1
|
|
|
|
set files (echo $argv | sed -nE 's/.* -- (.*)/\1/p')
|
|
set cmd "echo {} |grep -Eo '[a-f0-9]+' |head -1 |xargs -I% git show --color=always % -- $files | $forgit_show_pager"
|
|
|
|
if test -n "$FORGIT_COPY_CMD"
|
|
set copy_cmd $FORGIT_COPY_CMD
|
|
else
|
|
set copy_cmd pbcopy
|
|
end
|
|
|
|
set opts "
|
|
$FORGIT_FZF_DEFAULT_OPTS
|
|
+s +m --tiebreak=index
|
|
--bind=\"enter:execute($cmd |env LESS='-R' less)\"
|
|
--bind=\"ctrl-y:execute-silent(echo {} |grep -Eo '[a-f0-9]+' | head -1 | tr -d '\n' | $copy_cmd)\"
|
|
$FORGIT_LOG_FZF_OPTS
|
|
"
|
|
|
|
if set -q FORGIT_LOG_GRAPH_ENABLE
|
|
set graph "--graph"
|
|
else
|
|
set graph ""
|
|
end
|
|
|
|
eval "git log $graph --color=always --format='%C(auto)%h%d %s %C(black)%C(bold)%cr' $argv $forgit_emojify" |
|
|
env FZF_DEFAULT_OPTS="$opts" fzf --preview="$cmd"
|
|
end
|
|
|
|
## git diff viewer
|
|
function forgit::diff
|
|
forgit::inside_work_tree || return 1
|
|
if count $argv > /dev/null
|
|
if git rev-parse "$1" > /dev/null 2>&1
|
|
#set commit "$1" && set files ("${@:2}")
|
|
set commit "$1" && set files "$2"
|
|
else
|
|
set files "$argv"
|
|
end
|
|
end
|
|
|
|
set repo (git rev-parse --show-toplevel)
|
|
set opts "
|
|
$FORGIT_FZF_DEFAULT_OPTS
|
|
+m -0 --bind=\"enter:execute($cmd |env LESS='-R' less)\"
|
|
$FORGIT_DIFF_FZF_OPTS
|
|
"
|
|
|
|
set cmd "echo {} |sed 's/.*] //' | xargs -I% git diff --color=always $commit -- '$repo/%' | $forgit_diff_pager"
|
|
|
|
eval "git diff --name-only $commit -- $files*| sed -E 's/^(.)[[:space:]]+(.*)\$/[\1] \2/'" | env FZF_DEFAULT_OPTS="$opts" fzf --preview="$cmd"
|
|
end
|
|
|
|
# git add selector
|
|
function forgit::add
|
|
forgit::inside_work_tree || return 1
|
|
# Add files if passed as arguments
|
|
count $argv >/dev/null && git add "$argv" && git status --short && return
|
|
|
|
set changed (git config --get-color color.status.changed red)
|
|
set unmerged (git config --get-color color.status.unmerged red)
|
|
set untracked (git config --get-color color.status.untracked red)
|
|
|
|
set extract_file "
|
|
sed 's/^[[:space:]]*//' | # remove leading whitespace
|
|
cut -d ' ' -f 2- | # cut the line after the M or ??, this leaves just the filename
|
|
sed 's/.* -> //' | # for rename case
|
|
sed -e 's/^\\\"//' -e 's/\\\"\$//' # removes surrounding quotes
|
|
"
|
|
set preview "
|
|
set file (echo {} | $extract_file)
|
|
# exit
|
|
if test (git status -s -- \$file | grep '^??') # diff with /dev/null for untracked files
|
|
git diff --color=always --no-index -- /dev/null \$file | $forgit_diff_pager | sed '2 s/added:/untracked:/'
|
|
else
|
|
git diff --color=always -- \$file | $forgit_diff_pager
|
|
end
|
|
"
|
|
set opts "
|
|
$FORGIT_FZF_DEFAULT_OPTS
|
|
-0 -m --nth 2..,..
|
|
$FORGIT_ADD_FZF_OPTS
|
|
"
|
|
set files (git -c color.status=always -c status.relativePaths=true status -su |
|
|
grep -F -e "$changed" -e "$unmerged" -e "$untracked" |
|
|
sed -E 's/^(..[^[:space:]]*)[[:space:]]+(.*)\$/[\1] \2/' | # deal with white spaces internal to fname
|
|
env FZF_DEFAULT_OPTS="$opts" fzf --preview="$preview" |
|
|
sh -c "$extract_file") # for rename case
|
|
|
|
if test -n "$files"
|
|
for file in $files
|
|
echo $file | tr '\n' '\0' | xargs -I{} -0 git add {}
|
|
end
|
|
git status --short
|
|
return
|
|
end
|
|
echo 'Nothing to add.'
|
|
end
|
|
|
|
## git reset HEAD (unstage) selector
|
|
function forgit::reset::head
|
|
forgit::inside_work_tree || return 1
|
|
set cmd "git diff --cached --color=always -- {} | $forgit_diff_pager"
|
|
set opts "
|
|
$FORGIT_FZF_DEFAULT_OPTS
|
|
-m -0
|
|
$FORGIT_RESET_HEAD_FZF_OPTS
|
|
"
|
|
set files (git diff --cached --name-only --relative | env FZF_DEFAULT_OPTS="$opts" fzf --preview="$cmd")
|
|
if test -n "$files"
|
|
for file in $files
|
|
echo $file | tr '\n' '\0' |xargs -I{} -0 git reset -q HEAD {}
|
|
end
|
|
git status --short
|
|
return
|
|
end
|
|
echo 'Nothing to unstage.'
|
|
end
|
|
|
|
# git checkout-restore selector
|
|
function forgit::checkout_file
|
|
forgit::inside_work_tree || return 1
|
|
|
|
set cmd "git diff --color=always -- {} | $forgit_diff_pager"
|
|
set opts "
|
|
$FORGIT_FZF_DEFAULT_OPTS
|
|
-m -0
|
|
$FORGIT_CHECKOUT_FZF_OPTS
|
|
"
|
|
set git_rev_parse (git rev-parse --show-toplevel)
|
|
set files (git ls-files --modified "$git_rev_parse" | env FZF_DEFAULT_OPTS="$opts" fzf --preview="$cmd")
|
|
if test -n "$files"
|
|
for file in $files
|
|
echo $file | tr '\n' '\0' | xargs -I{} -0 git checkout -q {}
|
|
end
|
|
git status --short
|
|
return
|
|
end
|
|
echo 'Nothing to restore.'
|
|
end
|
|
|
|
# git stash viewer
|
|
function forgit::stash::show
|
|
forgit::inside_work_tree || return 1
|
|
set cmd "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($cmd |env LESS='-R' less)\"
|
|
$FORGIT_STASH_FZF_OPTS
|
|
"
|
|
git stash list | env FZF_DEFAULT_OPTS="$opts" fzf --preview="$cmd"
|
|
end
|
|
|
|
# git clean selector
|
|
function forgit::clean
|
|
forgit::inside_work_tree || return 1
|
|
|
|
set opts "
|
|
$FORGIT_FZF_DEFAULT_OPTS
|
|
-m -0
|
|
$FORGIT_CLEAN_FZF_OPTS
|
|
"
|
|
|
|
set files (git clean -xdffn $argv| awk '{print $3}'| env FZF_DEFAULT_OPTS="$opts" fzf |sed 's#/$##')
|
|
|
|
if test -n "$files"
|
|
for file in $files
|
|
echo $file | tr '\n' '\0'| xargs -0 -I{} git clean -xdff {}
|
|
end
|
|
git status --short
|
|
return
|
|
end
|
|
echo 'Nothing to clean.'
|
|
end
|
|
|
|
function forgit::cherry::pick
|
|
forgit::inside_work_tree || return 1
|
|
set base (git branch --show-current)
|
|
if not count $argv > /dev/null
|
|
echo "Please specify target branch"
|
|
return 1
|
|
end
|
|
set target $argv[1]
|
|
set preview "echo {1} | xargs -I% git show --color=always % | $forgit_show_pager"
|
|
set opts "
|
|
$FORGIT_FZF_DEFAULT_OPTS
|
|
-m -0
|
|
"
|
|
echo $base
|
|
echo $target
|
|
git cherry "$base" "$target" --abbrev -v | cut -d ' ' -f2- |
|
|
env FZF_DEFAULT_OPTS="$opts" fzf --preview="$preview" | cut -d' ' -f1 |
|
|
xargs -I% git cherry-pick %
|
|
end
|
|
|
|
# git ignore generator
|
|
if test -z "$FORGIT_GI_REPO_REMOTE"
|
|
set -x FORGIT_GI_REPO_REMOTE https://github.com/dvcs/gitignore
|
|
end
|
|
|
|
if test -z "$FORGIT_GI_REPO_LOCAL"
|
|
set -x FORGIT_GI_REPO_LOCAL ~/.forgit/gi/repos/dvcs/gitignore
|
|
end
|
|
|
|
if test -z "$FORGIT_GI_TEMPLATES"
|
|
set -x FORGIT_GI_TEMPLATES $FORGIT_GI_REPO_LOCAL/templates
|
|
end
|
|
|
|
function forgit::ignore
|
|
if ! test -d "$FORGIT_GI_REPO_LOCAL"
|
|
forgit::ignore::update
|
|
end
|
|
|
|
# https://github.com/sharkdp/bat.git
|
|
type -q bat > /dev/null 2>&1 && set cat 'bat -l gitignore --color=always' || set cat "cat"
|
|
set cmd "$cat $FORGIT_GI_TEMPLATES/{2}{,.gitignore} 2>/dev/null"
|
|
set opts "
|
|
$FORGIT_FZF_DEFAULT_OPTS
|
|
-m --preview-window='right:70%'
|
|
$FORGIT_IGNORE_FZF_OPTS
|
|
"
|
|
set IFS '\n'
|
|
|
|
set args $argv
|
|
if not count $argv > /dev/null
|
|
set args (forgit::ignore::list | nl -nrn -w4 -s' ' |
|
|
env FZF_DEFAULT_OPTS="$opts" fzf --preview="$cmd" |awk '{print $2}')
|
|
end
|
|
|
|
if not count $args > /dev/null
|
|
return 1
|
|
end
|
|
|
|
if type -q bat > /dev/null 2>&1
|
|
forgit::ignore::get $args | bat -l gitignore
|
|
else
|
|
forgit::ignore::get $args
|
|
end
|
|
end
|
|
|
|
function forgit::ignore::update
|
|
if test -d "$FORGIT_GI_REPO_LOCAL"
|
|
forgit::info 'Updating gitignore repo...'
|
|
set pull_result (git -C "$FORGIT_GI_REPO_LOCAL" pull --no-rebase --ff)
|
|
test -n "$pull_result" || return 1
|
|
else
|
|
forgit::info 'Initializing gitignore repo...'
|
|
git clone --depth=1 "$FORGIT_GI_REPO_REMOTE" "$FORGIT_GI_REPO_LOCAL"
|
|
end
|
|
end
|
|
|
|
function forgit::ignore::get
|
|
for item in $argv
|
|
set filename (find -L "$FORGIT_GI_TEMPLATES" -type f \( -iname "$item.gitignore" -o -iname "$item}" \) -print -quit)
|
|
if test -n "$filename"
|
|
set header $filename && set header (echo $filename | sed 's/.*\.//')
|
|
echo "### $header" && cat "$filename" && echo
|
|
else
|
|
forgit::warn "No gitignore template found for '$item'." && continue
|
|
end
|
|
end
|
|
end
|
|
|
|
function forgit::ignore::list
|
|
find "$FORGIT_GI_TEMPLATES" -print |sed -e 's#.gitignore$##' -e 's#.*/##' | sort -fu
|
|
end
|
|
|
|
function forgit::ignore::clean
|
|
setopt localoptions rmstarsilent
|
|
[[ -d "$FORGIT_GI_REPO_LOCAL" ]] && rm -rf "$FORGIT_GI_REPO_LOCAL"
|
|
end
|
|
|
|
set FORGIT_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'
|
|
--bind='alt-w:toggle-preview-wrap'
|
|
--preview-window='right:60%'
|
|
+1
|
|
$FORGIT_FZF_DEFAULT_OPTS
|
|
"
|
|
|
|
# register aliases
|
|
if test -z "$FORGIT_NO_ALIASES"
|
|
if test -n "$forgit_add"
|
|
alias $forgit_add 'forgit::add'
|
|
else
|
|
alias ga 'forgit::add'
|
|
end
|
|
|
|
if test -n "$forgit_reset_head"
|
|
alias $forgit_reset_head 'forgit::reset::head'
|
|
else
|
|
alias grh 'forgit::reset::head'
|
|
end
|
|
|
|
if test -n "$forgit_log"
|
|
alias $forgit_log 'forgit::log'
|
|
else
|
|
alias glo 'forgit::log'
|
|
end
|
|
|
|
if test -n "$forgit_diff"
|
|
alias $forgit_diff 'forgit::diff'
|
|
else
|
|
alias gd 'forgit::diff'
|
|
end
|
|
|
|
if test -n "$forgit_ignore"
|
|
alias $forgit_ignore 'forgit::ignore'
|
|
else
|
|
alias gi 'forgit::ignore'
|
|
end
|
|
|
|
if test -n "$forgit_restore"
|
|
alias $forgit_restore 'forgit::checkout_file'
|
|
else
|
|
alias gcf 'forgit::checkout_file'
|
|
end
|
|
|
|
if test -n "$forgit_clean"
|
|
alias $forgit_clean 'forgit::clean'
|
|
else
|
|
alias gclean 'forgit::clean'
|
|
end
|
|
|
|
if test -n "$forgit_stash_show"
|
|
alias $forgit_stash_show 'forgit::stash::show'
|
|
else
|
|
alias gss 'forgit::stash::show'
|
|
end
|
|
|
|
if test -n "$forgit_cherry_pick"
|
|
alias $forgit_cherry_pick 'forgit::cherry::pick'
|
|
else
|
|
alias gcp 'forgit::cherry::pick'
|
|
end
|
|
end
|