From a6ffe2da4f83107add2d60782e103d451ea38b90 Mon Sep 17 00:00:00 2001
From: ncanceill <nicolas.canceill@ens-cachan.org>
Date: Wed, 21 May 2014 12:25:40 +0200
Subject: [PATCH] re-organized plugin (no real change)

---
 plugins/git/git.plugin.zsh | 165 ++++++++++++++++++++-----------------
 1 file changed, 90 insertions(+), 75 deletions(-)

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index d3cab7b8e7e6..324b351301f7 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -1,20 +1,70 @@
+#
+# Compatibility
+#
+
+# Check xargs flavor for -r flag
+echo | xargs -r &>/dev/null && XARGS_OPTS="-r"
+
+#
+# Functions
+#
+
+# The current branch name
+# Usage example: git pull origin $(current_branch)
+function current_branch() {
+  if [ ! -d .git ]; then return; fi
+  ref=$(git symbolic-ref HEAD 2> /dev/null) || \
+  ref=$(git rev-parse --short HEAD 2> /dev/null) || return
+  echo ${ref#refs/heads/}
+}
+# The list of remotes
+function current_repository() {
+  if [ ! -d .git ]; then return; fi
+  ref=$(git symbolic-ref HEAD 2> /dev/null) || \
+  ref=$(git rev-parse --short HEAD 2> /dev/null) || return
+  echo $(git remote -v | cut -d':' -f 2)
+}
+# Pretty log messages
+function _git_log_prettily(){
+  if ! [ -z $1 ]; then
+    git log --pretty=$1
+  fi
+}
+# This function return a warning if the current branch is a wip
+function work_in_progress() {
+  if $(git log -n 1 2>/dev/null | grep -q -c "\-\-wip\-\-"); then
+    echo "WIP!!"
+  fi
+}
+
+#
 # Aliases
+#
 alias g='git'
 compdef g=git
+# Status
 alias gst='git status'
 compdef _git gst=git-status
+alias gss='git status -s'
+compdef _git gss=git-status
+# Diff
 alias gd='git diff'
 compdef _git gd=git-diff
 alias gdc='git diff --cached'
 compdef _git gdc=git-diff
+gdv() { git diff -w "$@" | view - }
+compdef _git gdv=git-diff
+# Pull
 alias gl='git pull'
 compdef _git gl=git-pull
 alias gup='git pull --rebase'
 compdef _git gup=git-fetch
+# Push
 alias gp='git push'
 compdef _git gp=git-push
-gdv() { git diff -w "$@" | view - }
-compdef _git gdv=git-diff
+alias gpoat='git push origin --all && git push origin --tags'
+compdef _git gpoat=git-push
+# Commit
 alias gc='git commit -v'
 compdef _git gc=git-commit
 alias gc!='git commit -v --amend'
@@ -25,10 +75,12 @@ alias gca!='git commit -v -a --amend'
 compdef _git gca!=git-commit
 alias gcmsg='git commit -m'
 compdef _git gcmsg=git-commit
+# Checkout
 alias gco='git checkout'
 compdef _git gco=git-checkout
 alias gcm='git checkout master'
 compdef _git gcm=git-checkout
+# Remote
 alias gr='git remote'
 compdef _git gr=git-remote
 alias grv='git remote -v'
@@ -41,6 +93,7 @@ alias grset='git remote set-url'
 compdef _git grset=git-remote
 alias grup='git remote update'
 compdef _git grset=git-remote
+# Rebase
 alias grb='git rebase'
 compdef _git grb=git-rebase
 alias grbi='git rebase -i'
@@ -51,16 +104,34 @@ alias grbs='git rebase --skip'
 compdef _git grbs=git-rebase
 alias grba='git rebase --abort'
 compdef _git grba=git-rebase
+# Cherry-pick
+alias gcp='git cherry-pick'
+compdef _git gcp=git-cherry-pick
+# Branch
 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
+# Config
 alias gcl='git config --list'
 compdef _git gcl=git-config
-alias gcp='git cherry-pick'
-compdef _git gcp=git-cherry-pick
+# Add
+alias ga='git add'
+compdef _git ga=git-add
+# Merge
+alias gm='git merge'
+compdef _git gm=git-merge
+alias gmt='git mergetool --no-prompt'
+compdef _git gmt=git-mergetool
+# Reset
+alias grh='git reset HEAD'
+compdef _git grh=git-reset
+alias grhh='git reset HEAD --hard'
+compdef _git grhh=git-reset
+alias gclean='git reset --hard && git clean -dfx'
+# Log
+alias gcount='git shortlog -sn'
+compdef gcount=git
 alias glg='git log --stat --color'
 compdef _git glg=git-log
 alias glgp='git log --stat --color -p'
@@ -73,105 +144,46 @@ alias glo='git log --oneline --decorate --color'
 compdef _git glo=git-log
 alias glog='git log --oneline --decorate --color --graph'
 compdef _git glog=git-log
-alias gss='git status -s'
-compdef _git gss=git-status
-alias ga='git add'
-compdef _git ga=git-add
-alias gm='git merge'
-compdef _git gm=git-merge
-alias grh='git reset HEAD'
-compdef _git grh=git-reset
-alias grhh='git reset HEAD --hard'
-compdef _git grhh=git-reset
-alias gclean='git reset --hard && git clean -dfx'
 alias gwc='git whatchanged -p --abbrev-commit --pretty=medium'
 compdef _git gwc=git-whatchanged
-alias gpoat='git push origin --all && git push origin --tags'
-compdef _git gpoat=git-push
-alias gmt='git mergetool --no-prompt'
-compdef _git gmt=git-mergetool
-
+alias glp="_git_log_prettily"
+compdef _git glp=git-log
+# GUI
 alias gg='git gui citool'
 alias gga='git gui citool --amend'
 alias gk='gitk --all --branches'
-
+# Stash
 alias gsts='git stash show --text'
 alias gsta='git stash'
 alias gstp='git stash pop'
 alias gstd='git stash drop'
 alias gstl='git stash list'
-
-# Will cd into the top of the current repository
-# or submodule.
+# cd into the top of the current repository or submodule
 alias grt='cd $(git rev-parse --show-toplevel || echo ".")'
-
 # Git and svn mix
 alias git-svn-dcommit-push='git svn dcommit && git push github master:svntrunk'
 compdef git-svn-dcommit-push=git
-
 alias gsr='git svn rebase'
 alias gsd='git svn dcommit'
-#
-# Will return the current branch name
-# Usage example: git pull origin $(current_branch)
-#
-function current_branch() {
-  if [ ! -d .git ]; then return; fi
-  ref=$(git symbolic-ref HEAD 2> /dev/null) || \
-  ref=$(git rev-parse --short HEAD 2> /dev/null) || return
-  echo ${ref#refs/heads/}
-}
-
-function current_repository() {
-  if [ ! -d .git ]; then return; fi
-  ref=$(git symbolic-ref HEAD 2> /dev/null) || \
-  ref=$(git rev-parse --short HEAD 2> /dev/null) || return
-  echo $(git remote -v | cut -d':' -f 2)
-}
-
-# these aliases take advantage of the previous function
+# Current branch
 alias ggpull='git pull origin $(current_branch)'
 compdef ggpull=git
 alias ggpur='git pull --rebase origin $(current_branch)'
 compdef ggpur=git
 alias ggpush='git push origin $(current_branch)'
 compdef ggpush=git
-alias ggpnp='git pull origin $(current_branch) && git push origin $(current_branch)'
+alias ggpnp='git pull origin $(current_branch) &&git push origin $(current_branch)'
 compdef ggpnp=git
-
-# Pretty log messages
-function _git_log_prettily(){
-  if ! [ -z $1 ]; then
-    git log --pretty=$1
-  fi
-}
-alias glp="_git_log_prettily"
-compdef _git glp=git-log
-
 # Work In Progress (wip)
-# These features allow to pause a branch development and switch to another one (wip)
+# These features allow to pause a branch development and switch to another one
 # When you want to go back to work, just unwip it
-#
-# This function return a warning if the current branch is a wip
-function work_in_progress() {
-  if $(git log -n 1 2>/dev/null | grep -q -c "\-\-wip\-\-"); then
-    echo "WIP!!"
-  fi
-}
-
-# these aliases commit and uncommit wip branches
-# first though, check xargs flavor for -r flag
-echo | xargs -r &>/dev/null && XARGS_OPTS="-r"
 alias gwip="git add -A; git ls-files --deleted -z | xargs ${XARGS_OPTS} -0 git rm; git commit -m \"--wip--\""
-unset XARGS_OPTS
 alias gunwip='git log -n 1 | grep -q -c "\-\-wip\-\-" && git reset HEAD~1'
-
-# these alias ignore changes to file
+# Ignore changes to file
 alias gignore='git update-index --assume-unchanged'
 alias gunignore='git update-index --no-assume-unchanged'
-# list temporarily ignored files
+# List temporarily ignored files
 alias gignored='git ls-files -v | grep "^[[:lower:]]"'
-
 # Submodules
 alias gf='git fetch'
 compdef _git gf=git-fetch
@@ -179,3 +191,6 @@ alias gsi='git submodule init'
 compdef _git gsi=git-submodule
 alias gsu='git submodule update'
 compdef _git gsu=git-submodule
+
+# Compatibility
+unset XARGS_OPTS