You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by br...@apache.org on 2005/06/04 06:41:51 UTC
svn commit: r179944 - in /maven/maven-1/plugins/trunk/changelog:
src/main/org/apache/maven/svnlib/SvnChangeLogParser.java
src/test-resources/svnlib/svnlog.txt
src/test/org/apache/maven/svnlib/SvnChangeLogParserTest.java
xdocs/changes.xml
Author: brett
Date: Fri Jun 3 21:41:50 2005
New Revision: 179944
URL: http://svn.apache.org/viewcvs?rev=179944&view=rev
Log:
PR: MPCHANGELOG-57
parse (no author) correctly from SVN logs
Modified:
maven/maven-1/plugins/trunk/changelog/src/main/org/apache/maven/svnlib/SvnChangeLogParser.java
maven/maven-1/plugins/trunk/changelog/src/test-resources/svnlib/svnlog.txt
maven/maven-1/plugins/trunk/changelog/src/test/org/apache/maven/svnlib/SvnChangeLogParserTest.java
maven/maven-1/plugins/trunk/changelog/xdocs/changes.xml
Modified: maven/maven-1/plugins/trunk/changelog/src/main/org/apache/maven/svnlib/SvnChangeLogParser.java
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/changelog/src/main/org/apache/maven/svnlib/SvnChangeLogParser.java?rev=179944&r1=179943&r2=179944&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/changelog/src/main/org/apache/maven/svnlib/SvnChangeLogParser.java (original)
+++ maven/maven-1/plugins/trunk/changelog/src/main/org/apache/maven/svnlib/SvnChangeLogParser.java Fri Jun 3 21:41:50 2005
@@ -44,7 +44,7 @@
* @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 @@
/** 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;
Modified: maven/maven-1/plugins/trunk/changelog/src/test-resources/svnlib/svnlog.txt
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/changelog/src/test-resources/svnlib/svnlog.txt?rev=179944&r1=179943&r2=179944&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/changelog/src/test-resources/svnlib/svnlog.txt (original)
+++ maven/maven-1/plugins/trunk/changelog/src/test-resources/svnlib/svnlog.txt Fri Jun 3 21:41:50 2005
@@ -42,7 +42,7 @@
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
Modified: maven/maven-1/plugins/trunk/changelog/src/test/org/apache/maven/svnlib/SvnChangeLogParserTest.java
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/changelog/src/test/org/apache/maven/svnlib/SvnChangeLogParserTest.java?rev=179944&r1=179943&r2=179944&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/changelog/src/test/org/apache/maven/svnlib/SvnChangeLogParserTest.java (original)
+++ maven/maven-1/plugins/trunk/changelog/src/test/org/apache/maven/svnlib/SvnChangeLogParserTest.java Fri Jun 3 21:41:50 2005
@@ -90,7 +90,7 @@
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",
Modified: maven/maven-1/plugins/trunk/changelog/xdocs/changes.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/changelog/xdocs/changes.xml?rev=179944&r1=179943&r2=179944&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/changelog/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/changelog/xdocs/changes.xml Fri Jun 3 21:41:50 2005
@@ -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 < 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>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org