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

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:

Merge branch 'feature--shortnames'
authorRichard Hartmann <richih@debian.org>
Thu, 19 Sep 2013 21:41:27 +0000 (23:41 +0200)
committerRichard Hartmann <richih@debian.org>
Thu, 19 Sep 2013 21:41:27 +0000 (23:41 +0200)
Conflicts:
vcsh

1  2 
vcsh

diff --combined vcsh
index cf0c8cf1d3dacfcf69cc6a0a95c050527881a419,3e2a6b6dc09851522e93ff98b23d1bfa8869ce40..ab58f3a31797045178b64f782291197b3db50362
--- 1/vcsh
--- 2/vcsh
+++ b/vcsh
@@@ -24,7 -24,7 +24,7 @@@ basename() 
  }
  
  SELF=$(basename $0)
 -VERSION='1.20130724'
 +VERSION='1.20130909'
  
  fatal() {
        echo "$SELF: fatal: $1" >&2
@@@ -81,15 -81,6 +81,15 @@@ f
  [ -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() {
@@@ -223,8 -214,9 +223,8 @@@ hook() 
  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
@@@ -277,6 -269,7 +277,6 @@@ push() 
  }
  
  retire() {
 -      unset GIT_WORK_TREE
        unset VCSH_DIRECTORY
  }
  
@@@ -318,26 -311,17 +318,26 @@@ status() 
  
  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'
 +      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
 -      export GIT_WORK_TREE="$(git config --get core.worktree)"
        export VCSH_DIRECTORY="$VCSH_REPO_NAME"
  }
  
@@@ -365,11 -349,7 +365,11 @@@ write_gitignore() 
                        file="$new"
                done;
        done | sort -u)
 -      tempfile=$(mktemp) || fatal "could not create tempfile" 51
 +
 +      # Contrary to GNU mktemp, mktemp on BSD/OSX requires a template for temp files
 +      # Use the template GNU mktemo defaults to
 +      tempfile=$(mktemp tmp.XXXXXXXXXX) || fatal "could not create tempfile" 51
 +
        echo '*' > "$tempfile" || fatal "could not write to '$tempfile'" 57
        for gitignore in $gitignores; do
                echo "$gitignore" | sed 's@^@!/@' >> "$tempfile" || fatal "could not write to '$tempfile'" 57
                fatal "could not move '$tempfile' to '$VCSH_BASE/.gitignore.d/$VCSH_REPO_NAME'" 53
  }
  
- if [ "$1" = 'clone' ]; then
-       [ -z "$2" ] && fatal "$1: please specify a remote" 1
-       export VCSH_COMMAND="$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
+ export VCSH_COMMAND="$1"
+ [ "$VCSH_COMMAND" = 'clon' ]   || [ "$VCSH_COMMAND" = 'clo' ]   || [ "$VCSH_COMMAND" = 'cl' ]                                                                && VCSH_COMMAND='clone'
+ [ "$VCSH_COMMAND" = 'commi' ]  || [ "$VCSH_COMMAND" = 'comm' ]  || [ "$VCSH_COMMAND" = 'com' ]  || [ "$VCSH_COMMAND" = 'co' ]                                && VCSH_COMMAND='commit'
+ [ "$VCSH_COMMAND" = 'delet' ]  || [ "$VCSH_COMMAND" = 'dele' ]  || [ "$VCSH_COMMAND" = 'del' ]  || [ "$VCSH_COMMAND" = 'de' ]                                && VCSH_COMMAND='delete'
+ [ "$VCSH_COMMAND" = 'ente' ]   || [ "$VCSH_COMMAND" = 'ent' ]   || [ "$VCSH_COMMAND" = 'en' ]                                                                && VCSH_COMMAND='enter'
+ [ "$VCSH_COMMAND" = 'hel' ]    || [ "$VCSH_COMMAND" = 'he' ]                                                                                                 && VCSH_COMMAND='help'
+ [ "$VCSH_COMMAND" = 'ini' ]    || [ "$VCSH_COMMAND" = 'in' ]                                                                                                 && VCSH_COMMAND='init'
+ [ "$VCSH_COMMAND" = 'pul' ]                                                                                                                                  && VCSH_COMMAND='pull'
+ [ "$VCSH_COMMAND" = 'pus' ]                                                                                                                                  && VCSH_COMMAND='push'
+ [ "$VCSH_COMMAND" = 'renam' ]  || [ "$VCSH_COMMAND" = 'rena' ]  || [ "$VCSH_COMMAND" = 'ren' ]  || [ "$VCSH_COMMAND" = 're' ]                                && VCSH_COMMAND='rename'
+ [ "$VCSH_COMMAND" = 'ru' ]                                                                                                                                   && VCSH_COMMAND='run'
+ [ "$VCSH_COMMAND" = 'statu' ]  || [ "$VCSH_COMMAND" = 'stat' ]  || [ "$VCSH_COMMAND" = 'sta' ]  || [ "$VCSH_COMMAND" = 'st' ]                                && VCSH_COMMAND='status'
+ [ "$VCSH_COMMAND" = 'upgrad' ] || [ "$VCSH_COMMAND" = 'upgra' ] || [ "$VCSH_COMMAND" = 'upgr' ] || [ "$VCSH_COMMAND" = 'upg' ]                               && VCSH_COMMAND='upgrade'
+ [ "$VCSH_COMMAND" = 'versio' ] || [ "$VCSH_COMMAND" = 'versi' ] || [ "$VCSH_COMMAND" = 'vers' ] || [ "$VCSH_COMMAND" = 'ver' ] || [ "$VCSH_COMMAND" = 've' ] && VCSH_COMMAND='version'
+ [ "$VCSH_COMMAND" = 'whic' ]   || [ "$VCSH_COMMAND" = 'whi' ]   || [ "$VCSH_COMMAND" = 'wh' ]                                                                && VCSH_COMMAND='which'
+ [ "$VCSH_COMMAND" = 'write' ]  || [ "$VCSH_COMMAND" = 'writ' ]  || [ "$VCSH_COMMAND" = 'wri' ]  || [ "$VCSH_COMMAND" = 'wr' ]                                && VCSH_COMMAND='write-gitignore'
+ if [ "$VCSH_COMMAND" = 'clone' ]; then
+       [ -z "$2" ] && fatal "$VCSH_COMMAND: please specify a remote" 1
        GIT_REMOTE="$2"
        [ -n "$3" ] && VCSH_REPO_NAME="$3" || VCSH_REPO_NAME=$(basename "$GIT_REMOTE" .git)
        export VCSH_REPO_NAME
        export GIT_DIR="$VCSH_REPO_D/$VCSH_REPO_NAME.git"
