X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=do_merge;h=eee20322459ff7cd976a2c319089258f7d51dc18;hb=e8d4ba815a033ff46dc0891daac5c309d0480d6c;hp=789d3619a102ce5f91576dba9954ae7e447400c3;hpb=0e3e9073e2ec92835c073bb24a264747c0675585;p=next-scripts diff --git a/do_merge b/do_merge index 789d361..eee2032 100755 --- a/do_merge +++ b/do_merge @@ -1,10 +1,5 @@ #!/bin/bash -LOG_FILE="../merge.log" -build_host="sprygo" -build_dir="/scratch/sfr/next" -build_cmd="bin/build_next" - no_build=false start_from="" @@ -21,33 +16,87 @@ start_from="" } shift } -[ -n "$1" ] && build_host="$1" + +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]}" +} + +do_rebase() +{ + rbase=${1#*/} + rbase="$2/${rbase%%:*}" + rtop="$2/${1#*:}" + rbid=$(git rev-parse "$rbase") + rtid=$(git rev-parse "$rtop") + [ "$rbid" = "$rtid" ] && { + echo Empty tree + return + } + [ "$(git rev-list HEAD..$rtop)" ] || { + echo Already merged + return + } + execute git clone -s -l -n -q . ../rebase-tmp || { + echo Clone failed 1>&2 + bash -i || exit + } + log '$' cd ../rebase-tmp + cd ../rebase-tmp + execute git fetch --no-tags ../next "refs/remotes/$rtop:$rtop" || { + echo Fetch of top failed 1>&2 + bash -i || exit + } + execute git fetch --no-tags ../next "refs/remotes/$rbase:$rbase" || { + echo Fetch of base failed 1>&2 + bash -i || exit + } + execute git checkout "$rtop" || { + echo Checkout of top failed 1>&2 + bash -i || exit + } + execute git rebase --onto master "$rbase" || { + echo Rebase failed 1>&2 + bash -i || exit + } + log '$' cd ../next + cd ../next + execute git pull -f ../rebase-tmp "$rtop" || { + echo Pull failed 1>&2 + echo "$h" >>../merge.debug + git diff >>../merge.debug 2>&1 + git diff 2>&1 | egrep -q '<<<<<|^\*' && { + bash -i || exit + } + } + execute rm -rf ../rebase-tmp } [ -n "$start_from" ] || { - cp /dev/null $LOG_FILE + 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/} + tree=${h%%/*} [ -n "$start_from" ] && { if [ "$tree" = "$start_from" ]; then @@ -57,14 +106,66 @@ for h in $heads; do fi } - log Merging $h + [ "$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 || { - echo Merge failed 1>&2 - bash -i || exit - GIT_EDITOR=: execute git commit -v -a - execute git diff -M --stat --summary 'HEAD^..' + [ -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)" + case "$h" in + *:*) + do_rebase "$h" "$tree" + ;; + *) + execute git merge "$h" || { + echo Merge failed 1>&2 + echo "$h" >>../merge.debug + git diff >>../merge.debug 2>&1 + um_files=$(git diff 2>&1 | sed -n 's/^\* Unmerged path //p') + [ "$um_files" ] && [ -f "../merge-files/$tree" ] && { + rm_files=$(grep -F "$um_files" "../merge-files/$tree") + [ "$rm_files" ] && + "$bin_dir/do_rm" $rm_files + } + 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^..' +# } + } + ;; + esac + [ -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 @@ -75,17 +176,27 @@ for h in $heads; do } $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