linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2026-02-20 03:02:29 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add Git tags to prompt

Browse source 
Example:
  ➜  abc git:(v1.0 @ f00baa)
  ➜  buz git:(v0_5-rc1 some-tag @ a1b2c3)

If using git >= 1.7.10, will show up to 10 tags separated by spaces
For earlier versions, only single (last) tag will be shown.

Minimum supported Git version: v1.0.5

External tool dependencies - head(1), paste(1)

Closes robbyrussell/oh-my-zsh#1599

Signed-off-by: Aleksandrs Ļedovskis <aleksandrs@ledovskis.lv>
This commit is contained in:
Aleksandrs Ļedovskis 2014-06-21 00:16:00 +03:00
commit 02b8fde99e
1 changed files with 42 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

46
lib/git.zsh
View file

@ -3,7 +3,7 @@ function git_prompt_info() {
if [[ "$(command git config --get oh-my-zsh.hide-status 2>/dev/null)" != "1" ]]; then if [[ "$(command git config --get oh-my-zsh.hide-status 2>/dev/null)" != "1" ]]; then
ref=$(command git symbolic-ref HEAD 2> /dev/null) || \ ref=$(command git symbolic-ref HEAD 2> /dev/null) || \
ref=$(command git rev-parse --short HEAD 2> /dev/null) || return 0 ref=$(command git rev-parse --short HEAD 2> /dev/null) || return 0
echo "$ZSH_THEME_GIT_PROMPT_PREFIX${ref#refs/heads/}$(parse_git_dirty)$ZSH_THEME_GIT_PROMPT_SUFFIX" echo "$ZSH_THEME_GIT_PROMPT_PREFIX$(git_at_tag)${ref#refs/heads/}$(parse_git_dirty)$ZSH_THEME_GIT_PROMPT_SUFFIX"
fi fi
} }
@ -52,6 +52,18 @@ git_remote_status() {
fi fi
} }
# Get up to ten tags for HEAD
git_at_tag() {
if [[ $POST_1_7_10_GIT -gt 0 ]]; then
tag=$(command git tag --points-at HEAD 2> /dev/null | head | paste -s -d ' ' -)
else
tag=$(command git describe --tags --exact-match HEAD 2> /dev/null)
fi
if [[ -n $tag ]]; then
echo "$tag @ "
fi
}
# Checks if there are commits ahead from remote # Checks if there are commits ahead from remote
function git_prompt_ahead() { function git_prompt_ahead() {
if $(echo "$(command git log origin/$(current_branch)..HEAD 2> /dev/null)" | grep '^commit' &> /dev/null); then if $(echo "$(command git log origin/$(current_branch)..HEAD 2> /dev/null)" | grep '^commit' &> /dev/null); then
@ -122,21 +134,47 @@ git_prompt_status() {
function git_compare_version() { function git_compare_version() {
local INPUT_GIT_VERSION=$1; local INPUT_GIT_VERSION=$1;
local INSTALLED_GIT_VERSION local INSTALLED_GIT_VERSION
local MAX_VERSION_PLACE
INPUT_GIT_VERSION=(${(s/./)INPUT_GIT_VERSION}); INPUT_GIT_VERSION=(${(s/./)INPUT_GIT_VERSION});
INSTALLED_GIT_VERSION=($(command git --version 2>/dev/null)); INSTALLED_GIT_VERSION=($(command git --version 2>/dev/null));
INSTALLED_GIT_VERSION=(${(s/./)INSTALLED_GIT_VERSION[3]}); INSTALLED_GIT_VERSION=(${(s/./)INSTALLED_GIT_VERSION[3]});
for i in {1..3}; do # Check for exact similarity
if [[ $INSTALLED_GIT_VERSION[$i] -lt $INPUT_GIT_VERSION[$i] ]]; then if [[ ${(j//)INSTALLED_GIT_VERSION} == ${(j//)INPUT_GIT_VERSION} ]]; then
echo 1
return 0
fi
# Find largest version number place out of two objects we are working with
if [[ ${#INSTALLED_GIT_VERSION[@]} -gt ${#INPUT_GIT_VERSION} ]]; then
MAX_VERSION_PLACE=${#INSTALLED_GIT_VERSION[@]}
else
MAX_VERSION_PLACE=${#INPUT_GIT_VERSION[@]}
fi
# Iteratively compare versions
for ((i=1; i <= MAX_VERSION_PLACE; i++)); do
if [[ $INSTALLED_GIT_VERSION[$i] -eq $INPUT_GIT_VERSION[$i] ]]; then
continue
elif [[ $INSTALLED_GIT_VERSION[$i] -lt $INPUT_GIT_VERSION[$i] ]]; then
echo -1 echo -1
return 0 else
echo 1
fi fi
return 0
done done
# Might end up here when local version contains SHA revision (when git was built
# directly from source) or some other textual information - "beta", "pre", "rc".
# For example, comparing "1.7.0.4" with its source built sibling "1.7.0.4.2be10bb"
# would result in "1", as would "1.9.0" check against "1.9.0-rc3"
echo 1 echo 1
} }
#this is unlikely to change so make it all statically assigned #this is unlikely to change so make it all statically assigned
POST_1_7_2_GIT=$(git_compare_version "1.7.2") POST_1_7_2_GIT=$(git_compare_version "1.7.2")
POST_1_7_10_GIT=$(git_compare_version "1.7.10")
#clean up the namespace slightly by removing the checker function #clean up the namespace slightly by removing the checker function
unset -f git_compare_version unset -f git_compare_version