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

smt: fix time since last commit logic

Browse source 
Fixes #5244
This commit is contained in:
Marc Cornellà 2020-06-09 19:34:52 +02:00
parent 374b4e02ef
commit a2a83be982
1 changed files with 34 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
themes/smt.zsh-theme
View file

@ -21,9 +21,9 @@ ZSH_THEME_GIT_PROMPT_SHA_BEFORE="➤ %{$fg_bold[yellow]%}"
ZSH_THEME_GIT_PROMPT_SHA_AFTER="%{$reset_color%}" ZSH_THEME_GIT_PROMPT_SHA_AFTER="%{$reset_color%}"
function prompt_char() { function prompt_char() {
git branch >/dev/null 2>/dev/null && echo "%{$fg[green]%}±%{$reset_color%}" && return command git branch &>/dev/null && echo "%{$fg[green]%}±%{$reset_color%}" && return
hg root >/dev/null 2>/dev/null && echo "%{$fg_bold[red]%}☿%{$reset_color%}" && return command hg root &>/dev/null && echo "%{$fg_bold[red]%}☿%{$reset_color%}" && return
darcs show repo >/dev/null 2>/dev/null && echo "%{$fg_bold[green]%}❉%{$reset_color%}" && return command darcs show repo &>/dev/null && echo "%{$fg_bold[green]%}❉%{$reset_color%}" && return
echo "%{$fg[cyan]%}◯%{$reset_color%}" echo "%{$fg[cyan]%}◯%{$reset_color%}"
} }
@ -36,46 +36,43 @@ ZSH_THEME_GIT_TIME_SINCE_COMMIT_NEUTRAL="%{$fg[cyan]%}"
# Determine the time since last commit. If branch is clean, # Determine the time since last commit. If branch is clean,
# use a neutral color, otherwise colors will vary according to time. # use a neutral color, otherwise colors will vary according to time.
function git_time_since_commit() { function git_time_since_commit() {
if git rev-parse --git-dir > /dev/null 2>&1; then local COLOR MINUTES HOURS DAYS SUB_HOURS SUB_MINUTES
# Only proceed if there is actually a commit. local last_commit seconds_since_last_commit
if [[ $(git log 2>&1 > /dev/null | grep -c "^fatal: bad default revision") == 0 ]]; then
# Get the last commit. # Only proceed if there is actually a commit
last_commit=`git log --pretty=format:'%at' -1 2> /dev/null` if ! last_commit=$(command git log --pretty=format:'%at' -1 2>/dev/null); then
now=`date +%s` echo "[$ZSH_THEME_GIT_TIME_SINCE_COMMIT_NEUTRAL~%{$reset_color%}]"
seconds_since_last_commit=$((now-last_commit)) return
fi
# Totals # Totals
seconds_since_last_commit=$(( EPOCHSECONDS - last_commit ))
MINUTES=$(( seconds_since_last_commit / 60 )) MINUTES=$(( seconds_since_last_commit / 60 ))
HOURS=$((seconds_since_last_commit/3600)) HOURS=$(( MINUTES / 60 ))
# Sub-hours and sub-minutes # Sub-hours and sub-minutes
DAYS=$((seconds_since_last_commit / 86400)) DAYS=$(( HOURS / 24 ))
SUB_HOURS=$(( HOURS % 24 )) SUB_HOURS=$(( HOURS % 24 ))
SUB_MINUTES=$(( MINUTES % 60 )) SUB_MINUTES=$(( MINUTES % 60 ))
if [[ -n $(git status -s 2> /dev/null) ]]; then if [[ -z "$(command git status -s 2>/dev/null)" ]]; then
if [ "$MINUTES" -gt 30 ]; then COLOR="$ZSH_THEME_GIT_TIME_SINCE_COMMIT_NEUTRAL"
else
if [[ "$MINUTES" -gt 30 ]]; then
COLOR="$ZSH_THEME_GIT_TIME_SINCE_COMMIT_LONG" COLOR="$ZSH_THEME_GIT_TIME_SINCE_COMMIT_LONG"
elif [ "$MINUTES" -gt 10 ]; then elif [[ "$MINUTES" -gt 10 ]]; then
COLOR="$ZSH_THEME_GIT_TIME_SHORT_COMMIT_MEDIUM" COLOR="$ZSH_THEME_GIT_TIME_SHORT_COMMIT_MEDIUM"
else else
COLOR="$ZSH_THEME_GIT_TIME_SINCE_COMMIT_SHORT" COLOR="$ZSH_THEME_GIT_TIME_SINCE_COMMIT_SHORT"
fi fi
else
COLOR="$ZSH_THEME_GIT_TIME_SINCE_COMMIT_NEUTRAL"
fi fi
if [ "$HOURS" -gt 24 ]; then if [[ "$HOURS" -gt 24 ]]; then
echo "[$COLOR${DAYS}d${SUB_HOURS}h${SUB_MINUTES}m%{$reset_color%}]" echo "[${COLOR}${DAYS}d${SUB_HOURS}h${SUB_MINUTES}m%{$reset_color%}]"
elif [ "$MINUTES" -gt 60 ]; then elif [[ "$MINUTES" -gt 60 ]]; then
echo "[$COLOR${HOURS}h${SUB_MINUTES}m%{$reset_color%}]" echo "[${COLOR}${HOURS}h${SUB_MINUTES}m%{$reset_color%}]"
else else
echo "[$COLOR${MINUTES}m%{$reset_color%}]" echo "[${COLOR}${MINUTES}m%{$reset_color%}]"
fi
else
COLOR="$ZSH_THEME_GIT_TIME_SINCE_COMMIT_NEUTRAL"
echo "[$COLOR~]"
fi
fi fi
} }