#!/bin/bash

LOG_FILE="../merge.log"
build_host="ka2"
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 show-ref --verify --hash "refs/next/$ver/$tree")
[ "$rev" ] || {
	echo "No such tree/date" 1>&2
	exit 1
}

[ -n "$3" ] && {
	build_host="$3"
	shift
}
[ -n "$3" ] && {
	build_dir="$3"
	shift
}

log()
{
	echo "$@" | tee -a $LOG_FILE
}

execute()
{
	log "$" $@
	$@ 2>&1 | tee -a $LOG_FILE
	return ${PIPESTATUS[0]}
}

GIT_EDITOR=: execute git reset --hard 'HEAD^' || {
	echo "git reset failed" 1>&2
	bash -i || exit
}

log Merging "refs/next/$ver/$tree"
execute git merge "refs/next/$ver/$tree" || {
	echo Merge failed 1>&2
	echo "refs/next/$ver/$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
}

d=$(date --date "5 hours ago" '+%Y%m%d')
git update-ref "refs/next/$d/broken/$tree" "refs/next/$d/$tree"
git update-ref "refs/next/$d/$tree" "refs/next/$ver/$tree"

$no_build && exit 0

git push -f "$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" || {
	echo Build failed 1>&2
	bash -i || exit
}

exit 0