Merged lib/git.zsh and lib/rvm.zsh into plugins/.
This commit is contained in:
Sorin Ionescu
parent
94ab5e0ec8
commit
4727e12013
80
lib/git.zsh
80
lib/git.zsh
|
|
@ -1,80 +0,0 @@
|
||||||
# Renders the name of the current branch.
|
|
||||||
function git_prompt_info() {
|
|
||||||
local branch=$(git_current_branch)
|
|
||||||
if [[ -n "$branch" ]]; then
|
|
||||||
echo "${ZSH_THEME_GIT_PROMPT_PREFIX}${branch}$(parse_git_dirty)${ZSH_THEME_GIT_PROMPT_SUFFIX}"
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
# Gets the current branch.
|
|
||||||
function git_current_branch() {
|
|
||||||
local ref=$(git symbolic-ref HEAD 2> /dev/null)
|
|
||||||
if [[ -n "$ref" ]]; then
|
|
||||||
echo "${ref#refs/heads/}"
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
# Checks if the working tree is dirty.
|
|
||||||
function parse_git_dirty() {
|
|
||||||
if [[ -n $(git status -s 2> /dev/null) ]]; then
|
|
||||||
echo "$ZSH_THEME_GIT_PROMPT_DIRTY"
|
|
||||||
else
|
|
||||||
echo "$ZSH_THEME_GIT_PROMPT_CLEAN"
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
# Checks if there are commits ahead from remote.
|
|
||||||
function git_prompt_ahead() {
|
|
||||||
if $(echo "$(git log origin/$(git_current_branch)..HEAD 2> /dev/null)" | grep '^commit' &> /dev/null); then
|
|
||||||
echo "$ZSH_THEME_GIT_PROMPT_AHEAD"
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
# Formats the prompt string for current git commit short SHA.
|
|
||||||
function git_prompt_short_sha() {
|
|
||||||
local sha=$(git rev-parse --short HEAD 2> /dev/null)
|
|
||||||
if [[ -n "$sha" ]]; then
|
|
||||||
echo "${ZSH_THEME_GIT_PROMPT_SHA_BEFORE}${sha}${ZSH_THEME_GIT_PROMPT_SHA_AFTER}"
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
# Formats the prompt string for current git commit long SHA.
|
|
||||||
function git_prompt_long_sha() {
|
|
||||||
local sha=$(git rev-parse HEAD 2> /dev/null)
|
|
||||||
if [[ -n "$sha" ]]; then
|
|
||||||
echo "${ZSH_THEME_GIT_PROMPT_SHA_BEFORE}${sha}${ZSH_THEME_GIT_PROMPT_SHA_AFTER}"
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
# Gets the status of the working tree.
|
|
||||||
function git_prompt_status() {
|
|
||||||
local indicators line untracked added modified renamed deleted
|
|
||||||
while IFS=$'\n' read line; do
|
|
||||||
if [[ "$line" =~ '^\?\? ' ]]; then
|
|
||||||
[[ -n $untracked ]] && continue || untracked='yes'
|
|
||||||
indicators="${ZSH_THEME_GIT_PROMPT_UNTRACKED}${indicators}"
|
|
||||||
fi
|
|
||||||
if [[ "$line" =~ '^(((A|M|D|T) )|(AD|AM|AT|MM)) ' ]]; then
|
|
||||||
[[ -n $added ]] && continue || added='yes'
|
|
||||||
indicators="${ZSH_THEME_GIT_PROMPT_ADDED}${indicators}"
|
|
||||||
fi
|
|
||||||
if [[ "$line" =~ '^(( (M|T))|(AM|AT|MM)) ' ]]; then
|
|
||||||
[[ -n $modified ]] && continue || modified='yes'
|
|
||||||
indicators="${ZSH_THEME_GIT_PROMPT_MODIFIED}${indicators}"
|
|
||||||
fi
|
|
||||||
if [[ "$line" =~ '^R ' ]]; then
|
|
||||||
[[ -n $renamed ]] && continue || renamed='yes'
|
|
||||||
indicators="${ZSH_THEME_GIT_PROMPT_RENAMED}${indicators}"
|
|
||||||
fi
|
|
||||||
if [[ "$line" =~ '^( D|AD) ' ]]; then
|
|
||||||
[[ -n $deleted ]] && continue || deleted='yes'
|
|
||||||
indicators="${ZSH_THEME_GIT_PROMPT_DELETED}${indicators}"
|
|
||||||
fi
|
|
||||||
if [[ "$line" =~ '^UU ' ]]; then
|
|
||||||
[[ -n $unmerged ]] && continue || unmerged='yes'
|
|
||||||
indicators="${ZSH_THEME_GIT_PROMPT_UNMERGED}${indicators}"
|
|
||||||
fi
|
|
||||||
done < <(git status --porcelain 2> /dev/null)
|
|
||||||
echo $indicators
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
@ -1,8 +0,0 @@
|
||||||
# Get the name of the current branch.
|
|
||||||
function rvm_prompt_info() {
|
|
||||||
local ruby_version=$(~/.rvm/bin/rvm-prompt 2> /dev/null)
|
|
||||||
if [[ -n "$ruby_version" ]]; then
|
|
||||||
echo "($ruby_version)"
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
@ -1,3 +1,83 @@
|
||||||
|
# Renders the name of the current branch.
|
||||||
|
function git_prompt_info() {
|
||||||
|
local branch=$(git_current_branch)
|
||||||
|
if [[ -n "$branch" ]]; then
|
||||||
|
echo "${ZSH_THEME_GIT_PROMPT_PREFIX}${branch}$(parse_git_dirty)${ZSH_THEME_GIT_PROMPT_SUFFIX}"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
# Gets the current branch.
|
||||||
|
function git_current_branch() {
|
||||||
|
local ref=$(git symbolic-ref HEAD 2> /dev/null)
|
||||||
|
if [[ -n "$ref" ]]; then
|
||||||
|
echo "${ref#refs/heads/}"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
# Checks if the working tree is dirty.
|
||||||
|
function parse_git_dirty() {
|
||||||
|
if [[ -n $(git status -s 2> /dev/null) ]]; then
|
||||||
|
echo "$ZSH_THEME_GIT_PROMPT_DIRTY"
|
||||||
|
else
|
||||||
|
echo "$ZSH_THEME_GIT_PROMPT_CLEAN"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
# Checks if there are commits ahead from remote.
|
||||||
|
function git_prompt_ahead() {
|
||||||
|
if $(echo "$(git log origin/$(git_current_branch)..HEAD 2> /dev/null)" | grep '^commit' &> /dev/null); then
|
||||||
|
echo "$ZSH_THEME_GIT_PROMPT_AHEAD"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
# Formats the prompt string for current git commit short SHA.
|
||||||
|
function git_prompt_short_sha() {
|
||||||
|
local sha=$(git rev-parse --short HEAD 2> /dev/null)
|
||||||
|
if [[ -n "$sha" ]]; then
|
||||||
|
echo "${ZSH_THEME_GIT_PROMPT_SHA_BEFORE}${sha}${ZSH_THEME_GIT_PROMPT_SHA_AFTER}"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
# Formats the prompt string for current git commit long SHA.
|
||||||
|
function git_prompt_long_sha() {
|
||||||
|
local sha=$(git rev-parse HEAD 2> /dev/null)
|
||||||
|
if [[ -n "$sha" ]]; then
|
||||||
|
echo "${ZSH_THEME_GIT_PROMPT_SHA_BEFORE}${sha}${ZSH_THEME_GIT_PROMPT_SHA_AFTER}"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
# Gets the status of the working tree.
|
||||||
|
function git_prompt_status() {
|
||||||
|
local indicators line untracked added modified renamed deleted
|
||||||
|
while IFS=$'\n' read line; do
|
||||||
|
if [[ "$line" =~ '^\?\? ' ]]; then
|
||||||
|
[[ -n $untracked ]] && continue || untracked='yes'
|
||||||
|
indicators="${ZSH_THEME_GIT_PROMPT_UNTRACKED}${indicators}"
|
||||||
|
fi
|
||||||
|
if [[ "$line" =~ '^(((A|M|D|T) )|(AD|AM|AT|MM)) ' ]]; then
|
||||||
|
[[ -n $added ]] && continue || added='yes'
|
||||||
|
indicators="${ZSH_THEME_GIT_PROMPT_ADDED}${indicators}"
|
||||||
|
fi
|
||||||
|
if [[ "$line" =~ '^(( (M|T))|(AM|AT|MM)) ' ]]; then
|
||||||
|
[[ -n $modified ]] && continue || modified='yes'
|
||||||
|
indicators="${ZSH_THEME_GIT_PROMPT_MODIFIED}${indicators}"
|
||||||
|
fi
|
||||||
|
if [[ "$line" =~ '^R ' ]]; then
|
||||||
|
[[ -n $renamed ]] && continue || renamed='yes'
|
||||||
|
indicators="${ZSH_THEME_GIT_PROMPT_RENAMED}${indicators}"
|
||||||
|
fi
|
||||||
|
if [[ "$line" =~ '^( D|AD) ' ]]; then
|
||||||
|
[[ -n $deleted ]] && continue || deleted='yes'
|
||||||
|
indicators="${ZSH_THEME_GIT_PROMPT_DELETED}${indicators}"
|
||||||
|
fi
|
||||||
|
if [[ "$line" =~ '^UU ' ]]; then
|
||||||
|
[[ -n $unmerged ]] && continue || unmerged='yes'
|
||||||
|
indicators="${ZSH_THEME_GIT_PROMPT_UNMERGED}${indicators}"
|
||||||
|
fi
|
||||||
|
done < <(git status --porcelain 2> /dev/null)
|
||||||
|
echo $indicators
|
||||||
|
}
|
||||||
|
|
||||||
alias g='git'
|
alias g='git'
|
||||||
compdef g=git
|
compdef g=git
|
||||||
alias gst='git status'
|
alias gst='git status'
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,11 @@
|
||||||
|
# Get the name of the current branch.
|
||||||
|
function rvm_prompt_info() {
|
||||||
|
local ruby_version=$(~/.rvm/bin/rvm-prompt 2> /dev/null)
|
||||||
|
if [[ -n "$ruby_version" ]]; then
|
||||||
|
echo "($ruby_version)"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
alias rubies='rvm list rubies'
|
alias rubies='rvm list rubies'
|
||||||
alias gemsets='rvm gemset list'
|
alias gemsets='rvm gemset list'
|
||||||
|
|
||||||
|
|
@ -42,3 +50,4 @@ function gems {
|
||||||
-Ee "s/$current_ruby@global/$fg[yellow]&$reset_color/g" \
|
-Ee "s/$current_ruby@global/$fg[yellow]&$reset_color/g" \
|
||||||
-Ee "s/$current_ruby$current_gemset$/$fg[green]&$reset_color/g"
|
-Ee "s/$current_ruby$current_gemset$/$fg[green]&$reset_color/g"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue