./all: make "push" autodetect uncommitted changes, and offer commit

[xonotic/xonotic.git] / all

diff --git a/all b/all
index 734695aa983b4f17dbd2334a1c2b62a52bde5d3c..76263e203c698c62c2c8fffaf6283ea3c2528e5b 100755 (executable)
--- a/all
+++ b/all
@@ -4,25 +4,25 @@ set -e
 
 msg()
 {
-       echo "\e[1m$*"
+       echo "\e[1m$*\e[m"
 }
 
-self=`md5sum "$0"`
+self=`cksum "$0"`
 checkself()
 {
-       self_new=`md5sum "$0"`
+       self_new=`cksum "$0"`
        if [ x"$self" != x"$self_new" ]; then
                msg "./all has changed."
                if [ -z "$XONOTIC_FORBID_RERUN_ALL" ]; then
                        msg "Rerunning the requested operation to make sure."
                        export XONOTIC_FORBID_RERUN_ALL=1
-                       "$0" update
                        exec "$0" "$@"
                else
                        msg "Please try $0 update, and then retry your requested operation."
                        exit 1
                fi
        fi
+       return 0
 }
 
 verbose()
@@ -39,6 +39,8 @@ repos_urls="
        data/xonotic-nexcompat.pk3dir
        darkplaces
        fteqcc@git://github.com/Blub/qclib.git
+       div0-gittools@git://git.icculus.org/divverent/div0-gittools.git
+       netradiant
 "
 
 repos=`for X in $repos_urls; do echo "${X%%@*}"; done`
@@ -80,7 +82,7 @@ case "$cmd" in
                                esac
                                verbose git pull
                                cd "$d0"
-                               checkself
+                               checkself "$0" "$@"
                                cd "$d0/$d"
                                verbose git remote prune origin
                                cd "$d0"
@@ -109,7 +111,7 @@ case "$cmd" in
                                verbose git checkout master
                        fi
                        cd "$d0"
-                       checkself
+                       checkself "$0" "$@"
                done
                if ! $exists; then
                        echo "The requested branch was not found in any repository."
@@ -136,7 +138,7 @@ case "$cmd" in
                                cd "$d0/$d"
                                a=
                                while [ x"$a" != x"y" -a x"$a" != x"n" ]; do
-                                       echo "Branch in $d?"
+                                       echo "Branch in \"$d\"?"
                                        read -r a
                                done
                                if [ x"$a" = x"y" ]; then
@@ -162,9 +164,19 @@ case "$cmd" in
                        r=`git symbolic-ref HEAD`
                        r=${r#refs/heads/}
                        a=
+                       if git diff HEAD | grep .; then
+                               # we have uncommitted changes
+                               while [ x"$a" != x"y" -a x"$a" != x"n" ]; do
+                                       echo "Uncommitted changes in \"$r\" in \"$d\". Commit?"
+                                       read -r a
+                               done
+                               if [ x"$a" = x"y" ]; then
+                                       verbose git commit -a
+                               fi
+                       fi
                        if git log "origin/$r".."$r" | grep .; then
                                while [ x"$a" != x"y" -a x"$a" != x"n" ]; do
-                                       echo "Push $r in $d?"
+                                       echo "Push \"$r\" in \"$d\"?"
                                        read -r a
                                done
                                if [ x"$a" = x"y" ]; then