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

Merge branch 'magicmonty'

Browse Source
master
Martin Goldhahn 13 years ago
parent d22e1b495e ff7575ccdc
commit 6f47998906
6 changed files with 287 additions and 111 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. 2
      .gitignore
  2. 4
      README.md
  3. 106
      gitprompt.fish
  4. BIN
      gitprompt.png
  5. 201
      gitprompt.sh
  6. 5
      gitstatus.py

2
.gitignore vendored
Unescape View File

@ -0,0 +1,2 @@
*~
*.bak

4
README.md
Unescape View File

@ -1,4 +1,4 @@
# Informative git prompt for bash # Informative git prompt for bash and fish
This prompt is a port of the "Informative git prompt for zsh" which you can find [here](https://github.com/olivierverdier/zsh-git-prompt) This prompt is a port of the "Informative git prompt for zsh" which you can find [here](https://github.com/olivierverdier/zsh-git-prompt)
@ -11,6 +11,8 @@ In particular the branch name, difference with remote branch, number of files st
The prompt may look like the following: The prompt may look like the following:
![Example prompt](gitprompt.png)
* ``(master↑3|✚1)``: on branch ``master``, ahead of remote by 3 commits, 1 file changed but not staged * ``(master↑3|✚1)``: on branch ``master``, ahead of remote by 3 commits, 1 file changed but not staged
* ``(status|●2)``: on branch ``status``, 2 files staged * ``(status|●2)``: on branch ``status``, 2 files staged
* ``(master|✚7…)``: on branch ``master``, 7 files changed, some files untracked * ``(master|✚7…)``: on branch ``master``, 7 files changed, some files untracked

106
gitprompt.fish
Unescape View File

@ -0,0 +1,106 @@
if not set -q __GIT_PROMPT_DIR
set __GIT_PROMPT_DIR ~/.bash
end
# Colors
# Reset
set ResetColor (set_color normal) # Text Reset
# Regular Colors
set Red (set_color red) # Red
set Yellow (set_color yellow); # Yellow
set Blue (set_color blue) # Blue
set WHITE (set_color white)
# Bold
set BGreen (set_color -o green) # Green
# High Intensty
set IBlack (set_color -o black) # Black
# Bold High Intensty
set Magenta (set_color -o purple) # Purple
# Default values for the appearance of the prompt. Configure at will.
set GIT_PROMPT_PREFIX "["
set GIT_PROMPT_SUFFIX "]"
set GIT_PROMPT_SEPARATOR "|"
set GIT_PROMPT_BRANCH "$Magenta"
set GIT_PROMPT_STAGED "$Red● "
set GIT_PROMPT_CONFLICTS "$Red✖ "
set GIT_PROMPT_CHANGED "$Blue✚ "
set GIT_PROMPT_REMOTE " "
set GIT_PROMPT_UNTRACKED "…"
set GIT_PROMPT_CLEAN "$BGreen✔"
function fish_prompt
# Various variables you might want for your PS1 prompt instead
set Time (date +%R)
set PathShort (pwd|sed "s=$HOME=~=")
set PROMPT_START "$Yellow$PathShort$ResetColor"
set PROMPT_END " \n$WHITE$Time$ResetColor \$ "
set -e __CURRENT_GIT_STATUS
set gitstatus "$__GIT_PROMPT_DIR/gitstatus.py"
set _GIT_STATUS (python $gitstatus)
set __CURRENT_GIT_STATUS $_GIT_STATUS
set __CURRENT_GIT_STATUS_PARAM_COUNT (count $__CURRENT_GIT_STATUS)
if not test "0" -eq $__CURRENT_GIT_STATUS_PARAM_COUNT
set GIT_BRANCH $__CURRENT_GIT_STATUS[1]
set GIT_REMOTE "$__CURRENT_GIT_STATUS[2]"
if contains "." "$GIT_REMOTE"
set -e GIT_REMOTE
end
set GIT_STAGED $__CURRENT_GIT_STATUS[3]
set GIT_CONFLICTS $__CURRENT_GIT_STATUS[4]
set GIT_CHANGED $__CURRENT_GIT_STATUS[5]
set GIT_UNTRACKED $__CURRENT_GIT_STATUS[6]
set GIT_CLEAN $__CURRENT_GIT_STATUS[7]
end
if test -n "$__CURRENT_GIT_STATUS"
set STATUS " $GIT_PROMPT_PREFIX$GIT_PROMPT_BRANCH$GIT_BRANCH$ResetColor"
if set -q GIT_REMOTE
set STATUS "$STATUS$GIT_PROMPT_REMOTE$GIT_REMOTE$ResetColor"
end
set STATUS "$STATUS$GIT_PROMPT_SEPARATOR"
if [ $GIT_STAGED != "0" ]
set STATUS "$STATUS$GIT_PROMPT_STAGED$GIT_STAGED$ResetColor"
end
if [ $GIT_CONFLICTS != "0" ]
set STATUS "$STATUS$GIT_PROMPT_CONFLICTS$GIT_CONFLICTS$ResetColor"
end
if [ $GIT_CHANGED != "0" ]
set STATUS "$STATUS$GIT_PROMPT_CHANGED$GIT_CHANGED$ResetColor"
end
if [ "$GIT_UNTRACKED" != "0" ]
set STATUS "$STATUS$GIT_PROMPT_UNTRACKED$GIT_UNTRACKED$ResetColor"
end
if [ "$GIT_CLEAN" = "1" ]
set STATUS "$STATUS$GIT_PROMPT_CLEAN"
end
set STATUS "$STATUS$ResetColor$GIT_PROMPT_SUFFIX"
set PS1 "$PROMPT_START$STATUS$PROMPT_END"
else
set PS1 "$PROMPT_START$PROMPT_END"
end
echo -e $PS1
end

BIN
gitprompt.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 22 KiB

201
gitprompt.sh
Unescape View File

@ -1,39 +1,40 @@
#!/bin/bash #!/bin/sh
function git_prompt_dir()
{
# assume the gitstatus.py is in the same directory as this script # assume the gitstatus.py is in the same directory as this script
# code thanks to http://stackoverflow.com/questions/59895 # code thanks to http://stackoverflow.com/questions/59895
if [ -z "$__GIT_PROMPT_DIR" ] ; then if [ -z "${__GIT_PROMPT_DIR}" ]; then
SOURCE="${BASH_SOURCE[0]}" local SOURCE="${BASH_SOURCE[0]}"
while [ -h "$SOURCE" ] ; do while [ -h "${SOURCE}" ]; do
DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )" local DIR="$( cd -P "$( dirname "${SOURCE}" )" && pwd )"
SOURCE="$(readlink "$SOURCE")" SOURCE="$(readlink "${SOURCE}")"
[[ $SOURCE != /* ]] && SOURCE="$DIR/$SOURCE" [[ $SOURCE != /* ]] && SOURCE="${DIR}/${SOURCE}"
done done
__GIT_PROMPT_DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )" __GIT_PROMPT_DIR="$( cd -P "$( dirname "${SOURCE}" )" && pwd )"
fi fi
}
function git_prompt_config()
{
# Colors # Colors
# Reset ResetColor="\[\033[0m\]" # Text reset
ResetColor="\[\033[0m\]" # Text Reset
# Regular Colors
Red="\[\033[0;31m\]" # Red
Yellow="\[\033[0;33m\]" # Yellow
Blue="\[\033[0;34m\]" # Blue
WHITE='\[\033[37m\]'
# Bold # Bold
BGreen="\[\033[1;32m\]" # Green local BoldGreen="\[\033[1;32m\]" # Green
local BoldBlue="\[\033[1;34m\]" # Blue
# High Intensty # High Intensty
IBlack="\[\033[0;90m\]" # Black local IntenseBlack="\[\033[0;90m\]" # Grey
# Bold High Intensty # Bold High Intensty
Magenta="\[\033[1;95m\]" # Purple local Magenta="\[\033[1;95m\]" # Purple
# Various variables you might want for your PS1 prompt instead # Regular Colors
#Time12a="\@" local Yellow="\[\033[0;33m\]"
Time12a="(\$(date +%H:%M:%S))" local White='\[\033[37m\]'
PathShort="\w" local Red="\[\033[0;31m\]"
local Blue="\[\033[0;34m\]"
# Default values for the appearance of the prompt. Configure at will. # Default values for the appearance of the prompt. Configure at will.
GIT_PROMPT_PREFIX="[" GIT_PROMPT_PREFIX="["
@ -45,76 +46,136 @@ GIT_PROMPT_CONFLICTS="${Red}✖ "
GIT_PROMPT_CHANGED="${Blue}✚ " GIT_PROMPT_CHANGED="${Blue}✚ "
GIT_PROMPT_REMOTE=" " GIT_PROMPT_REMOTE=" "
GIT_PROMPT_UNTRACKED="…" GIT_PROMPT_UNTRACKED="…"
GIT_PROMPT_CLEAN="${BGreen}✔" GIT_PROMPT_CLEAN="${BoldGreen}✔"
# Various variables you might want for your PS1 prompt instead
local Time12a="\$(date +%H:%M)"
# local Time12a="(\$(date +%H:%M:%S))"
# local Time12a="(\@))"
local PathShort="\w"
if [ "x${GIT_PROMPT_START}" == "x" ]; then
PROMPT_START="${Yellow}${PathShort}${ResetColor}"
else
PROMPT_START="${GIT_PROMPT_START}"
fi
PROMPT_START="$Yellow$PathShort$ResetColor" if [ "x${GIT_PROMPT_END}" == "x" ]; then
PROMPT_END=" \n$WHITE$Time12a$ResetColor $ " PROMPT_END=" \n${White}${Time12a}${ResetColor} $ "
if [ -z "$OLDPROMPT" ] ; then else
export OLDPROMPT=$PS1 PROMPT_END="${GIT_PROMPT_END}"
fi fi
function update_current_git_vars() { EMPTY_PROMPT="${PROMPT_START}${PROMPT_END}"
unset __CURRENT_GIT_STATUS
local gitstatus="${__GIT_PROMPT_DIR}/gitstatus.py"
_GIT_STATUS=$(python $gitstatus) # fetch remote revisions every other $GIT_PROMPT_FETCH_TIMEOUT (default 5) minutes
__CURRENT_GIT_STATUS=($_GIT_STATUS) GIT_PROMPT_FETCH_TIMEOUT=${1-5}
GIT_BRANCH=${__CURRENT_GIT_STATUS[0]} if [ "x$__GIT_STATUS_CMD" == "x" ]
GIT_REMOTE=${__CURRENT_GIT_STATUS[1]} then
if [[ "." == "$GIT_REMOTE" ]]; then git_prompt_dir
unset GIT_REMOTE __GIT_STATUS_CMD="${__GIT_PROMPT_DIR}/gitstatus.py"
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() {
update_current_git_vars
set_virtualenv
if [ -n "$__CURRENT_GIT_STATUS" ]; then local GIT_PROMPT_PREFIX
STATUS=" $GIT_PROMPT_PREFIX$GIT_PROMPT_BRANCH$GIT_BRANCH$ResetColor" 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
EMPTY_PROMPT=${OLD_GITPROMPT}
local repo=`git rev-parse --show-toplevel 2> /dev/null`
if [[ ! -e "${repo}" ]]; then
PS1="${EMPTY_PROMPT}"
return
fi
if [ -n "$GIT_REMOTE" ]; then local FETCH_HEAD="${repo}/.git/FETCH_HEAD"
STATUS="$STATUS$GIT_PROMPT_REMOTE$GIT_REMOTE$ResetColor" # 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}` ]]
then
[[ -n $(git remote show) ]] && git fetch --quiet
fi fi
STATUS="$STATUS$GIT_PROMPT_SEPARATOR" local -a GitStatus
if [ "$GIT_STAGED" -ne "0" ]; then GitStatus=($("${__GIT_STATUS_CMD}" 2>/dev/null))
STATUS="$STATUS$GIT_PROMPT_STAGED$GIT_STAGED$ResetColor"
local GIT_BRANCH=${GitStatus[0]}
local GIT_REMOTE=${GitStatus[1]}
if [[ "." == "$GIT_REMOTE" ]]; then
unset GIT_REMOTE
fi 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 [ "$GIT_CONFLICTS" -ne "0" ]; then if [[ -n "${GitStatus}" ]]; then
STATUS="$STATUS$GIT_PROMPT_CONFLICTS$GIT_CONFLICTS$ResetColor" local STATUS=" ${GIT_PROMPT_PREFIX}${GIT_PROMPT_BRANCH}${GIT_BRANCH}${ResetColor}"
if [[ -n "${GIT_REMOTE}" ]]; then
STATUS="${STATUS}${GIT_PROMPT_REMOTE}${GIT_REMOTE}${ResetColor}"
fi fi
if [ "$GIT_CHANGED" -ne "0" ]; then
STATUS="$STATUS$GIT_PROMPT_CHANGED$GIT_CHANGED$ResetColor" STATUS="${STATUS}${GIT_PROMPT_SEPARATOR}"
if [ "${GIT_STAGED}" -ne "0" ]; then
STATUS="${STATUS}${GIT_PROMPT_STAGED}${GIT_STAGED}${ResetColor}"
fi fi
if [ "$GIT_UNTRACKED" -ne "0" ]; then
STATUS="$STATUS$GIT_PROMPT_UNTRACKED$GIT_UNTRACKED$ResetColor" if [ "${GIT_CONFLICTS}" -ne "0" ]; then
STATUS="${STATUS}${GIT_PROMPT_CONFLICTS}${GIT_CONFLICTS}${ResetColor}"
fi fi
if [ "$GIT_CLEAN" -eq "1" ]; then
STATUS="$STATUS$GIT_PROMPT_CLEAN" if [ "${GIT_CHANGED}" -ne "0" ]; then
STATUS="${STATUS}${GIT_PROMPT_CHANGED}${GIT_CHANGED}${ResetColor}"
fi fi
STATUS="$STATUS$ResetColor$GIT_PROMPT_SUFFIX"
PS1="$PYTHON_VIRTUALENV$PROMPT_START$STATUS$PROMPT_END" if [ "${GIT_UNTRACKED}" -ne "0" ]; then
else STATUS="${STATUS}${GIT_PROMPT_UNTRACKED}${GIT_UNTRACKED}${ResetColor}"
#PS1="$PROMPT_START$PROMPT_END" fi
PS1=$OLDPROMPT
if [ "${GIT_CLEAN}" -eq "1" ]; then
STATUS="${STATUS}${GIT_PROMPT_CLEAN}"
fi
STATUS="${STATUS}${ResetColor}${GIT_PROMPT_SUFFIX}"
PS1="${PROMPT_START}${STATUS}${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
} }
if [ -z "$OLD_GITPROMPT" ]; then
OLD_GITPROMPT=$PS1
fi
if [ -z "$PROMPT_COMMAND" ]; then
PROMPT_COMMAND=setGitPrompt PROMPT_COMMAND=setGitPrompt
else
PROMPT_COMMAND="$PROMPT_COMMAND;setGitPrompt"
fi

5
gitstatus.py
Unescape View File

@ -40,7 +40,12 @@ else:
remote = '' remote = ''
tag, tag_error = Popen(['git', 'describe', '--exact-match'], stdout=PIPE, stderr=PIPE).communicate()
if not branch: # not on any branch if not branch: # not on any branch
if tag: # if we are on a tag, print the tag's name
branch = tag
else:
branch = symbols['prehash']+ Popen(['git','rev-parse','--short','HEAD'], stdout=PIPE).communicate()[0][:-1] branch = symbols['prehash']+ Popen(['git','rev-parse','--short','HEAD'], stdout=PIPE).communicate()[0][:-1]
else: else:
remote_name = Popen(['git','config','branch.%s.remote' % branch], stdout=PIPE).communicate()[0].strip() remote_name = Popen(['git','config','branch.%s.remote' % branch], stdout=PIPE).communicate()[0].strip()

Write Preview
Loading…
Cancel
Save