From 3da658fc6d1226afa522cf41859bb9354cadfcdf Mon Sep 17 00:00:00 2001 From: Sorin Ionescu Date: Sun, 17 Jul 2011 20:25:53 -0400 Subject: [PATCH] Cleaned up the Git plugin. --- plugins/git/git.plugin.zsh | 373 +++++++++++++++++++++++++++++++------ 1 file changed, 313 insertions(+), 60 deletions(-) diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh index baf34b83..cbf00395 100644 --- a/plugins/git/git.plugin.zsh +++ b/plugins/git/git.plugin.zsh @@ -1,117 +1,370 @@ +# Set the default Git prompt theme. +ZSH_THEME_GIT_PROMPT_PREFIX="git:(" # Prefix before the branch name. +ZSH_THEME_GIT_PROMPT_SUFFIX=")" # Suffix after the branch name. +ZSH_THEME_GIT_PROMPT_SHA_BEFORE="" # Prefix before the SHA-1 hash. +ZSH_THEME_GIT_PROMPT_SHA_AFTER="" # Suffix after the SHA-1 hash. +ZSH_THEME_GIT_PROMPT_DIRTY="*" # Indicator to notify of dirty branch. +ZSH_THEME_GIT_PROMPT_CLEAN="" # Indicator to notify of clean branch. +ZSH_THEME_GIT_PROMPT_AHEAD="" # Indicator to notify of ahead branch +ZSH_THEME_GIT_PROMPT_UNTRACKED="" # Indicator to notify of untracked files. +ZSH_THEME_GIT_PROMPT_ADDED="" # Indicator to notify of added files. +ZSH_THEME_GIT_PROMPT_MODIFIED="" # Indicator to notify of modified files. +ZSH_THEME_GIT_PROMPT_RENAMED="" # Indicator to notify of renamed files. +ZSH_THEME_GIT_PROMPT_DELETED="" # Indicator to notify of deleted files. +ZSH_THEME_GIT_PROMPT_UNMERGED="" # Indicator to notify of unmerged files. + +# Checks if the working tree is dirty. +function __git-parse-dirty() { + if [[ -n "$(git status -s 2> /dev/null)" ]]; then + echo "$ZSH_THEME_GIT_PROMPT_DIRTY" + else + echo "$ZSH_THEME_GIT_PROMPT_CLEAN" + fi +} + # Renders the name of the current branch. -function git_prompt_info() { - local branch=$(git_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}" + echo "${ZSH_THEME_GIT_PROMPT_PREFIX}${branch}$(__git-parse-dirty)${ZSH_THEME_GIT_PROMPT_SUFFIX}" + else + return 1 fi } # Gets the current branch. -function git_current_branch() { - local ref=$(git symbolic-ref HEAD 2> /dev/null) +function git-current-branch() { + local ref="$(git symbolic-ref HEAD 2> /dev/null)" if [[ -n "$ref" ]]; then echo "${ref#refs/heads/}" + else + return 1 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 +# Gets the repository root. +function git-root() { + git rev-parse --show-toplevel } # 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 +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" + else + return 1 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) +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}" + else + return 1 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) +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}" + else + return 1 fi } # Gets the status of the working tree. -function git_prompt_status() { - local indicators line untracked added modified renamed deleted +function git-prompt-status() { + local indicators line untracked added modified renamed deleted unmerged + + if ! git rev-parse &>/dev/null; then + return 1 + fi + while IFS=$'\n' read line; do - if [[ "$line" =~ '^\?\? ' ]]; then - [[ -n $untracked ]] && continue || untracked='yes' + if [[ "$line" == \?\?\ * ]] && [[ untracked != 'yes' ]]; then + 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' + if [[ "$line" == (((A|M|D|T) )|(AD|AM|AT|MM))\ * ]] && [[ added != 'yes' ]]; then + added='yes' indicators="${ZSH_THEME_GIT_PROMPT_ADDED}${indicators}" fi - if [[ "$line" =~ '^(( (M|T))|(AM|AT|MM)) ' ]]; then - [[ -n $modified ]] && continue || modified='yes' + if [[ "$line" == (( (M|T))|(AM|AT|MM))\ * ]] && [[ modified != 'yes' ]]; then + modified='yes' indicators="${ZSH_THEME_GIT_PROMPT_MODIFIED}${indicators}" fi - if [[ "$line" =~ '^R ' ]]; then - [[ -n $renamed ]] && continue || renamed='yes' + if [[ "$line" == R\ \ * ]] && [[ renamed != 'yes' ]]; then + renamed='yes' indicators="${ZSH_THEME_GIT_PROMPT_RENAMED}${indicators}" fi - if [[ "$line" =~ '^( D|AD) ' ]]; then - [[ -n $deleted ]] && continue || deleted='yes' + if [[ "$line" == ( D|AD)\ * ]] && [[ deleted != 'yes' ]]; then + deleted='yes' indicators="${ZSH_THEME_GIT_PROMPT_DELETED}${indicators}" fi - if [[ "$line" =~ '^UU ' ]]; then - [[ -n $unmerged ]] && continue || unmerged='yes' + if [[ "$line" == UU\ * ]] && [[ unmerged != 'yes' ]]; then + unmerged='yes' indicators="${ZSH_THEME_GIT_PROMPT_UNMERGED}${indicators}" fi done < <(git status --porcelain 2> /dev/null) - echo $indicators + + if [[ -n "$indicators" ]]; then + echo $indicators + fi } +# Open the GitHub repository in the browser. +function git-hub() { + local url=$( + git config -l \ + | grep "remote.origin.url" \ + | sed -En "s/remote.origin.url=(git|https?)(@|:\/\/)github.com(:|\/)(.+)\/(.+).git/https:\/\/github.com\/\4\/\5/p" + ) + + if [[ -n "$url" ]]; then + url="${url}/tree/${$(git-current-branch):-master}" + + if (( $+commands[$BROWSER] )); then + "$BROWSER" "$url" + else + echo "fatal: Browser not set or set to a non-existent browser." >&2 + return 1 + fi + else + echo "fatal: Not a Git repository or origin remote not set." >&2 + return 1 + fi +} + +# Git alias g='git' compdef g=git -alias gst='git status' -compdef _git gst=git-status -alias gl='git pull' -compdef _git gl=git-pull -alias gup='git fetch && git rebase' -compdef _git gup=git-fetch -alias gp='git push' -compdef _git gp=git-push -gdv() { git-diff -w "$@" | view - } -compdef _git gdv=git-diff -alias gc='git commit -v' + +# Working Copy (w) +alias gws='git status --short' +compdef _git gws=git-status +alias gwS='git status' +compdef _git gwS=git-status +alias gwd='git diff --no-ext-diff' +compdef _git gwd=git-diff +function gwD() { git diff --no-ext-diff --ignore-all-space "$@" | view - } +compdef _git gwD=git-diff +alias gwr='git reset --soft' +compdef _git gwr=git-reset +alias gwR='git reset --hard' +compdef _git gwR=git-reset +alias gwc='git clean -n' +compdef _git gwc=git-clean +alias gwC='git clean -f' +compdef _git gwC=git-clean +alias gwx='git rm -r' +compdef _git gwx=git-rm +alias gwX='git rm -rf' +compdef _git gwX=git-rm + +# Index +alias gia='git add' +compdef _git gia=git-add +alias giA='git add --patch' +compdef _git giA=git-add +alias giu='git add --update' +compdef _git giu=git-add +alias gid='git diff --no-ext-diff --cached' +compdef _git gid=git-diff +alias gir='git reset' +compdef _git gir=git-reset +alias giR='git reset --mixed' +compdef _git giR=git-reset +alias gix='git rm -r --cached' +compdef _git gix=git-rm +alias giX='git rm -rf --cached' +compdef _git giX=git-rm + +# Branah (b) +alias gb='git branch' +compdef _git gb=git-branch +alias gbc='git checkout -b' +compdef _git gbc=git-checkout +alias gbl='git branch -v' +compdef _git gbl=git-branch +alias gbL='git branch -av' +compdef _git gbL=git-branch +alias gbx='git branch -d' +compdef _git gbx=git-branch +alias gbX='git branch -D' +compdef _git gbX=git-branch +alias gbm='git branch -m' +compdef _git gbm=git-branch +alias gbM='git branch -M' +compdef _git gbM=git-branch + +# Commit (c) +alias gc='git commit' compdef _git gc=git-commit -alias gca='git commit -v -a' +alias gca='git commit --all' compdef _git gca=git-commit +alias gcm='git commit --message' +compdef _git gcm=git-commit alias gco='git checkout' compdef _git gco=git-checkout -alias gb='git branch' -compdef _git gb=git-branch -alias gba='git branch -a' -compdef _git gba=git-branch -alias gcount='git shortlog -sn' -compdef gcount=git +alias gcO='git checkout HEAD --' +compdef _git gcO=git-checkout +alias gcf='git commit --amend --reuse-message HEAD' +compdef _git gcf=git-commit alias gcp='git cherry-pick' compdef _git gcp=git-cherry-pick -alias glg='git log --stat --max-count=5' +alias gcr='git revert' +compdef _git gcr=git-revert +alias gcR='git reset "HEAD^"' +compdef _git gcR=git-reset +alias gcs='git show' +compdef _git gcs=git-show +alias gcv='git fsck | awk '\''/dangling commit/ {print $3}'\'' | git show --format="SHA1: %C(green)%h%C(reset) %f" --stdin | awk '\''/SHA1/ {sub("SHA1: ", ""); print}'\''' + +# Conflict (k) +alias gkl='git status | sed -n "s/^.*both [a-z]*ed: *//p"' +alias gka='git add $(gkl)' +compdef _git gka=git-add +alias gke='git mergetool $(gkl)' +alias gko='git checkout --ours --' +compdef _git gko=git-checkout +alias gkO='gko $(gkl)' +alias gkt='git checkout --theirs --' +compdef _git gkt=git-checkout +alias gkT='gkt $(gkl)' + +# File Data (d) +alias gd='git ls-files' +compdef _git gd=git-ls-files +alias gdc='git ls-files --cached' +compdef _git gdc=git-ls-files +alias gdx='git ls-files --deleted' +compdef _git gdx=git-ls-files +alias gdm='git ls-files --modified' +compdef _git gdm=git-ls-files +alias gdu='git ls-files --others' +compdef _git gdu=git-ls-files +alias gdk='git ls-files --killed' +compdef _git gdk=git-ls-files +alias gdi='git status --porcelain --short --ignored | sed -n "s/^!! //p"' + +# Merge (m) +alias gm='git merge --no-ff' +compdef _git gm=git-merge +alias gmf='git merge --ff' +compdef _git gmf=git-merge +alias gma='git merge --abort' +compdef _git gma=git-merge + +# Pull +alias gf='git fetch' +compdef _git gf=git-fetch +alias gfc='git clone' +compdef _git gfc=git-clone +alias gfm='git pull' +compdef _git gfm=git-pull +alias gfr='git pull --rebase' +compdef _git gfr=git-pull + +# Push +alias gp='git push' +compdef _git gp=git-push +alias gpf='git push --force' +compdef _git gpf=git-push +alias gpa='git push --all' +compdef _git gpa=git-push +alias gpA='git push --all && git push --tags' +compdef _git gpA=git-push +alias gpt='git push --tags' +compdef _git gpt=git-push +alias gpc='git push --set-upstream origin $(git-current-branch)' +compdef _git gpc=git-push +alias gpp='git pull origin $(git-current-branch) && git push origin $(git-current-branch)' + +# Rebase (r) +alias gr='git rebase' +compdef _git gr=git-rebase +alias gra='git rebase --abort' +compdef _git gra=git-rebase +alias grc='git rebase --continue' +compdef _git grc=git-rebase +alias gri='git rebase --interactive' +compdef _git gri=git-rebase +alias grs='git rebase --skip' +compdef _git grs=git-rebase + +# Remote Host (h) +alias gh='git remote' +compdef _git gh=git-remote +alias ghl='git remote --verbose' +compdef _git ghl=git-remote +alias gha='git remote add' +compdef _git gha=git-remote +alias ghx='git remote rm' +compdef _git ghx=git-remote +alias ghm='git remote rename' +compdef _git ghm=git-remote +alias ghu='git remote update' +compdef _git ghu=git-remote +alias ghc='git remote prune' +compdef _git ghc=git-remote +alias ghs='git remote show' +compdef _git ghs=git-remote + +# Stash (t) +alias gta='git stash apply' +compdef _git gta=git-stash +alias gtc='git stash clear' +compdef _git gtc=git-stash +alias gtx='git stash drop' +compdef _git gtx=git-stash +alias gtl='git stash list' +compdef _git gtl=git-stash +alias gtL='git stash show --patch --stat' +compdef _git gtL=git-stash +alias gtp='git stash pop' +compdef _git gtp=git-stash +alias gts='git stash save' +compdef _git gts=git-stash + +# Submodule (u) +alias gu='git submodule' +compdef _git gu=git-submodule +alias gua='git submodule add' +compdef _git gua=git-submodule +alias guf='git submodule foreach' +compdef _git guf=git-submodule +alias gui='git submodule init' +compdef _git gui=git-submodule +alias gul='git submodule status' +compdef _git gul=git-submodule +alias gus='git submodule sync' +compdef _git gus=git-submodule +alias guu='git submodule update' +compdef _git guu=git-submodule +alias guU='git submodule update --init --recursive' +compdef _git guU=git-submdoule + +# Git log (pretty). +git_log_format_oneline='--pretty=format:%C(green)%h%C(reset) %s%C(red)%d%C(reset)' +git_log_format_oneline_more='--pretty=format:%C(green)%h%C(reset) %C(blue)%ad%C(reset) %s%C(red)%d%C(reset) [%C(magenta)%an%C(reset)]' +git_log_format_medium='--pretty=format:%C(green)Commit: %H%C(red)%d%C(reset)%n%C(magenta)Author: %an <%ae>%C(reset)%n%C(blue)Date: %cd%C(reset)%n%+s%n%+b' + +alias gl='git log' +compdef _git gl=git-log +alias glo='git log --topo-order ${git_log_format_oneline}' +compdef _git glo=git-log +alias glO='git log --topo-order --date=short ${git_log_format_oneline_more}' +compdef _git glO=git-log +alias glg='git log --graph --topo-order ${git_log_format_medium}' compdef _git glg=git-log -alias git-svn-dcommit-push='git svn dcommit && git push github master:svntrunk' -compdef git-svn-dcommit-push=git -alias ggpull='git pull origin $(git_current_branch)' -compdef ggpull=git -alias ggpush='git push origin $(git_current_branch)' -compdef ggpush=git -alias ggpnp='git pull origin $(git_current_branch) && git push origin $(git_current_branch)' -compdef ggpnp=git +alias gls='git log --graph --topo-order --stat ${git_log_format_medium}' +compdef _git gls=git-log +alias gld='git log --graph --topo-order --stat --patch --full-diff ${git_log_format_medium}' +compdef _git gld=git-log +alias glc='git shortlog --summary --numbered' +compdef _git glc=git-shortlog