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 2009/11/29 19:28:54 UTC
svn commit: r885254 - in /maven/scm/trunk/maven-scm-providers:
maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/changelog/
maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svn...
Author: olamy
Date: Sun Nov 29 18:28:54 2009
New Revision: 885254
URL: http://svn.apache.org/viewvc?rev=885254&view=rev
Log:
[SCM-512] add field revision in ChangeSet bean
implementation for change log consumers : svn and hg.
Submitted by Emmanuel Hugonnet
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/changelog/HgChangeLogConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/changelog/SvnChangeLogConsumer.java
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/changelog/HgChangeLogConsumer.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/changelog/HgChangeLogConsumer.java?rev=885254&r1=885253&r2=885254&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/changelog/HgChangeLogConsumer.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/changelog/HgChangeLogConsumer.java Sun Nov 29 18:28:54 2009
@@ -174,6 +174,9 @@
tmpLine = line.substring( REVNO_TAG.length() );
tmpLine = tmpLine.trim();
currentRevision = tmpLine;
+ String revision = currentRevision.substring( 0, currentRevision.indexOf( ':' ) );
+ currentChange.setRevision( revision );
+
}
else if ( line.startsWith( TAG_TAG ) )
{
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/changelog/SvnChangeLogConsumer.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/changelog/SvnChangeLogConsumer.java?rev=885254&r1=885253&r2=885254&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/changelog/SvnChangeLogConsumer.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/changelog/SvnChangeLogConsumer.java Sun Nov 29 18:28:54 2009
@@ -194,6 +194,8 @@
currentChange.setAuthor( HEADER_REG_EXP.getParen( AUTHOR_GROUP ) );
currentChange.setDate( getDate(HEADER_REG_EXP.getParen( DATE_GROUP )) );
+
+ currentChange.setRevision( currentRevision );
status = GET_FILE;
}
@@ -277,20 +279,20 @@
* @param dateOutput The date output from an svn log command.
* @return A date representing the time stamp of the log entry.
*/
- private Date getDate(final String dateOutput)
+ private Date getDate( final String dateOutput )
{
- if (!DATE_REG_EXP.match(dateOutput))
+ if ( !DATE_REG_EXP.match( dateOutput ) )
{
- throw new IllegalOutputException(dateOutput);
+ throw new IllegalOutputException( dateOutput );
}
-
+
final StringBuffer date = new StringBuffer();
- date.append(DATE_REG_EXP.getParen( 1 ));
- date.append(" GMT");
- date.append(DATE_REG_EXP.getParen( 2 ));
- date.append(DATE_REG_EXP.getParen( 3 ));
- date.append(':');
- date.append(DATE_REG_EXP.getParen( 4 ));
+ date.append( DATE_REG_EXP.getParen( 1 ) );
+ date.append( " GMT" );
+ date.append( DATE_REG_EXP.getParen( 2 ) );
+ date.append( DATE_REG_EXP.getParen( 3 ) );
+ date.append( ':' );
+ date.append( DATE_REG_EXP.getParen( 4 ) );
return parseDate( date.toString(), userDateFormat, SVN_TIMESTAMP_PATTERN );
}