Reintegrate

   1 #!/bin/sh
   2
   3 accept_rerere="--rerere-autoupdate" generate=no update= diff= edit= stop_at_cut=
   4 while case "$#,$1" in 0,*) break;; *,-*) ;; esac
   5 do
   6         case "$1" in
   7         -n)     accept_rerere= ;;
   8         -e)     edit=t ;;
   9         -c)     stop_at_cut=1 ;;
  10         -c?*)   stop_at_cut=${1#-c} ;;
  11         -d)     update=${2?"diff with what?"}
  12                 diff=yes
  13                 generate=yes
  14                 shift ;;
  15         -u)     update=${2?"update what?"}
  16                 generate=yes
  17                 shift ;;
  18         *)      generate=yes
  19                 break ;;
  20         esac
  21         shift
  22 done
  23
  24 annotate_merge () {
  25         test -f Meta/whats-cooking.txt || return 0
  26
  27         perl -e '
  28                 sub wildo_match {
  29                         s/^\s*//;
  30                         if (/^Will (?:\S+ ){0,2}(fast-track|keep|merge|drop|discard|cook|kick|defer|be re-?rolled)[,. ]/ ||
  31                             /^Not urgent/ || /^Not ready/ || /^Waiting for / ||
  32                             /^Can wait in / ||
  33                             /^Needs? / || /^Expecting / || /^May want to /) {
  34                                 return 1;
  35                         }
  36                         return 0;
  37                 }
  38
  39                 sub read_message {
  40                         my ($fh, $branch) = @_;
  41                         my ($in_section, $in_desc);
  42                         my @msg = ();
  43                         while (<$fh>) {
  44                                 chomp;
  45                                 if (/^\* $branch /) {
  46                                         $in_section = 1;
  47                                         next;
  48                                 }
  49                                 last if (/^[-*\[]/ && $in_section);
  50                                 next unless $in_section;
  51                                 s/^\s+//;
  52                                 if (/^$/) {
  53                                         $in_desc = 1;
  54                                 }
  55                                 next unless ($in_section && $in_desc);
  56                                 next if (/Originally merged to '\''next'\'' on ([-0-9]+)/);
  57                                 next if (wildo_match($_));
  58                                 push @msg, "$_\n";
  59                         }
  60                         return ($in_section, @msg);
  61                 }
  62
  63                 my ($branch) = $ARGV[0];
  64                 my ($fh, $in_section, @msg);
  65                 if (open $fh, "<", "Meta/whats-cooking.txt") {
  66                         ($in_section, @msg) = read_message($fh, $branch);
  67                 }
  68                 if (!@msg) {
  69                         open my $revs, "-|",
  70                                 qw(git -C Meta rev-list -32 HEAD -- whats-cooking.txt);
  71                         while (my $rev = <$revs>) {
  72                                 chomp($rev);
  73                                 open $fh, "-|",
  74                                 qw(git -C Meta cat-file blob), "$rev:whats-cooking.txt";
  75                                 ($in_section, @msg) = read_message($fh, $branch);
  76                                 last if (@msg);
  77                         }
  78                 }
  79                 if (@msg) {
  80                         open(my $fh, "-|", qw(git cat-file commit HEAD));
  81                         my @original = (<$fh>);
  82                         close $fh;
  83                         my @final;
  84                         $in_section = 0;
  85                         for (@original) {
  86                                 if (!$in_section) {
  87                                         $in_section = 1 if (/^$/);
  88                                         next;
  89                                 }
  90                                 if (/^Conflicts:$/ && $in_section == 2) {
  91                                         $in_section = 3;
  92                                 }
  93
  94                                 if ($in_section == 3) {
  95                                         $_ = "# $_";
  96                                 }
  97                                 push @final, $_;
  98                                 if (/^$/ && $in_section == 1) {
  99                                         push @final, @msg;
 100                                         push @final, "\n";
 101                                         $in_section = 2;
 102                                 }
 103                         }
 104                         open($fh, "|-", qw(git commit --amend -F -));
 105                         print $fh @final;
 106                         close $fh;
 107                 }
 108         ' "$1"
 109 }
 110
 111 case "$generate" in
 112 no)
 113         accept_rerere () {
 114                 if ! git write-tree 2>/dev/null >/dev/null
 115                 then
 116                         git rerere remaining
 117                         return 1
 118                 else
 119                         GIT_EDITOR=: git commit --no-verify
 120                         echo "Accepted previous resolution"
 121                         return 0
 122                 fi
 123         }
 124
 125         mark_cut () {
 126                 test -n "$stop_at_cut" && return
 127
 128                 count_since_last_cut=$(( $count_since_last_cut + 1 ))
 129                 test -z "$prev_cut" && return
 130                 git commit --allow-empty -m "$prev_cut"
 131                 prev_cut=
 132         }
 133
 134         cut_seen=0 prev_cut= count_since_last_cut=0
 135         while read branch eh
 136         do
 137                 case "$branch" in '###') cut_seen=$(( $cut_seen + 1 )) ;; esac
 138                 if test -n "$stop_at_cut" && test $stop_at_cut -le $cut_seen
 139                 then
 140                         continue ;# slurp the remainder and skip
 141                 fi
 142
 143                 case "$branch" in
 144                 '###')
 145                         if test "$count_since_last_cut" = 0
 146                         then
 147                                 prev_cut=
 148                         else
 149                                 echo >&2 "$branch $eh"
 150                                 prev_cut="$branch $eh"
 151                                 count_since_last_cut=0
 152                         fi
 153                         continue ;;
 154                 '#'* | '')
 155                         continue ;;
 156                 esac
 157
 158                 case "$eh" in
 159                 "" | "#"*)
 160                         echo >&2 "* $branch"
 161
 162                         save=$(git rev-parse --verify HEAD) &&
 163                         tip=$(git rev-parse --verify "$branch^0") &&
 164                         mb=$(git merge-base "$tip" "$save") ||
 165                         exit
 166
 167                         test "$mb" = "$tip" && continue
 168
 169                         mark_cut
 170
 171                         rebuild=$(git config "branch.$branch.rebuild" || :)
 172
 173                         GIT_EDITOR=: git merge $rebuild $accept_rerere --edit "$branch" ||
 174                         accept_rerere ||
 175                         exit
 176
 177                         annotate_merge "$branch" || exit
 178                         test -z "$edit" ||
 179                         git commit --amend || exit
 180
 181                         this=$(git rev-parse --verify HEAD)
 182                         if test "$this" = "$save"
 183                         then
 184                                 :
 185                         elif git show-ref -q --verify "refs/merge-fix/$branch"
 186                         then
 187                                 echo >&2 "Fixing up the merge"
 188                                 git cherry-pick --no-commit "refs/merge-fix/$branch" &&
 189                                 git diff --stat HEAD &&
 190                                 GIT_EDITOR=: git commit --amend -a || exit
 191                         fi
 192                         ;;
 193                 pick" "*)
 194                         echo >&2 "* $eh"
 195
 196                         mark_cut
 197
 198                         git cherry-pick "$branch" || exit ;;
 199                 *) echo >&2 "Eh? $branch $eh"; exit ;;
 200                 esac
 201         done
 202         exit
 203 esac
 204
 205 if test -n "$update" && test $# = 0
 206 then
 207         set x $(sed -n -e '2s/^# //p' <"$update") &&
 208         shift
 209 fi
 210
 211 # Generation (or updating)
 212
 213 x40='[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f]'
 214 x40="$x40$x40$x40$x40$x40$x40$x40$x40"
 215 LF='
 216 '
 217
 218 show_merge () {
 219         case "$msg" in
 220         "Merge branch '"*"'"*)
 221                 branch=$(expr "$msg" : "Merge branch '\(.*\)'")
 222                 merge_hier=heads/
 223                 ;;
 224         "Merge remote branch '"*"'"*)
 225                 branch=$(expr "$msg" : "Merge remote branch '\(.*\)'")
 226                 merge_hier=
 227                 ;;
 228         *)
 229                 echo 2>&1 "Huh?: $msg"
 230                 return
 231                 ;;
 232         esac &&
 233         tip=$(git rev-parse --verify "refs/$merge_hier$branch" 2>/dev/null) &&
 234         merged=$(git name-rev --refs="refs/$merge_hier$branch" "$other" 2>/dev/null) &&
 235         merged=$(expr "$merged" : "$x40 \(.*\)") &&
 236         test "$merged" != undefined || {
 237                 other=$(git log -1 --pretty='format:%s' $other) &&
 238                 merged="$branch :rebased? $other"
 239         }
 240 }
 241
 242 show_pick () {
 243         case "$msg" in
 244         "### "* | "###")
 245                 merged="$msg"
 246                 ;;
 247         *)
 248                 merged="$(git rev-parse --verify "$commit") pick $msg"
 249                 ;;
 250         esac
 251
 252 }
 253
 254 generate () {
 255         PROGRAM=$1
 256         shift
 257         echo '#!/bin/sh'
 258         echo "# $1"
 259         echo 'case "$#,$1" in'
 260         echo '1,-u|1,-d)'
 261         echo "  exec $PROGRAM" '"$1" "$0"'
 262         echo 'esac'
 263         echo "$PROGRAM" '"$@" <<\EOF'
 264         git log --no-decorate --pretty=oneline --first-parent "$1" |
 265         {
 266                 series=
 267                 while read commit msg
 268                 do
 269                         if other=$(git rev-parse -q --verify "$commit^2")
 270                         then
 271                                 show_merge
 272                         else
 273                                 show_pick
 274                         fi
 275
 276                         if test -z "$series"
 277                         then
 278                                 series="$merged"
 279                         else
 280                                 series="$merged$LF$series"
 281                         fi
 282                 done
 283                 echo "$series"
 284         }
 285         echo EOF
 286 }
 287
 288 if test -z "$update"
 289 then
 290         generate "$0" "$@"
 291 elif test -z "$diff"
 292 then
 293         generate "$0" "$@" | diff -w -u "$update" -
 294         if test $? = 0
 295         then
 296                 echo >&2 "No changes."
 297         else
 298                 echo >&2 -n "Update [y/N]? "
 299                 read yesno
 300                 case "$yesno" in
 301                 [Yy]*)
 302                         generate "$0" "$@" |
 303                         sed -e 's/ :rebased?.*//' >"$update" ;;
 304                 *)
 305                         echo >&2 "No update then." ;;
 306                 esac
 307         fi
 308 else
 309         generate "$0" "$@" | diff -w -u "$update" -
 310 fi