From: Richard Hartmann Date: Mon, 5 Dec 2011 10:26:10 +0000 (+0100) Subject: Rename `vcsh seed-gitignore` to `vcsh write-gitignore` X-Git-Url: https://git.madduck.net/code/vcsh.git/commitdiff_plain/5e352846b9d840bf9370f7b5ea9052c82b07f2c6?ds=inline Rename `vcsh seed-gitignore` to `vcsh write-gitignore` --- diff --git a/_vcsh b/_vcsh index f5ab347..89588e4 100644 --- a/_vcsh +++ b/_vcsh @@ -12,7 +12,7 @@ _arguments \ list-tracked-by\:"list files tracked by a repo" rename\:"rename repo" run\:"run command on repo" - seed-gitignore\:"seed .gitignore.d/foo from git ls-files" setup\:"set up repo with recommended settings" + write-gitignore\:"write .gitignore.d/foo via git ls-files" \\:"Run git command directly" ))' diff --git a/doc/vcsh.1.ronn b/doc/vcsh.1.ronn index 77e3fec..6755768 100644 --- a/doc/vcsh.1.ronn +++ b/doc/vcsh.1.ronn @@ -23,10 +23,10 @@ vcsh(1) - manage and sync config files via git `vcsh` run -`vcsh` seed-gitignore - `vcsh` setup +`vcsh` write-gitignore + `vcsh` `vcsh` @@ -94,12 +94,12 @@ an interactive user. This is needed to support mr and other scripts properly and of no concern to an interactive user. -* seed-gitignore: - Seed .gitignore.d/ from git ls-files. - * setup: Set up repository with recommended settings. +* write-gitignore: + Write .gitignore.d/ via git ls-files. + * : Shortcut to run `vcsh` on a repo. Will prepend `git` to by itself. diff --git a/vcsh b/vcsh index 1d38101..0a9e52d 100755 --- a/vcsh +++ b/vcsh @@ -23,13 +23,13 @@ help() { Rename repository run \\ Use this repository - - seed-gitignore \\ - Seed .gitignore.d/ from git ls-files setup Set up repository with recommended settings + write-gitignore \\ + Write .gitignore.d/ via git ls-files Special command that allows you to run git commands directly without having to type so much ;)" >&2 + Special command that enters a repository } debug() { @@ -141,7 +141,21 @@ run() { $VCSH_EXTERNAL_COMMAND } -seed_gitignore() { +setup() { + use + git config core.worktree "$GIT_WORK_TREE" + git config core.excludesfile ".gitignore.d/$VCSH_REPO_NAME" + git config vcsh.vcsh 'true' + [ -e "$HOME/.gitignore.d/$VCSH_REPO_NAME" ] && git add -f "$HOME/.gitignore.d/$VCSH_REPO_NAME" +} + +use() { + git_dir_exists + export GIT_WORK_TREE="$(git config --get core.worktree)" + export VCSH_DIRECTORY="$VCSH_REPO_NAME" +} + +write_gitignore() { use cd "$HOME" || fatal "could not enter '$HOME'" 11 gitignores=$(for file in $(git ls-files); do @@ -170,20 +184,6 @@ seed_gitignore() { fatal "could not move '$tempfile' to '$HOME/.gitignore.d/$VCSH_REPO_NAME'" 53 } -setup() { - use - git config core.worktree "$GIT_WORK_TREE" - git config core.excludesfile ".gitignore.d/$VCSH_REPO_NAME" - git config vcsh.vcsh 'true' - [ -e "$HOME/.gitignore.d/$VCSH_REPO_NAME" ] && git add -f "$HOME/.gitignore.d/$VCSH_REPO_NAME" -} - -use() { - git_dir_exists - export GIT_WORK_TREE="$(git config --get core.worktree)" - export VCSH_DIRECTORY="$VCSH_REPO_NAME" -} - if [ "$1" = 'clone' ]; then [ -z $2 ] && fatal "$1: please specify a remote" 1 export VCSH_COMMAND="$1" @@ -197,8 +197,8 @@ elif [ "$1" = 'delete' ] || [ "$1" = 'list-tracked-by' ] || [ "$1" = 'rename' ] || [ "$1" = 'run' ] || - [ "$1" = 'seed-gitignore' ] || - [ "$1" = 'setup' ]; then + [ "$1" = 'setup' ] || + [ "$1" = 'write-gitignore' ]; then [ -z $2 ] && fatal "$1: please specify repository to work on" 1 [ "$1" = 'rename' -a -z "$3" ] && fatal "$1: please specify a target name" 1 [ "$1" = 'run' -a -z "$3" ] && fatal "$1: please specify a command" 1 @@ -207,7 +207,7 @@ elif [ "$1" = 'delete' ] || export GIT_DIR="$VCSH_BASE/$VCSH_REPO_NAME.git" [ "$VCSH_COMMAND" = 'rename' ] && export GIT_DIR_NEW="$VCSH_BASE/$3.git" [ "$VCSH_COMMAND" = 'run' ] && shift 2 && export VCSH_EXTERNAL_COMMAND="$*" - [ "$VCSH_COMMAND" = 'seed-gitignore' ] + [ "$VCSH_COMMAND" = 'write-gitignore' ] elif [ "$1" = 'list' ] || [ "$1" = 'list-tracked' ]; then export VCSH_COMMAND="$1"