X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=do_merge;h=01d7f1c01bbdc1220680286639b0419a2780d264;hb=063e3ebc696de808c6254167104a3ec1c08892c9;hp=ff19ef6f17be0386c1b6f2c586bb553175b0d96f;hpb=e416fb0e4b08ebc9ef1dc994d0e9ec07fefbaa85;p=next-scripts diff --git a/do_merge b/do_merge index ff19ef6..01d7f1c 100755 --- a/do_merge +++ b/do_merge @@ -1,72 +1,142 @@ #!/bin/bash -LOG_FILE="../merge.log" -build_host="sprygo" -build_dir="/scratch/sfr/next" -build_cmd="bin/build_next" - no_build=false +start_from="" + [ "$1" = "-n" ] && { shift no_build=true } -[ -n "$1" ] && build_host="$1" +[ "$1" = "-s" ] && { + shift + start_from="$1" + [ -z "$start_from" ] && { + echo "-s requires a start tree" 1>&2 + exit 1 + } + shift +} -cp /dev/null $LOG_FILE +tool_dir=$(dirname "$0") +. "$tool_dir/common.sh" log() { - echo "$@" | tee -a $LOG_FILE + echo "$@" | tee -a "$LOG_FILE" } execute() { - log "$" $@ - $@ 2>&1 | tee -a $LOG_FILE - return ${PIPESTATUS[0]} + log "$" "$@" + "$@" 2>&1 | tee -a "$LOG_FILE" + return "${PIPESTATUS[0]}" } -execute git checkout master -execute git reset --hard stable +[ -n "$start_from" ] || { + cp /dev/null "$LOG_FILE" + execute date -R + execute git checkout master + execute git reset --hard stable + printf 'Name\t\tSHA1\n----\t\t----\n' > "$SHA1_FILE" -heads=$(grep -v '^#' ../real_control | awk -F ' ' '$2=="quilt" { printf("quilt/%s ", $3); } $2=="git" { printf("%s/%s ", $3, $5); }') +} + +heads=$(awk -F '\t' '/^#/ { next; } $2=="quilt" || $2=="git" { printf("%s/%s ", $3, $5); } $2=="branch" { printf("branch/%s ", $1); }' "$CTRL_FILE") need_build=false for h in $heads; do - tree=${h%/*} - [ "$tree" == "quilt" ] && tree=${h#quilt/} - log Merging $h + tree=${h%%/*} + + [ -n "$start_from" ] && { + if [ "$tree" = "$start_from" ]; then + start_from="" + else + continue + fi + } + + [ "$tree" = "branch" ] && { + git branch -f "${h#branch/}" + continue + } + + hlog=$(git log -1 --oneline "${h/\/*://}") 2>/dev/null old_head=$(git rev-parse HEAD) - execute git merge $h || { + [ -f "../pre-merge/$tree" ] && { + for p in $(cat "../pre-merge/$tree"); do + "$bin_dir/do_patch" -n "$p" || { + linux-next-notify "premerge patch failed" + bash -i || exit + } + done + } + log Merging "$h" "($hlog)" + execute git merge "$h" || { echo Merge failed 1>&2 - bash -i || exit - GIT_EDITOR=: execute git commit -v -a - execute git diff -M --stat --summary 'HEAD^..' + echo "$h" >>../merge.debug + git diff >>../merge.debug 2>&1 + + check_unmerged_files "$tree" + + git diff 2>&1 | egrep -q '<<<<<|^\*' && { + linux-next-notify "new conflict found merging $tree" + if [ -f "../merge-fixes/$tree" ]; then + echo "Merge fixes exist for this tree:" + cat "../merge-fixes/$tree" + fi + bash -i || exit + } +# [ "$(git status --porcelain)" ] && { + GIT_EDITOR=: execute git commit -v -a || { + linux-next-notify "next commit failed for $tree" + bash -i || exit + } + execute git diff -M --stat --summary 'HEAD^..' +# } + } + [ -f "../merge-fixes/$tree" ] && { + for p in $(cat "../merge-fixes/$tree"); do + "$bin_dir/merge_fix" -n "$p" || { + linux-next-notify "merge fix failed for $tree" + bash -i || exit + } + done } + tab="\t" + [ $(echo "$tree" | wc -c) -le 8 ] && tab="\t\t" + printf "%s$tab%s\n" $tree $(git rev-parse "${h/\/*://}^{}") >> $SHA1_FILE $no_build && continue $need_build || { # See if we need to build after merging this tree new_head=$(git rev-parse HEAD) [ "$old_head" = "$new_head" ] || - need_build=true - $need_build || [ "$(git diff ${old_head}.. | wc -c)" -eq 0 ] || - need_build=true + need_build=true } $need_build || continue - do_build=$(grep -v '^#' ../real_control | awk -F ' ' '$3=="'$tree'" { print $6; }') + do_build=$(awk -F '\t' '/^[^#]/ && $3=="'$tree'" { print $6; }' "$CTRL_FILE") [ "$do_build" = "yes" ] || continue - 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 + linux-next-notify "push failed for $tree" bash -i || exit } - ssh "$build_host" "$build_cmd" || { + [ -x "../pre-build/$tree" ] && { + "../pre-build/$tree" || { + echo Prebuild script failed 1>&2 + linux-next-notify "pre-build script failed for $tree" + bash -i || exit + } + } + "$bin_dir/do_build" "$tree" || { echo Build failed 1>&2 + linux-next-notify "build failed for $tree" bash -i || exit } + need_build=false done