stevo
/
.bash-git-prompt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:sdefresne/bash-git-prompt into sdefresne-master

Browse Source 
# By Sylvain Defresne
# Via Sylvain Defresne
* 'master' of github.com:sdefresne/bash-git-prompt:
  Prevent pollution of the global namespace & properly quote variables

Conflicts:
	gitprompt.sh
master
Martin Gondermann 13 years ago
parent bd5710498f dee331fb47
commit 71ab709ab9
1 changed files with 123 additions and 106 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 203
      gitprompt.sh

203
gitprompt.sh
Unescape View File

@ -1,121 +1,138 @@
if [ "x$__GIT_STATUS_CMD" == "x" ] #!/bin/sh
then
__GIT_STATUS_CMD=~/.bash/gitstatus.py function git_prompt_config()
fi {
# Colors
# Colors ResetColor="\[\033[0m\]" # Text reset
# Reset
ResetColor="\[\033[0m\]" # Text Reset # Bold
local BoldGreen="\[\033[1;32m\]" # Green
# fetch remote revisions every other $GIT_PROMPT_FETCH_TIMEOUT (default 5) minutes local BoldBlue="\[\033[1;34m\]" # Blue
GIT_PROMPT_FETCH_TIMEOUT=${1-5}
# High Intensty
# Regular Colors local IntenseBlack="\[\033[0;90m\]" # Grey
Red="\[\033[0;31m\]" # Red
Yellow="\[\033[0;33m\]" # Yellow # Bold High Intensty
Blue="\[\033[0;34m\]" # Blue local Magenta="\[\033[1;95m\]" # Purple
WHITE='\[\033[37m\]'
# Regular Colors
# Bold local Yellow="\[\033[0;33m\]"
BGreen="\[\033[1;32m\]" # Green local White='\[\033[37m\]'
local Red="\[\033[0;31m\]"
# High Intensty Blue="\[\033[0;34m\]"
IBlack="\[\033[0;90m\]" # Black
# Default values for the appearance of the prompt. Configure at will.
# Bold High Intensty GIT_PROMPT_PREFIX="["
Magenta="\[\033[1;95m\]" # Purple GIT_PROMPT_SUFFIX="]"
GIT_PROMPT_SEPARATOR="|"
# Various variables you might want for your PS1 prompt instead GIT_PROMPT_BRANCH="${Magenta}"
Time12a="\@" GIT_PROMPT_STAGED="${Red}● "
PathShort="\w" GIT_PROMPT_CONFLICTS="${Red}✖ "
GIT_PROMPT_CHANGED="${Blue}✚ "
# Default values for the appearance of the prompt. Configure at will. GIT_PROMPT_REMOTE=" "
GIT_PROMPT_PREFIX="[" GIT_PROMPT_UNTRACKED="…"
GIT_PROMPT_SUFFIX="]" GIT_PROMPT_CLEAN="${BoldGreen}✔"
GIT_PROMPT_SEPARATOR="|"
GIT_PROMPT_BRANCH="${Magenta}" # Various variables you might want for your PS1 prompt instead
GIT_PROMPT_STAGED="${Red}● " local Time12a="\@"
GIT_PROMPT_CONFLICTS="${Red}✖ " local PathShort="\w"
GIT_PROMPT_CHANGED="${Blue}✚ "
GIT_PROMPT_REMOTE=" " PROMPT_START="${Yellow}${PathShort}${ResetColor}"
GIT_PROMPT_UNTRACKED="…" PROMPT_END=" \n${White}${Time12a}${ResetColor} $ "
GIT_PROMPT_CLEAN="${BGreen}✔"
EMPTY_PROMPT="${PROMPT_START}${PROMPT_END}"
PROMPT_START="$Yellow$PathShort$ResetColor"
PROMPT_END=" \n$WHITE$Time12a$ResetColor $ " # fetch remote revisions every other $GIT_PROMPT_FETCH_TIMEOUT (default 5) minutes
GIT_PROMPT_FETCH_TIMEOUT=${1-5}
if [ "x$__GIT_STATUS_CMD" == "x" ]
function update_current_git_vars() { then
unset __CURRENT_GIT_STATUS __GIT_STATUS_CMD="${__GIT_PROMPT_DIR:-${HOME}/.bash}/gitstatus.py"
_GIT_STATUS=$(python $__GIT_STATUS_CMD)
__CURRENT_GIT_STATUS=($_GIT_STATUS)
GIT_BRANCH=${__CURRENT_GIT_STATUS[0]}
GIT_REMOTE=${__CURRENT_GIT_STATUS[1]}
if [[ "." == "$GIT_REMOTE" ]]; then
unset GIT_REMOTE
fi fi
GIT_STAGED=${__CURRENT_GIT_STATUS[2]}
GIT_CONFLICTS=${__CURRENT_GIT_STATUS[3]}
GIT_CHANGED=${__CURRENT_GIT_STATUS[4]}
GIT_UNTRACKED=${__CURRENT_GIT_STATUS[5]}
GIT_CLEAN=${__CURRENT_GIT_STATUS[6]}
} }
function setGitPrompt() { function setGitPrompt() {
repo=`git rev-parse --show-toplevel 2> /dev/null`
if [[ ! -e $repo ]]; then local GIT_PROMPT_PREFIX
PS1="$PROMPT_START$PROMPT_END" local GIT_PROMPT_SUFFIX
local GIT_PROMPT_SEPARATOR
local GIT_PROMPT_BRANCH
local GIT_PROMPT_STAGED
local GIT_PROMPT_CONFLICTS
local GIT_PROMPT_CHANGED
local GIT_PROMPT_REMOTE
local GIT_PROMPT_UNTRACKED
local GIT_PROMPT_CLEAN
local PROMPT_START
local PROMPT_END
local EMPTY_PROMPT
local ResetColor
local Blue
local GIT_PROMPT_FETCH_TIMEOUT
local __GIT_STATUS_CMD
git_prompt_config
local repo=`git rev-parse --show-toplevel 2> /dev/null`
if [[ ! -e "${repo}" ]]; then
PS1="${EMPTY_PROMPT}"
return return
fi fi
FETCH_HEAD=$repo/.git/FETCH_HEAD local FETCH_HEAD="${repo}/.git/FETCH_HEAD"
# Fech repo if local is stale for more than $GIT_FETCH_TIMEOUT minutes # Fech repo if local is stale for more than $GIT_FETCH_TIMEOUT minutes
if [[ ! -e $FETCH_HEAD || -e `find $FETCH_HEAD -mmin +$GIT_PROMPT_FETCH_TIMEOUT` ]] if [[ ! -e "${FETCH_HEAD}" || -e `find ${FETCH_HEAD} -mmin +${GIT_PROMPT_FETCH_TIMEOUT}` ]]
then then
git fetch --quiet git fetch --quiet
fi fi
update_current_git_vars
set_virtualenv
if [ -n "$__CURRENT_GIT_STATUS" ]; then local -a GitStatus
STATUS=" $GIT_PROMPT_PREFIX$GIT_PROMPT_BRANCH$GIT_BRANCH$ResetColor" GitStatus=($("${__GIT_STATUS_CMD}" 2>/dev/null))
local GIT_BRANCH=${GitStatus[0]}
local GIT_REMOTE=${GitStatus[1]}
if [[ "." == "$GIT_REMOTE" ]]; then
unset GIT_REMOTE
fi
local GIT_STAGED=${GitStatus[2]}
local GIT_CONFLICTS=${GitStatus[3]}
local GIT_CHANGED=${GitStatus[4]}
local GIT_UNTRACKED=${GitStatus[5]}
local GIT_CLEAN=${GitStatus[6]}
if [[ -n "${GitStatus}" ]]; then
local STATUS=" ${GIT_PROMPT_PREFIX}${GIT_PROMPT_BRANCH}${GIT_BRANCH}${ResetColor}"
if [ -n "$GIT_REMOTE" ]; then if [[ -n "${GIT_REMOTE}" ]]; then
STATUS="$STATUS$GIT_PROMPT_REMOTE$GIT_REMOTE$ResetColor" STATUS="${STATUS}${GIT_PROMPT_REMOTE}${GIT_REMOTE}${ResetColor}"
fi fi
STATUS="$STATUS$GIT_PROMPT_SEPARATOR" STATUS="${STATUS}${GIT_PROMPT_SEPARATOR}"
if [ "$GIT_STAGED" -ne "0" ]; then if [ "${GIT_STAGED}" -ne "0" ]; then
STATUS="$STATUS$GIT_PROMPT_STAGED$GIT_STAGED$ResetColor" STATUS="${STATUS}${GIT_PROMPT_STAGED}${GIT_STAGED}${ResetColor}"
fi fi
if [ "$GIT_CONFLICTS" -ne "0" ]; then if [ "${GIT_CONFLICTS}" -ne "0" ]; then
STATUS="$STATUS$GIT_PROMPT_CONFLICTS$GIT_CONFLICTS$ResetColor" STATUS="${STATUS}${GIT_PROMPT_CONFLICTS}${GIT_CONFLICTS}${ResetColor}"
fi fi
if [ "$GIT_CHANGED" -ne "0" ]; then if [ "${GIT_CHANGED}" -ne "0" ]; then
STATUS="$STATUS$GIT_PROMPT_CHANGED$GIT_CHANGED$ResetColor" STATUS="${STATUS}${GIT_PROMPT_CHANGED}${GIT_CHANGED}${ResetColor}"
fi fi
if [ "$GIT_UNTRACKED" -ne "0" ]; then if [ "${GIT_UNTRACKED}" -ne "0" ]; then
STATUS="$STATUS$GIT_PROMPT_UNTRACKED$GIT_UNTRACKED$ResetColor" STATUS="${STATUS}${GIT_PROMPT_UNTRACKED}${GIT_UNTRACKED}${ResetColor}"
fi fi
if [ "$GIT_CLEAN" -eq "1" ]; then if [ "${GIT_CLEAN}" -eq "1" ]; then
STATUS="$STATUS$GIT_PROMPT_CLEAN" STATUS="${STATUS}${GIT_PROMPT_CLEAN}"
fi fi
STATUS="$STATUS$ResetColor$GIT_PROMPT_SUFFIX" STATUS="${STATUS}${ResetColor}${GIT_PROMPT_SUFFIX}"
PS1="$PYTHON_VIRTUALENV$PROMPT_START$STATUS$PROMPT_END"
else PS1="${PROMPT_START}${STATUS}${PROMPT_END}"
PS1="$PROMPT_START$PROMPT_END" if [[ -n "${VIRTUAL_ENV}" ]]; then
PS1="${Blue}($(basename "${VIRTUAL_ENV}"))${ResetColor} ${PS1}"
fi fi
}
# Determine active Python virtualenv details.
function set_virtualenv () {
if test -z "$VIRTUAL_ENV" ; then
PYTHON_VIRTUALENV=""
else else
PYTHON_VIRTUALENV="${BLUE}(`basename \"$VIRTUAL_ENV\"`)${ResetColor} " PS1="${EMPTY_PROMPT}"
fi fi
} }

Write Preview
Loading…
Cancel
Save