PR: MPCHANGELOG-57

parse (no author) correctly from SVN logs


git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@179944 13f79535-47bb-0310-9956-ffa450edef68

changelog/src/main/org/apache/maven/svnlib/SvnChangeLogParser.java

@@ -44,7 +44,7 @@ import org.apache.regexp.RESyntaxException;
  * @author <a href="mailto:dion@multitask.com.au">dIon Gillard</a>
  * @author <a href="mailto:pete-apache-dev@kazmier.com">Pete Kazmier</a>
  * @author Daniel Rall
- * @version $Id: SvnChangeLogParser.java,v 1.6 2004/07/08 08:36:51 evenisse Exp $
+ * @version $Id$
  */
 class SvnChangeLogParser implements ChangeLogParser
 {
@@ -82,10 +82,10 @@ class SvnChangeLogParser implements ChangeLogParser
     /** The pattern used to match svn header lines */
     private static final String pattern =
         "^r(\\d+)\\s+\\|\\s+" +          // revision number
-        "(\\S+)\\s+\\|\\s+" +            // author username 
-        "(\\d+-\\d+-\\d+ " +             // date 2002-08-24 
-        "\\d+:\\d+:\\d+) " +             // time 16:01:00 
-        "([\\-+])(\\d\\d)(\\d\\d)";      // gmt offset -0400
+        "(\\(\\S+\\s+\\S+\\)|\\S+)\\s+\\|\\s+" + // author username
+        "(\\d+-\\d+-\\d+ " +             // date 2002-08-24
+        "\\d+:\\d+:\\d+) " +             // time 16:01:00
+        "([\\-+])(\\d\\d)(\\d\\d)";      // gmt offset -0400 
 
     /** Current status of the parser */
     private int status = GET_HEADER;

changelog/src/test-resources/svnlib/svnlog.txt

@@ -42,7 +42,7 @@ Changed paths:
 Added a ctags target in the event I have to use vim.
 
 ------------------------------------------------------------------------
-r9 | kaz | 2002-08-23 11:11:52 -0400 (Fri, 23 Aug 2002) | 3 lines
+r9 | (no author) | 2002-08-24 00:11:52 +0900 (Fri, 23 Aug 2002) | 3 lines
 Changed paths:
    M /poolserver/trunk/build.xml
 

changelog/src/test/org/apache/maven/svnlib/SvnChangeLogParserTest.java

@@ -90,7 +90,7 @@ public class SvnChangeLogParserTest extends TestCase
 
         entry = (ChangeLogEntry) entries.get(6);
         assertEquals("Entry 6 was parsed incorrectly", 
-                "kaz\n" +
+                "(no author)\n" +
                 DATE.parse("Fri Aug 23 11:11:52 EDT 2002") + "\n" +
                 "[/poolserver/trunk/build.xml, 9]\n" +
                 "Testing script out again ...\n\n",

changelog/xdocs/changes.xml

@@ -26,6 +26,7 @@
   </properties>
   <body>
     <release version="1.8-SNAPSHOT" date="in SVN">
+      <action dev="brett" type="fix" issue="MPCHANGELOG-57" due-to="Sebastian Scholze">Correctly parse (no author) from SVN logs</action>
       <action dev="brett" type="fix" issue="MPCHANGELOG-53" due-to="Kenneth Leider">Add CVS monitor support</a>
       <action dev="brett" type="fix" issue="MPCHANGELOG-47">Quote argument with &lt; in it on Windows for the CVS provider - required if using CVSNT</action>
       <action dev="brett" type="fix" issue="MPCHANGELOG-55">Fix problem parsing revisions on Linux introduced by MPCHANGELOG-29</action>