git.ozlabs.org Git - next-scripts/blob - do_merge

   1 #!/bin/bash
   2
   3 LOG_FILE="../merge.log"
   4 SHA1_FILE="../SHA1s"
   5 build_host="ka2"
   6 build_dir="/scratch/sfr/next"
   7 build_cmd="bin/build_next"
   8
   9 no_build=false
  10 start_from=""
  11 [ "$NEXT_BUILD_HOST" ] && build_host="$NEXT_BUILD_HOST"
  12 [ "$NEXT_BUILD_DIR" ] && build_host="$NEXT_BUILD_DIR"
  13
  14 [ "$1" = "-n" ] && {
  15         shift
  16         no_build=true
  17 }
  18 [ "$1" = "-s" ] && {
  19         shift
  20         start_from="$1"
  21         [ -z "$start_from" ] && {
  22                 echo "-s requires a start tree" 1>&2
  23                 exit 1
  24         }
  25         shift
  26 }
  27 [ -n "$1" ] && {
  28         build_host="$1"
  29         shift
  30 }
  31 [ -n "$1" ] && {
  32         build_dir="$1"
  33         shift
  34 }
  35
  36 log()
  37 {
  38         echo "$@" | tee -a $LOG_FILE
  39 }
  40
  41 execute()
  42 {
  43         log "$" $@
  44         $@ 2>&1 | tee -a $LOG_FILE
  45         return ${PIPESTATUS[0]}
  46 }
  47
  48 do_rebase()
  49 {
  50         rbase=${1#*/}
  51         rbase=${rbase%%:*}
  52         rtop=${1#*:}
  53         rbid=$(git rev-parse $2/$rbase)
  54         rtid=$(git rev-parse $2/$rtop)
  55         [ "$rbid" = "$rtid" ] && {
  56                 echo Empty tree
  57                 return
  58         }
  59         [ "$(git rev-list HEAD..$2/$rtop)" ] || {
  60                 echo Already merged
  61                 return
  62         }
  63         execute git clone -s -l -n -q . ../rebase-tmp || {
  64                 echo Clone failed 1>&2
  65                 bash -i || exit
  66         }
  67         log '$' cd ../rebase-tmp
  68         cd ../rebase-tmp
  69         execute git fetch --no-tags ../next refs/remotes/$2/$rtop:$2/$rtop || {
  70                 echo Fetch of top failed 1>&2
  71                 bash -i || exit
  72         }
  73         execute git fetch --no-tags ../next refs/remotes/$2/$rbase:$2/$rbase || {
  74                 echo Fetch of base failed 1>&2
  75                 bash -i || exit
  76         }
  77         execute git checkout $2/$rtop || {
  78                 echo Checkout of top failed 1>&2
  79                 bash -i || exit
  80         }
  81         execute git rebase --onto master $2/$rbase || {
  82                 echo Rebase failed 1>&2
  83                 bash -i || exit
  84         }
  85         log '$' cd ../next
  86         cd ../next
  87         execute git pull -f ../rebase-tmp $2/$rtop || {
  88                 echo Pull failed 1>&2
  89                 echo $h >>../merge.debug
  90                 git diff >>../merge.debug 2>&1
  91                 git diff 2>&1 | egrep -q '<<<<<|^\*' && {
  92                         bash -i || exit
  93                 }
  94         }
  95         execute rm -rf ../rebase-tmp
  96 }
  97
  98 [ -n "$start_from" ] || {
  99         cp /dev/null $LOG_FILE
 100         execute date
 101         execute git checkout master
 102         execute git reset --hard stable
 103         printf 'Name\t\tSHA1\n----\t\t----\n' > $SHA1_FILE
 104
 105 }
 106
 107 heads=$(grep -v '^#' ../real_control | awk -F '\t' '$2=="quilt" || $2=="git" { printf("%s/%s ", $3, $5); }')
 108
 109 need_build=false
 110
 111 for h in $heads; do
 112         tree=${h%%/*}
 113
 114         [ -n "$start_from" ] && {
 115                 if [ "$tree" = "$start_from" ]; then
 116                         start_from=""
 117                 else
 118                         continue
 119                 fi
 120         }
 121
 122         hlog=$(git log -1 --oneline ${h/\/*://}) 2>/dev/null
 123         log Merging $h "($hlog)"
 124         old_head=$(git rev-parse HEAD)
 125         [ -x "../pre-merge/$tree" ] && {
 126                 "../pre-merge/$tree" || bash -i || exit
 127         }
 128         case "$h" in
 129         *:*)
 130                 do_rebase $h $tree
 131                 ;;
 132         *)
 133                 execute git merge $h || {
 134                         echo Merge failed 1>&2
 135                         echo $h >>../merge.debug
 136                         git diff >>../merge.debug 2>&1
 137                         git diff 2>&1 | egrep -q '<<<<<|^\*' && {
 138                                 bash -i || exit
 139                         }
 140                         GIT_EDITOR=: execute git commit -v -a
 141                         execute git diff -M --stat --summary 'HEAD^..'
 142                 }
 143                 ;;
 144         esac
 145         [ -f "../merge-fixes/$tree" ] && {
 146                 for p in $(cat "../merge-fixes/$tree"); do
 147                         $(dirname $0)/merge_fix -n "$p" || {
 148                                 bash -i || exit
 149                         }
 150                 done
 151         }
 152         tab="\t"
 153         [ $(echo "$tree" | wc -c) -le 8 ] && tab="\t\t"
 154         printf "%s$tab%s\n" $tree $(git show-ref --hash "${h/\/*://}") >> $SHA1_FILE
 155         [ -x "../pre-build/$tree" ] && {
 156                 "../pre-build/$tree" || bash -i || exit
 157         }
 158         $no_build && continue
 159         $need_build || {
 160                 # See if we need to build after merging this tree
 161                 new_head=$(git rev-parse HEAD)
 162                 [ "$old_head" = "$new_head" ] ||
 163                         [ "$(git diff ${old_head}.. | wc -c)" -eq 0 ] ||
 164                                 need_build=true
 165         }
 166         $need_build ||
 167                 continue
 168         do_build=$(grep -v '^#' ../real_control | awk -F '      ' '$3=="'$tree'" { print $6; }')
 169         [ "$do_build" = "yes" ] ||
 170                 continue
 171         git push -f "$build_host":"$build_dir" master:refs/heads/next || {
 172                 echo git push failed 1>&2
 173                 bash -i || exit
 174         }
 175         ssh "$build_host" "$build_cmd" || {
 176                 echo Build failed 1>&2
 177                 bash -i || exit
 178         }
 179         need_build=false
 180 done
 181
 182 exit 0