X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=all;h=1d85b6e24d457ca0fe6e96f7fbc57c7bdb50ee0a;hp=44c037646eb3e99b6b1d27b6445e3b5c94423cf0;hb=5f46e908547dffbaba1661966633ec2eea4c6940;hpb=a93d716530f59cce4f56cfc0fc5326998fee954d diff --git a/all b/all index 44c03764..1d85b6e2 100755 --- a/all +++ b/all @@ -1,4 +1,5 @@ #!/bin/sh +# vim: filetype=zsh set -e @@ -18,7 +19,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 +71,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() +{ + $2 cd "$1" + check_mergeconflict "$1" +} + repos_urls=" . data/xonotic-data.pk3dir @@ -108,7 +144,7 @@ case "$cmd" in ;; esac if [ -d "$d0/$d" ]; then - verbose cd "$d0/$d" + enter "$d0/$d" verbose case "$d" in .) ;; @@ -118,9 +154,23 @@ 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/*" + # TODO remove this line later + + verbose git config core.autocrlf input + verbose 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" @@ -138,7 +188,7 @@ case "$cmd" in fi exists=false for d in $repos; do - verbose cd "$d0/$d" + enter "$d0/$d" verbose if git rev-parse "refs/heads/$branch" >/dev/null 2>&1; then exists=true verbose git checkout "$branch" @@ -149,7 +199,7 @@ case "$cmd" in verbose git checkout master fi cd "$d00" - checkself "$SELF" "$@" + checkself "$cmd" "$@" cd "$d0" done if ! $exists; then @@ -160,13 +210,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 +228,15 @@ case "$cmd" in done else for d in $repos; do - cd "$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" @@ -191,66 +246,92 @@ 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" + 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 - cd "$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 if ! verbose git merge origin/master; then - echo - echo "MERGE CONFLICT." - echo "change into the \"$d\" project directory, and then:" - echo "- edit the files mentioned above with your favorite editor," - echo " and fix the conflicts (marked with <<<<<<< blocks)" - echo "- when done with a file, 'git add' the file" - echo "- when done, 'git commit'" - exit 1 + check_mergeconflict "$d" + exit 1 # this should ALWAYS be fatal fi fi fi cd "$d0" done ;; - push) + push|commit) + submit=$1 for d in $repos; do - cd "$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 verbose git commit -a fi fi - if git log "origin/$r".."$r" | grep .; then + rem=`git config "branch.$r.remote" || echo origin` + if git log "$rem/$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 - verbose git push `git config "branch.$r.remote" || echo origin` HEAD + verbose git push "$rem" HEAD fi fi + if [ x"$submit" = x"-s" ]; then + case "$r" in + */*) + verbose git push "$rem" HEAD:"${r%%/*}/finished/${r#*/}" + ;; + esac + fi cd "$d0" done ;; @@ -263,11 +344,11 @@ case "$cmd" in fi fi fi - verbose cd "$d0/fteqcc" + enter "$d0/fteqcc" verbose verbose make $MAKEFLAGS - verbose cd "$d0/data/xonotic-data.pk3dir" + enter "$d0/data/xonotic-data.pk3dir" verbose verbose make FTEQCC="$d0/fteqcc/fteqcc.bin" $MAKEFLAGS - verbose cd "$d0/darkplaces" + enter "$d0/darkplaces" verbose verbose make $MAKEFLAGS sv-debug verbose make $MAKEFLAGS cl-debug verbose make $MAKEFLAGS sdl-debug @@ -297,18 +378,80 @@ case "$cmd" in ;; each|foreach) for d in $repos; do - verbose cd "$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" echo " $SELF merge" - echo " $SELF push" + echo " $SELF push [-s]" echo " $SELF branches" echo " $SELF branch [] " + echo " $SELF branch " echo " $SELF checkout [] " echo " $SELF compile" echo " $SELF run "