diff --git a/themes/rkj.zsh-theme b/themes/rkj.zsh-theme index f8c051f99..5206a4240 100644 --- a/themes/rkj.zsh-theme +++ b/themes/rkj.zsh-theme @@ -7,14 +7,6 @@ # # If you do not wish to have vcs info redefine function rkj_vcs_info to be empty. -rkj_hg_prompt_info() { - hg prompt --angle-brackets "\ -%{$reset_color%}>\ -%{$reset_color%}>\ -%{$fg[red]%}%{$reset_color%}< -patches: >" 2>/dev/null -} - ZSH_THEME_GIT_PROMPT_ADDED="%{$fg[cyan]%}+" ZSH_THEME_GIT_PROMPT_MODIFIED="%{$fg[yellow]%}✱" ZSH_THEME_GIT_PROMPT_DELETED="%{$fg[red]%}✗" @@ -22,6 +14,11 @@ ZSH_THEME_GIT_PROMPT_RENAMED="%{$fg[blue]%}➦" ZSH_THEME_GIT_PROMPT_UNMERGED="%{$fg[magenta]%}✂" ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[grey]%}✈" +rkj_hg_prompt_info() { + hg root > /dev/null 2>&1 || return + echo -n "hg:($( hg id --tags )%{$reset_color%}$ZSH_THEME_GIT_PROMPT_SUFFIX" +} + rkj_git_prompt_info() { ref=$(git symbolic-ref HEAD 2> /dev/null) || return echo -n "$ZSH_THEME_GIT_PROMPT_PREFIX${ref#refs/heads/}$( git_prompt_status )%{$reset_color%}$ZSH_THEME_GIT_PROMPT_SUFFIX"