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