mirror of
				https://github.com/ohmyzsh/ohmyzsh.git
				synced 2025-11-04 13:21:19 +08:00 
			
		
		
		
	fix: fix svn branch output in themes: apple, gentoo, kolo, zhann (#10751)
Fixes #10751
This commit is contained in:
		
							parent
							
								
									04b1b75b9d
								
							
						
					
					
						commit
						46195d3aa7
					
				@ -2,19 +2,15 @@ function toon {
 | 
			
		||||
  echo -n ""
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
get_git_dirty() {
 | 
			
		||||
  git diff --quiet || echo '*'
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
autoload -Uz vcs_info
 | 
			
		||||
zstyle ':vcs_info:*' check-for-changes true
 | 
			
		||||
zstyle ':vcs_info:*' unstagedstr '%F{red}*'   # display this when there are unstaged changes
 | 
			
		||||
zstyle ':vcs_info:*' stagedstr '%F{yellow}+'  # display this when there are staged changes
 | 
			
		||||
zstyle ':vcs_info:*' actionformats \
 | 
			
		||||
    '%F{5}%F{5}[%F{2}%b%F{3}|%F{1}%a%c%u%F{5}]%f '
 | 
			
		||||
zstyle ':vcs_info:*' formats       \
 | 
			
		||||
    '%F{5}%F{5}[%F{2}%b%c%u%F{5}]%f '
 | 
			
		||||
zstyle ':vcs_info:(sv[nk]|bzr):*' branchformat '%b%F{1}:%F{3}%r'
 | 
			
		||||
zstyle ':vcs_info:*' actionformats '%F{5}[%F{2}%b%F{3}|%F{1}%a%c%u%F{5}]%f '
 | 
			
		||||
zstyle ':vcs_info:*' formats '%F{5}[%F{2}%b%c%u%F{5}]%f '
 | 
			
		||||
zstyle ':vcs_info:svn:*' branchformat '%b'
 | 
			
		||||
zstyle ':vcs_info:svn:*' actionformats '%F{5}[%F{2}%b%F{1}:%F{3}%i%F{3}|%F{1}%a%c%u%F{5}]%f '
 | 
			
		||||
zstyle ':vcs_info:svn:*' formats '%F{5}[%F{2}%b%F{1}:%F{3}%i%c%u%F{5}]%f '
 | 
			
		||||
zstyle ':vcs_info:*' enable git cvs svn
 | 
			
		||||
 | 
			
		||||
theme_precmd () {
 | 
			
		||||
 | 
			
		||||
@ -6,7 +6,9 @@ zstyle ':vcs_info:*' unstagedstr '%F{red}*'   # display this when there are unst
 | 
			
		||||
zstyle ':vcs_info:*' stagedstr '%F{yellow}+'  # display this when there are staged changes
 | 
			
		||||
zstyle ':vcs_info:*' actionformats '%F{5}(%F{2}%b%F{3}|%F{1}%a%c%u%m%F{5})%f '
 | 
			
		||||
zstyle ':vcs_info:*' formats '%F{5}(%F{2}%b%c%u%m%F{5})%f '
 | 
			
		||||
zstyle ':vcs_info:(sv[nk]|bzr):*' branchformat '%b%F{1}:%F{3}%r'
 | 
			
		||||
zstyle ':vcs_info:svn:*' branchformat '%b'
 | 
			
		||||
zstyle ':vcs_info:svn:*' actionformats '%F{5}(%F{2}%b%F{1}:%{3}%i%F{3}|%F{1}%a%c%u%m%F{5})%f '
 | 
			
		||||
zstyle ':vcs_info:svn:*' formats '%F{5}(%F{2}%b%F{1}:%F{3}%i%c%u%m%F{5})%f '
 | 
			
		||||
zstyle ':vcs_info:*' enable git cvs svn
 | 
			
		||||
zstyle ':vcs_info:git*+set-message:*' hooks untracked-git
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@ -3,14 +3,16 @@ autoload -Uz vcs_info
 | 
			
		||||
zstyle ':vcs_info:*' stagedstr '%F{green}●'
 | 
			
		||||
zstyle ':vcs_info:*' unstagedstr '%F{yellow}●'
 | 
			
		||||
zstyle ':vcs_info:*' check-for-changes true
 | 
			
		||||
zstyle ':vcs_info:(sv[nk]|bzr):*' branchformat '%b%F{1}:%F{11}%r'
 | 
			
		||||
zstyle ':vcs_info:svn:*' branchformat '%b'
 | 
			
		||||
zstyle ':vcs_info:svn:*' formats ' [%b%F{1}:%F{11}%i%c%u%B%F{green}]'
 | 
			
		||||
zstyle ':vcs_info:*' enable git svn
 | 
			
		||||
 | 
			
		||||
theme_precmd () {
 | 
			
		||||
    if [[ -z $(git ls-files --other --exclude-standard 2> /dev/null) ]] {
 | 
			
		||||
        zstyle ':vcs_info:*' formats ' [%b%c%u%B%F{green}]'
 | 
			
		||||
    } else {
 | 
			
		||||
        zstyle ':vcs_info:*' formats ' [%b%c%u%B%F{red}●%F{green}]'
 | 
			
		||||
    }
 | 
			
		||||
  if [[ -z $(git ls-files --other --exclude-standard 2> /dev/null) ]]; then
 | 
			
		||||
    zstyle ':vcs_info:git:*' formats ' [%b%c%u%B%F{green}]'
 | 
			
		||||
  else
 | 
			
		||||
    zstyle ':vcs_info:git:*' formats ' [%b%c%u%B%F{red}●%F{green}]'
 | 
			
		||||
  fi
 | 
			
		||||
 | 
			
		||||
  vcs_info
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
@ -3,14 +3,16 @@ autoload -Uz vcs_info
 | 
			
		||||
zstyle ':vcs_info:*' stagedstr '%F{green}●'
 | 
			
		||||
zstyle ':vcs_info:*' unstagedstr '%F{yellow}●'
 | 
			
		||||
zstyle ':vcs_info:*' check-for-changes true
 | 
			
		||||
zstyle ':vcs_info:(sv[nk]|bzr):*' branchformat '%b%F{1}:%F{11}%r'
 | 
			
		||||
zstyle ':vcs_info:svn:*' branchformat '%b'
 | 
			
		||||
zstyle ':vcs_info:svn:*' formats ' [%b%F{1}:%F{11}%i%c%u%B%F{green}]'
 | 
			
		||||
zstyle ':vcs_info:*' enable git svn
 | 
			
		||||
 | 
			
		||||
theme_precmd () {
 | 
			
		||||
    if [[ -z $(git ls-files --other --exclude-standard 2> /dev/null) ]] {
 | 
			
		||||
        zstyle ':vcs_info:*' formats ' [%b%c%u%B%F{green}]'
 | 
			
		||||
    } else {
 | 
			
		||||
        zstyle ':vcs_info:*' formats ' [%b%c%u%B%F{red}●%F{green}]'
 | 
			
		||||
    }
 | 
			
		||||
  if [[ -z $(git ls-files --other --exclude-standard 2> /dev/null) ]]; then
 | 
			
		||||
    zstyle ':vcs_info:git:*' formats ' [%b%c%u%B%F{green}]'
 | 
			
		||||
  else
 | 
			
		||||
    zstyle ':vcs_info:git:*' formats ' [%b%c%u%B%F{red}●%F{green}]'
 | 
			
		||||
  fi
 | 
			
		||||
 | 
			
		||||
  vcs_info
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user