`vcsh init` without repo name prints help, now

[code/vcsh.git] / vcsh

diff --git a/vcsh b/vcsh
index 4e99718046fbc56bf2f6d287700bcd36a8a25d12..38c1e0d7da477981e8ad8e1380e1b59f8cd0d742 100755 (executable)
--- a/vcsh
+++ b/vcsh
@@ -27,22 +27,22 @@ verbose() {
        if [ "$VCSH_DEBUG" = '1' ] || [ "$VCSH_VERBOSE" = '1' ]; then echo "$SELF: verbose: $1"; fi
 }
 
        if [ "$VCSH_DEBUG" = '1' ] || [ "$VCSH_VERBOSE" = '1' ]; then echo "$SELF: verbose: $1"; fi
 }
 

+#   use <repo>     Use this repository

 help() {
        echo "usage: $SELF <args>
 
 help() {
        echo "usage: $SELF <args>
 

-   help           Display this help
+   help              Display this help

 
 

-   list           List all repos
+   list              List all repos

 
 

-   use <repo>     Use this repository
-   run <repo>
-       <command>  Use this repository
+   run <repo> \\
+       <command>     Use this repository

 
 

-   init           Initialize a new repository
-   clone <remote>
-         [<repo>] Clone from an existing repository
+   init <repo>       Initialize a new repository
+   clone <remote> \\
+         [<repo>]    Clone from an existing repository

 
 

-   exit           Exit vcsh mode" >&2
+   exit              Exit vcsh mode" >&2

 }
 
 use() {
 }
 
 use() {


@@ -105,24 +105,24 @@ elif [ "$1" = 'run' ]; then
        verbose "run end"
        exit 0
 
        verbose "run end"
        exit 0
 

-elif [ "$1" = 'use' ]; then
-       verbose "use begin"
-       if [ -n "$ZSH_VERSION" ]; then
-               if [ -o NO_IGNORE_EOF ]; then
-                       export VCSH_NO_IGNORE_EOF=1
-                       setopt IGNORE_EOF
-               fi
-               vcsh_exit() {
-                       vcsh exit;
-                       zle reset-prompt;
-               }
-               zle -N vcsh_exit
-               bindkey '^d' 'vcsh_exit'
-       fi
-       use $2
-       [ -n "$ZSH_VERSION" ] && [ "$USER" = richih ] && buildPS1
-       verbose "use end"
-       exit 0
+#elif [ "$1" = 'use' ]; then
+#      verbose "use begin"
+#      if [ -n "$ZSH_VERSION" ]; then
+#              if [ -o NO_IGNORE_EOF ]; then
+#                      export VCSH_NO_IGNORE_EOF=1
+#                      setopt IGNORE_EOF
+#              fi
+#              vcsh_exit() {
+#                      vcsh exit;
+#                      zle reset-prompt;
+#              }
+#              zle -N vcsh_exit
+#              bindkey '^d' 'vcsh_exit'
+#      fi
+#      use $2
+#      [ -n "$ZSH_VERSION" ] && [ "$USER" = richih ] && buildPS1
+#      verbose "use end"
+#      exit 0

 
 elif [ "$1" = 'clone' ]; then
        verbose "clone begin"
 
 elif [ "$1" = 'clone' ]; then
        verbose "clone begin"


@@ -146,15 +146,16 @@ elif [ "$1" = 'clone' ]; then
                echo "$SELF: fatal: will stop after fetching and not try to merge!\n" &&
                exit 3
        git merge origin/master
                echo "$SELF: fatal: will stop after fetching and not try to merge!\n" &&
                exit 3
        git merge origin/master

-       vcsh use $REPO_NAME
+#      vcsh use $REPO_NAME

        verbose "clone end"
 
 elif [ "$1" = 'init' ]; then
        verbose "init begin"
        verbose "clone end"
 
 elif [ "$1" = 'init' ]; then
        verbose "init begin"

+       [ -z $2 ] && help; return 0

        export REPO_NAME="$2"
        export GIT_DIR="$VCSH_BASE/$REPO_NAME.git"
        init
        export REPO_NAME="$2"
        export GIT_DIR="$VCSH_BASE/$REPO_NAME.git"
        init

-       vcsh use $REPO_NAME
+#      vcsh use $REPO_NAME

        verbose "init end"
 
 elif [ "$1" = 'exit' ]; then
        verbose "init end"
 
 elif [ "$1" = 'exit' ]; then