You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm-commits@maven.apache.org by ol...@apache.org on 2010/06/08 23:02:19 UTC
svn commit: r952815 -
/maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/blame/HgBlameConsumer.java
Author: olamy
Date: Tue Jun 8 21:02:18 2010
New Revision: 952815
URL: http://svn.apache.org/viewvc?rev=952815&view=rev
Log:
[SCM-539] blame command Unparseable date with Mercurial SCM provider
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/blame/HgBlameConsumer.java
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/blame/HgBlameConsumer.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/blame/HgBlameConsumer.java?rev=952815&r1=952814&r2=952815&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/blame/HgBlameConsumer.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/blame/HgBlameConsumer.java Tue Jun 8 21:02:18 2010
@@ -48,13 +48,13 @@ public class HgBlameConsumer
public void doConsume( ScmFileStatus status, String trimmedLine )
{
/* godin 0 Sun Jan 31 03:04:54 2010 +0300 */
- String annotation = trimmedLine.substring( 0, trimmedLine.indexOf( ": " ) );
+ String annotation = trimmedLine.substring( 0, trimmedLine.indexOf( ": " ) ).trim();
String author = annotation.substring( 0, annotation.indexOf( ' ' ) );
- annotation = annotation.substring( annotation.indexOf( ' ' ) + 1 );
+ annotation = annotation.substring( annotation.indexOf( ' ' ) + 1 ).trim();
String revision = annotation.substring( 0, annotation.indexOf( ' ' ) );
- annotation = annotation.substring( annotation.indexOf( ' ' ) + 1 );
+ annotation = annotation.substring( annotation.indexOf( ' ' ) + 1 ).trim();
String dateStr = annotation;
Date dateTime = parseDate( dateStr, null, HG_TIMESTAMP_PATTERN );