dion 2004/05/09 19:00:25
Modified: changelog/xdocs changes.xml
changelog/src/test-resources/svnlib svnlog.txt
changelog/src/test/org/apache/maven/svnlib
SvnChangeLogParserTest.java
changelog/src/main/org/apache/maven/svnlib
SvnChangeLogParser.java
Log:
Parsing of windows user names was broken
PR: MPCHANGELOG-22
Obtained from: Tim Shadel
Submitted by: Tim Shadel
Reviewed by: dIon
Revision Changes Path
1.29 +3 -0 maven-plugins/changelog/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven-plugins/changelog/xdocs/changes.xml,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- changes.xml 6 May 2004 01:56:05 -0000 1.28
+++ changes.xml 10 May 2004 02:00:25 -0000 1.29
@@ -26,6 +26,9 @@
</properties>
<body>
<release version="1.5" date="in CVS">
+ <action dev="dion" type="fix" due-to="Tim Shadel" issue="MPCHANGELOG-22">
+ Parsing of windows user names (domain\user) was broken.
+ </action>
<action dev="dion" type="fix" due-to="Archimedes Trajano">Bad documentation
for goals</action>
<action dev="dion" type="update">
Add changelog:create-cvspass goal for creating the required .cvspass file
1.3 +8 -0 maven-plugins/changelog/src/test-resources/svnlib/svnlog.txt
Index: svnlog.txt
===================================================================
RCS file: /home/cvs/maven-plugins/changelog/src/test-resources/svnlib/svnlog.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- svnlog.txt 22 Nov 2003 22:52:13 -0000 1.2
+++ svnlog.txt 10 May 2004 02:00:25 -0000 1.3
@@ -209,4 +209,12 @@
A /poolserver/trunk
Poolserver Main Trunk
+
+------------------------------------------------------------------------
+r1 | DOMAIN\user | 2002-08-21 00:20:25 -0400 (Wed, 21 Aug 2002) | 3 lines
+Changed paths:
+ M /poolserver/trunk/build.xml
+
+Cleaned up some whitespace.
+
------------------------------------------------------------------------
1.5 +10 -2
maven-plugins/changelog/src/test/org/apache/maven/svnlib/SvnChangeLogParserTest.java
Index: SvnChangeLogParserTest.java
===================================================================
RCS file:
/home/cvs/maven-plugins/changelog/src/test/org/apache/maven/svnlib/SvnChangeLogParserTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SvnChangeLogParserTest.java 2 Mar 2004 15:00:19 -0000 1.4
+++ SvnChangeLogParserTest.java 10 May 2004 02:00:25 -0000 1.5
@@ -77,7 +77,7 @@
FileInputStream fis = new FileInputStream(testFile);
List entries = new ArrayList(parser.parse(fis));
- assertEquals("Wrong number of entries returned", 12, entries.size());
+ assertEquals("Wrong number of entries returned", 13, entries.size());
ChangeLogEntry entry = (ChangeLogEntry) entries.get(0);
assertEquals("Entry 0 was parsed incorrectly",
@@ -103,6 +103,14 @@
"[/poolserver/trunk/build.xml, 7]\n" +
"Reformatted the indentation (really just an excuse to test out\n" +
"subversion).\n\n",
+ entry.toString());
+
+ entry = (ChangeLogEntry) entries.get(12);
+ assertEquals("Entry 12 was parsed incorrectly",
+ "DOMAIN\\user\n" +
+ DATE.parse("Wed Aug 21 00:20:25 EDT 2002") + "\n" +
+ "[/poolserver/trunk/build.xml, 1]\n" +
+ "Cleaned up some whitespace.\n\n",
entry.toString());
}
}
1.5 +2 -2
maven-plugins/changelog/src/main/org/apache/maven/svnlib/SvnChangeLogParser.java
Index: SvnChangeLogParser.java
===================================================================
RCS file:
/home/cvs/maven-plugins/changelog/src/main/org/apache/maven/svnlib/SvnChangeLogParser.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SvnChangeLogParser.java 2 Mar 2004 15:00:18 -0000 1.4
+++ SvnChangeLogParser.java 10 May 2004 02:00:25 -0000 1.5
@@ -82,7 +82,7 @@
/** The pattern used to match svn header lines */
private static final String pattern =
"^r(\\d+)\\s+\\|\\s+" + // revision number
- "(\\w+)\\s+\\|\\s+" + // author username
+ "(\\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
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
