zsh/rc: Add aliases for gitk and tig.

[config/dotfiles.git] / zsh / rc

diff --git a/zsh/rc b/zsh/rc
index 4d64ece7afbcf9fa3eec3a543a00aa5d9a6c58ad..fae7b4da97eeafdd9e711ac0692f52dedfb5bbce 100644 (file)
--- a/zsh/rc
+++ b/zsh/rc
@@ -322,34 +322,37 @@ zstyle ':completion:*:(hg|git)*:*' ignore-line yes
 
 # CUSTOM ALIASES AND FUNCTIONS
 
+# If ^C is pressed while typing a command, add it to the history so it can be
+# easily retrieved later and then abort like ^C normally does. This is useful
+# when I want to abort an command to do something in between and then finish
+# typing the command.
+TRAPINT() {
+    # Store the current buffer in the history.
+    zle && print -s $BUFFER
+
+    # Return the default exit code so zsh aborts the current command.
+    return $1
+}
+
+# Colorize stderr. Very useful when looking for errors. Thanks to
+# http://gentoo-wiki.com/wiki/Zsh
+exec 2>>(while read line; do
+    print '\e[91m'${(q)line}'\e[0m' > /dev/tty; print -n $'\0'; done &)
+
 # Make sure aliases are expanded when using sudo.
 alias sudo='sudo '
 
-# Redirect stderr to stdout.
+# Global aliases for often used commands used in the command line.
 alias -g E='2>&1'
-
-# Simplify calls to less, automatically redirects all output.
 alias -g L='E | less'
-# Simplify calls to colordiff, output is also piped through less.
 alias -g D='E | colordiff L'
-# Simplify calls to grep.
 alias -g G='| grep'
-# Simplify calls to sort.
 alias -g S='| sort'
 
-# Automatically use unified diffs.
-alias diff='diff -u'
-
-# Display all files and use human readable sizes.
-alias du='du -sh'
-
-# Use human readable sizes.
-alias df='df -h'
-
-# Multiple files given to Vim are opened in tabs, supported since Vim 7.
-if [[ ${${${(f)"$(vim --version)"}[1]#VIM - Vi IMproved }%% *} == 7* ]]; then
-    alias vim='vim -p'
-fi
+# Make going up directories simple.
+alias -g ...='../..'
+alias -g ....='../../..'
+alias -g .....='../../../..'
 
 # Shortcuts for often used programs.
 alias e='elinks'
@@ -358,20 +361,6 @@ alias m='mutt'
 alias v='vim'
 alias vi='vim'
 
-# I sometimes confuse editor and shell, print a warning to prevent I exit the
-# shell.
-alias :q='echo "This is not Vim!" >&2'
-
-# Edit the mercurial patch queue series file for the current mercurial
-# repository in Vim. Also change Vim's pwd to the patches directory so other
-# patches can easily be opened.
-alias vqs='vim -c "cd $(hg root)/.hg/patches/" "$(hg root)/.hg/patches/series"'
-
-# Make going up directories simple.
-alias -g ...='../..'
-alias -g ....='../../..'
-alias -g .....='../../../..'
-
 # Improved ls which displays the files in columns (-C), visualizes
 # directories, links and other special files (-F) and pages everything through
 # less (L).
@@ -398,29 +387,41 @@ function ll() {
     la -l $*
 }
 
-# If ^C is pressed while typing a command, add it to the history so it can be
-# easily retrieved later and then abort like ^C normally does. This is useful
-# when I want to abort an command to do something in between and then finish
-# typing the command.
-TRAPINT() {
-    # Store the current buffer in the history.
-    zle && print -s $BUFFER
+# I sometimes confuse editor and shell, print a warning to prevent I exit the
+# shell.
+alias :q='echo "This is not Vim!" >&2'
 
-    # Return the default exit code so zsh aborts the current command.
-    return $1
-}
+# Automatically use unified diffs.
+alias diff='diff -u'
 
-# Display TODOs stored in ~/.todo if this file exists.
-todo() {
-    if [[ -f ~/.todo ]]; then
-        cat ~/.todo | $PAGER
-    fi
-}
+# Display all files and use human readable sizes.
+alias du='du -sh'
 
-# Colorize stderr. Very useful when looking for errors. Thanks to
-# http://gentoo-wiki.com/wiki/Zsh
-exec 2>>(while read line; do
-    print '\e[91m'${(q)line}'\e[0m' > /dev/tty; print -n $'\0'; done &)
+# Use human readable sizes.
+alias df='df -h'
+
+# Edit the mercurial patch queue series file for the current mercurial
+# repository in Vim. Also change Vim's pwd to the patches directory so other
+# patches can easily be opened.
+alias vqs='vim -c "cd $(hg root)/.hg/patches/" "$(hg root)/.hg/patches/series"'
+
+# Display all branches (except stash) in gitk but only 200 commits as this is
+# much faster. Also put in the background and disown. Thanks to sitaram in
+# #git on Freenode (2009-04-20 15:51).
+gitk() {
+    command gitk \
+        --max-count=200 \
+        $(git rev-parse --symbolic-full-name --remotes --branches) \
+        $@ &
+    disown %command
+}
+# Same for tig (except the disown part as it's no GUI program).
+tig() {
+    command tig \
+        --max-count=200 \
+        $(git rev-parse --symbolic-full-name --remotes --branches) \
+        $@
+}
 
 
 # RUN COMMANDS
@@ -430,12 +431,14 @@ exec 2>>(while read line; do
 # screen* is necessary as `screen` uses screen.linux for example for a linux
 # console which would otherwise cause an infinite loop.
 if [[ $TERM != screen* && $TERM != 'dumb' ]]; then
+    # Get running detached sessions.
+    session=$(screen -list | grep 'Detached' | awk '{ print $1; exit }')
     # Create a new session if none is running.
-    if [[ $(screen -list | grep "Detached" | wc -l) == 0 ]]; then
+    if [[ -z $session ]]; then
         screen
     # Reattach to a running session.
     else
-        screen -r
+        screen -r $session
     fi
 fi