]> 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:

Handle the French locale in reproducible builds slightly less hamfistedly
[code/vcsh.git] / vcsh
diff --git a/vcsh b/vcsh
index 9a5d5e04113dfd2bfaaa67cabf853e3c8276a6b8..98e0acd3cd3356626e672035a4ebc2d5258168ba 100755 (executable)
--- a/vcsh
+++ b/vcsh
@@ -106,13 +106,16 @@ help() {
    commit               Commit in all repositories
    delete <repo>        Delete an existing repository
    enter <repo>         Enter repository; spawn new instance of \$SHELL
    commit               Commit in all repositories
    delete <repo>        Delete an existing repository
    enter <repo>         Enter repository; spawn new instance of \$SHELL
+   foreach [<-g>]
+     <git command>      Execute a command for every repository
    help                 Display this help text
    init <repo>          Initialize a new repository
    list                 List all repositories
    list-tracked \\
         [<repo>]        List all files tracked all or one repositories
    list-untracked \\
    help                 Display this help text
    init <repo>          Initialize a new repository
    list                 List all repositories
    list-tracked \\
         [<repo>]        List all files tracked all or one repositories
    list-untracked \\
-        [<-r>] [<repo>] List all files not tracked by all or one repositories
+        [<-a>] [<-r>]
+        [<repo>]        List all files not tracked by all or one repositories
    pull                 Pull from all vcsh remotes
    push                 Push to vcsh remotes
    rename <repo> \\
    pull                 Pull from all vcsh remotes
    push                 Push to vcsh remotes
    rename <repo> \\
@@ -159,7 +162,12 @@ clone() {
   You should add files to your new repository."
                exit
        fi
   You should add files to your new repository."
                exit
        fi
-       git fetch origin "$VCSH_BRANCH"
+       GIT_VERSION_MAJOR=$(git --version | sed -n 's/.* \([0-9]\)\..*/\1/p' )
+       if [ 1 -lt "$GIT_VERSION_MAJOR" ];then
+               git fetch origin "$VCSH_BRANCH"
+       else
+               git fetch origin
+       fi
        hook pre-merge
        git ls-tree -r --name-only origin/"$VCSH_BRANCH" | (while read object; do
                [ -e "$object" ] &&
        hook pre-merge
        git ls-tree -r --name-only origin/"$VCSH_BRANCH" | (while read object; do
                [ -e "$object" ] &&
@@ -169,7 +177,7 @@ clone() {
        [ x"$VCSH_CONFLICT" = x'1' ]) &&
                fatal "will stop after fetching and not try to merge!
   Once this situation has been resolved, run 'vcsh $VCSH_REPO_NAME pull' to finish cloning." 17
        [ x"$VCSH_CONFLICT" = x'1' ]) &&
                fatal "will stop after fetching and not try to merge!
   Once this situation has been resolved, run 'vcsh $VCSH_REPO_NAME pull' to finish cloning." 17
-       git merge origin/"$VCSH_BRANCH"
+       git -c merge.ff=true merge origin/"$VCSH_BRANCH"
        hook post-merge
        hook post-clone
        retire
        hook post-merge
        hook post-clone
        retire
@@ -215,6 +223,27 @@ enter() {
        hook post-enter
 }
 
        hook post-enter
 }
 
+foreach() {
+       hook pre-foreach
+
+       # We default to prefixing `git` to all commands passed to foreach, but
+       # allow running in general context with -g
+       command_prefix=git
+       while getopts "g" flag; do
+               if [ x"$1" = x'-g' ]; then
+                       unset command_prefix
+               fi
+               shift 1
+       done
+       for VCSH_REPO_NAME in $(list); do
+               echo "$VCSH_REPO_NAME:"
+               GIT_DIR=$VCSH_REPO_D/$VCSH_REPO_NAME.git; export GIT_DIR
+               use
+               $command_prefix "$@"
+       done
+       hook post-foreach
+}
+
 git_dir_exists() {
        [ -d "$GIT_DIR" ] || fatal "no repository found for '$VCSH_REPO_NAME'" 12
 }
 git_dir_exists() {
        [ -d "$GIT_DIR" ] || fatal "no repository found for '$VCSH_REPO_NAME'" 12
 }
@@ -275,10 +304,13 @@ list_untracked() {
        temp_file_untracked_copy=$(mktemp "${TMPDIR:-/tmp}/tmp.XXXXXXXXXX") || fatal 'Could not create temp file'
 
        # Hack in support for `vcsh list-untracked -r`...
        temp_file_untracked_copy=$(mktemp "${TMPDIR:-/tmp}/tmp.XXXXXXXXXX") || fatal 'Could not create temp file'
 
        # Hack in support for `vcsh list-untracked -r`...
+       exclude_standard_opt='--exclude-standard'
        directory_opt="--directory"
        shift 1
        directory_opt="--directory"
        shift 1
-       while getopts "r" flag; do
-               if [ x"$1" = x'-r' ]; then
+       while getopts "ar" flag; do
+               if [ x"$1" = x'-a' ]; then
+                       unset exclude_standard_opt
+               elif [ x"$1" = x'-r' ]; then
                        unset directory_opt
                fi
                shift 1
                        unset directory_opt
                fi
                shift 1
@@ -301,7 +333,7 @@ list_untracked() {
 
 list_untracked_helper() {
        export GIT_DIR="$VCSH_REPO_D/$VCSH_REPO_NAME.git"
 
 list_untracked_helper() {
        export GIT_DIR="$VCSH_REPO_D/$VCSH_REPO_NAME.git"
-       git ls-files --others "$directory_opt" | (
+       git ls-files --others $exclude_standard_opt "$directory_opt" | (
                while read line; do
                        echo "$line"
                        directory_component=${line%%/*}
                while read line; do
                        echo "$line"
                        directory_component=${line%%/*}
@@ -554,6 +586,9 @@ elif [ x"$VCSH_COMMAND" = x'delete' ]           ||
        [ x"$VCSH_COMMAND" = x'rename' ] && { VCSH_REPO_NAME_NEW=$3; export VCSH_REPO_NAME_NEW;
                                              GIT_DIR_NEW=$VCSH_REPO_D/$VCSH_REPO_NAME_NEW.git; export GIT_DIR_NEW; }
        [ x"$VCSH_COMMAND" = x'run' ]    && shift 2
        [ x"$VCSH_COMMAND" = x'rename' ] && { VCSH_REPO_NAME_NEW=$3; export VCSH_REPO_NAME_NEW;
                                              GIT_DIR_NEW=$VCSH_REPO_D/$VCSH_REPO_NAME_NEW.git; export GIT_DIR_NEW; }
        [ x"$VCSH_COMMAND" = x'run' ]    && shift 2
+elif [ x"$VCSH_COMMAND" = x'foreach' ]; then
+       [ -z "$2" ] && fatal "$VCSH_COMMAND: please specify a command" 1
+       shift 1
 elif [ x"$VCSH_COMMAND" = x'commit' ] ||
      [ x"$VCSH_COMMAND" = x'list'   ] ||
      [ x"$VCSH_COMMAND" = x'list-tracked' ] ||
 elif [ x"$VCSH_COMMAND" = x'commit' ] ||
      [ x"$VCSH_COMMAND" = x'list'   ] ||
      [ x"$VCSH_COMMAND" = x'list-tracked' ] ||