]> git.xonotic.org Git - xonotic/xonotic.git/blobdiff - all
set autocrlf and safecrlf in all repos automatically
[xonotic/xonotic.git] / all
diff --git a/all b/all
index 21c9eaa54f9ad18285933805c805a269307e7956..bf6dfb9856c062e4f2f5af9827abf4bbdcc5d1e1 100755 (executable)
--- a/all
+++ b/all
@@ -18,7 +18,7 @@ SELF="$d0/all"
 case "$0" in
        all|*/all)
                case "`uname`" in
-                       MINGW*)
+                       MINGW*|Win*)
                                # Windows hates users. So this script has to copy itself elsewhere first...
                                tname=
                                cp "$SELF" ../all.xonotic.sh
@@ -70,6 +70,18 @@ verbose()
        "$@"
 }
 
+visible_repo_name()
+{
+       case "$1" in
+               .)
+                       echo "the root directory"
+                       ;;
+               *)
+                       echo "\"$1\""
+                       ;;
+       esac
+}
+
 check_mergeconflict()
 {
        if git ls-files -u | grep ' 1   '; then
@@ -89,7 +101,7 @@ check_mergeconflict()
 
 enter()
 {
-       verbose cd "$1"
+       $2 cd "$1"
        check_mergeconflict "$1"
 }
 
@@ -131,7 +143,7 @@ case "$cmd" in
                                        ;;
                        esac
                        if [ -d "$d0/$d" ]; then
-                               enter "$d0/$d"
+                               enter "$d0/$d" verbose
                                case "$d" in
                                        .)
                                                ;;
@@ -141,12 +153,23 @@ case "$cmd" in
                                                fi
                                                ;;
                                esac
-                               if ! verbose git pull; then
-                                       check_mergeconflict "$d"
-                                       # do not exit, as this may also mean we are tracking something else
+                               verbose git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*"
+                                       # TODO remove this line later
+
+                               git config core.autocrlf input
+                               git config core.safecrlf true
+
+                               r=`git symbolic-ref HEAD`
+                               r=${r#refs/heads/}
+                               if git config branch.$r.remote >/dev/null 2>&1; then
+                                       if ! verbose git pull; then
+                                               check_mergeconflict "$d"
+                                               exit 1 # FATAL
+                                       fi
                                fi
+
                                cd "$d00"
-                               checkself "$SELF" "$@"
+                               checkself "$cmd" "$@"
                                cd "$d0/$d"
                                verbose git remote prune origin
                                cd "$d0"
@@ -164,7 +187,7 @@ case "$cmd" in
                fi
                exists=false
                for d in $repos; do
-                       enter "$d0/$d"
+                       enter "$d0/$d" verbose
                        if git rev-parse "refs/heads/$branch" >/dev/null 2>&1; then
                                exists=true
                                verbose git checkout "$branch"
@@ -175,7 +198,7 @@ case "$cmd" in
                                verbose git checkout master
                        fi
                        cd "$d00"
-                       checkself "$SELF" "$@"
+                       checkself "$cmd" "$@"
                        cd "$d0"
                done
                if ! $exists; then
@@ -186,10 +209,14 @@ case "$cmd" in
        branch)
                remote=$1
                branch=$2
+               srcbranch=$3
                if [ -z "$branch" ]; then
                        branch=$remote
                        remote=origin
                fi
+               if [ -z "$srcbranch" ]; then
+                       srcbranch=master
+               fi
                if [ -z "$branch" ]; then
                        for d in $repos; do
                                enter "$d0/$d"
@@ -200,14 +227,15 @@ case "$cmd" in
                        done
                else
                        for d in $repos; do
-                               enter "$d0/$d"
+                               dv=`visible_repo_name "$d"`
+                               enter "$d0/$d" verbose
                                a=
                                while [ x"$a" != x"y" -a x"$a" != x"n" ]; do
-                                       echo "Branch in \"$d\"?"
+                                       echo "Branch in $dv?"
                                        read -r a
                                done
                                if [ x"$a" = x"y" ]; then
-                                       verbose git push "$remote" HEAD:"$branch"
+                                       verbose git push "$remote" "$srcbranch":"$branch"
                                        verbose git checkout --track -b "$branch" "$remote/$branch"
                                fi
                                cd "$d0"
@@ -219,20 +247,42 @@ case "$cmd" in
                for d in $repos; do
                        enter "$d0/$d"
                        echo "In $d:"
-                       git branch -a | sed 's/^/  /; /->/d'
-                       cd "$d0"
+                       git branch -a -v -v | cut -c 3- | while read -r BRANCH REV UPSTREAM TEXT; do
+                               case "$UPSTREAM" in
+                                       \[*)
+                                               UPSTREAM=${UPSTREAM#\[}
+                                               UPSTREAM=${UPSTREAM%\]}
+                                               UPSTREAM=${UPSTREAM%:*}
+                                               ;;
+                                       *)
+                                               TEXT="$UPSTREAM $TEXT"
+                                               UPSTREAM=
+                                               ;;
+                               esac
+                               if [ x"$REV" = x"->" ]; then
+                                       continue
+                               fi
+                               BRANCH=${BRANCH#remotes/}
+                               echo -n "  $BRANCH"
+                               if [ -n "$UPSTREAM" ]; then
+                                       echo -n " (tracking $UPSTREAM)"
+                               fi
+                               #echo " $TEXT"
+                               echo
+                       done
                done
                ;;
        merge)
                for d in $repos; do
