update to_build_host a bit

[next-scripts] / merge_old_version

diff --git a/merge_old_version b/merge_old_version
index b84bc0cdcac015233608dd31e78d638c9d42ddc4..c5975ecc75e5f150b4d86408fdd644021ec199e7 100755 (executable)
--- a/merge_old_version
+++ b/merge_old_version
@@ -1,26 +1,25 @@
 #!/bin/bash
 
-LOG_FILE="../merge.log"
-build_host="sprygo"
-build_dir="/scratch/sfr/next"
-build_cmd="bin/build_next"
-
 no_build=false
 [ "$1" = "-n" ] && {
        shift
        no_build=true
 }
 
-tree=$1
-ver=$2
-
-rev=$(git rev-parse -verify "next-$ver/$tree")
-[ "$rev" ] || {
-       echo "No such tree/date" 1>&2
-       exit 1
-}
+if [ "$1" ]; then
+       tree=$1
+       shift
+else
+       tree=
+fi
+if [ "$1" ]; then
+       ver="next-${1#next-}"
+       shift
+else
+       ver=$(git tag -l next-\* | sort | tail -n 1)
+fi
 
-[ -n "$3" ] && build_host="$3"
+. "$(dirname $0)/common.sh"
 
 log()
 {
@@ -34,34 +33,76 @@ execute()
        return ${PIPESTATUS[0]}
 }
 
+line="$(tail -n 1 $SHA1_FILE)"
+
+# strip everything after the first tab character
+stree=${line%% *}
+if [ "$tree" ]; then
+       [ "$tree" = "$stree" ] || {
+               echo "That is not the last tree merged ($tree v $stree)" 1>&2
+               exit 1
+       }
+else
+       tree="$stree"
+fi
+
+rev=$(git show ${ver}:Next/SHA1s | sed -n "s/^$tree\t\t*//p")
+[ "$rev" ] || {
+       echo "No previous tree/date ($tree/$ver)" 1>&2
+       exit 1
+}
+
+bad_rev=$(git rev-parse --verify 'HEAD^2')
+
+tab="\t"
+[ $(echo "$tree" | wc -c) -le 8 ] && tab="\t\t"
+
+# strip evrything up to the last tab character
+srev=${line##* }
+[ "$bad_rev" = "$srev" ] || {
+       echo "bad last line in $SHA1_FILE" 1>&2
+       exit 1
+}
+
 GIT_EDITOR=: execute git reset --hard 'HEAD^' || {
        echo "git reset failed" 1>&2
        bash -i || exit
 }
 
-log Merging "next-$ver/$tree"
-execute git merge "next-$ver/$tree" || {
+log Merging "$ver version of $tree"
+execute git merge -m "$ver/$tree" "$rev" || {
        echo Merge failed 1>&2
-       bash -i || exit
+       echo "$ver version of $tree" >>../merge.debug
+       git diff >>../merge.debug 2>&1
+       git diff 2>&1 | egrep -q '<<<<<|^\*' && {
+               bash -i || exit
+       }
        GIT_EDITOR=: execute git commit -v -a
        execute git diff -M --stat --summary 'HEAD^..'
 }
+[ -f "../merge-fixes/$tree" ] && {
+       for p in $(cat "../merge-fixes/$tree"); do
+               $(dirname $0)/merge_fix -n "$p" || {
+                       bash -i || exit
+               }
+       done
+}
 
-$no_build && exit 0
+d=$(date --date "5 hours ago" '+%Y%m%d')
+
+sed -i '$d' $SHA1_FILE
+printf "%s$tab%s\n" $tree $rev >>$SHA1_FILE
 
-rsync -avH --exclude .git --delete . "$build_host":"$build_dir"/. || {
-       echo Rsync failed 1>&2
+git push -f "${build_host}${build_host:+:}${build_dir}" master:refs/heads/next || {
+       echo git push failed 1>&2
        bash -i || exit
 }
 
-echo "Building using $build_cmd on $build_host"
-ssh "$build_host" "$build_cmd" || {
+$no_build && exit 0
+
+"$bin_dir/do_build" "$tree" || {
        echo Build failed 1>&2
        bash -i || exit
 }
 
-d=$(date --date "5 hours ago" '+%Y%m%d')
-git update-ref "refs/heads/next-$d/broken/$tree" "refs/heads/next-$d/$tree"
-git update-ref "refs/heads/next-$d/$tree" "refs/heads/next-$ver/$tree"
-
 exit 0