mirror of
				https://github.com/ohmyzsh/ohmyzsh.git
				synced 2025-11-04 21:31:19 +08:00 
			
		
		
		
	Merge pull request #3025 from DanielOaks/ys-newness
Let 'ys' theme use hg repo info too
This commit is contained in:
		
						commit
						aa9325a0b3
					
				@ -14,12 +14,35 @@ function box_name {
 | 
			
		||||
# Directory info.
 | 
			
		||||
local current_dir='${PWD/#$HOME/~}'
 | 
			
		||||
 | 
			
		||||
# VCS
 | 
			
		||||
YS_VCS_PROMPT_PREFIX1=" %{$fg[white]%}on%{$reset_color%} "
 | 
			
		||||
YS_VCS_PROMPT_PREFIX2=":%{$fg[cyan]%}"
 | 
			
		||||
YS_VCS_PROMPT_SUFFIX="%{$reset_color%}"
 | 
			
		||||
YS_VCS_PROMPT_DIRTY=" %{$fg[red]%}x"
 | 
			
		||||
YS_VCS_PROMPT_CLEAN=" %{$fg[green]%}o"
 | 
			
		||||
 | 
			
		||||
# Git info.
 | 
			
		||||
local git_info='$(git_prompt_info)'
 | 
			
		||||
ZSH_THEME_GIT_PROMPT_PREFIX=" %{$fg[white]%}on%{$reset_color%} git:%{$fg[cyan]%}"
 | 
			
		||||
ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
 | 
			
		||||
ZSH_THEME_GIT_PROMPT_DIRTY=" %{$fg[red]%}x"
 | 
			
		||||
ZSH_THEME_GIT_PROMPT_CLEAN=" %{$fg[green]%}o"
 | 
			
		||||
ZSH_THEME_GIT_PROMPT_PREFIX="${YS_VCS_PROMPT_PREFIX1}git${YS_VCS_PROMPT_PREFIX2}"
 | 
			
		||||
ZSH_THEME_GIT_PROMPT_SUFFIX="$YS_VCS_PROMPT_SUFFIX"
 | 
			
		||||
ZSH_THEME_GIT_PROMPT_DIRTY="$YS_VCS_PROMPT_DIRTY"
 | 
			
		||||
ZSH_THEME_GIT_PROMPT_CLEAN="$YS_VCS_PROMPT_CLEAN"
 | 
			
		||||
 | 
			
		||||
# HG info
 | 
			
		||||
local hg_info='$(ys_hg_prompt_info)'
 | 
			
		||||
ys_hg_prompt_info() {
 | 
			
		||||
	# make sure this is a hg dir
 | 
			
		||||
	if [ -d '.hg' ]; then
 | 
			
		||||
		echo -n "${YS_VCS_PROMPT_PREFIX1}hg${YS_VCS_PROMPT_PREFIX2}"
 | 
			
		||||
		echo -n $(hg branch 2>/dev/null)
 | 
			
		||||
		if [ -n "$(hg status 2>/dev/null)" ]; then
 | 
			
		||||
			echo -n "$YS_VCS_PROMPT_DIRTY"
 | 
			
		||||
		else
 | 
			
		||||
			echo -n "$YS_VCS_PROMPT_CLEAN"
 | 
			
		||||
		fi
 | 
			
		||||
		echo -n "$YS_VCS_PROMPT_SUFFIX"
 | 
			
		||||
	fi
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
# Prompt format: \n # USER at MACHINE in DIRECTORY on git:BRANCH STATE [TIME] \n $ 
 | 
			
		||||
PROMPT="
 | 
			
		||||
@ -29,6 +52,7 @@ PROMPT="
 | 
			
		||||
%{$fg[green]%}$(box_name) \
 | 
			
		||||
%{$fg[white]%}in \
 | 
			
		||||
%{$terminfo[bold]$fg[yellow]%}${current_dir}%{$reset_color%}\
 | 
			
		||||
${hg_info}\
 | 
			
		||||
${git_info} \
 | 
			
		||||
%{$fg[white]%}[%*]
 | 
			
		||||
%{$terminfo[bold]$fg[red]%}$ %{$reset_color%}"
 | 
			
		||||
@ -41,6 +65,7 @@ PROMPT="
 | 
			
		||||
%{$fg[green]%}$(box_name) \
 | 
			
		||||
%{$fg[white]%}in \
 | 
			
		||||
%{$terminfo[bold]$fg[yellow]%}${current_dir}%{$reset_color%}\
 | 
			
		||||
${hg_info}\
 | 
			
		||||
${git_info} \
 | 
			
		||||
%{$fg[white]%}[%*]
 | 
			
		||||
%{$terminfo[bold]$fg[red]%}$ %{$reset_color%}"
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user