./all - handle upstream rebase better (abort, instead of causing a frankenstein merge)

[xonotic/xonotic.git] / all

diff --git a/all b/all
index 5e713f9c3d0164670f499badd7562e3230af5f25..f36fdde2eeeceae5f4f5137e37e4b1001f72e655 100755 (executable)
--- a/all
+++ b/all
@@ -70,6 +70,41 @@ verbose()
        "$@"
 }
 
+visible_repo_name()
+{
+       case "$1" in
+               .)
+                       echo "the root directory"
+                       ;;
+               *)
+                       echo "\"$1\""
+                       ;;
+       esac
+}
+
+check_mergeconflict()
+{
+       if git ls-files -u | grep ' 1   '; then
+               echo
+               echo "MERGE CONFLICT."
+               echo "change into the \"$1\" project directory, and then:"
+               echo "- edit the files mentioned above with your favorite editor,"
+               echo "  and fix the conflicts (marked with <<<<<<< blocks)"
+               echo "- for binary files, you can select the files using"
+               echo "  git checkout --ours or git checkout --theirs"
+               echo "- when done with a file, 'git add' the file"
+               echo "- when done, 'git commit'"
+               echo
+               exit 1
+       fi
+}
+
+enter()
+{
+       verbose cd "$1"
+       check_mergeconflict "$1"
+}
+
 repos_urls="
        .
        data/xonotic-data.pk3dir
@@ -108,7 +143,7 @@ case "$cmd" in
                                        ;;
                        esac
                        if [ -d "$d0/$d" ]; then
-                               verbose cd "$d0/$d"
+                               enter "$d0/$d"
                                case "$d" in
                                        .)
                                                ;;
@@ -118,9 +153,19 @@ case "$cmd" in
                                                fi
                                                ;;
                                esac
-                               verbose git pull || true # errors if the branch is not tracking anything
+                               verbose git config remote.origin.fetch "refs/heads/*:refs/remotes/origin/*"
+
+                               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"
@@ -138,7 +183,7 @@ case "$cmd" in
                fi
                exists=false
                for d in $repos; do
-                       verbose cd "$d0/$d"
+                       enter "$d0/$d"
                        if git rev-parse "refs/heads/$branch" >/dev/null 2>&1; then
                                exists=true
                                verbose git checkout "$branch"
@@ -149,7 +194,7 @@ case "$cmd" in
                                verbose git checkout master
                        fi
                        cd "$d00"
-                       checkself "$SELF" "$@"
+                       checkself "$cmd" "$@"
                        cd "$d0"
                done
                if ! $exists; then
@@ -160,13 +205,17 @@ 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
-                               cd "$d0/$d"
+                               enter "$d0/$d"
                                r=`git symbolic-ref HEAD`
                                r=${r#refs/heads/}
                                echo "$d is at $r"
@@ -174,14 +223,15 @@ case "$cmd" in
                        done
                else
                        for d in $repos; do
-                               cd "$d0/$d"
+                               dv=`visible_repo_name "$d"`
+                               enter "$d0/$d"
                                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"
@@ -191,22 +241,46 @@ case "$cmd" in
                ;;
        branches)
                for d in $repos; do
-                       cd "$d0/$d"
+                       enter "$d0/$d"
                        echo "In $d:"
                        git branch -a | sed 's/^/  /; /->/d'
                        cd "$d0"
                done
                ;;
+       merge)
+               for d in $repos; do
+                       dv=`visible_repo_name "$d"`
+                       enter "$d0/$d"
+                       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 $dv. Do it?"
+                                       read -r a
+                               done
+                               if [ x"$a" = x"y" ]; then
+                                       if ! verbose git merge origin/master; then
+                                               check_mergeconflict "$d"
+                                               exit 1 # this should ALWAYS be fatal
+                                       fi
+                               fi
+                       fi
+                       cd "$d0"
+               done
+               ;;
        push)
                for d in $repos; do
-                       cd "$d0/$d"
+                       dv=`visible_repo_name "$d"`
+                       enter "$d0/$d"
                        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
@@ -216,7 +290,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
@@ -235,11 +309,11 @@ case "$cmd" in
                                fi
                        fi
                fi
-               verbose cd "$d0/fteqcc"
+               enter "$d0/fteqcc"
                verbose make $MAKEFLAGS
-               verbose cd "$d0/data/xonotic-data.pk3dir"
+               enter "$d0/data/xonotic-data.pk3dir"
                verbose make FTEQCC="$d0/fteqcc/fteqcc.bin" $MAKEFLAGS
-               verbose cd "$d0/darkplaces"
+               enter "$d0/darkplaces"
                verbose make $MAKEFLAGS sv-debug
                verbose make $MAKEFLAGS cl-debug
                verbose make $MAKEFLAGS sdl-debug
@@ -269,7 +343,7 @@ case "$cmd" in
                ;;
        each|foreach)
                for d in $repos; do
-                       verbose cd "$d0/$d"
+                       enter "$d0/$d"
                        verbose "$@"
                        cd "$d0"
                done
@@ -277,10 +351,12 @@ case "$cmd" in
        *)
                echo "Usage:"
                echo "  $SELF pull"
+               echo "  $SELF merge"
                echo "  $SELF push"
                echo "  $SELF branches"
-               echo "  $SELF branch <remote> <branchname>"
-               echo "  $SELF checkout"
+               echo "  $SELF branch [<remote>] <branchname>"
+               echo "  $SELF branch <remote> <branchname> <srcbranchname>"
+               echo "  $SELF checkout [<remote>] <branchname>"
                echo "  $SELF compile"
                echo "  $SELF run <client> <options>"
                echo "  $SELF each <command>"