vcsh: Support per-repo .gitattributes

[code/vcsh.git] / vcsh

diff --git a/vcsh b/vcsh
index 6ce5320a620e098d2907c127261c65a0a334a939..a6653fc5790b3019084f9d0c8e44210407e7e0d7 100755 (executable)
--- a/vcsh
+++ b/vcsh
@@ -152,6 +152,7 @@ clone() {
                exit
        fi
        git fetch
                exit
        fi
        git fetch

+       hook pre-merge

        git ls-tree -r --name-only origin/master | (while read object; do
                [ -e "$object" ] &&
                        error "'$object' exists." &&
        git ls-tree -r --name-only origin/master | (while read object; do
                [ -e "$object" ] &&
                        error "'$object' exists." &&


@@ -161,6 +162,7 @@ clone() {
                fatal "will stop after fetching and not try to merge!
   Once this situation has been resolved, run 'vcsh run $VCSH_REPO_NAME git pull' to finish cloning." 17
        git merge origin/master
                fatal "will stop after fetching and not try to merge!
   Once this situation has been resolved, run 'vcsh run $VCSH_REPO_NAME git pull' to finish cloning." 17
        git merge origin/master

+       hook post-merge

        hook post-clone
        retire
        hook post-clone-retired
        hook post-clone
        retire
        hook post-clone-retired


@@ -173,6 +175,7 @@ commit() {
                export GIT_DIR="$VCSH_REPO_D/$VCSH_REPO_NAME.git"
                use
                git commit --untracked-files=no --quiet
                export GIT_DIR="$VCSH_REPO_D/$VCSH_REPO_NAME.git"
                use
                git commit --untracked-files=no --quiet

+               VCSH_COMMAND_RETURN_CODE=$?

                echo
        done
        hook post-commit
                echo
        done
        hook post-commit


@@ -221,7 +224,7 @@ init() {
        [ ! -e "$GIT_DIR" ] || fatal "'$GIT_DIR' exists" 10
        mkdir -p "$VCSH_BASE" || fatal "could not create '$VCSH_BASE'" 50
        cd "$VCSH_BASE" || fatal "could not enter '$VCSH_BASE'" 11
        [ ! -e "$GIT_DIR" ] || fatal "'$GIT_DIR' exists" 10
        mkdir -p "$VCSH_BASE" || fatal "could not create '$VCSH_BASE'" 50
        cd "$VCSH_BASE" || fatal "could not enter '$VCSH_BASE'" 11

-       git init
+       git init --shared=0600

        upgrade
        hook post-init
 }
        upgrade
        hook post-init
 }


@@ -255,6 +258,7 @@ pull() {
                export GIT_DIR="$VCSH_REPO_D/$VCSH_REPO_NAME.git"
                use
                git pull
                export GIT_DIR="$VCSH_REPO_D/$VCSH_REPO_NAME.git"
                use
                git pull

+               VCSH_COMMAND_RETURN_CODE=$?

                echo
        done
        hook post-pull
                echo
        done
        hook post-pull


@@ -267,6 +271,7 @@ push() {
                export GIT_DIR="$VCSH_REPO_D/$VCSH_REPO_NAME.git"
                use
                git push
                export GIT_DIR="$VCSH_REPO_D/$VCSH_REPO_NAME.git"
                use
                git push

+               VCSH_COMMAND_RETURN_CODE=$?

                echo
        done
        hook post-push
                echo
        done
        hook post-push


@@ -293,6 +298,7 @@ run() {
        hook pre-run
        use
        "$@"
        hook pre-run
        use
        "$@"

+       VCSH_COMMAND_RETURN_CODE=$?

        hook post-run
 }
 
        hook post-run
 }
 


@@ -301,12 +307,14 @@ status() {
                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'

+               VCSH_COMMAND_RETURN_CODE=$?

        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'
        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'

+                       VCSH_COMMAND_RETURN_CODE=$?

                        echo
                done
        fi
                        echo
                done
        fi


@@ -326,9 +334,11 @@ upgrade() {
                git config core.worktree "$VCSH_BASE"
        fi
        [ ! "x$VCSH_GITIGNORE" = 'xnone' ] && git config core.excludesfile ".gitignore.d/$VCSH_REPO_NAME"
                git config core.worktree "$VCSH_BASE"
        fi
        [ ! "x$VCSH_GITIGNORE" = 'xnone' ] && git config core.excludesfile ".gitignore.d/$VCSH_REPO_NAME"

+       git config core.attributesfile ".gitattributes.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"
        git config vcsh.vcsh         'true'
        use
        [ -e "$VCSH_BASE/.gitignore.d/$VCSH_REPO_NAME" ] && git add -f "$VCSH_BASE/.gitignore.d/$VCSH_REPO_NAME"

+       [ -e "$VCSH_BASE/.gitattributes.d/$VCSH_REPO_NAME" ] && git add -f "$VCSH_BASE/.gitattributes.d/$VCSH_REPO_NAME"

        hook post-upgrade
 }
 
        hook post-upgrade
 }
 


@@ -490,6 +500,7 @@ check_dir() {
 
 check_dir "$VCSH_REPO_D"
 [ ! "x$VCSH_GITIGNORE" = 'xnone' ] && check_dir "$VCSH_BASE/.gitignore.d"
 
 check_dir "$VCSH_REPO_D"
 [ ! "x$VCSH_GITIGNORE" = 'xnone' ] && check_dir "$VCSH_BASE/.gitignore.d"

+check_dir "$VCSH_BASE/.gitattributes.d"

 
 verbose "$VCSH_COMMAND begin"
 export VCSH_COMMAND=$(echo $VCSH_COMMAND | sed 's/-/_/g')
 
 verbose "$VCSH_COMMAND begin"
 export VCSH_COMMAND=$(echo $VCSH_COMMAND | sed 's/-/_/g')


@@ -497,3 +508,4 @@ hook pre-command
 $VCSH_COMMAND "$@"
 hook post-command
 verbose "$VCSH_COMMAND end, exiting"
 $VCSH_COMMAND "$@"
 hook post-command
 verbose "$VCSH_COMMAND end, exiting"

+exit $VCSH_COMMAND_RETURN_CODE