mirror of
https://github.com/ohmyzsh/ohmyzsh.git
synced 2024-11-15 09:58:47 -07:00
[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
This commit is contained in:
parent
6c9af4455d
commit
d7948b39dc
@ -1,16 +1,13 @@
|
|||||||
# user, host, full path, and time/date on two lines for easier vgrepping
|
# 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 {
|
function hg_prompt_info {
|
||||||
|
if (( $+commands[hg] )) && grep -q "prompt" ~/.hgrc; then
|
||||||
hg prompt --angle-brackets "\
|
hg prompt --angle-brackets "\
|
||||||
<hg:%{$fg[magenta]%}<branch>%{$reset_color%}><:%{$fg[magenta]%}<bookmark>%{$reset_color%}>\
|
<hg:%{$fg[magenta]%}<branch>%{$reset_color%}><:%{$fg[magenta]%}<bookmark>%{$reset_color%}>\
|
||||||
</%{$fg[yellow]%}<tags|%{$reset_color%}, %{$fg[yellow]%}>%{$reset_color%}>\
|
</%{$fg[yellow]%}<tags|%{$reset_color%}, %{$fg[yellow]%}>%{$reset_color%}>\
|
||||||
%{$fg[red]%}<status|modified|unknown><update>%{$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
|
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]%}+"
|
ZSH_THEME_GIT_PROMPT_ADDED="%{$fg[cyan]%}+"
|
||||||
|
Loading…
Reference in New Issue
Block a user