[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

[rkj-repos] Make `hg prompt` check less strict (#6746)
d7948b39 · Marc Cornellà · GitHub · 6c9af445 · d7948b39
Unverified Commit d7948b39 authored Apr 19, 2018 by Marc Cornellà Committed by GitHub Apr 19, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 5 deletions

rkj-repos.zsh-theme themes/rkj-repos.zsh-theme +2 -5

No files found.
--- a/themes/rkj-repos.zsh-theme
+++ b/themes/rkj-repos.zsh-theme
 # user, host, full path, and time/date on two lines for easier vgrepping

-if ! grep -q "prompt" ~/.hgrc; then 
-  echo "This theme requires 'hg prompt' (https://bitbucket.org/sjl/hg-prompt/overview)"
-  return 1
-fi
-
 function hg_prompt_info {
+  if (( $+commands[hg] )) && grep -q "prompt" ~/.hgrc; then
    hg prompt --angle-brackets "\
 <hg:%{$fg[magenta]%}<branch>%{$reset_color%}><:%{$fg[magenta]%}<bookmark>%{$reset_color%}>\
 </%{$fg[yellow]%}<tags|%{$reset_color%}, %{$fg[yellow]%}>%{$reset_color%}>\
 %{$fg[red]%}<status|modified|unknown><update>%{$reset_color%}<
 patches: <patches|join( → )|pre_applied(%{$fg[yellow]%})|post_applied(%{$reset_color%})|pre_unapplied(%{$fg_bold[black]%})|post_unapplied(%{$reset_color%})>>" 2>/dev/null
+  fi
 }

 ZSH_THEME_GIT_PROMPT_ADDED="%{$fg[cyan]%}+"