Skip to content
Snippets Groups Projects
Commit da4f9ca1 authored by Richard Hartmann's avatar Richard Hartmann
Browse files

Re-introduce `vcsh use` and `vcsh exit`

github:
closes: #4
parent 17c66ba8
Branches
Tags
No related merge requests found
#compdef vcsh #compdef vcsh
# use\:"use/enter repo"
# exit\:"exit repo"
_arguments \ _arguments \
':subcommand:(( ':subcommand:((
clone\:"clone from repo" clone\:"clone from repo"
help\:"display help" help\:"display help"
init\:"init & clone from repo"
delete\:"delete repo" delete\:"delete repo"
exit\:"Exit repo; unset"
init\:"init & clone from repo"
list\:"list all repos" list\:"list all repos"
run\:"run command on repo" run\:"run command on repo"
seed-gitignore\:"seed .gitignore.d/foo from git ls-files" seed-gitignore\:"seed .gitignore.d/foo from git ls-files"
use\:"Use repo; set ENV"
\<REPO\>\:"Run git command directly" \<REPO\>\:"Run git command directly"
))' ))'
...@@ -5,10 +5,12 @@ vcsh(1) - manage and sync config files via git ...@@ -5,10 +5,12 @@ vcsh(1) - manage and sync config files via git
`vcsh` clone <url> [<location>] `vcsh` clone <url> [<location>]
`vcsh` help
`vcsh` delete `vcsh` delete
`vcsh` exit
`vcsh` help
`vcsh` init <repo> `vcsh` init <repo>
`vcsh` list `vcsh` list
...@@ -17,6 +19,8 @@ vcsh(1) - manage and sync config files via git ...@@ -17,6 +19,8 @@ vcsh(1) - manage and sync config files via git
`vcsh` seed-gitignore `vcsh` seed-gitignore
`vcsh` use <repo>
`vcsh` <repo> <gitcommand> `vcsh` <repo> <gitcommand>
...@@ -43,12 +47,15 @@ A sample configuration for `vcsh` and `mr` can be found at ...@@ -43,12 +47,15 @@ A sample configuration for `vcsh` and `mr` can be found at
* clone: * clone:
Clone an existing repository. Clone an existing repository.
* help:
Display help.
* delete: * delete:
Delete an existing repository. Delete an existing repository.
* exit:
Exit repository; unset ENV
* help:
Display help.
* init: * init:
Initialize an empty repository. Initialize an empty repository.
...@@ -62,6 +69,9 @@ A sample configuration for `vcsh` and `mr` can be found at ...@@ -62,6 +69,9 @@ A sample configuration for `vcsh` and `mr` can be found at
* seed-gitignore: * seed-gitignore:
Seed .gitignore.d/<repo> from git ls-files. Seed .gitignore.d/<repo> from git ls-files.
* use:
Use repository; set ENV
* <repo> <gitcommand>: * <repo> <gitcommand>:
Shortcut to run `vcsh` on a repo. Will prepend `git` to <command> by itself. Shortcut to run `vcsh` on a repo. Will prepend `git` to <command> by itself.
... ...
......
...@@ -14,19 +14,18 @@ help() { ...@@ -14,19 +14,18 @@ help() {
[<repo>] Clone from an existing repository [<repo>] Clone from an existing repository
help Display this help text help Display this help text
delete Delete an existing repository delete Delete an existing repository
exit Exit repository; unset ENV
init <repo> Initialize a new repository init <repo> Initialize a new repository
list List all repos list List all repositories
run <repo> \\ run <repo> \\
<command> Use this repository <command> Use this repository
seed-gitignore \\ seed-gitignore \\
<repo> Seed .gitignore.d/<repo> from git ls-files <repo> Seed .gitignore.d/<repo> from git ls-files
use <repo> Use repository; set ENV
<repo> <git command> Special command that allows you to run git commands <repo> <git command> Special command that allows you to run git commands
directly without having to type so much ;)" >&2 directly without having to type so much ;)" >&2
# use <repo> Use this repository
#
# exit Exit vcsh mode" >&2
} }
debug() { debug() {
...@@ -85,7 +84,8 @@ if [ "$1" = 'clone' ]; then ...@@ -85,7 +84,8 @@ if [ "$1" = 'clone' ]; then
elif [ "$1" = 'delete' ] || elif [ "$1" = 'delete' ] ||
[ "$1" = 'init' ] || [ "$1" = 'init' ] ||
[ "$1" = 'run' ] || [ "$1" = 'run' ] ||
[ "$1" = 'seed-gitignore' ]; then [ "$1" = 'seed-gitignore' ] ||
[ "$1" = 'use' ]; then
[ -z $2 ] && echo "$SELF $1: error: please specify repository to work on" && return 1 [ -z $2 ] && echo "$SELF $1: error: please specify repository to work on" && return 1
export VCSH_COMMAND="$1" export VCSH_COMMAND="$1"
export VCSH_REPO_NAME="$2" export VCSH_REPO_NAME="$2"
...@@ -95,7 +95,8 @@ elif [ "$1" = 'delete' ] || ...@@ -95,7 +95,8 @@ elif [ "$1" = 'delete' ] ||
if [ "$VCSH_COMMAND" = 'run' ]; then if [ "$VCSH_COMMAND" = 'run' ]; then
[ -z "$VCSH_EXTERNAL_COMMAND" ] && echo "$SELF $1 $2: error: please specify a command" && return 1 [ -z "$VCSH_EXTERNAL_COMMAND" ] && echo "$SELF $1 $2: error: please specify a command" && return 1
fi fi
elif [ "$1" = 'help' ] || elif [ "$1" = 'exit' ] ||
[ "$1" = 'help' ] ||
[ "$1" = 'list' ]; then [ "$1" = 'list' ]; then
export VCSH_COMMAND="$1" export VCSH_COMMAND="$1"
else else
...@@ -169,16 +170,16 @@ To continue, type \"Yes, do as I say\"" ...@@ -169,16 +170,16 @@ To continue, type \"Yes, do as I say\""
cd "$old_dir" cd "$old_dir"
verbose "delete end" verbose "delete end"
#elif [ "$VCSH_COMMAND" = 'exit' ]; then elif [ "$VCSH_COMMAND" = 'exit' ]; then
# verbose "exit begin" verbose "exit begin"
# if [ -n "$ZSH_VERSION" ] && [ "$VCSH_NO_IGNORE_EOF" = '1' ]; then # if [ -n "$ZSH_VERSION" ] && [ "$VCSH_NO_IGNORE_EOF" = '1' ]; then
# unset VCSH_NO_IGNORE_EOF # unset VCSH_NO_IGNORE_EOF
# setopt NO_IGNORE_EOF # setopt NO_IGNORE_EOF
# fi # fi
# leave leave
# [ -n "$ZSH_VERSION" ] && [ "$USER" = richih ] && buildPS1 # [ -n "$ZSH_VERSION" ] && [ "$USER" = richih ] && buildPS1
# verbose "exit end" verbose "exit end"
# exit 0 return 0
elif [ "$VCSH_COMMAND" = 'init' ]; then elif [ "$VCSH_COMMAND" = 'init' ]; then
verbose "init begin" verbose "init begin"
...@@ -236,8 +237,8 @@ elif [ "$VCSH_COMMAND" = 'seed-gitignore' ]; then ...@@ -236,8 +237,8 @@ elif [ "$VCSH_COMMAND" = 'seed-gitignore' ]; then
cd "$old_dir" cd "$old_dir"
verbose "seed-gitignore end" verbose "seed-gitignore end"
#elif [ "$VCSH_COMMAND" = 'use' ]; then elif [ "$VCSH_COMMAND" = 'use' ]; then
# verbose "use begin" verbose "use begin"
# if [ -n "$ZSH_VERSION" ]; then # if [ -n "$ZSH_VERSION" ]; then
# if [ -o NO_IGNORE_EOF ]; then # if [ -o NO_IGNORE_EOF ]; then
# export VCSH_NO_IGNORE_EOF=1 # export VCSH_NO_IGNORE_EOF=1
...@@ -250,9 +251,9 @@ elif [ "$VCSH_COMMAND" = 'seed-gitignore' ]; then ...@@ -250,9 +251,9 @@ elif [ "$VCSH_COMMAND" = 'seed-gitignore' ]; then
# zle -N vcsh_exit # zle -N vcsh_exit
# bindkey '^d' 'vcsh_exit' # bindkey '^d' 'vcsh_exit'
# fi # fi
# use || return $? use || return $?
# [ -n "$ZSH_VERSION" ] && [ "$USER" = richih ] && buildPS1 # [ -n "$ZSH_VERSION" ] && [ "$USER" = richih ] && buildPS1
# verbose "use end" verbose "use end"
else else
verbose "defaulting to calling help()" verbose "defaulting to calling help()"
... ...
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment