meineerde/dotfiles
1
0
Fork 0
mirror of https://github.com/meineerde/dotfiles.git synced 2026-02-05 16:43:22 +00:00
Code Issues Releases Activity

Fix whitespace and behavior when there is no prompt

Browse Source
This commit is contained in:
Holger Just 2011-05-12 21:29:37 +02:00
parent 061091b45d
commit f1ea4312a4
1 changed files with 61 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

124
bin/bash_vcs.sh
View File

@ -1,76 +1,74 @@
# I use this in my .bashrc to have nice VCS stuff.
# Tim Felgentreff (09/20/01): Simplify for speedup, use the git-completion script for git
_bold=$(tput bold)
_normal=$(tput sgr0)
__prompt_command() {
if [ -z $NOPROMPT ]; then
if [ -z $NOPROMPT ]; then
local vcs base_dir sub_dir ref last_command _bold _normal
local vcs base_dir sub_dir ref last_command
sub_dir() {
local sub_dir
sub_dir=$(stat --printf="%n" "${PWD}")
sub_dir=${sub_dir#$1}
echo ${sub_dir#/}
}
_bold=$(tput bold)
_normal=$(tput sgr0)
git_dir() {
ref=$(echo -e $(__git_ps1))
if [ -z $ref ]; then return 1; fi
vcs="git"
alias pull="git pull"
alias commit="git commit -v -a"
alias push="commit ; git push"
alias revert="git checkout"
}
sub_dir() {
local sub_dir
sub_dir=$(stat --printf="%n" "${PWD}")
sub_dir=${sub_dir#$1}
echo ${sub_dir#/}
}
svn_dir() {
[ -d ".svn" ] || return 1
ref=$(svn info "$base_dir" | awk '/^URL/ { sub(".*/","",$0); r=$0 } /^Revision/ { sub("[^0-9]*","",$0); print $0 }')
# this is too slow...
#if [ -n $(svn status -q) ]; then
# ref="\e[0;31m$ref\e[m"
#fi
ref="[$ref]"
vcs="svn"
alias pull="svn up"
alias commit="svn commit"
alias push="svn ci"
alias revert="svn revert"
}
cvs_dir() {
[ -d "CVS" ] || return 1
vcs="cvs"
alias pull="cvs update"
alias commit="cvs commit"
alias push="cvs commit"
}
git_dir() {
ref=$(echo -e $(__git_ps1))
if [ -z $ref ]; then return 1; fi
vcs="git"
alias pull="git pull"
alias commit="git commit -v -a"
alias push="commit ; git push"
alias revert="git checkout"
}
bzr_dir() {
base_dir=$(bzr root 2>/dev/null) || return 1
ref=$(bzr revno 2>/dev/null)
vcs="bzr"
alias pull="bzr pull"
alias commit="bzr commit"
alias push="bzr push"
alias revert="bzr revert"
}
svn_dir() {
[ -d ".svn" ] || return 1
ref=$(svn info "$base_dir" | awk '/^URL/ { sub(".*/","",$0); r=$0 } /^Revision/ { sub("[^0-9]*","",$0); print $0 }')
# this is too slow...
#if [ -n $(svn status -q) ]; then
# ref="\e[0;31m$ref\e[m"
#fi
ref="[$ref]"
vcs="svn"
alias pull="svn up"
alias commit="svn commit"
alias push="svn ci"
alias revert="svn revert"
}
git_dir || svn_dir || cvs_dir
cvs_dir() {
[ -d "CVS" ] || return 1
vcs="cvs"
alias pull="cvs update"
alias commit="cvs commit"
alias push="cvs commit"
}
if [ -n "$vcs" ]; then
alias st="$vcs status"
alias d="$vcs diff"
alias up="pull"
alias cdb="cd $base_dir"
__vcs_ref="$vcs:$ref"
echo " $__vcs_ref"
fi
fi
bzr_dir() {
base_dir=$(bzr root 2>/dev/null) || return 1
ref=$(bzr revno 2>/dev/null)
vcs="bzr"
alias pull="bzr pull"
alias commit="bzr commit"
alias push="bzr push"
alias revert="bzr revert"
}
git_dir || svn_dir || cvs_dir
if [ -n "$vcs" ]; then
alias st="$vcs status"
alias d="$vcs diff"
alias up="pull"
alias cdb="cd $base_dir"
__vcs_ref="$vcs:$ref"
echo " $__vcs_ref"
fi
fi
}
#export PROMPT_COMMAND=__prompt_command