utils-code/wfxr.forgit
1
0
Fork 0
mirror of https://github.com/wfxr/forgit.git synced 2026-09-15 09:46:16 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #142 from cjappl/fish_vim_gcb

Browse source 
Fish vim gcb
This commit is contained in:
Wenxuan 2021-03-13 12:15:48 +08:00 committed by GitHub
parent 12b8881573 74724a80cb
commit 983a50140b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -57,11 +57,10 @@ function forgit::log -d "git commit viewer"
end
## git diff viewer
function forgit::diff -d "git diff viewer"
function forgit::diff -d "git diff viewer"
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"
@ -168,9 +167,15 @@ function forgit::checkout::file -d "git checkout-file selector"
echo 'Nothing to restore.'
end
function forgit::checkout::branch -d "git checkout branch selector"
function forgit::checkout::branch -d "git checkout branch selector" --argument-names 'branch_name'
forgit::inside_work_tree || return 1
if test -n "$branch_name"
git checkout -b "$branch_name"
git status --short
return
end
set cmd "git branch --color=always --verbose --all --format=\"%(if:equals=HEAD)%(refname:strip=3)%(then)%(else)%(refname:short)%(end)\" $argv $forgit_emojify | sed '/^\$/d'"
set preview "git log {} --graph --pretty=format:'%C(auto)%h%d %s %C(black)%C(bold)%cr%Creset' --color=always --abbrev-commit --date=relative"
@ -216,14 +221,13 @@ function forgit::clean -d "git clean selector"
echo 'Nothing to clean.'
end
function forgit::cherry::pick -d "git cherry-picking"
function forgit::cherry::pick -d "git cherry-picking" --argument-names 'target'
forgit::inside_work_tree || return 1
set base (git branch --show-current)
if not count $argv > /dev/null
if test -n "$target"
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
@ -237,7 +241,7 @@ function forgit::cherry::pick -d "git cherry-picking"
end
function forgit::rebase -d "git rebase "
function forgit::rebase -d "git rebase"
forgit::inside_work_tree || return 1
if set -q FORGIT_LOG_GRAPH_ENABLE
@ -262,9 +266,12 @@ function forgit::rebase -d "git rebase "
--bind=\"ctrl-y:execute-silent(echo {} |grep -Eo '[a-f0-9]+' | head -1 | tr -d '[:space:]' |$copy_cmd)\"
$FORGIT_REBASE_FZF_OPTS
"
eval "$cmd" | FZF_DEFAULT_OPTS="$opts" fzf --preview="$preview" |
grep -Eo '[a-f0-9]+' | head -1 |
xargs -I% git rebase -i %
set commit (eval "$cmd" | FZF_DEFAULT_OPTS="$opts" fzf --preview="$preview" |
grep -Eo '[a-f0-9]+' | head -1)
if test $commit
git rebase -i "$commit"
end
end
# git ignore generator

2
forgit.plugin.zsh
View file

@ -186,7 +186,7 @@ forgit::checkout::branch() {
forgit::inside_work_tree || return 1
[[ $# -ne 0 ]] && { git checkout -b "$*"; return $?; }
local cmd preview opts
cmd="git branch --color=always --verbose --all --format=\"%(if:equals=HEAD)%(refname:strip=3)%(then)%(else)%(refname:short)%(end)\" $* $forgit_emojify | sed '/^$/d'"
cmd="git branch --color=always --verbose --all --format=\"%(if:equals=HEAD)%(refname:strip=3)%(then)%(else)%(refname:short)%(end)\" $forgit_emojify | sed '/^$/d'"
preview="git log {} --graph --pretty=format:'%C(auto)%h%d %s %C(black)%C(bold)%cr%Creset' --color=always --abbrev-commit --date=relative"
opts="
$FORGIT_FZF_DEFAULT_OPTS