aa9325a0b3126cb4f0563ef1fbc0e3da11734298

 1diff --git a/themes/ys.zsh-theme b/themes/ys.zsh-theme
 2index 0171391001a171b1f3e8f1bb0ae09d339b7d963a..fd8adc41ea30f26ae9a5179a7796934cc67fbbad 100644
 3--- a/themes/ys.zsh-theme
 4+++ b/themes/ys.zsh-theme
 5@@ -14,12 +14,35 @@ function box_name {
 6 # Directory info.
 7 local current_dir='${PWD/#$HOME/~}'
 8 
 9+# VCS
10+YS_VCS_PROMPT_PREFIX1=" %{$fg[white]%}on%{$reset_color%} "
11+YS_VCS_PROMPT_PREFIX2=":%{$fg[cyan]%}"
12+YS_VCS_PROMPT_SUFFIX="%{$reset_color%}"
13+YS_VCS_PROMPT_DIRTY=" %{$fg[red]%}x"
14+YS_VCS_PROMPT_CLEAN=" %{$fg[green]%}o"
15+
16 # Git info.
17 local git_info='$(git_prompt_info)'
18-ZSH_THEME_GIT_PROMPT_PREFIX=" %{$fg[white]%}on%{$reset_color%} git:%{$fg[cyan]%}"
19-ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
20-ZSH_THEME_GIT_PROMPT_DIRTY=" %{$fg[red]%}x"
21-ZSH_THEME_GIT_PROMPT_CLEAN=" %{$fg[green]%}o"
22+ZSH_THEME_GIT_PROMPT_PREFIX="${YS_VCS_PROMPT_PREFIX1}git${YS_VCS_PROMPT_PREFIX2}"
23+ZSH_THEME_GIT_PROMPT_SUFFIX="$YS_VCS_PROMPT_SUFFIX"
24+ZSH_THEME_GIT_PROMPT_DIRTY="$YS_VCS_PROMPT_DIRTY"
25+ZSH_THEME_GIT_PROMPT_CLEAN="$YS_VCS_PROMPT_CLEAN"
26+
27+# HG info
28+local hg_info='$(ys_hg_prompt_info)'
29+ys_hg_prompt_info() {
30+	# make sure this is a hg dir
31+	if [ -d '.hg' ]; then
32+		echo -n "${YS_VCS_PROMPT_PREFIX1}hg${YS_VCS_PROMPT_PREFIX2}"
33+		echo -n $(hg branch 2>/dev/null)
34+		if [ -n "$(hg status 2>/dev/null)" ]; then
35+			echo -n "$YS_VCS_PROMPT_DIRTY"
36+		else
37+			echo -n "$YS_VCS_PROMPT_CLEAN"
38+		fi
39+		echo -n "$YS_VCS_PROMPT_SUFFIX"
40+	fi
41+}
42 
43 # Prompt format: \n # USER at MACHINE in DIRECTORY on git:BRANCH STATE [TIME] \n $ 
44 PROMPT="
45@@ -29,6 +52,7 @@ PROMPT="
46 %{$fg[green]%}$(box_name) \
47 %{$fg[white]%}in \
48 %{$terminfo[bold]$fg[yellow]%}${current_dir}%{$reset_color%}\
49+${hg_info}\
50 ${git_info} \
51 %{$fg[white]%}[%*]
52 %{$terminfo[bold]$fg[red]%}$ %{$reset_color%}"
53@@ -41,6 +65,7 @@ PROMPT="
54 %{$fg[green]%}$(box_name) \
55 %{$fg[white]%}in \
56 %{$terminfo[bold]$fg[yellow]%}${current_dir}%{$reset_color%}\
57+${hg_info}\
58 ${git_info} \
59 %{$fg[white]%}[%*]
60 %{$terminfo[bold]$fg[red]%}$ %{$reset_color%}"