cook.sh

   1 #!/bin/sh
   2
   3 LANG=C LC_ALL=C GIT_PAGER=cat
   4 export LANG LC_ALL GIT_PAGER
   5
   6 tmpdir=/var/tmp/cook.$$
   7 mkdir "$tmpdir" || exit
   8 tmp="$tmpdir/t"
   9 trap 'rm -fr "$tmpdir"' 0
  10
  11 git branch --merged "master" | sed -n -e 's/^..//' -e '/\//p' >"$tmp.in.master"
  12 git branch --merged "pu" | sed -n -e 's/^..//' -e '/\//p' >"$tmp.in.pu"
  13 {
  14         comm -13 "$tmp.in.master" "$tmp.in.pu"
  15         git branch --no-merged pu |
  16         sed -n -e 's/^..//' -e '/\//p'
  17 } >"$tmp.branches"
  18
  19 git log --first-parent --format="%H %ci" master..next |
  20 sed -e 's/ [0-2][0-9]:[0-6][0-9]:[0-6][0-9] [-+][0-2][0-9][0-6][0-9]$//' >"$tmp.next"
  21 git rev-list master..pu >"$tmp.commits.in.pu"
  22
  23 format_branch () {
  24         # branch=$1 others=$2
  25         git rev-list --no-merges --topo-order "master..$1" --not $2 >"$tmp.list"
  26         count=$(wc -l <"$tmp.list" | tr -d ' ')
  27         label="* $1 ($(git show -s --format="%ai" $1 | sed -e 's/ .*//')) $count commit"
  28         test "$count" = 1 || label="${label}s"
  29
  30         echo "$label"
  31         lasttimelabel=
  32         lastfoundmerge=
  33         while read commit
  34         do
  35                 merged= merged_with=
  36                 while read merge at
  37                 do
  38                         if test -n "$lastfoundmerge"
  39                         then
  40                                 if test "$lastfoundmerge" = "$merge"
  41                                 then
  42                                         lastfoundmerge=
  43                                 else
  44                                         continue
  45                                 fi
  46                         fi
  47                         mb=$(git merge-base $merge $commit)
  48                         if test "$mb" = "$commit"
  49                         then
  50                                 merged=$at merged_with=$merge
  51                         else
  52                                 break
  53                         fi
  54                 done <"$tmp.next"
  55
  56                 lastfoundmerge=$merged_with
  57                 thistimelabel=
  58                 if test -n "$merged"
  59                 then
  60                         thistimelabel=$merged
  61                         commitlabel="+"
  62                 elif grep "$commit" "$tmp.commits.in.pu" >/dev/null
  63                 then
  64                         commitlabel="-"
  65                 else
  66                         commitlabel="."
  67                 fi
  68                 if test "$lasttimelabel" != "$thistimelabel"
  69                 then
  70                         with=$(git rev-parse --short $merged_with)
  71                         echo "  (merged to 'next' on $thistimelabel at $with)"
  72                         lasttimelabel=$thistimelabel
  73                 fi
  74                 git show -s --format=" $commitlabel %s" $commit
  75         done <"$tmp.list"
  76 }
  77
  78 add_desc () {
  79         kind=$1
  80         shift
  81         test -z "$description" || description="$description;"
  82         others=
  83         while :
  84         do
  85                 other=$1
  86                 case "$other" in
  87                 "#EPO-"*) other="early parts of ${other#"#EPO-"}"
  88                 esac
  89                 shift
  90                 case "$#,$others" in
  91                 0,)
  92                         others="$other"
  93                         break ;;
  94                 0,?*)
  95                         others="$others and $other"
  96                         break ;;
  97                 *,)
  98                         others="$other"
  99                         ;;
 100                 *,?*)
 101                         others="$others, $other"
 102                         ;;
 103                 esac
 104         done
 105         description="$description $kind $others"
 106 }
 107
 108 show_topic () {
 109         old=$1 new=$2
 110
 111         sed -n -e '/^ ..*/p' -e '/^\* /p' "$old" >"$tmp.old.nc"
 112         sed -n -e '/^ ..*/p' -e '/^\* /p' "$new" >"$tmp.new.nc"
 113         if cmp "$tmp.old.nc" "$tmp.new.nc" >/dev/null
 114         then
 115                 cat "$old"
 116         else
 117                 cat "$new"
 118                 echo "<<"
 119                 cat "$old"
 120                 echo ">>"
 121         fi
 122 }
 123
 124 compare_topic () {
 125         b=$1 r=$2
 126         based=$(git rev-list --no-merges $b..$r | wc -l | tr -d ' ')
 127         bases=$(git rev-list --no-merges $r..$b | wc -l | tr -d ' ')
 128         case "$based,$bases" in
 129         0,0)    echo same; exit ;;
 130         0,*)    echo left; exit ;;
 131         *,0)    echo right; exit ;;
 132         esac
 133
 134         if test $based -lt $bases
 135         then
 136                 echo left-p
 137         else
 138                 echo fork
 139         fi
 140 }
 141
 142 # List commits that are shared between more than one topic branches
 143 while read b
 144 do
 145         git rev-list --no-merges "master..$b"
 146 done <"$tmp.branches" | sort | uniq -d >"$tmp.shared"
 147
 148 # Set of branches related to each other due to sharing the same commit
 149 while read shared
 150 do
 151         b=$(git branch --contains "$shared" | sed -n -e 's/^..//' -e '/\//p')
 152         echo "" $b ""
 153 done <"$tmp.shared" | sort -u >"$tmp.related"
 154
 155 serial=1
 156 while read b
 157 do
 158         related=$(grep " $b " "$tmp.related" | tr ' ' '\012' | sort -u | sed -e '/^$/d')
 159
 160         based_on= based_on_msg=
 161         used_by=
 162         forks=
 163         same_as=
 164         if test -n "$related"
 165         then
 166                 for r in $related
 167                 do
 168                         test "$b" = "$r" && continue
 169                         case "$(compare_topic "$b" "$r")" in
 170                         same)
 171                                 same_as="$same_as$r "
 172                                 ;;
 173                         left)
 174                                 based_on="$based_on$r "
 175                                 based_on_msg="$based_on_msg$r "
 176                                 ;;
 177                         left-p)
 178                                 based_on="$based_on$r "
 179                                 based_on_msg="${based_on_msg}#EPO-$r "
 180                                 ;;
 181                         right)
 182                                 used_by="$used_by$r "
 183                                 ;;
 184                         fork)
 185                                 forks="$forks$r "
 186                                 ;;
 187                         esac
 188                 done
 189         fi
 190
 191         {
 192                 format_branch "$b" "$based_on"
 193
 194                 description=
 195                 test -z "$same_as" || add_desc 'is same as' $same_as
 196                 test -z "$based_on" || add_desc 'uses' $based_on_msg
 197                 test -z "$used_by" || add_desc 'is used by' $used_by
 198                 test -z "$forks" || add_desc 'shares commits with' $forks
 199
 200                 test -z "$description" ||
 201                 echo " (this branch$description.)"
 202         } >"$tmp.output.$serial"
 203         echo "$b $serial"
 204         serial=$(( $serial + 1 ))
 205 done <"$tmp.branches" >"$tmp.output.toc"
 206
 207 eval $(date +"monthname=%b month=%m year=%Y date=%d dow=%a")
 208
 209 incremental=$(
 210         cd Meta &&
 211         if git diff --quiet --no-ext-diff HEAD -- whats-cooking.txt >/dev/null
 212         then
 213                 echo no
 214         else
 215                 echo yes
 216         fi
 217 )
 218
 219 # Find the current issue
 220 eval $(sed -ne '/^Subject: /{
 221         s/^Subject: What.s cooking in git.git (\([A-Z][a-z][a-z]\) \([0-9][0-9][0-9][0-9]\), #\([0-9][0-9]*\); [A-Z][a-z][a-z], [0-9][0-9])$/lastmon=\1 lastyear=\2 lastissue=\3/p
 222         q
 223 }' Meta/whats-cooking.txt)
 224 if test "$monthname $year" = "$lastmon $lastyear"
 225 then
 226         if test "$incremental" = no
 227         then
 228                 issue=$(( $lastissue + 1 ))
 229         else
 230                 issue=$(( lastissue + 0 ))
 231         fi
 232 else
 233         issue=1
 234 fi
 235
 236 issue=$( printf "%02d" $issue )
 237 last=whats-cooking.txt
 238
 239 master_at=$(git rev-parse --verify refs/heads/master)
 240 next_at=$(git rev-parse --verify refs/heads/next)
 241 cat >"$tmp.output.blurb" <<EOF
 242 To: git@vger.kernel.org
 243 Subject: What's cooking in git.git ($monthname $year, #$issue; $dow, $date)
 244 X-master-at: $master_at
 245 X-next-at: $next_at
 246
 247 What's cooking in git.git ($monthname $year, #$issue; $dow, $date)
 248 --------------------------------------------------
 249
 250 Here are the topics that have been cooking.  Commits prefixed with '-' are
 251 only in 'pu' while commits prefixed with '+' are in 'next'.  The ones
 252 marked with '.' do not appear in any of the branches, but I am still
 253 holding onto them.
 254
 255 EOF
 256
 257 if test -z "$NO_TEMPLATE" && test -f "Meta/$last"
 258 then
 259         template="Meta/$last"
 260 else
 261         template=/dev/null
 262 fi
 263 perl -w -e '
 264         my $section = undef;
 265         my $serial = 1;
 266         my $blurb = "b..l..u..r..b";
 267         my $branch = $blurb;
 268         my $tmp = $ARGV[0];
 269         my $incremental = $ARGV[1] eq "yes";
 270         my $last_empty = undef;
 271         my (@section, %section, @branch, %branch, %description, @leader);
 272         my $in_unedited_olde = 0;
 273
 274         while (<STDIN>) {
 275                 if ($in_unedited_olde) {
 276                         if (/^>>$/) {
 277                                 $in_unedited_olde = 0;
 278                                 $_ = " | $_";
 279                         }
 280                 } elsif (/^<<$/) {
 281                         $in_unedited_olde = 1;
 282                 }
 283
 284                 if ($in_unedited_olde) {
 285                         $_ = " | $_";
 286                 }
 287
 288                 if (defined $section && /^-{20,}$/) {
 289                         $_ = "\n";
 290                 }
 291                 if (/^$/) {
 292                         $last_empty = 1;
 293                         next;
 294                 }
 295                 if (/^\[(.*)\]\s*$/) {
 296                         $section = $1;
 297                         $branch = undef;
 298                         if ($section eq "New Topics" && !$incremental) {
 299                                 $section = "Old New Topics";
 300                         }
 301                         if (!exists $section{$section}) {
 302                                 push @section, $section;
 303                                 $section{$section} = [];
 304                         }
 305                         next;
 306                 }
 307                 if (defined $section && /^\* (\S+) /) {
 308                         $branch = $1;
 309                         $last_empty = 0;
 310                         if (!exists $branch{$branch}) {
 311                                 push @branch, [$branch, $section];
 312                                 $branch{$branch} = 1;
 313                         }
 314                         push @{$section{$section}}, $branch;
 315                 }
 316                 if (defined $branch) {
 317                         my $was_last_empty = $last_empty;
 318                         $last_empty = 0;
 319                         if (!exists $description{$branch}) {
 320                                 $description{$branch} = [];
 321                         }
 322                         if ($was_last_empty) {
 323                                 push @{$description{$branch}}, "\n";
 324                         }
 325                         push @{$description{$branch}}, $_;
 326                 }
 327         }
 328
 329         if (open I, "<$tmp.output.toc") {
 330                 $section = "New Topics";
 331                 while (<I>) {
 332                         my ($branch, $oldserial) = /^(\S*) (\d+)$/;
 333                         next if (exists $branch{$branch});
 334                         if (!exists $section{$section}) {
 335                                 # Have it at the beginning
 336                                 unshift @section, $section;
 337                                 $section{$section} = [];
 338                         }
 339                         push @{$section{$section}}, $branch;
 340                         push @branch, [$branch, $section];
 341                         $branch{$branch} = 1;
 342                         if (!exists $description{$branch}) {
 343                                 $description{$branch} = [];
 344                         }
 345                         open II, "<$tmp.output.$oldserial";
 346                         while (<II>) {
 347                                 push @{$description{$branch}}, $_;
 348                         }
 349                         close II;
 350                 }
 351                 close I;
 352         }
 353
 354         while (0 <= @{$description{$blurb}}) {
 355                 my $last = pop @{$description{$blurb}};
 356                 if ($last =~ /^$/ || $last =~ /^-{20,}$/) {
 357                         next;
 358                 } else {
 359                         push @{$description{$blurb}}, $last;
 360                         last;
 361                 }
 362         }
 363
 364         open O, ">$tmp.template.blurb";
 365         for (@{$description{$blurb}}) {
 366                 print O $_;
 367         }
 368         close O;
 369
 370         open TOC, ">$tmp.template.toc";
 371         $serial = 1;
 372         for my $section (@section) {
 373                 for my $branch (@{$section{$section}}) {
 374                         print TOC "$branch $serial $section\n";
 375                         open O, ">$tmp.template.$serial";
 376                         for (@{$description{$branch}}) {
 377                                 print O $_;
 378                         }
 379                         close O;
 380                         $serial++;
 381                 }
 382         }
 383 ' <"$template" "$tmp" "$incremental"
 384
 385 tmpserial=$(
 386         tail -n 1 "$tmp.template.toc" |
 387         read branch serial section &&
 388         echo $serial
 389 )
 390
 391 # Assemble them all
 392
 393 if test -z "$TO_STDOUT"
 394 then
 395         exec >"Meta/whats-cooking.txt"
 396 fi
 397
 398 if test -s "$tmp.template.blurb"
 399 then
 400         sed -e '/^---------------*$/q' <"$tmp.output.blurb"
 401         sed -e '1,/^---------------*$/d' <"$tmp.template.blurb"
 402 else
 403         cat "$tmp.output.blurb"
 404 fi
 405
 406 current='
 407 --------------------------------------------------
 408 [Graduated to "master"]
 409 '
 410 while read branch oldserial section
 411 do
 412         test "$section" = 'Graduated to "master"' &&
 413         test "$incremental" = no && continue
 414
 415         tip=$(git rev-parse --quiet --verify "refs/heads/$branch") || continue
 416         mb=$(git merge-base master $tip)
 417         test "$mb" = "$tip" || continue
 418         if test -n "$current"
 419         then
 420                 echo "$current"
 421                 current=
 422         else
 423                 echo
 424         fi
 425         cat "$tmp.template.$oldserial"
 426 done <"$tmp.template.toc"
 427
 428 current=
 429 while read branch oldserial section
 430 do
 431         found=$(grep "^$branch " "$tmp.output.toc") || continue
 432         newserial=$(expr "$found" : '[^ ]* \(.*\)')
 433         if test "$current" != "$section"
 434         then
 435                 current=$section
 436                 echo "
 437 --------------------------------------------------
 438 [$section]
 439 "
 440         else
 441                 echo
 442         fi
 443
 444         show_topic "$tmp.template.$oldserial" "$tmp.output.$newserial"
 445 done <"$tmp.template.toc"