- elif [ "$1" = 'version' ]; then
+ elif [ "$VCSH_COMMAND" = 'version' ]; then
        echo "$SELF $VERSION"
 +      git version
        exit
- elif [ "$1" = 'which' ]; then
-       [ -z "$2" ] && fatal "$1: please specify a filename" 1
-       [ -n "$3" ] && fatal "$1: too many parameters" 1
-       export VCSH_COMMAND="$1"
+ elif [ "$VCSH_COMMAND" = 'which' ]; then
+       [ -z "$2" ] && fatal "$VCSH_COMMAND: please specify a filename" 1
+       [ -n "$3" ] && fatal "$VCSH_COMMAND: too many parameters" 1
        export VCSH_COMMAND_PARAMETER="$2"
- elif [ "$1" = 'delete' ]           ||
-      [ "$1" = 'enter' ]            ||
-      [ "$1" = 'init' ]             ||
-      [ "$1" = 'list-tracked-by' ]  ||
-      [ "$1" = 'rename' ]           ||
-      [ "$1" = 'run' ]              ||
-      [ "$1" = 'upgrade' ]          ||
-      [ "$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
-       export VCSH_COMMAND="$1"
+ elif [ "$VCSH_COMMAND" = 'delete' ]           ||
+      [ "$VCSH_COMMAND" = 'enter' ]            ||
+      [ "$VCSH_COMMAND" = 'init' ]             ||
+      [ "$VCSH_COMMAND" = 'list-tracked-by' ]  ||
+      [ "$VCSH_COMMAND" = 'rename' ]           ||
+      [ "$VCSH_COMMAND" = 'run' ]              ||
+      [ "$VCSH_COMMAND" = 'upgrade' ]          ||
+      [ "$VCSH_COMMAND" = 'write-gitignore' ]; then
+       [ -z $2 ]                                 && fatal "$VCSH_COMMAND: please specify repository to work on" 1
+       [ "$VCSH_COMMAND" = 'rename' -a -z "$3" ] && fatal "$VCSH_COMMAND: please specify a target name" 1
+       [ "$VCSH_COMMAND" = 'run'    -a -z "$3" ] && fatal "$VCSH_COMMAND: please specify a command" 1
        export VCSH_REPO_NAME="$2"
        export GIT_DIR="$VCSH_REPO_D/$VCSH_REPO_NAME.git"
        [ "$VCSH_COMMAND" = 'rename' ] && { export VCSH_REPO_NAME_NEW="$3";
                                            export GIT_DIR_NEW="$VCSH_REPO_D/$VCSH_REPO_NAME_NEW.git"; }
        [ "$VCSH_COMMAND" = 'run' ]    && shift 2
- elif [ "$1" = 'commit' ] ||
-      [ "$1" = 'list' ] ||
-      [ "$1" = 'list-tracked' ] ||
-      [ "$1" = 'pull' ] ||
-      [ "$1" = 'push' ]; then
-       export VCSH_COMMAND="$1"
- elif [ "$1" = 'status' ]; then
-       export VCSH_COMMAND="$1"
+ elif [ "$VCSH_COMMAND" = 'commit' ] ||
+      [ "$VCSH_COMMAND" = 'list' ] ||
+      [ "$VCSH_COMMAND" = 'list-tracked' ] ||
+      [ "$VCSH_COMMAND" = 'pull' ] ||
+      [ "$VCSH_COMMAND" = 'push' ]; then
+       :
+ elif [ "$VCSH_COMMAND" = 'status' ]; then
        export VCSH_REPO_NAME="$2"
  elif [ -n "$2" ]; then
        export VCSH_COMMAND='run'
        [ -d $GIT_DIR ] || { help; exit 1; }
        shift 1
        set -- "git" "$@"
- elif [ -n "$1" ]; then
+ elif [ -n "$VCSH_COMMAND" ]; then
        export VCSH_COMMAND='enter'
        export VCSH_REPO_NAME="$1"
        export GIT_DIR="$VCSH_REPO_D/$VCSH_REPO_NAME.git"