httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From n.@apache.org
Subject svn commit: r111610 - /httpd/docs-build/trunk/lib/metafile.pl
Date Sat, 11 Dec 2004 18:18:58 GMT
Author: nd
Date: Sat Dec 11 10:18:57 2004
New Revision: 111610

URL: http://svn.apache.org/viewcvs?view=rev&rev=111610
Log:
use another format for the revision references
the new one is better for copy and paste to
svn diff -r command lines.
The old format is still recognized (but will be
removed some time in the future; probably after
the next 2.0 release)

Modified:
   httpd/docs-build/trunk/lib/metafile.pl

Modified: httpd/docs-build/trunk/lib/metafile.pl
Url: http://svn.apache.org/viewcvs/httpd/docs-build/trunk/lib/metafile.pl?view=diff&rev=111610&p1=httpd/docs-build/trunk/lib/metafile.pl&r1=111609&p2=httpd/docs-build/trunk/lib/metafile.pl&r2=111610
==============================================================================
--- httpd/docs-build/trunk/lib/metafile.pl	(original)
+++ httpd/docs-build/trunk/lib/metafile.pl	Sat Dec 11 10:18:57 2004
@@ -199,7 +199,10 @@
                 local $_;
                 while (<FILE>) {
                     $rev = $1, $orev=$2, last
-                        if /<!--\s*English\s+Revision:\s*(\S+)\s+
+                        if /<!--\s*English\s+Revision:\s*([^\s:]+)
+                            (?::(\S+)\s+\(outdated\))?\s+-->/xi
+                                             or
+                           /<!--\s*English\s+Revision:\s*(\S+)\s+
                             (?:\(outdated:\s*(\S+)\s*\)\s+)?-->/xi;
                 }
             }
@@ -220,9 +223,15 @@
                     close(FILE)
                         or die "could not close file '$curpath' ($!), stopped";
 
-                    $cont =~ s{<!--\s*English\s+Revision:\s*(\S+)\s+
-                               (?:\(outdated[^)]*\)\s+)?-->}
-                        {<!-- English Revision: $1 (outdated: $reven) -->}ix;
+                    unless (
+                        $cont =~ s{<!--\s*English\s+Revision:\s*([^\s:]+)
+                                   (?::\S+\s+\(outdated\))?\s+-->}
+                            {<!-- English Revision: $1:$reven (outdated) -->}ix
+                    ) {
+                        $cont =~ s{<!--\s*English\s+Revision:\s*(\S+)\s+
+                                   (?:\(outdated[^)]*\)\s+)?-->}
+                            {<!-- English Revision: $1:$reven (outdated) -->}ix
+                    }
 
                     sysopen(FILE, "$curpath.tmp", O_WRONLY | O_CREAT | O_TRUNC)
                         or die "could not open file '$curpath.tmp' ($!), stopped";

Mime
View raw message