From: Richard Hartmann Date: Tue, 23 Jul 2013 23:29:04 +0000 (+0200) Subject: Merge branch 'feature--vcsh-status' X-Git-Url: https://git.madduck.net/code/vcsh.git/commitdiff_plain/fa9c745105d377d950b089fdbd3b11e234f635a1?ds=inline;hp=-c Merge branch 'feature--vcsh-status' --- fa9c745105d377d950b089fdbd3b11e234f635a1 diff --combined doc/vcsh.1.ronn index 3457736,bcf114d..9532e65 --- a/doc/vcsh.1.ronn +++ b/doc/vcsh.1.ronn @@@ -29,6 -29,8 +29,8 @@@ vcsh(1) - Version Control System for $H `vcsh` run + `vcsh` status + `vcsh` upgrade `vcsh` version @@@ -125,6 -127,9 +127,9 @@@ an interactive user This is needed to support mr and other scripts properly and of no concern to an interactive user. + * status: + Show statuses of all vcsh repositories. + * upgrade: Upgrade repository to currently recommended settings. @@@ -164,16 -169,16 +169,16 @@@ executed in the context of your shell Interesting knobs you can turn: * <$VCSH_GITIGNORE>: - Can be , , or . + Can be , , or . will seed the repo-specific ignore file with all file and directory names which `git ls-files` returns. + will not write any ignore file. + will descend through all directories recursively additionally to the above. - will not write any ignore file. - Defaults to . Less interesting knobs you could turn: diff --combined vcsh index 0742bec,b88fd97..98c2bab --- a/vcsh +++ b/vcsh @@@ -8,7 -8,7 +8,7 @@@ # While the following is not legally binding, the author would like to # explain the choice of GPLv2+ over GPLv3+. # The author prefers GPLv3+ over GPLv2+ but feels it's better to maintain -# full compatibility's with git. In case git ever changes its licensing terms, +# full compatibility's with Git. In case Git ever changes its licensing terms, # which is admittedly extremely unlikely to the point of being impossible, # this software will most likely follow suit. @@@ -24,7 -24,7 +24,7 @@@ basename() } SELF=$(basename $0) -VERSION='1.20130614' +VERSION='1.20130723' fatal() { echo "$SELF: fatal: $1" >&2 @@@ -106,6 -106,7 +106,7 @@@ help() Rename repository run \\ Use this repository + status Show statuses of all vcsh repositories upgrade Upgrade repository to currently recommended settings version Print version information which Find substring in name of any tracked file @@@ -233,7 -234,6 +234,7 @@@ pull() export GIT_DIR="$VCSH_REPO_D/$VCSH_REPO_NAME.git" use git pull + echo done hook post-pull } @@@ -245,7 -245,6 +246,7 @@@ push() export GIT_DIR="$VCSH_REPO_D/$VCSH_REPO_NAME.git" use git push + echo done hook post-push } @@@ -275,6 -274,16 +276,16 @@@ run() hook post-run } + status() { + for VCSH_REPO_NAME in $(list); do + echo "$VCSH_REPO_NAME:" + export GIT_DIR="$VCSH_REPO_D/$VCSH_REPO_NAME.git" + use + git status --short --untracked-files='no' + echo + done + } + upgrade() { hook pre-upgrade use @@@ -336,8 -345,8 +347,8 @@@ write_gitignore() fatal "could not move '$tempfile' to '$VCSH_BASE/.gitignore.d/$VCSH_REPO_NAME'" 53 } -if [ ! "x$VCSH_GITIGNORE" = 'xexact' ] && [ ! "x$VCSH_GITIGNORE" = 'xrecursive' ] && [ ! "x$VCSH_GITIGNORE" = 'xnone' ]; then - fatal "'\$VCSH_GITIGNORE' must equal 'exact', 'recursive', or 'none'" 1 +if [ ! "x$VCSH_GITIGNORE" = 'xexact' ] && [ ! "x$VCSH_GITIGNORE" = 'xnone' ] && [ ! "x$VCSH_GITIGNORE" = 'xrecursive' ]; then + fatal "'\$VCSH_GITIGNORE' must equal 'exact', 'none', or 'recursive'" 1 fi if [ "$1" = 'clone' ]; then @@@ -375,7 -384,8 +386,8 @@@ elif [ "$1" = 'delete' ] | elif [ "$1" = 'list' ] || [ "$1" = 'list-tracked' ] || [ "$1" = 'pull' ] || - [ "$1" = 'push' ]; then + [ "$1" = 'push' ] || + [ "$1" = 'status' ]; then export VCSH_COMMAND="$1" elif [ -n "$2" ]; then export VCSH_COMMAND='run'