X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=all;h=21c9eaa54f9ad18285933805c805a269307e7956;hp=7a2f62db0c2fcbf6b29be9dd44edd50a28bdb5da;hb=592d77dbf05125078c51b336b69bfdf19b2ee167;hpb=93c92a7de24c5b92321580aed1f804b70d1c94cd diff --git a/all b/all index 7a2f62db..21c9eaa5 100755 --- a/all +++ b/all @@ -2,23 +2,62 @@ set -e +d00=`pwd` +while ! [ -f ./all ]; do + if [ x"`pwd`" = x"/" ]; then + echo "Cannot find myself." + echo "Please run this script with the working directory inside a Xonotic checkout." + exit 1 + fi + cd .. +done +d0=`pwd` +SELF="$d0/all" + +# If we are on WINDOWS: +case "$0" in + all|*/all) + case "`uname`" in + MINGW*) + # Windows hates users. So this script has to copy itself elsewhere first... + tname= + cp "$SELF" ../all.xonotic.sh + exec ../all.xonotic.sh "$@" + ;; + esac + ;; +esac + msg() { echo "$*" } -self=`cksum "$0"` +checksum() +{ + if [ -x /usr/bin/md5sum ]; then + /usr/bin/md5sum "$@" + elif [ -x /bin/md5sum ]; then + /bin/md5sum "$@" + elif [ -x /usr/bin/cksum ]; then + /usr/bin/cksum "$@" + else + echo "NOCHECKSUM" + fi +} + +self=`checksum "$SELF"` checkself() { - self_new=`cksum "$0"` + self_new=`checksum "$SELF"` 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 - exec "$@" + exec "$SELF" "$@" else - msg "Please try $0 update, and then retry your requested operation." + msg "Please try $SELF update, and then retry your requested operation." exit 1 fi fi @@ -31,6 +70,29 @@ verbose() "$@" } +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 @@ -40,6 +102,7 @@ repos_urls=" 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` @@ -50,7 +113,6 @@ fi cmd=$1 shift -d0=`pwd` case "$cmd" in update|pull) base=`git config remote.origin.url` @@ -69,7 +131,7 @@ case "$cmd" in ;; esac if [ -d "$d0/$d" ]; then - verbose cd "$d0/$d" + enter "$d0/$d" case "$d" in .) ;; @@ -79,9 +141,12 @@ case "$cmd" in fi ;; esac - verbose git pull - cd "$d0" - checkself "$0" "$@" + if ! verbose git pull; then + check_mergeconflict "$d" + # do not exit, as this may also mean we are tracking something else + fi + cd "$d00" + checkself "$SELF" "$@" cd "$d0/$d" verbose git remote prune origin cd "$d0" @@ -99,7 +164,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" @@ -109,13 +174,14 @@ case "$cmd" in else verbose git checkout master fi + cd "$d00" + checkself "$SELF" "$@" cd "$d0" - checkself "$0" "$@" done if ! $exists; then echo "The requested branch was not found in any repository." fi - "$0" branch + exec "$SELF" branch ;; branch) remote=$1 @@ -126,7 +192,7 @@ case "$cmd" in 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" @@ -134,10 +200,10 @@ case "$cmd" in done else for d in $repos; do - cd "$d0/$d" + enter "$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 @@ -146,26 +212,59 @@ case "$cmd" in fi cd "$d0" done - "$0" branch + "$SELF" branch fi ;; 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 + 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 \"$d\". 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" + enter "$d0/$d" r=`git symbolic-ref HEAD` r=${r#refs/heads/} - a= + 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?" + read -r a + done + if [ x"$a" = x"y" ]; then + verbose git commit -a + fi + fi 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 \"$d\"?" read -r a done if [ x"$a" = x"y" ]; then @@ -184,11 +283,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 @@ -218,20 +317,21 @@ case "$cmd" in ;; each|foreach) for d in $repos; do - verbose cd "$d0/$d" + enter "$d0/$d" verbose "$@" cd "$d0" done ;; *) echo "Usage:" - echo " $0 pull" - echo " $0 push" - echo " $0 branches" - echo " $0 branch " - echo " $0 checkout" - echo " $0 compile" - echo " $0 run " - echo " $0 each " + echo " $SELF pull" + echo " $SELF merge" + echo " $SELF push" + echo " $SELF branches" + echo " $SELF branch [] " + echo " $SELF checkout [] " + echo " $SELF compile" + echo " $SELF run " + echo " $SELF each " ;; esac