automate deleting of files

[next-scripts] / do_merge

diff --git a/do_merge b/do_merge
index c1e688208a678b48c7b30e5bdca1e3c959806be4..b86f527739020e7e5e48a07ce4e9f5203fc3bfd2 100755 (executable)
--- a/do_merge
+++ b/do_merge
@@ -1,14 +1,7 @@
 #!/bin/bash
 
-LOG_FILE="../merge.log"
-build_host="ka2"
-build_dir="/scratch/sfr/next"
-build_cmd="bin/build_next"
-
 no_build=false
 start_from=""
-[ "$NEXT_BUILD_HOST" ] && build_host="$NEXT_BUILD_HOST"
-[ "$NEXT_BUILD_DIR" ] && build_host="$NEXT_BUILD_DIR"
 
 [ "$1" = "-n" ] && {
        shift
@@ -23,14 +16,8 @@ start_from=""
        }
        shift
 }
-[ -n "$1" ] && {
-       build_host="$1"
-       shift
-}
-[ -n "$1" ] && {
-       build_dir="$1"
-       shift
-}
+
+. "$(dirname $0)/common.sh"
 
 log()
 {
@@ -99,15 +86,16 @@ do_rebase()
        execute date
        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=$(grep -v '^#' $CTRL_FILE | awk -F '\t' '$2=="quilt" || $2=="git" { printf("%s/%s ", $3, $5); }')
 
 need_build=false
 
 for h in $heads; do
        tree=${h%%/*}
-       [ "$tree" == "quilt" ] && tree=${h#quilt/}
 
        [ -n "$start_from" ] && {
                if [ "$tree" = "$start_from" ]; then
@@ -117,8 +105,16 @@ for h in $heads; do
                fi
        }
 
-       log Merging $h
+       hlog=$(git log -1 --oneline ${h/\/*://}) 2>/dev/null
        old_head=$(git rev-parse HEAD)
+       [ -f "../pre-merge/$tree" ] && {
+               for p in $(cat "../pre-merge/$tree"); do
+                       "$bin_dir/do_patch" -n "$p" || {
+                               bash -i || exit
+                       }
+               done
+       }
+       log Merging $h "($hlog)"
        case "$h" in
        *:*)
                do_rebase $h $tree
@@ -128,24 +124,32 @@ for h in $heads; do
                        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 '<<<<<|^\*' && {
                                bash -i || exit
                        }
-                       GIT_EDITOR=: execute git commit -v -a
-                       execute git diff -M --stat --summary 'HEAD^..'
+#                      [ "$(git status --porcelain)" ] && {
+                               GIT_EDITOR=: execute git commit -v -a
+                               execute git diff -M --stat --summary 'HEAD^..'
+#                      }
                }
                ;;
        esac
        [ -f "../merge-fixes/$tree" ] && {
                for p in $(cat "../merge-fixes/$tree"); do
-                       ../tools/merge_fix -n "$p" || {
+                       "$bin_dir/merge_fix" -n "$p" || {
                                bash -i || exit
                        }
                done
        }
-       [ -x "../pre-build/$tree" ] && {
-               "../pre-build/$tree" || bash -i || exit
-       }
+       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
@@ -156,14 +160,14 @@ for h in $heads; do
        }
        $need_build ||
                continue
-       do_build=$(grep -v '^#' ../real_control | awk -F '      ' '$3=="'$tree'" { print $6; }')
+       do_build=$(grep -v '^#' $CTRL_FILE | awk -F '   ' '$3=="'$tree'" { print $6; }')
        [ "$do_build" = "yes" ] ||
                continue
        git push -f "$build_host":"$build_dir" master:refs/heads/next || {
                echo git push failed 1>&2
                bash -i || exit
        }
-       ssh "$build_host" "$build_cmd" || {
+       "$bin_dir/do_build" || {
                echo Build failed 1>&2
                bash -i || exit
        }