linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2026-01-02 02:19:06 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Cleaned lib/hg.zsh of references to git.

Browse source 
Theme now sets necessary vars for hg info on prompts.
This commit is contained in:
Mathew Hall 2012-02-01 17:54:45 +00:00
commit 3e4f6d1df5
2 changed files with 24 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

25
lib/hg.zsh
View file

@ -1,18 +1,6 @@
ZSH_THEME_HG_PROMPT_PREFIX=$ZSH_THEME_GIT_PROMPT_PREFIX #give branch & tag:
ZSH_THEME_HG_PROMPT_SUFFIX=$ZSH_THEME_GIT_PROMPT_SUFFIX
ZSH_THEME_HG_PROMPT_SHA_BEFORE=$ZSH_THEME_GIT_PROMPT_SHA_BEFORE
ZSH_THEME_HG_PROMPT_SHA_AFTER=$ZSH_THEME_GIT_PROMPT_SHA_AFTER
ZSH_THEME_HG_PROMPT_UNTRACKED=$ZSH_THEME_GIT_PROMPT_UNTRACKED
ZSH_THEME_HG_PROMPT_ADDED=$ZSH_THEME_GIT_PROMPT_ADDED
ZSH_THEME_HG_PROMPT_MODIFIED=$ZSH_THEME_GIT_PROMPT_MODIFIED
ZSH_THEME_HG_PROMPT_RENAMED=$ZSH_THEME_GIT_PROMPT_RENAMED
ZSH_THEME_HG_PROMPT_DELETED=$ZSH_THEME_GIT_PROMPT_DELETED
ZSH_THEME_HG_PROMPT_UNMERGED=$ZSH_THEME_GIT_PROMPT_UNMERGED
# get the name of the branch we are on
function hg_prompt_info() { function hg_prompt_info() {
ref=$(hg branch 2> /dev/null) || return ref=$(hg branch 2> /dev/null) || return
tag=$(hg parent | grep tag | cut -f 2 -d ":" | tr -d ' ') tag=$(hg parent | grep tag | cut -f 2 -d ":" | tr -d ' ')
@ -21,9 +9,9 @@ function hg_prompt_info() {
# Formats prompt string for current git commit short SHA #
function hg_prompt_name() { function hg_prompt_name() {
SHA=$(hg id 2> /dev/null) && echo "$ZSH_THEME_HG_PROMPT_SHA_BEFORE$SHA$ZSH_THEME_HG_PROMPT_SHA_AFTER" ID=$(hg id 2> /dev/null) && echo "$ZSH_THEME_HG_PROMPT_SHA_BEFORE$ID$ZSH_THEME_HG_PROMPT_SHA_AFTER"
} }
@ -46,12 +34,9 @@ hg_prompt_status() {
elif $(echo "$INDEX" | grep '^ T ' &> /dev/null); then elif $(echo "$INDEX" | grep '^ T ' &> /dev/null); then
STATUS="$ZSH_THEME_HG_PROMPT_MODIFIED$STATUS" STATUS="$ZSH_THEME_HG_PROMPT_MODIFIED$STATUS"
fi fi
if $(echo "$INDEX" | grep '^R ' &> /dev/null); then if $(echo "$INDEX" | grep '^ R ' &> /dev/null); then
STATUS="$ZSH_THEME_HG_PROMPT_RENAMED$STATUS"
fi
if $(echo "$INDEX" | grep '^ D ' &> /dev/null); then
STATUS="$ZSH_THEME_HG_PROMPT_DELETED$STATUS" STATUS="$ZSH_THEME_HG_PROMPT_DELETED$STATUS"
elif $(echo "$INDEX" | grep '^AD ' &> /dev/null); then elif $(echo "$INDEX" | grep '^R ' &> /dev/null); then
STATUS="$ZSH_THEME_HG_PROMPT_DELETED$STATUS" STATUS="$ZSH_THEME_HG_PROMPT_DELETED$STATUS"
fi fi
if $(echo "$INDEX" | grep '^UU ' &> /dev/null); then if $(echo "$INDEX" | grep '^UU ' &> /dev/null); then

19
themes/mjh.zsh-theme
View file

@ -1,3 +1,5 @@
#Based on themes/jonathan.mjh.zsh-theme.
function theme_precmd { function theme_precmd {
local TERMWIDTH local TERMWIDTH
(( TERMWIDTH = ${COLUMNS} - 1 )) (( TERMWIDTH = ${COLUMNS} - 1 ))
@ -52,6 +54,8 @@ setprompt () {
done done
PR_NO_COLOUR="%{$terminfo[sgr0]%}" PR_NO_COLOUR="%{$terminfo[sgr0]%}"
### ###
# Modify Git prompt # Modify Git prompt
ZSH_THEME_GIT_PROMPT_PREFIX=" on %{$fg[green]%}" ZSH_THEME_GIT_PROMPT_PREFIX=" on %{$fg[green]%}"
@ -66,6 +70,21 @@ setprompt () {
ZSH_THEME_GIT_PROMPT_UNMERGED="%{$fg[yellow]%} !M" ZSH_THEME_GIT_PROMPT_UNMERGED="%{$fg[yellow]%} !M"
ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[white]%} !T" ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[white]%} !T"
#Shameless git stuff:
ZSH_THEME_HG_PROMPT_PREFIX=$ZSH_THEME_GIT_PROMPT_PREFIX
ZSH_THEME_HG_PROMPT_SUFFIX=$ZSH_THEME_GIT_PROMPT_SUFFIX
ZSH_THEME_HG_PROMPT_SHA_BEFORE=$ZSH_THEME_GIT_PROMPT_SHA_BEFORE
ZSH_THEME_HG_PROMPT_SHA_AFTER=$ZSH_THEME_GIT_PROMPT_SHA_AFTER
ZSH_THEME_HG_PROMPT_UNTRACKED=$ZSH_THEME_GIT_PROMPT_UNTRACKED
ZSH_THEME_HG_PROMPT_ADDED=$ZSH_THEME_GIT_PROMPT_ADDED
ZSH_THEME_HG_PROMPT_MODIFIED=$ZSH_THEME_GIT_PROMPT_MODIFIED
ZSH_THEME_HG_PROMPT_RENAMED=$ZSH_THEME_GIT_PROMPT_RENAMED
ZSH_THEME_HG_PROMPT_DELETED=$ZSH_THEME_GIT_PROMPT_DELETED
ZSH_THEME_HG_PROMPT_UNMERGED=$ZSH_THEME_GIT_PROMPT_UNMERGED
### ###
# See if we can use extended characters to look nicer. # See if we can use extended characters to look nicer.