Auto commit by The Sugar System.

[sugar.git] / dot-files / _zshrc

diff --git a/dot-files/_zshrc b/dot-files/_zshrc
index d5fdcf850a7e95ae29ad3f515e6487a6559e4372..575cb3ada0ec5abb9b1bd47bea4fdc46c1fe5a95 100644 (file)
--- a/dot-files/_zshrc
+++ b/dot-files/_zshrc
@@ -75,7 +75,7 @@ function preexec() { # Hook
 }
 
 function chpwd() { # Hook
-    local dirinfo=$(print_directory_info)
+    local dirinfo=$(print_directory_info $(pwd))
 
     case $dirinfo in
         "")
@@ -86,40 +86,34 @@ function chpwd() { # Hook
 }
 
 function print_directory_info() {
-    local vcs_type=$(print_vcs_type $(pwd))
-
-    case $vcs_type in
-        git)
-            git branch --no-color 2>/dev/null \
-                | sed -e '/^[^*]/d' -e 's/* \(.*\)/\1/';;
-        hg)
-            hg branch 2>/dev/null;;
-        darcs-*)
-            # Delete `darcs-' at the beginning.
-            echo ${vcs_type#darcs-};;
-        *)
-            # Unknown
-            echo
-    esac
-}
-
-function print_vcs_type() {
     local absdir=$1
 
     if [[ -d $absdir/.git ]] then
-        echo git
+        # Git
+        git branch --no-color 2>/dev/null \
+            | sed -e '/^[^*]/d' -e 's/* \(.*\)/\1/'
+
     elif [[ -d $absdir/.hg ]] then
-        echo hg
+        # Hg
+        hg branch 2>/dev/null
+
     elif [[ -d $absdir/_darcs ]] then
-        echo darcs-$(basename $absdir)
+        # Darcs
+        basename $absdir
+
+    elif [[ -r $absdir/CVS/Repository ]] then
+        # CVS
+        cat $absdir/CVS/Repository \
+            | sed -e 's!\([^/]*\).*!\1!'
+
     else
-        # Nothing.
+        # Unknown.
         if [[ $absdir = "/" ]] then
             # This is the root directory so exit from the recursion.
             echo
         else
             # Recurse to the parent dir.
-            print_vcs_type $(dirname $absdir)
+            print_directory_info $(dirname $absdir)
         fi
     fi
 }
@@ -153,7 +147,7 @@ alias aria="ssh -X admin@aria.cielonegro.org"
 alias nem="ssh -X pho@nem.cielonegro.org"
 alias mikasa="ssh -X daimon@mikasa.tomilab.net"
 
-alias aria-emacs="ssh -f -X admin@aria.cielonegro.org emacs"
+alias aria-emacs="ssh -f -X admin@aria.cielonegro.org emacsclient -c"
 
 alias g1="ssh pho@g1.cuenote.jp"
 alias g2="ssh pho@g2.cuenote.jp"