2 # Maintain "what's cooking" messages
6 my %reverts = ('next' => {
14 my (@u) = grep { $uniq{$_}++ == 0 } sort @_;
16 for (my $i = 0; $i < @u; $i++) {
20 } elsif ($i < @u - 2) {
27 sub describe_relation
{
28 my ($topic_info) = @_;
31 if (exists $topic_info->{'used'}) {
32 push @desc, ("is used by " .
33 phrase_these
(@
{$topic_info->{'used'}}));
36 if (exists $topic_info->{'uses'}) {
37 push @desc, ("uses " .
38 phrase_these
(@
{$topic_info->{'uses'}}));
41 if (exists $topic_info->{'shares'}) {
42 push @desc, ("is tangled with " .
43 phrase_these
(@
{$topic_info->{'shares'}}));
50 return "(this branch " . join("; ", @desc) . ".)";
54 my ($topic, $fork, $forkee, @overlap) = @_;
55 my %ovl = map { $_ => 1 } (@overlap, @
{$topic->{$forkee}{'log'}});
57 push @
{$topic->{$fork}{'uses'}}, $forkee;
58 push @
{$topic->{$forkee}{'used'}}, $fork;
59 @
{$topic->{$fork}{'log'}} = (grep { !exists $ovl{$_} }
60 @
{$topic->{$fork}{'log'}});
64 my ($topic, $one, $two) = @_;
68 qw(git log --abbrev=7), "--format=%m %h",
69 "$one...$two", "^master")
70 or die "$!: open log --left-right";
73 my ($sign, $sha1) = /^(.) (.*)/;
76 } elsif ($sign eq '>') {
80 close($fh) or die "$!: close log --left-right";
84 forks_from
($topic, $two, $one);
87 forks_from
($topic, $one, $two);
89 push @
{$topic->{$one}{'shares'}}, $two;
90 push @
{$topic->{$two}{'shares'}}, $one;
95 Inspect the current set of topics
101 'tipdate' => date of the tip commit,
102 'desc' => description string,
103 'log' => [ $commit,... ],
110 my (@base) = qw(master next pu);
113 qw(git for-each-ref),
114 "--format=%(refname:short) %(committerdate:iso8601)",
116 or die "$!: open for-each-ref";
122 my ($branch, $date) = /^(\S+) (.*)$/;
123 push @topic, $branch;
130 close($fh) or die "$!: close for-each-ref";
132 my %base = map { $_ => undef } @base;
134 my $show_branch_batch = 20;
137 my @t = (@base, splice(@topic, 0, $show_branch_batch));
138 my $header_delim = '-' x
scalar(@t);
139 my $contain_pat = '.' x
scalar(@t);
140 open($fh, '-|', qw(git show-branch --sparse --sha1-name),
141 map { "refs/heads/$_" } @t)
142 or die "$!: open show-branch";
146 if (/^$header_delim$/) {
147 $header_delim = undef;
151 my ($contain, $sha1, $log) =
152 ($_ =~ /^($contain_pat) \[([0-9a-f]+)\] (.*)$/);
154 for (my $i = 0; $i < @t; $i++) {
156 my $sign = substr($contain, $i, 1);
157 next if ($sign eq ' ');
158 next if (substr($contain, 0, 1) ne ' ');
160 if (!exists $commit{$sha1}) {
166 my $co = $commit{$sha1};
167 if (!exists $reverts{$branch}{$sha1}) {
168 $co->{'branch'}{$branch} = 1;
170 next if (exists $base{$branch});
171 push @
{$topic{$branch}{'log'}}, $sha1;
174 close($fh) or die "$!: close show-branch";
178 for my $sha1 (keys %commit) {
180 my $co = $commit{$sha1};
181 if (exists $co->{'branch'}{'next'}) {
183 } elsif (exists $co->{'branch'}{'pu'}) {
188 $co->{'log'} = $sign . ' ' . $co->{'log'};
189 my @t = (sort grep { !exists $base{$_} }
190 keys %{$co->{'branch'}});
196 for my $combo (keys %shared) {
197 my @combo = split(' ', $combo);
198 for (my $i = 0; $i < @combo - 1; $i++) {
199 for (my $j = $i + 1; $j < @combo; $j++) {
200 topic_relation
(\
%topic, $combo[$i], $combo[$j]);
206 qw(git log --first-parent --abbrev=7),
207 "--format=%ci %h %p :%s", "master..next")
208 or die "$!: open log master..next";
210 my ($date, $commit, $parent, $tips);
211 unless (($date, $commit, $parent, $tips) =
212 /^([-0-9]+) ..:..:.. .\d{4} (\S+) (\S+) ([^:]*):/) {
215 for my $tip (split(' ', $tips)) {
216 my $co = $commit{$tip};
217 next unless ($co->{'branch'}{'next'});
218 $co->{'merged'} = " (merged to 'next' on $date at $commit)";
221 close($fh) or die "$!: close log master..next";
223 for my $branch (keys %topic) {
225 my $n = scalar(@
{$topic{$branch}{'log'}});
227 delete $topic{$branch};
234 my $d = $topic{$branch}{'tipdate'};
235 my $head = "* $branch ($d) $n\n";
237 for (@
{$topic{$branch}{'log'}}) {
238 my $co = $commit{$_};
239 if (exists $co->{'merged'}) {
240 push @desc, $co->{'merged'};
242 push @desc, $commit{$_}->{'log'};
250 my $list = join("\n", map { " " . $_ } @desc);
251 my $relation = describe_relation
($topic{$branch});
252 $topic{$branch}{'desc'} = $head . $list;
254 $topic{$branch}{'desc'} .= "\n $relation";
262 my ($mon, $year, $issue, $dow, $date,
263 $master_at, $next_at, $text) = @_;
265 my $now_string = localtime;
266 my ($current_dow, $current_mon, $current_date, $current_year) =
267 ($now_string =~ /^(\w+) (\w+) (\d+) [\d:]+ (\d+)$/);
269 $mon ||= $current_mon;
270 $year ||= $current_year;
272 $dow ||= $current_dow;
273 $date ||= $current_date;
274 $master_at ||= '0' x
40;
275 $next_at ||= '0' x
40;
277 Here are the topics that have been cooking. Commits prefixed with '-' are
278 only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'.
279 The ones marked with '.' do not appear in any of the integration branches,
280 but I am still holding onto them.
282 You can find the changes described here in the integration branches of the
283 repositories listed at
285 http://git-blame.blogspot.com/p/git-public-repositories.html
289 To: git\@vger.kernel.org
291 Subject: What's cooking in git.git ($mon $year, #$issue; $dow, $date)
292 X-master-at: $master_at
295 What's cooking in git.git ($mon $year, #$issue; $dow, $date)
296 --------------------------------------------------
300 $text =~ s/\n+\Z/\n/;
304 my $blurb_match = <<'EOF';
305 (?i:\s*[a-z]+: .*\n)*?Subject: What's cooking in \S+ \((\w+) (\d+), #(\d+); (\w+), (\d+)\)
306 X-master-at: ([0-9a-f]{40})
307 X-next-at: ([0-9a-f]{40})
309 What's cooking in \S+ \(\1 \2, #\3; \4, \5\)
314 my $blurb = "b..l..u..r..b";
321 my $last_empty = undef;
322 my (@section, %section, @branch, %branch, %description, @leader);
323 my $in_unedited_olde = 0;
327 'section_list' => [],
328 'section_data' => {},
329 'topic_description' => {
332 text
=> blurb_text
(),
338 open ($fh, '<', $fn) or die "$!: open $fn";
342 if ($in_unedited_olde) {
344 $in_unedited_olde = 0;
348 $in_unedited_olde = 1;
351 if ($in_unedited_olde) {
355 if (defined $section && /^-{20,}$/) {
362 if (/^\[(.*)\]\s*$/) {
365 if (!exists $section{$section}) {
366 push @section, $section;
367 $section{$section} = [];
371 if (defined $section && /^\* (\S+) /) {
374 if (!exists $branch{$branch}) {
375 push @branch, [$branch, $section];
376 $branch{$branch} = 1;
378 push @
{$section{$section}}, $branch;
380 if (defined $branch) {
381 my $was_last_empty = $last_empty;
383 if (!exists $description{$branch}) {
384 $description{$branch} = [];
386 if ($was_last_empty) {
387 push @
{$description{$branch}}, "";
389 push @
{$description{$branch}}, $_;
395 for my $branch (keys %description) {
396 my $ary = $description{$branch};
397 if ($branch eq $blurb) {
398 while (@
{$ary} && $ary->[-1] =~ /^-{30,}$/) {
401 $description{$branch} = +{
403 text
=> join("\n", @
{$ary}),
408 my $elem = shift @
{$ary};
409 last if ($elem eq '');
419 $description{$branch} = +{
420 desc
=> join("\n", @desc),
421 text
=> join("\n", @txt),
427 section_list
=> \
@section,
428 section_data
=> \
%section,
429 topic_description
=> \
%description,
434 my ($fn, $cooking) = @_;
437 open($fh, '>', $fn) or die "$!: open $fn";
438 print $fh $cooking->{'topic_description'}{$blurb}{'text'};
440 for my $section_name (@
{$cooking->{'section_list'}}) {
441 my $topic_list = $cooking->{'section_data'}{$section_name};
442 next if (!@
{$topic_list});
445 print $fh '-' x
50, "\n";
446 print $fh "[$section_name]\n";
448 for my $topic (@
{$topic_list}) {
449 my $d = $cooking->{'topic_description'}{$topic};
451 print $fh $lead, $d->{'desc'}, "\n";
453 print $fh "\n", $d->{'text'}, "\n";
461 my $graduated = 'Graduated to "master"';
462 my $new_topics = 'New Topics';
463 my $discarded = 'Discarded';
464 my $cooking_topics = 'Cooking';
468 my ($fh, $master_at, $next_at, $incremental);
471 qw(git for-each-ref),
472 "--format=%(refname:short) %(objectname)",
474 "refs/heads/next") or die "$!: open for-each-ref";
476 my ($branch, $at) = /^(\S+) (\S+)$/;
477 if ($branch eq 'master') { $master_at = $at; }
478 if ($branch eq 'next') { $next_at = $at; }
480 close($fh) or die "$!: close for-each-ref";
482 $incremental = ((-r
"Meta/whats-cooking.txt") &&
483 system("cd Meta && " .
484 "git diff --quiet --no-ext-diff HEAD -- " .
485 "whats-cooking.txt"));
487 my $now_string = localtime;
488 my ($current_dow, $current_mon, $current_date, $current_year) =
489 ($now_string =~ /^(\w+) (\w+) +(\d+) [\d:]+ (\d+)$/);
491 my $btext = $cooking->{'topic_description'}{$blurb}{'text'};
492 if ($btext !~ s/\A$blurb_match//) {
493 die "match pattern broken?";
495 my ($mon, $year, $issue, $dow, $date) = ($1, $2, $3, $4, $5);
497 if ($current_mon ne $mon || $current_year ne $year) {
499 } elsif (!$incremental) {
501 $issue = sprintf "%02d", ($issue + 1);
504 $year = $current_year;
506 $date = $current_date;
508 $cooking->{'topic_description'}{$blurb}{'text'} =
509 blurb_text
($mon, $year, $issue, $dow, $date,
510 $master_at, $next_at, $btext);
513 my $sd = $cooking->{'section_data'};
514 my $sl = $cooking->{'section_list'};
516 if (exists $sd->{$new_topics}) {
517 if (!exists $sd->{$cooking_topics}) {
518 $sd->{$cooking_topics} = [];
519 unshift @
{$sl}, $cooking_topics;
521 unshift @
{$sd->{$cooking_topics}}, @
{$sd->{$new_topics}};
523 $sd->{$new_topics} = [];
530 my ($topic_desc) = @_;
531 for my $line (split(/\n/, $topic_desc)) {
532 if ($line =~ /^ [+-] /) {
540 my ($cooking, $current) = @_;
541 my $td = $cooking->{'topic_description'};
542 my $sd = $cooking->{'section_data'};
543 my $sl = $cooking->{'section_list'};
544 my (@new_topic, @gone_topic);
546 # Make sure "New Topics" and "Graduated" exists
547 if (!exists $sd->{$new_topics}) {
548 $sd->{$new_topics} = [];
549 unshift @
{$sl}, $new_topics;
552 if (!exists $sd->{$graduated}) {
553 $sd->{$graduated} = [];
554 unshift @
{$sl}, $graduated;
557 my $incremental = update_issue
($cooking);
559 for my $topic (sort keys %{$current}) {
560 if (!exists $td->{$topic}) {
561 # Ignore new topics without anything merged
562 if (topic_in_pu
($current->{$topic}{'desc'})) {
563 push @new_topic, $topic;
567 # Annotate if the contents of the topic changed
568 my $n = $current->{$topic}{'desc'};
569 my $o = $td->{$topic}{'desc'};
571 $td->{$topic}{'desc'} = $n . "\n<<\n" . $o ."\n>>";
575 for my $topic (sort keys %{$td}) {
576 next if ($topic eq $blurb);
577 next if (!$incremental &&
578 grep { $topic eq $_ } @
{$sd->{$graduated}});
579 next if (grep { $topic eq $_ } @
{$sd->{$discarded}});
580 if (!exists $current->{$topic}) {
581 push @gone_topic, $topic;
586 push @
{$sd->{$new_topics}}, $_;
587 $td->{$_}{'desc'} = $current->{$_}{'desc'};
591 $sd->{$graduated} = [];
595 for my $topic (@gone_topic) {
596 for my $section (@
{$sl}) {
597 my $pre = scalar(@
{$sd->{$section}});
598 @
{$sd->{$section}} = (grep { $_ ne $topic }
600 my $post = scalar(@
{$sd->{$section}});
601 next if ($pre == $post);
605 push @
{$sd->{$graduated}}, $_;
610 ################################################################
613 my ($what, $action, $topic) = @_;
614 if (!exists $what->{$action}) {
615 $what->{$action} = [];
617 push @
{$what->{$action}}, $topic;
624 return if (/^Graduated to/ || /^Discarded$/);
625 return $_ if (/^Stalled$/);
631 sub wildo_flush_topic
{
632 my ($in_section, $what, $topic) = @_;
633 if (defined $topic) {
634 my $action = section_action
($in_section);
636 wildo_queue
($what, $action, $topic);
642 if (/^Will (?:\S+ ){0,2}(fast-track|keep|merge|drop|discard|cook|kick|defer|be re-?rolled)[,. ]/ ||
643 /^Not urgent/ || /^Not ready/ || /^Waiting for / ||
644 /^Needs? / || /^Expecting / || /^May want to /) {
647 if (/^I think this is ready for /) {
655 my (%what, $topic, $last_merge_to_next, $in_section, $in_desc);
656 my $too_recent = '9999-99-99';
661 my $old_section = $in_section;
663 wildo_flush_topic
($old_section, \
%what, $topic);
664 $topic = $in_desc = undef;
668 if (/^\* (\S+) \(([-0-9]+)\) (\d+) commits?$/) {
669 wildo_flush_topic
($in_section, \
%what, $topic);
671 # tip-date, next-date, topic, count, pu-count
672 $topic = [$2, $too_recent, $1, $3, 0];
677 if (defined $topic &&
678 ($topic->[1] eq $too_recent) &&
679 ($topic->[4] == 0) &&
680 (/^ \(merged to 'next' on ([-0-9]+)/)) {
683 if (defined $topic && /^ - /) {
687 if (defined $topic && /^$/) {
692 next unless defined $topic && $in_desc;
695 if (wildo_match
($_)) {
696 wildo_queue
(\
%what, $_, $topic);
697 $topic = $in_desc = undef;
700 if (/Originally merged to 'next' on ([-0-9]+)/) {
704 wildo_flush_topic
($in_section, \
%what, $topic);
707 for my $what (sort keys %what) {
708 print "$ipbl$what\n";
709 for $topic (sort { (($a->[1] cmp $b->[1]) ||
710 ($a->[0] cmp $b->[0])) }
712 my ($tip, $next, $name, $count, $pu) = @
$topic;
715 if (($next eq $too_recent) || (0 < $pu)) {
720 $next =~ s
|^\d
{4}-|/|;
723 printf " %s %-60s %s%s %5s\n", $sign, $name, $tip, $next, $count;
729 ################################################################
739 for $str (split(/\n/, $str)) {
740 print "$prefix$str\n";
747 my $cnt = `git rev-list --count @range`;
756 my ($topic, $to_maint, %to_maint, %merged, $in_desc);
759 qw(git rev-list --first-parent -1 master Documentation/RelNotes))
760 or die "$!: open rev-list";
762 close($fh) or die "$!: close rev-list";
764 @ARGV = ("$rev..master");
767 qw(git log --first-parent --oneline --reverse), @ARGV)
768 or die "$!: open log --first-parent";
770 my ($sha1, $branch) = /^([0-9a-f]+) Merge branch '(.*)'$/;
772 $topic{$branch} = "";
773 $merged{$branch} = $sha1;
774 push @topic, $branch;
776 close($fh) or die "$!: close log --first-parent";
777 open($fh, "<", "Meta/whats-cooking.txt")
778 or die "$!: open whats-cooking";
783 $in_desc = $topic = undef;
786 if (/^\* (\S+) \([-0-9]+\) \d+ commits?$/) {
787 if (exists $topic{$1}) {
791 $in_desc = $topic = undef;
795 if (defined $topic && /^$/) {
800 next unless defined $topic && $in_desc;
803 if (wildo_match
($_)) {
806 $topic{$topic} .= "$_\n";
808 close($fh) or die "$!: close whats-cooking";
810 for $topic (@topic) {
811 my $merged = $merged{$topic};
812 my $in_master = havedone_count
("$merged^1..$merged^2");
813 my $not_in_maint = havedone_count
("maint..$merged^2");
814 if ($in_master == $not_in_maint) {
815 $to_maint{$topic} = 1;
820 for $topic (@topic) {
821 next if (exists $to_maint{$topic});
822 havedone_show
($topic, $topic{$topic});
828 print "-" x
64, "\n";
831 for $topic (@topic) {
832 next unless (exists $to_maint{$topic});
833 havedone_show
($topic, $topic{$topic});
834 my $sha1 = `git rev-parse --short $topic`;
836 print " (merge $sha1 $topic later to maint).\n";
841 ################################################################
845 my $topic = get_commit
();
846 my $cooking = read_previous
('Meta/whats-cooking.txt');
847 merge_cooking
($cooking, $topic);
848 write_cooking
('Meta/whats-cooking.txt', $cooking);
851 ################################################################
856 my ($wildo, $havedone);
857 if (!GetOptions
("wildo" => \
$wildo,
858 "havedone" => \
$havedone)) {
859 print STDERR
"$0 [--wildo|--havedone]\n";
866 open($fd, "<", "Meta/whats-cooking.txt");
867 } elsif (@ARGV != 1) {
868 print STDERR
"$0 --wildo [filename|HEAD|-]\n";
870 } elsif ($ARGV[0] eq '-') {
872 } elsif ($ARGV[0] =~ /^HEAD/) {
874 qw(git --git-dir=Meta/.git cat-file -p),
875 "$ARGV[0]:whats-cooking.txt");
877 open($fd, "<", $ARGV[0]);
880 } elsif ($havedone) {