Author: olamy
Date: Mon Mar 16 22:09:29 2009
New Revision: 755019
URL: http://svn.apache.org/viewvc?rev=755019&view=rev
Log:
[SCM-448] CheckInScmResult could return the scm revision (at least for svn
provider)
Modified:
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/checkin/CheckInScmResult.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/checkin/SvnCheckInCommand.java
Modified:
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/checkin/CheckInScmResult.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/checkin/CheckInScmResult.java?rev=755019&r1=755018&r2=755019&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/checkin/CheckInScmResult.java
(original)
+++
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/checkin/CheckInScmResult.java
Mon Mar 16 22:09:29 2009
@@ -32,6 +32,8 @@
extends ScmResult
{
private List checkedInFiles;
+
+ private String scmRevision;
public CheckInScmResult( String commandLine, String providerMessage,
String commandOutput, boolean success )
{
@@ -45,15 +47,38 @@
this.checkedInFiles = checkedInFiles;
}
+ /**
+ * @param commandLine
+ * @param checkedInFiles
+ * @param scmRevision
+ * @since 1.2
+ */
+ public CheckInScmResult( String commandLine, List checkedInFiles, String
scmRevision )
+ {
+ this( commandLine, checkedInFiles );
+
+ this.scmRevision = scmRevision;
+ }
+
public CheckInScmResult( List checkedInFiles, ScmResult result )
{
super( result );
this.checkedInFiles = checkedInFiles;
}
+
public List getCheckedInFiles()
{
return checkedInFiles;
}
+
+ /**
+ * @since 1.2
+ * @return can be null for some providers (implemented at least for svn)
+ */
+ public String getScmRevision()
+ {
+ return scmRevision;
+ }
}
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/checkin/SvnCheckInCommand.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/checkin/SvnCheckInCommand.java?rev=755019&r1=755018&r2=755019&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/checkin/SvnCheckInCommand.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/checkin/SvnCheckInCommand.java
Mon Mar 16 22:09:29 2009
@@ -106,7 +106,7 @@
return new CheckInScmResult( cl.toString(), "The svn command
failed.", stderr.getOutput(), false );
}
- return new CheckInScmResult( cl.toString(),
consumer.getCheckedInFiles() );
+ return new CheckInScmResult( cl.toString(),
consumer.getCheckedInFiles(), Integer.toString( consumer.getRevision() ) );
}
// ----------------------------------------------------------------------