-                       enter "$d0/$d"
+                       dv=`visible_repo_name "$d"`
+                       enter "$d0/$d" verbose
                        r=`git symbolic-ref HEAD`
                        r=${r#refs/heads/}
                        if git log HEAD..origin/master | grep .; then
                                # we have uncommitted changes
                                a=
                                while [ x"$a" != x"y" -a x"$a" != x"n" ]; do
-                                       echo "Could merge from \"master\" into \"$r\" in \"$d\". Do it?"
+                                       echo "Could merge from \"master\" into \"$r\" in $dv. Do it?"
                                        read -r a
                                done
                                if [ x"$a" = x"y" ]; then
@@ -245,16 +295,17 @@ case "$cmd" in
                        cd "$d0"
                done
                ;;
-       push)
+       push|commit)
                for d in $repos; do
-                       enter "$d0/$d"
+                       dv=`visible_repo_name "$d"`
+                       enter "$d0/$d" verbose
                        r=`git symbolic-ref HEAD`
                        r=${r#refs/heads/}
                        if git diff HEAD | grep .; then
                                # we have uncommitted changes
                                a=
                                while [ x"$a" != x"y" -a x"$a" != x"n" ]; do
-                                       echo "Uncommitted changes in \"$r\" in \"$d\". Commit?"
+                                       echo "Uncommitted changes in \"$r\" in $dv. Commit?"
                                        read -r a
                                done
                                if [ x"$a" = x"y" ]; then
@@ -264,7 +315,7 @@ case "$cmd" in
                        if git log "origin/$r".."$r" | grep .; then
                                a=
                                while [ x"$a" != x"y" -a x"$a" != x"n" ]; do
-                                       echo "Push \"$r\" in \"$d\"?"
+                                       echo "Push \"$r\" in $dv?"
                                        read -r a
                                done
                                if [ x"$a" = x"y" ]; then
@@ -283,11 +334,11 @@ case "$cmd" in
                                fi
                        fi
                fi
-               enter "$d0/fteqcc"
+               enter "$d0/fteqcc" verbose
                verbose make $MAKEFLAGS
-               enter "$d0/data/xonotic-data.pk3dir"
+               enter "$d0/data/xonotic-data.pk3dir" verbose
                verbose make FTEQCC="$d0/fteqcc/fteqcc.bin" $MAKEFLAGS
-               enter "$d0/darkplaces"
+               enter "$d0/darkplaces" verbose
                verbose make $MAKEFLAGS sv-debug
                verbose make $MAKEFLAGS cl-debug
                verbose make $MAKEFLAGS sdl-debug
@@ -317,11 +368,72 @@ case "$cmd" in
                ;;
        each|foreach)
                for d in $repos; do
-                       enter "$d0/$d"
+                       enter "$d0/$d" verbose
                        verbose "$@"
                        cd "$d0"
                done
                ;;
+       save-patches)
+               outfile=$1
+               patchdir=`mktemp -d -t save-patches.XXXXXX`
+               for d in $repos; do
+                       enter "$d0/$d" verbose
+                       git branch -v -v | cut -c 3- | {
+                               i=0
+                               while read -r BRANCH REV UPSTREAM TEXT; do
+                                       case "$UPSTREAM" in
+                                               \[*)
+                                                       UPSTREAM=${UPSTREAM#\[}
+                                                       UPSTREAM=${UPSTREAM%\]}
+                                                       UPSTREAM=${UPSTREAM%:*}
+                                                       TRACK=true
+                                                       ;;
+                                               *)
+                                                       UPSTREAM=origin/master
+                                                       TRACK=false
+                                                       ;;
+                                       esac
+                                       if [ x"$REV" = x"->" ]; then
+                                               continue
+                                       fi
+                                       if git format-patch -o "$patchdir/$i" "$UPSTREAM".."$BRANCH"; then
+                                               echo "$d" > "$patchdir/$i/info.txt"
+                                               echo "$BRANCH" >> "$patchdir/$i/info.txt"
+                                               echo "$UPSTREAM" >> "$patchdir/$i/info.txt"
+                                               echo "$TRACK" >> "$patchdir/$i/info.txt"
+                                               i=$(($i+1))
+                                       else
+                                               rm -rf "$patchdir/$i"
+                                       fi
+                               done
+                       }
+               done
+               ( cd "$patchdir" && tar cvzf - . ) > "$outfile"
+               rm -rf "$patchdir"
+               ;;
+       restore-patches)
+               infile=$1
+               patchdir=`mktemp -d -t restore-patches.XXXXXX`
+               ( cd "$patchdir" && tar xvzf - ) < "$infile"
+               # detach the head
+               for P in "$patchdir"/*/info.txt; do
+                       D=${P%/info.txt}
+                       exec 3<"$P"
+                       read -r d <&3
+                       read -r BRANCH <&3
+                       read -r UPSTREAM <&3
+                       read -r TRACK <&3
+                       verbose git checkout HEAD^0
+                       verbose git branch -D "$BRANCH"
+                       if [ x"$TRACK" = x"true" ]; then
+                               verbose git checkout --track -b "$BRANCH" "$UPSTREAM"
+                       else
+                               verbose git branch -b "$BRANCH" "$UPSTREAM"
+                       fi
+                       verbose git am "$D"
+               done
+               rm -rf "$patchdir"
+               ;;
        *)
                echo "Usage:"
                echo "  $SELF pull"
@@ -329,6 +441,7 @@ case "$cmd" in
                echo "  $SELF push"
                echo "  $SELF branches"
                echo "  $SELF branch [<remote>] <branchname>"
+               echo "  $SELF branch <remote> <branchname> <srcbranchname>"
                echo "  $SELF checkout [<remote>] <branchname>"
                echo "  $SELF compile"
                echo "  $SELF run <client> <options>"