Skip to content

GitLab

"plugins/vscode:/vscode.git/clone" did not exist on "19b925e741fa46d2222210469a4dffc34a634ebd"
Commit e344f4c0 authored by Marc Cornellà's avatar Marc Cornellà
Browse files

Merge pull request #4420 from apjanke/git-move-current_branch-to-core 

Git: move current_branch() to core
parents bfd2d8de 9f552130
Show whitespace changes
Inline Side-by-side
lib/git.zsh
View file @ e344f4c0
# get the name of the branch we are on # Outputs current branch info in prompt format
function git_prompt_info() { function git_prompt_info() {
local ref
if [[ "$(command git config --get oh-my-zsh.hide-status 2>/dev/null)" != "1" ]]; then if [[ "$(command git config --get oh-my-zsh.hide-status 2>/dev/null)" != "1" ]]; then
ref=$(command git symbolic-ref HEAD 2> /dev/null) || \ ref=$(command git symbolic-ref HEAD 2> /dev/null) || \
ref=$(command git rev-parse --short HEAD 2> /dev/null) || return 0 ref=$(command git rev-parse --short HEAD 2> /dev/null) || return 0
...@@ -7,9 +8,8 @@ function git_prompt_info() { ...@@ -7,9 +8,8 @@ function git_prompt_info() {
fi fi
} }
# Checks if working tree is dirty # Checks if working tree is dirty
parse_git_dirty() { function parse_git_dirty() {
local STATUS='' local STATUS=''
local FLAGS local FLAGS
FLAGS=('--porcelain') FLAGS=('--porcelain')
...@@ -29,32 +29,26 @@ parse_git_dirty() { ...@@ -29,32 +29,26 @@ parse_git_dirty() {
fi fi
} }
# get the difference between the local and remote branches # Gets the difference between the local and remote branches
git_remote_status() { function git_remote_status() {
local remote ahead behind git_remote_status git_remote_status_detailed
remote=${$(command git rev-parse --verify ${hook_com[branch]}@{upstream} --symbolic-full-name 2>/dev/null)/refs\/remotes\/} remote=${$(command git rev-parse --verify ${hook_com[branch]}@{upstream} --symbolic-full-name 2>/dev/null)/refs\/remotes\/}
if [[ -n ${remote} ]] ; then if [[ -n ${remote} ]]; then
ahead=$(command git rev-list ${hook_com[branch]}@{upstream}..HEAD 2>/dev/null | wc -l) ahead=$(command git rev-list ${hook_com[branch]}@{upstream}..HEAD 2>/dev/null | wc -l)
behind=$(command git rev-list HEAD..${hook_com[branch]}@{upstream} 2>/dev/null | wc -l) behind=$(command git rev-list HEAD..${hook_com[branch]}@{upstream} 2>/dev/null | wc -l)
if [ $ahead -eq 0 ] && [ $behind -eq 0 ] if [[ $ahead -gt 0 ]] && [[ $behind -eq 0 ]]; then
then
git_remote_status="$ZSH_THEME_GIT_PROMPT_EQUAL_REMOTE"
elif [ $ahead -gt 0 ] && [ $behind -eq 0 ]
then
git_remote_status="$ZSH_THEME_GIT_PROMPT_AHEAD_REMOTE" git_remote_status="$ZSH_THEME_GIT_PROMPT_AHEAD_REMOTE"
git_remote_status_detailed="$ZSH_THEME_GIT_PROMPT_AHEAD_REMOTE_COLOR$ZSH_THEME_GIT_PROMPT_AHEAD_REMOTE$((ahead))%{$reset_color%}" git_remote_status_detailed="$ZSH_THEME_GIT_PROMPT_AHEAD_REMOTE_COLOR$ZSH_THEME_GIT_PROMPT_AHEAD_REMOTE$((ahead))%{$reset_color%}"
elif [ $behind -gt 0 ] && [ $ahead -eq 0 ] elif [[ $behind -gt 0 ]] && [[ $ahead -eq 0 ]]; then
then
git_remote_status="$ZSH_THEME_GIT_PROMPT_BEHIND_REMOTE" git_remote_status="$ZSH_THEME_GIT_PROMPT_BEHIND_REMOTE"
git_remote_status_detailed="$ZSH_THEME_GIT_PROMPT_BEHIND_REMOTE_COLOR$ZSH_THEME_GIT_PROMPT_BEHIND_REMOTE$((behind))%{$reset_color%}" git_remote_status_detailed="$ZSH_THEME_GIT_PROMPT_BEHIND_REMOTE_COLOR$ZSH_THEME_GIT_PROMPT_BEHIND_REMOTE$((behind))%{$reset_color%}"
elif [ $ahead -gt 0 ] && [ $behind -gt 0 ] elif [[ $ahead -gt 0 ]] && [[ $behind -gt 0 ]]; then
then
git_remote_status="$ZSH_THEME_GIT_PROMPT_DIVERGED_REMOTE" git_remote_status="$ZSH_THEME_GIT_PROMPT_DIVERGED_REMOTE"
git_remote_status_detailed="$ZSH_THEME_GIT_PROMPT_AHEAD_REMOTE_COLOR$ZSH_THEME_GIT_PROMPT_AHEAD_REMOTE$((ahead))%{$reset_color%}$ZSH_THEME_GIT_PROMPT_BEHIND_REMOTE_COLOR$ZSH_THEME_GIT_PROMPT_BEHIND_REMOTE$((behind))%{$reset_color%}" git_remote_status_detailed="$ZSH_THEME_GIT_PROMPT_AHEAD_REMOTE_COLOR$ZSH_THEME_GIT_PROMPT_AHEAD_REMOTE$((ahead))%{$reset_color%}$ZSH_THEME_GIT_PROMPT_BEHIND_REMOTE_COLOR$ZSH_THEME_GIT_PROMPT_BEHIND_REMOTE$((behind))%{$reset_color%}"
fi fi
if [ $ZSH_THEME_GIT_PROMPT_REMOTE_STATUS_DETAILED ] if [[ -n $ZSH_THEME_GIT_PROMPT_REMOTE_STATUS_DETAILED ]]; then
then
git_remote_status="$ZSH_THEME_GIT_PROMPT_REMOTE_STATUS_PREFIX$remote$git_remote_status_detailed$ZSH_THEME_GIT_PROMPT_REMOTE_STATUS_SUFFIX" git_remote_status="$ZSH_THEME_GIT_PROMPT_REMOTE_STATUS_PREFIX$remote$git_remote_status_detailed$ZSH_THEME_GIT_PROMPT_REMOTE_STATUS_SUFFIX"
fi fi
...@@ -62,31 +56,47 @@ git_remote_status() { ...@@ -62,31 +56,47 @@ git_remote_status() {
fi fi
} }
# Outputs the name of the current branch
# Usage example: git pull origin $(git_current_branch)
# Using '--quiet' with 'symbolic-ref' will not cause a fatal error (128) if
# it's not a symbolic ref, but in a Git repo.
function git_current_branch() {
local ref
ref=$(command git symbolic-ref --quiet HEAD 2> /dev/null)
local ret=$?
if [[ $ret != 0 ]]; then
[[ $ret == 128 ]] && return # no git repo.
ref=$(command git rev-parse --short HEAD 2> /dev/null) || return
fi
echo ${ref#refs/heads/}
}
# Gets the number of commits ahead from remote # Gets the number of commits ahead from remote
function git_commits_ahead() { function git_commits_ahead() {
if $(echo "$(command git log @{upstream}..HEAD 2> /dev/null)" | grep '^commit' &> /dev/null); then if $(echo "$(command git log @{upstream}..HEAD 2> /dev/null)" | grep '^commit' &> /dev/null); then
COMMITS=$(command git log @{upstream}..HEAD | grep '^commit' | wc -l | tr -d ' ') local COMMITS=$(command git log @{upstream}..HEAD | grep '^commit' | wc -l | tr -d ' ')
echo "$ZSH_THEME_GIT_COMMITS_AHEAD_PREFIX$COMMITS$ZSH_THEME_GIT_COMMITS_AHEAD_SUFFIX" echo "$ZSH_THEME_GIT_COMMITS_AHEAD_PREFIX$COMMITS$ZSH_THEME_GIT_COMMITS_AHEAD_SUFFIX"
fi fi
} }
# Outputs if current branch is ahead of remote # Outputs if current branch is ahead of remote
function git_prompt_ahead() { function git_prompt_ahead() {
if [[ -n "$(command git rev-list origin/$(current_branch)..HEAD 2> /dev/null)" ]]; then if [[ -n "$(command git rev-list origin/$(git_current_branch)..HEAD 2> /dev/null)" ]]; then
echo "$ZSH_THEME_GIT_PROMPT_AHEAD" echo "$ZSH_THEME_GIT_PROMPT_AHEAD"
fi fi
} }
# Outputs if current branch is behind remote # Outputs if current branch is behind remote
function git_prompt_behind() { function git_prompt_behind() {
if [[ -n "$(command git rev-list HEAD..origin/$(current_branch) 2> /dev/null)" ]]; then if [[ -n "$(command git rev-list HEAD..origin/$(git_current_branch) 2> /dev/null)" ]]; then
echo "$ZSH_THEME_GIT_PROMPT_BEHIND" echo "$ZSH_THEME_GIT_PROMPT_BEHIND"
fi fi
} }
# Outputs if current branch exists on remote or not # Outputs if current branch exists on remote or not
function git_prompt_remote() { function git_prompt_remote() {
if [[ -n "$(command git show-ref origin/$(current_branch) 2> /dev/null)" ]]; then if [[ -n "$(command git show-ref origin/$(git_current_branch) 2> /dev/null)" ]]; then
echo "$ZSH_THEME_GIT_PROMPT_REMOTE_EXISTS" echo "$ZSH_THEME_GIT_PROMPT_REMOTE_EXISTS"
else else
echo "$ZSH_THEME_GIT_PROMPT_REMOTE_MISSING" echo "$ZSH_THEME_GIT_PROMPT_REMOTE_MISSING"
...@@ -95,16 +105,17 @@ function git_prompt_remote() { ...@@ -95,16 +105,17 @@ function git_prompt_remote() {
# Formats prompt string for current git commit short SHA # Formats prompt string for current git commit short SHA
function git_prompt_short_sha() { function git_prompt_short_sha() {
SHA=$(command git rev-parse --short HEAD 2> /dev/null) && echo "$ZSH_THEME_GIT_PROMPT_SHA_BEFORE$SHA$ZSH_THEME_GIT_PROMPT_SHA_AFTER" local SHA=$(command git rev-parse --short HEAD 2> /dev/null) && echo "$ZSH_THEME_GIT_PROMPT_SHA_BEFORE$SHA$ZSH_THEME_GIT_PROMPT_SHA_AFTER"
} }
# Formats prompt string for current git commit long SHA # Formats prompt string for current git commit long SHA
function git_prompt_long_sha() { function git_prompt_long_sha() {
SHA=$(command git rev-parse HEAD 2> /dev/null) && echo "$ZSH_THEME_GIT_PROMPT_SHA_BEFORE$SHA$ZSH_THEME_GIT_PROMPT_SHA_AFTER" local SHA=$(command git rev-parse HEAD 2> /dev/null) && echo "$ZSH_THEME_GIT_PROMPT_SHA_BEFORE$SHA$ZSH_THEME_GIT_PROMPT_SHA_AFTER"
} }
# Get the status of the working tree # Get the status of the working tree
git_prompt_status() { function git_prompt_status() {
local INDEX STATUS
INDEX=$(command git status --porcelain -b 2> /dev/null) INDEX=$(command git status --porcelain -b 2> /dev/null)
STATUS="" STATUS=""
if $(echo "$INDEX" | command grep -E '^\?\? ' &> /dev/null); then if $(echo "$INDEX" | command grep -E '^\?\? ' &> /dev/null); then
...@@ -150,9 +161,9 @@ git_prompt_status() { ...@@ -150,9 +161,9 @@ git_prompt_status() {
echo $STATUS echo $STATUS
} }
#compare the provided version of git to the version installed and on path # Compares the provided version of git to the version installed and on path
#prints 1 if input version <= installed version # Outputs -1, 0, or 1 if the installed version is less than, equal to, or
#prints -1 otherwise # greater than the input version, respectively.
function git_compare_version() { function git_compare_version() {
local INPUT_GIT_VERSION=$1; local INPUT_GIT_VERSION=$1;
local INSTALLED_GIT_VERSION local INSTALLED_GIT_VERSION
...@@ -173,7 +184,7 @@ function git_compare_version() { ...@@ -173,7 +184,7 @@ function git_compare_version() {
echo 0 echo 0
} }
#this is unlikely to change so make it all statically assigned # This is unlikely to change so make it all statically assigned
POST_1_7_2_GIT=$(git_compare_version "1.7.2") POST_1_7_2_GIT=$(git_compare_version "1.7.2")
#clean up the namespace slightly by removing the checker function # Clean up the namespace slightly by removing the checker function
unset -f git_compare_version unset -f git_compare_version
plugins/git/git.plugin.zsh
View file @ e344f4c0
...@@ -6,19 +6,12 @@ zstyle -s ":vcs_info:git:*:-all-" "command" _omz_git_git_cmd ...@@ -6,19 +6,12 @@ zstyle -s ":vcs_info:git:*:-all-" "command" _omz_git_git_cmd
# Functions # Functions
# #
# The current branch name # The name of the current branch
# Usage example: git pull origin $(current_branch) # Back-compatibility wrapper for when this function was defined here in
# Using '--quiet' with 'symbolic-ref' will not cause a fatal error (128) if # the plugin, before being pulled in to core lib/git.zsh as git_current_branch()
# it's not a symbolic ref, but in a Git repo. # to fix the core -> git plugin dependency.
function current_branch() { function current_branch() {
local ref git_current_branch
ref=$($_omz_git_git_cmd symbolic-ref --quiet HEAD 2> /dev/null)
local ret=$?
if [[ $ret != 0 ]]; then
[[ $ret == 128 ]] && return # no git repo.
ref=$($_omz_git_git_cmd rev-parse --short HEAD 2> /dev/null) || return
fi
echo ${ref#refs/heads/}
} }
# The list of remotes # The list of remotes
function current_repository() { function current_repository() {
...@@ -99,7 +92,7 @@ alias gfo='git fetch origin' ...@@ -99,7 +92,7 @@ alias gfo='git fetch origin'
alias gg='git gui citool' alias gg='git gui citool'
alias gga='git gui citool --amend' alias gga='git gui citool --amend'
ggf() { ggf() {
[[ "$#" != 1 ]] && local b="$(current_branch)" [[ "$#" != 1 ]] && local b="$(git_current_branch)"
git push --force origin "${b:=$1}" git push --force origin "${b:=$1}"
} }
compdef _git ggf=git-checkout compdef _git ggf=git-checkout
...@@ -107,23 +100,23 @@ ggl() { ...@@ -107,23 +100,23 @@ ggl() {
if [[ "$#" != 0 ]] && [[ "$#" != 1 ]]; then if [[ "$#" != 0 ]] && [[ "$#" != 1 ]]; then
git pull origin "${*}" git pull origin "${*}"
else else
[[ "$#" == 0 ]] && local b="$(current_branch)" [[ "$#" == 0 ]] && local b="$(git_current_branch)"
git pull origin "${b:=$1}" git pull origin "${b:=$1}"
fi fi
} }
compdef _git ggl=git-checkout compdef _git ggl=git-checkout
alias ggpull='git pull origin $(current_branch)' alias ggpull='git pull origin $(git_current_branch)'
compdef _git ggpull=git-checkout compdef _git ggpull=git-checkout
ggp() { ggp() {
if [[ "$#" != 0 ]] && [[ "$#" != 1 ]]; then if [[ "$#" != 0 ]] && [[ "$#" != 1 ]]; then
git push origin "${*}" git push origin "${*}"
else else
[[ "$#" == 0 ]] && local b="$(current_branch)" [[ "$#" == 0 ]] && local b="$(git_current_branch)"
git push origin "${b:=$1}" git push origin "${b:=$1}"
fi fi
} }
compdef _git ggp=git-checkout compdef _git ggp=git-checkout
alias ggpush='git push origin $(current_branch)' alias ggpush='git push origin $(git_current_branch)'
compdef _git ggpush=git-checkout compdef _git ggpush=git-checkout
ggpnp() { ggpnp() {
if [[ "$#" == 0 ]]; then if [[ "$#" == 0 ]]; then
...@@ -133,9 +126,9 @@ ggl "${*}" && ggp "${*}" ...@@ -133,9 +126,9 @@ ggl "${*}" && ggp "${*}"
fi fi
} }
compdef _git ggpnp=git-checkout compdef _git ggpnp=git-checkout
alias ggsup='git branch --set-upstream-to=origin/$(current_branch)' alias ggsup='git branch --set-upstream-to=origin/$(git_current_branch)'
ggu() { ggu() {
[[ "$#" != 1 ]] && local b="$(current_branch)" [[ "$#" != 1 ]] && local b="$(git_current_branch)"
git pull --rebase origin "${b:=$1}" git pull --rebase origin "${b:=$1}"
} }
compdef _git ggu=git-checkout compdef _git ggu=git-checkout
......
themes/eastwood.zsh-theme
View file @ e344f4c0
...@@ -14,9 +14,9 @@ ZSH_THEME_GIT_PROMPT_CLEAN="" ...@@ -14,9 +14,9 @@ ZSH_THEME_GIT_PROMPT_CLEAN=""
# Customized git status, oh-my-zsh currently does not allow render dirty status before branch # Customized git status, oh-my-zsh currently does not allow render dirty status before branch
git_custom_status() { git_custom_status() {
local cb=$(current_branch) local cb=$(git_current_branch)
if [ -n "$cb" ]; then if [ -n "$cb" ]; then
echo "$(parse_git_dirty)$ZSH_THEME_GIT_PROMPT_PREFIX$(current_branch)$ZSH_THEME_GIT_PROMPT_SUFFIX" echo "$(parse_git_dirty)$ZSH_THEME_GIT_PROMPT_PREFIX$(git_current_branch)$ZSH_THEME_GIT_PROMPT_SUFFIX"
fi fi
} }
......
themes/gallois.zsh-theme
View file @ e344f4c0
# Depends on the git plugin for work_in_progress()
ZSH_THEME_GIT_PROMPT_PREFIX="%{$reset_color%}%{$fg[green]%}[" ZSH_THEME_GIT_PROMPT_PREFIX="%{$reset_color%}%{$fg[green]%}["
ZSH_THEME_GIT_PROMPT_SUFFIX="]%{$reset_color%}" ZSH_THEME_GIT_PROMPT_SUFFIX="]%{$reset_color%}"
ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[red]%}*%{$reset_color%}" ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[red]%}*%{$reset_color%}"
...@@ -5,9 +7,9 @@ ZSH_THEME_GIT_PROMPT_CLEAN="" ...@@ -5,9 +7,9 @@ ZSH_THEME_GIT_PROMPT_CLEAN=""
#Customized git status, oh-my-zsh currently does not allow render dirty status before branch #Customized git status, oh-my-zsh currently does not allow render dirty status before branch
git_custom_status() { git_custom_status() {
local cb=$(current_branch) local cb=$(git_current_branch)
if [ -n "$cb" ]; then if [ -n "$cb" ]; then
echo "$(parse_git_dirty)%{$fg_bold[yellow]%}$(work_in_progress)%{$reset_color%}$ZSH_THEME_GIT_PROMPT_PREFIX$(current_branch)$ZSH_THEME_GIT_PROMPT_SUFFIX" echo "$(parse_git_dirty)%{$fg_bold[yellow]%}$(work_in_progress)%{$reset_color%}$ZSH_THEME_GIT_PROMPT_PREFIX$(git_current_branch)$ZSH_THEME_GIT_PROMPT_SUFFIX"
fi fi
} }
......
themes/josh.zsh-theme
View file @ e344f4c0
...@@ -9,7 +9,7 @@ function josh_prompt { ...@@ -9,7 +9,7 @@ function josh_prompt {
(( spare_width = ${COLUMNS} )) (( spare_width = ${COLUMNS} ))
prompt=" " prompt=" "
branch=$(current_branch) branch=$(git_current_branch)
ruby_version=$(rvm_prompt_info || rbenv_prompt_info) ruby_version=$(rvm_prompt_info || rbenv_prompt_info)
path_size=${#PWD} path_size=${#PWD}
branch_size=${#branch} branch_size=${#branch}
...@@ -31,7 +31,7 @@ function josh_prompt { ...@@ -31,7 +31,7 @@ function josh_prompt {
prompt=" $prompt" prompt=" $prompt"
done done
prompt="%{%F{green}%}$PWD$prompt%{%F{red}%}$(rvm_prompt_info || rbenv_prompt_info)%{$reset_color%} $(current_branch)" prompt="%{%F{green}%}$PWD$prompt%{%F{red}%}$(rvm_prompt_info || rbenv_prompt_info)%{$reset_color%} $(git_current_branch)"
echo $prompt echo $prompt
} }
......
themes/juanghurtado.zsh-theme
View file @ e344f4c0
# Needs Git plugin for current_branch method
# Color shortcuts # Color shortcuts
RED=$fg[red] RED=$fg[red]
YELLOW=$fg[yellow] YELLOW=$fg[yellow]
...@@ -40,4 +38,4 @@ ZSH_THEME_GIT_PROMPT_SHA_AFTER="%{$WHITE%}]" ...@@ -40,4 +38,4 @@ ZSH_THEME_GIT_PROMPT_SHA_AFTER="%{$WHITE%}]"
PROMPT=' PROMPT='
%{$GREEN_BOLD%}%n@%m%{$WHITE%}:%{$YELLOW%}%~%u$(parse_git_dirty)$(git_prompt_ahead)%{$RESET_COLOR%} %{$GREEN_BOLD%}%n@%m%{$WHITE%}:%{$YELLOW%}%~%u$(parse_git_dirty)$(git_prompt_ahead)%{$RESET_COLOR%}
%{$BLUE%}>%{$RESET_COLOR%} ' %{$BLUE%}>%{$RESET_COLOR%} '
RPROMPT='%{$GREEN_BOLD%}$(current_branch)$(git_prompt_short_sha)$(git_prompt_status)%{$RESET_COLOR%}' RPROMPT='%{$GREEN_BOLD%}$(git_current_branch)$(git_prompt_short_sha)$(git_prompt_status)%{$RESET_COLOR%}'
themes/mortalscumbag.zsh-theme
View file @ e344f4c0
...@@ -5,7 +5,7 @@ function my_git_prompt() { ...@@ -5,7 +5,7 @@ function my_git_prompt() {
STATUS="" STATUS=""
# is branch ahead? # is branch ahead?
if $(echo "$(git log origin/$(current_branch)..HEAD 2> /dev/null)" | grep '^commit' &> /dev/null); then if $(echo "$(git log origin/$(git_current_branch)..HEAD 2> /dev/null)" | grep '^commit' &> /dev/null); then
STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_AHEAD" STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_AHEAD"
fi fi
...@@ -37,7 +37,7 @@ function my_git_prompt() { ...@@ -37,7 +37,7 @@ function my_git_prompt() {
} }
function my_current_branch() { function my_current_branch() {
echo $(current_branch || echo "(no branch)") echo $(git_current_branch || echo "(no branch)")
} }
function ssh_connection() { function ssh_connection() {
......
themes/peepcode.zsh-theme
View file @ e344f4c0
...@@ -28,7 +28,7 @@ git_dirty() { ...@@ -28,7 +28,7 @@ git_dirty() {
} }
git_prompt() { git_prompt() {
local cb=$(current_branch) local cb=$(git_current_branch)
if [ -n "$cb" ]; then if [ -n "$cb" ]; then
local repo_path=$(git_repo_path) local repo_path=$(git_repo_path)
echo " %{$fg_bold[grey]%}$cb %{$fg[white]%}$(git_commit_id)%{$reset_color%}$(git_mode)$(git_dirty)" echo " %{$fg_bold[grey]%}$cb %{$fg[white]%}$(git_commit_id)%{$reset_color%}$(git_mode)$(git_dirty)"
......
themes/sunrise.zsh-theme
View file @ e344f4c0
# Sunrise theme for oh-my-zsh # Sunrise theme for oh-my-zsh
# Intended to be used with Solarized: http://ethanschoonover.com/solarized # Intended to be used with Solarized: http://ethanschoonover.com/solarized
# (Needs Git plugin for current_branch method)
# Color shortcuts # Color shortcuts
R=$fg_no_bold[red] R=$fg_no_bold[red]
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment