]> git.madduck.net Git - code/vcsh.git/blobdiff - vcsh

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

projects / code / vcsh.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
vcsh: Move up gitignore check
[code/vcsh.git] / vcsh
diff --git a/vcsh b/vcsh
index 0822c9ae10c2ac3f0caf4d02fefb3aaefae37505..1de5ed77a768795406426682d97a3e10f4024600 100755 (executable)
--- a/vcsh
+++ b/vcsh
@@ -24,7 +24,7 @@ basename() {
 }
 
 SELF=$(basename $0)
 }
 
 SELF=$(basename $0)
-VERSION='1.20130724'
+VERSION='1.20130829'
 
 fatal() {
        echo "$SELF: fatal: $1" >&2
 
 fatal() {
        echo "$SELF: fatal: $1" >&2
@@ -81,6 +81,15 @@ fi
 [ -z "$VCSH_HOOK_D" ]                 && VCSH_HOOK_D="$XDG_CONFIG_HOME/vcsh/hooks-enabled"
 [ -z "$VCSH_BASE" ]                   && VCSH_BASE="$HOME"
 [ -z "$VCSH_GITIGNORE" ]              && VCSH_GITIGNORE='exact'
 [ -z "$VCSH_HOOK_D" ]                 && VCSH_HOOK_D="$XDG_CONFIG_HOME/vcsh/hooks-enabled"
 [ -z "$VCSH_BASE" ]                   && VCSH_BASE="$HOME"
 [ -z "$VCSH_GITIGNORE" ]              && VCSH_GITIGNORE='exact'
+[ -z "$VCSH_WORKTREE" ]               && VCSH_WORKTREE='absolute'
+
+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 [ ! "x$VCSH_WORKTREE" = 'xabsolute' ] && [ ! "x$VCSH_WORKTREE" = 'xrelative' ]; then
+       fatal "'\$VCSH_WORKTREE' must equal 'absolute', or 'relative'" 1
+fi
 
 
 help() {
 
 
 help() {
@@ -109,7 +118,7 @@ help() {
           <newname>     Rename repository
    run <repo> \\
        <command>        Use this repository
           <newname>     Rename repository
    run <repo> \\
        <command>        Use this repository
-   status               Show statuses of all vcsh repositories
+   status [<repo>]      Show statuses of all/one vcsh repositories
    upgrade <repo>       Upgrade repository to currently recommended settings
    version              Print version information
    which <substring>    Find substring in name of any tracked file
    upgrade <repo>       Upgrade repository to currently recommended settings
    version              Print version information
    which <substring>    Find substring in name of any tracked file
@@ -214,9 +223,8 @@ hook() {
 init() {
        hook pre-init
        [ ! -e "$GIT_DIR" ] || fatal "'$GIT_DIR' exists" 10
 init() {
        hook pre-init
        [ ! -e "$GIT_DIR" ] || fatal "'$GIT_DIR' exists" 10
-       export GIT_WORK_TREE="$VCSH_BASE"
-       mkdir -p "$GIT_WORK_TREE" || fatal "could not create '$GIT_WORK_TREE'" 50
-       cd "$GIT_WORK_TREE" || fatal "could not enter '$GIT_WORK_TREE'" 11
+       mkdir -p "$VCSH_BASE" || fatal "could not create '$VCSH_BASE'" 50
+       cd "$VCSH_BASE" || fatal "could not enter '$VCSH_BASE'" 11
        git init
        upgrade
        hook post-init
        git init
        upgrade
        hook post-init
@@ -269,7 +277,6 @@ push() {
 }
 
 retire() {
 }
 
 retire() {
-       unset GIT_WORK_TREE
        unset VCSH_DIRECTORY
 }
 
        unset VCSH_DIRECTORY
 }
 
@@ -294,28 +301,43 @@ run() {
 }
 
 status() {
 }
 
 status() {
-       for VCSH_REPO_NAME in $(list); do
-               echo "$VCSH_REPO_NAME:"
+       if [ ! "x$VCSH_REPO_NAME" = "x" ]; then
                export GIT_DIR="$VCSH_REPO_D/$VCSH_REPO_NAME.git"
                use
                git status --short --untracked-files='no'
                export GIT_DIR="$VCSH_REPO_D/$VCSH_REPO_NAME.git"
                use
                git status --short --untracked-files='no'
-               echo
-       done
+       else
+               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
+       fi
 }
 
 upgrade() {
        hook pre-upgrade
 }
 
 upgrade() {
        hook pre-upgrade
-       use
-       git config core.worktree     "$GIT_WORK_TREE"
+       # fake-bare repositories are not bare, actually. Set this to false
+       # because otherwise Git complains "fatal: core.bare and core.worktree
+       # do not make sense"
+       git config core.bare false
+       # core.worktree may be absolute or relative to $GIT_DIR, depending on
+       # user preference
+       if [ ! "x$VCSH_WORKTREE" = 'xabsolute' ]; then
+               git config core.worktree $(cd $GIT_DIR && GIT_WORK_TREE="$VCSH_BASE" git rev-parse --show-cdup)
+       elif [ ! "x$VCSH_WORKTREE" = 'xrelative' ]; then
+               git config core.worktree "$VCSH_BASE"
+       fi
        [ ! "x$VCSH_GITIGNORE" = 'xnone' ] && git config core.excludesfile ".gitignore.d/$VCSH_REPO_NAME"
        git config vcsh.vcsh         'true'
        [ ! "x$VCSH_GITIGNORE" = 'xnone' ] && git config core.excludesfile ".gitignore.d/$VCSH_REPO_NAME"
        git config vcsh.vcsh         'true'
+       use
        [ -e "$VCSH_BASE/.gitignore.d/$VCSH_REPO_NAME" ] && git add -f "$VCSH_BASE/.gitignore.d/$VCSH_REPO_NAME"
        hook post-upgrade
 }
 
 use() {
        git_dir_exists
        [ -e "$VCSH_BASE/.gitignore.d/$VCSH_REPO_NAME" ] && git add -f "$VCSH_BASE/.gitignore.d/$VCSH_REPO_NAME"
        hook post-upgrade
 }
 
 use() {
        git_dir_exists
-       export GIT_WORK_TREE="$(git config --get core.worktree)"
        export VCSH_DIRECTORY="$VCSH_REPO_NAME"
 }
 
        export VCSH_DIRECTORY="$VCSH_REPO_NAME"
 }
 
@@ -364,10 +386,6 @@ write_gitignore() {
                fatal "could not move '$tempfile' to '$VCSH_BASE/.gitignore.d/$VCSH_REPO_NAME'" 53
 }
 
                fatal "could not move '$tempfile' to '$VCSH_BASE/.gitignore.d/$VCSH_REPO_NAME'" 53
 }
 
-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
        [ -z "$2" ] && fatal "$1: please specify a remote" 1
        export VCSH_COMMAND="$1"
 if [ "$1" = 'clone' ]; then
        [ -z "$2" ] && fatal "$1: please specify a remote" 1
        export VCSH_COMMAND="$1"
@@ -404,9 +422,11 @@ elif [ "$1" = 'commit' ] ||
      [ "$1" = 'list' ] ||
      [ "$1" = 'list-tracked' ] ||
      [ "$1" = 'pull' ] ||
      [ "$1" = 'list' ] ||
      [ "$1" = 'list-tracked' ] ||
      [ "$1" = 'pull' ] ||
-     [ "$1" = 'push' ] ||
-     [ "$1" = 'status' ]; then
+     [ "$1" = 'push' ]; then
        export VCSH_COMMAND="$1"
        export VCSH_COMMAND="$1"
+elif [ "$1" = 'status' ]; then
+       export VCSH_COMMAND="$1"
+       export VCSH_REPO_NAME="$2"
 elif [ -n "$2" ]; then
        export VCSH_COMMAND='run'
        export VCSH_REPO_NAME="$1"
 elif [ -n "$2" ]; then
        export VCSH_COMMAND='run'
        export VCSH_REPO_NAME="$1"
@@ -437,7 +457,7 @@ check_dir() {
                if [ -e "$check_directory" ]; then
                        fatal "'$check_directory' exists but is not a directory" 13
                else
                if [ -e "$check_directory" ]; then
                        fatal "'$check_directory' exists but is not a directory" 13
                else
-                       info "attempting to create '$check_directory'"
+                       verbose "attempting to create '$check_directory'"
                        mkdir -p "$check_directory" || fatal "could not create '$check_directory'" 50
                fi
        fi
                        mkdir -p "$check_directory" || fatal "could not create '$check_directory'" 50
                fi
        fi
version controlled RC files

Legalese

All content available in this repository is copyright © martin f. krafft, unless otherwise noted.

All files and their content are released under the terms of the Artistic Licence 2.0, unless otherwise noted.

The operator of this repository shall not be held liable for offending content in pages linking to or linked from these page, nor does he endorse their content unless stated otherwise.