X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=etc%2Fskel%2F.zshrc;h=de649eb2d61978836ad7800272bf2820fd40007a;hb=7cb3be14606f3e2f2e7d01adbf2cf64db4176606;hp=0d9d5dd4b9d3d31ded10a7ce4edc5dbc5c08c8f5;hpb=fdc8e8a0089fc457478464f8cbe4b89a813b27fc;p=grml-etc-core.git

diff --git a/etc/skel/.zshrc b/etc/skel/.zshrc
index 0d9d5dd..de649eb 100644
--- a/etc/skel/.zshrc
+++ b/etc/skel/.zshrc
@@ -3,7 +3,7 @@
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2.
-# Latest change: Mon Sep 18 18:54:28 CEST 2006 [mika]
+# Latest change: Son Okt 22 21:25:17 CEST 2006 [mika]
 ################################################################################
 
 # source ~/.zshrc.global {{{
@@ -342,7 +342,7 @@
         if [[ $NBFILES > 0 ]]; then
                 print $FILES
                 local ans
-                echo -n "Remove this files? [y/n] "
+                echo -n "Remove these files? [y/n] "
                 read -q ans
                 if [[ $ans == "y" ]]
                 then
@@ -814,7 +814,23 @@
        fi
     fi
   }
+# }}}
 
+# mercurial related stuff {{{
+  if type -p hg >/dev/null 2>&1 ; then
+  # gnu like diff for mercurial
+  # http://www.selenic.com/mercurial/wiki/index.cgi/TipsAndTricks
+    hgdi() {
+      for i in `hg status -marn "$@"` ; diff -ubwd <(hg cat "$i") "$i"
+    }
+
+  # diffstat for specific version of mercurial
+  #   hgstat      => display diffstat between last revision and tip
+  #   hgstat 1234 => display diffstat between revision 1234 and tip
+    hgstat() {
+      [ -n "$1" ] && hg diff -r $1 -r tip | diffstat || hg export tip | diffstat
+    }
+  fi
 # }}}
 
 # some useful commands often hard to remember - let's grep for them {{{