von/vdotfiles
1
0
Fork 0
Code Activity

a function to run git clean and reset commands, a little bit of refactoring

Browse source
This commit is contained in:
Von Random 2017-11-15 15:24:08 +03:00
parent 928d450c85
commit 591a5bac1c
1 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
zshrc
View file

@ -79,8 +79,7 @@ precmd.title() {
;; ;;
esac esac
} }
precmd.is_git_repo() precmd.is_git_repo() {
{
local curr_dir=$PWD local curr_dir=$PWD
while [[ -n $curr_dir ]]; do while [[ -n $curr_dir ]]; do
if [[ -r $curr_dir/.git/HEAD ]]; then if [[ -r $curr_dir/.git/HEAD ]]; then
@ -91,8 +90,7 @@ precmd.is_git_repo()
done done
return 1 return 1
} }
precmd.git() precmd.git() {
{
precmd.is_git_repo || return 0 precmd.is_git_repo || return 0
local raw_status="$(git status --porcelain -bu 2>/dev/null)" local raw_status="$(git status --porcelain -bu 2>/dev/null)"
@ -122,16 +120,16 @@ precmd.git_update() {
precmd.git > $prompt_state_file precmd.git > $prompt_state_file
kill -s USR1 $$ kill -s USR1 $$
} }
TRAPUSR1() {
prompt_git_data="$(<$prompt_state_file)"
precmd.prompt
zle && zle reset-prompt
}
precmd() { precmd() {
precmd.title precmd.title
precmd.prompt precmd.prompt
precmd.git_update &! precmd.git_update &!
} }
TRAPUSR1() {
prompt_git_data="$(<$prompt_state_file)"
precmd.prompt
zle && zle reset-prompt
}
TRAPEXIT() { TRAPEXIT() {
[[ -r $prompt_state_file ]] && rm $prompt_state_file [[ -r $prompt_state_file ]] && rm $prompt_state_file
} }
@ -159,7 +157,7 @@ alias atmux='command tmux -2 attach'
alias rscreen='command screen -Dr' alias rscreen='command screen -Dr'
alias scr='command screen sudo -Es' alias scr='command screen sudo -Es'
# }}} # }}}
# {{{ global aliases # {{{ awesome zsh only aliases
alias -g L='| less -R' alias -g L='| less -R'
alias -g H='| head' alias -g H='| head'
alias -g T='| tail' alias -g T='| tail'
@ -176,8 +174,6 @@ alias -g WK='| iconvwk'
alias -g UK='| iconvuk' alias -g UK='| iconvuk'
alias -g KU='| iconvku' alias -g KU='| iconvku'
alias -g WU='| iconvwu' alias -g WU='| iconvwu'
# }}}
# {{{ suffix aliases
alias -s {txt,xml,cfg,cnf,conf,ini.erb.pp}=${EDITOR} alias -s {txt,xml,cfg,cnf,conf,ini.erb.pp}=${EDITOR}
alias -s {mkv,mp4,avi,mpg,mp3,ogg,mpeg,mov,webm,flv}='mpv' alias -s {mkv,mp4,avi,mpg,mp3,ogg,mpeg,mov,webm,flv}='mpv'
alias -s {jpg,png,gif,bmp,jpeg}='eog' alias -s {jpg,png,gif,bmp,jpeg}='eog'
@ -228,4 +224,10 @@ gdf() {
gdiff "$@" gdiff "$@"
fi fi
} }
greset() {
echo "OK to reset and clean teh repo?"
read _
/usr/bin/git clean -fd
/usr/bin/git reset --hard
}
# }}} # }}}