From 4714b5567607bd982cbc0ba15702ffdfd6a3ad83 Mon Sep 17 00:00:00 2001 From: joe Date: Sat, 12 May 2001 22:16:17 +0000 Subject: Recently Maxim Sobolev introduced an MFC notification service driven from 'MFC after:' headers in the commit message. This commit adds 'MFC after:' into the rcstemplate and associated code to make sure that if it's used it's used correctly. Based upon code submitted by Maxim Sobolev . Submitted by: sobomax --- CVSROOT/log_accum.pl | 1 + CVSROOT/logcheck | 12 ++++++++++++ CVSROOT/rcstemplate | 6 ++++++ 3 files changed, 19 insertions(+) (limited to 'CVSROOT') diff --git a/CVSROOT/log_accum.pl b/CVSROOT/log_accum.pl index 1e63f2c..17ea171 100755 --- a/CVSROOT/log_accum.pl +++ b/CVSROOT/log_accum.pl @@ -615,6 +615,7 @@ while () { /^Reviewed by:$/i || /^Submitted by:$/i || /^Obtained from:$/i || + /^MFC after:$/i || /^Approved by:$/i) { push @log_lines, $_; } diff --git a/CVSROOT/logcheck b/CVSROOT/logcheck index fdec5db..1f03cb2 100755 --- a/CVSROOT/logcheck +++ b/CVSROOT/logcheck @@ -50,6 +50,18 @@ while() { /^PR:$/i) { next; } + + # Special handling for type checking the 'MFC after' field. + if (/^MFC after:\s*(.*)$/) { + # Ignore it if no value was filled in. + next unless $1; + + unless ($1 =~ /[\d]+ (days?|weeks?)$/) { + print "Parse error in 'MFC after:'\n"; + exit 1; + } + } + if ($blank && $first) { # Previous line(s) was blank, this isn't. Close the # collapsed section. diff --git a/CVSROOT/rcstemplate b/CVSROOT/rcstemplate index 8c68bf4..c9097ea 100644 --- a/CVSROOT/rcstemplate +++ b/CVSROOT/rcstemplate @@ -4,9 +4,15 @@ Submitted by: Reviewed by: Approved by: Obtained from: +MFC after: CVS: ---------------------------------------------------------------------- CVS: PR: Fill this in if a GNATS PR is affected by the change. CVS: Submitted by: Fill this in if someone else sent in the change. CVS: Reviewed by: Fill this in if someone else reviewed your modification. CVS: Approved by: Fill this in if you needed approval for this commit. CVS: Obtained from: Fill this in if the change is from third party software. +CVS: +CVS: MFC after: XXX [day[s]|week[s]] +CVS: Fill this in if you want to get MFC notification later. XXX is a +CVS: number of days or weeks after which MFC is planned. If no day[s] +CVS: or week[s] suffix was specified then days assumed. -- cgit v1.1