Merge branch 'master' into feature/foreach

[code/vcsh.git] / vcsh

diff --git a/vcsh b/vcsh
index 11370f89e4e1c95da73b086653b56089021e8099..18faf4c16dd6bfef4b97eb86029e5ea83f9134c2 100755 (executable)
--- a/vcsh
+++ b/vcsh
@@ -112,7 +112,8 @@ help() {
    list-tracked \\
         [<repo>]        List all files tracked all or one repositories
    list-untracked \\
    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> \\


@@ -169,7 +170,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 +216,17 @@ enter() {
        hook post-enter
 }
 
        hook post-enter
 }
 

+foreach() {
+       hook pre-foreach
+       for VCSH_REPO_NAME in $(list); do
+               echo "$VCSH_REPO_NAME:"
+               GIT_DIR=$VCSH_REPO_D/$VCSH_REPO_NAME.git; export GIT_DIR
+               use
+               git "$@"
+       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
 }


@@ -264,7 +276,7 @@ list_tracked_helper() {
 }
 
 list_tracked_by() {
 }
 
 list_tracked_by() {

-       list_tracked $2
+       list_tracked '' $2

 }
 
 list_untracked() {
 }
 
 list_untracked() {


@@ -275,10 +287,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 +316,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%%/*}


@@ -425,10 +440,14 @@ use() {
 }
 
 which() {
 }
 
 which() {

-       [ -e "$VCSH_COMMAND_PARAMETER" ] || fatal "'$VCSH_COMMAND_PARAMETER' does not exist" 1
-       for VCSH_REPO_NAME in $(list); do
+       output=$(for VCSH_REPO_NAME in $(list); do

                get_files | grep -- "$VCSH_COMMAND_PARAMETER" | sed "s/^/$VCSH_REPO_NAME: /"
                get_files | grep -- "$VCSH_COMMAND_PARAMETER" | sed "s/^/$VCSH_REPO_NAME: /"

-       done | sort -u
+       done | sort -u)
+       if [ -z "$output" ]; then
+               fatal "'$VCSH_COMMAND_PARAMETER' does not exist" 1
+       else
+               echo "$output"
+       fi

 }
 
 write_gitignore() {
 }
 
 write_gitignore() {


@@ -550,6 +569,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' ] ||