From 83f8c7461e84aeacc496dac2e994d8c25f91d1e8 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 8 Dec 2010 15:35:41 -0800 Subject: [PATCH] candidates: some topics have capital letters in their names --- candidates | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/candidates b/candidates index 549e632b33..449041aed8 100755 --- a/candidates +++ b/candidates @@ -15,29 +15,33 @@ sub merged { return $count; } -my ($topic, $topic_date); +my ($topic, $topic_date, $last); my (@candidate); while (<>) { - if (/^\* ([a-z][a-z]\/[-a-z0-9_]+) \(([-0-9]{10})\) \d+ commit/) { - $topic = $1; + if (/^\* ([a-z][a-z]\/[-a-zA-Z0-9_]+) \(([-0-9]{10})\) \d+ commit/) { + $topic = $last = $1; $topic_date = $2; next; } if (defined $topic) { if (/^ \(merged to 'next' on ([-0-9]{10}) at/) { - push @candidate, [$topic, $1, $topic_date]; + push @candidate, [$topic, $1, $topic_date, ""]; next; } $topic = undef; $topic_date = undef; } + if (defined $last && @candidate && $candidate[-1][0] eq $last) { + if (/Will merge to 'master'/i) { + $candidate[-1][3] = "*"; + } + } } for $topic (sort { ($a->[1] cmp $b->[1]) || ($a->[2] cmp $b->[2]) } @candidate) { my $count = merged($topic->[0], 'master'); if ($count) { - print "$topic->[1] $topic->[2] ($count) $topic->[0]\n"; + print "$topic->[1] $topic->[2] ($count) $topic->[3]$topic->[0]\n"; } } -