[rkj-repos] Make `hg prompt` check less strict (#6746)
* [rkj-repos] Make `hg prompt` check less strict
Move the `hg prompt` check inside the hg_prompt_info function so that
it returns an empty string if hg-prompt isn't installed.
Fixes #6743.
* [rkj-repos] Check for hg in `hg prompt` function
Diff
1diff --git a/themes/rkj-repos.zsh-theme b/themes/rkj-repos.zsh-theme
2index 0d5a166ba8ed36cb95a3a3d0775b9f31e88edd2f..65a07545619908b6d5221163bba4f67363eee9ea 100644
3--- a/themes/rkj-repos.zsh-theme
4+++ b/themes/rkj-repos.zsh-theme
5@@ -1,16 +1,13 @@
6 # user, host, full path, and time/date on two lines for easier vgrepping
7 8-if ! grep -q "prompt" ~/.hgrc; then
9- echo "This theme requires 'hg prompt' (https://bitbucket.org/sjl/hg-prompt/overview)"
10- return 1
11-fi
12-
13 function hg_prompt_info {
14+ if (( $+commands[hg] )) && grep -q "prompt" ~/.hgrc; then
15 hg prompt --angle-brackets "\
16 <hg:%{$fg[magenta]%}<branch>%{$reset_color%}><:%{$fg[magenta]%}<bookmark>%{$reset_color%}>\
17 </%{$fg[yellow]%}<tags|%{$reset_color%}, %{$fg[yellow]%}>%{$reset_color%}>\
18 %{$fg[red]%}<status|modified|unknown><update>%{$reset_color%}<
19 patches: <patches|join( → )|pre_applied(%{$fg[yellow]%})|post_applied(%{$reset_color%})|pre_unapplied(%{$fg_bold[black]%})|post_unapplied(%{$reset_color%})>>" 2>/dev/null
20+ fi
21 }
2223 ZSH_THEME_GIT_PROMPT_ADDED="%{$fg[cyan]%}+"