a2a83be982bad4568c8311474f02de551d0c9aaa
- Author
- Marc Cornellà <marc.cornella@live.com>
- Committer
- Marc Cornellà <marc.cornella@live.com>
- Date
Message
smt: fix time since last commit logic
Fixes #5244
Diff
1diff --git a/themes/smt.zsh-theme b/themes/smt.zsh-theme
2index f2b0526b761ac35a727c71e36bababe90c66c4cc..7f54472c6b55407bde66ac1ff38ce02d9860e322 100644
3--- a/themes/smt.zsh-theme
4+++ b/themes/smt.zsh-theme
5@@ -21,9 +21,9 @@ ZSH_THEME_GIT_PROMPT_SHA_BEFORE="➤ %{$fg_bold[yellow]%}"
6 ZSH_THEME_GIT_PROMPT_SHA_AFTER="%{$reset_color%}"
7
8 function prompt_char() {
9- git branch >/dev/null 2>/dev/null && echo "%{$fg[green]%}±%{$reset_color%}" && return
10- hg root >/dev/null 2>/dev/null && echo "%{$fg_bold[red]%}☿%{$reset_color%}" && return
11- darcs show repo >/dev/null 2>/dev/null && echo "%{$fg_bold[green]%}❉%{$reset_color%}" && return
12+ command git branch &>/dev/null && echo "%{$fg[green]%}±%{$reset_color%}" && return
13+ command hg root &>/dev/null && echo "%{$fg_bold[red]%}☿%{$reset_color%}" && return
14+ command darcs show repo &>/dev/null && echo "%{$fg_bold[green]%}❉%{$reset_color%}" && return
15 echo "%{$fg[cyan]%}◯%{$reset_color%}"
16 }
17
18@@ -36,47 +36,44 @@ ZSH_THEME_GIT_TIME_SINCE_COMMIT_NEUTRAL="%{$fg[cyan]%}"
19 # Determine the time since last commit. If branch is clean,
20 # use a neutral color, otherwise colors will vary according to time.
21 function git_time_since_commit() {
22- if git rev-parse --git-dir > /dev/null 2>&1; then
23- # Only proceed if there is actually a commit.
24- if [[ $(git log 2>&1 > /dev/null | grep -c "^fatal: bad default revision") == 0 ]]; then
25- # Get the last commit.
26- last_commit=`git log --pretty=format:'%at' -1 2> /dev/null`
27- now=`date +%s`
28- seconds_since_last_commit=$((now-last_commit))
29+ local COLOR MINUTES HOURS DAYS SUB_HOURS SUB_MINUTES
30+ local last_commit seconds_since_last_commit
31
32- # Totals
33- MINUTES=$((seconds_since_last_commit / 60))
34- HOURS=$((seconds_since_last_commit/3600))
35+ # Only proceed if there is actually a commit
36+ if ! last_commit=$(command git log --pretty=format:'%at' -1 2>/dev/null); then
37+ echo "[$ZSH_THEME_GIT_TIME_SINCE_COMMIT_NEUTRAL~%{$reset_color%}]"
38+ return
39+ fi
40
41- # Sub-hours and sub-minutes
42- DAYS=$((seconds_since_last_commit / 86400))
43- SUB_HOURS=$((HOURS % 24))
44- SUB_MINUTES=$((MINUTES % 60))
45+ # Totals
46+ seconds_since_last_commit=$(( EPOCHSECONDS - last_commit ))
47+ MINUTES=$(( seconds_since_last_commit / 60 ))
48+ HOURS=$(( MINUTES / 60 ))
49
50- if [[ -n $(git status -s 2> /dev/null) ]]; then
51- if [ "$MINUTES" -gt 30 ]; then
52- COLOR="$ZSH_THEME_GIT_TIME_SINCE_COMMIT_LONG"
53- elif [ "$MINUTES" -gt 10 ]; then
54- COLOR="$ZSH_THEME_GIT_TIME_SHORT_COMMIT_MEDIUM"
55- else
56- COLOR="$ZSH_THEME_GIT_TIME_SINCE_COMMIT_SHORT"
57- fi
58- else
59- COLOR="$ZSH_THEME_GIT_TIME_SINCE_COMMIT_NEUTRAL"
60- fi
61+ # Sub-hours and sub-minutes
62+ DAYS=$(( HOURS / 24 ))
63+ SUB_HOURS=$(( HOURS % 24 ))
64+ SUB_MINUTES=$(( MINUTES % 60 ))
65
66- if [ "$HOURS" -gt 24 ]; then
67- echo "[$COLOR${DAYS}d${SUB_HOURS}h${SUB_MINUTES}m%{$reset_color%}]"
68- elif [ "$MINUTES" -gt 60 ]; then
69- echo "[$COLOR${HOURS}h${SUB_MINUTES}m%{$reset_color%}]"
70- else
71- echo "[$COLOR${MINUTES}m%{$reset_color%}]"
72- fi
73+ if [[ -z "$(command git status -s 2>/dev/null)" ]]; then
74+ COLOR="$ZSH_THEME_GIT_TIME_SINCE_COMMIT_NEUTRAL"
75+ else
76+ if [[ "$MINUTES" -gt 30 ]]; then
77+ COLOR="$ZSH_THEME_GIT_TIME_SINCE_COMMIT_LONG"
78+ elif [[ "$MINUTES" -gt 10 ]]; then
79+ COLOR="$ZSH_THEME_GIT_TIME_SHORT_COMMIT_MEDIUM"
80 else
81- COLOR="$ZSH_THEME_GIT_TIME_SINCE_COMMIT_NEUTRAL"
82- echo "[$COLOR~]"
83+ COLOR="$ZSH_THEME_GIT_TIME_SINCE_COMMIT_SHORT"
84 fi
85 fi
86+
87+ if [[ "$HOURS" -gt 24 ]]; then
88+ echo "[${COLOR}${DAYS}d${SUB_HOURS}h${SUB_MINUTES}m%{$reset_color%}]"
89+ elif [[ "$MINUTES" -gt 60 ]]; then
90+ echo "[${COLOR}${HOURS}h${SUB_MINUTES}m%{$reset_color%}]"
91+ else
92+ echo "[${COLOR}${MINUTES}m%{$reset_color%}]"
93+ fi
94 }
95
96 PROMPT='