#!/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
}
patch="$1"
shift
[ -f "$patch" ] || {
	echo "patch does not exist" 1>&2
	exit 1
}
[ -n "$1" ] && {
	build_host="$1"
	shift
}
[ -n "$1" ] && {
	build_dir="$1"
	shift
}

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

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

old_head=$(git rev-parse HEAD)
execute git am -3 "$patch" || {
	echo "git am failed" 1>&2
	bash -i || exit
}
new_head=$(git rev-parse HEAD)
[ "$old_head" = "$new_head" ] && {
	echo "hmmm, looks like the patch was already applied or is unneeded"
	exit 0
}
[ "$(git diff ${old_head}.. | wc -c)" -eq 0 ] && {
	echo "hmmm, committed soemthing, but diff is empty" 1>&2
	bash -i || exit
}

GIT_EDITOR=: execute git reset 'HEAD^' || {
	echo "git reset failed" 1>&2
	bash -i || exit
}
execute git add . || {
	echo "git add failed" 1>&2
	bash -i || exit
}
GIT_EDITOR=: execute git commit -v -a --amend || {
	echo "git commit failed" 1>&2
	bash -i || exit
}

$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