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/03/16 01:23:49 UTC
svn commit: r754800 - in /maven/scm/trunk:
maven-scm-api/src/main/java/org/apache/maven/scm/provider/
maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/tag/
Author: olamy
Date: Mon Mar 16 00:23:48 2009
New Revision: 754800
URL: http://svn.apache.org/viewvc?rev=754800&view=rev
Log:
[SCM-262] really use revision from svn info for remote tagging
Modified:
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/provider/AbstractScmProvider.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/tag/SvnTagCommand.java
Modified: maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/provider/AbstractScmProvider.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/provider/AbstractScmProvider.java?rev=754800&r1=754799&r2=754800&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/provider/AbstractScmProvider.java (original)
+++ maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/provider/AbstractScmProvider.java Mon Mar 16 00:23:48 2009
@@ -690,7 +690,7 @@
parameters.setString( CommandParameter.TAG_NAME, tagName );
parameters.setScmTagParameters( CommandParameter.SCM_TAG_PARAMETERS, scmTagParameters );
-
+
return tag( repository.getProviderRepository(), fileSet, parameters );
}
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/tag/SvnTagCommand.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/tag/SvnTagCommand.java?rev=754800&r1=754799&r2=754800&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/tag/SvnTagCommand.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/tag/SvnTagCommand.java Mon Mar 16 00:23:48 2009
@@ -76,10 +76,17 @@
// NPE free
if (scmTagParameters == null)
{
+ getLogger().debug( "SvnTagCommand :: scmTagParameters is null create an empty one" );
scmTagParameters = new ScmTagParameters();
scmTagParameters.setRemoteTagging( false );
}
+ else
+ {
+ getLogger().debug(
+ "SvnTagCommand :: scmTagParameters.remoteTagging : "
+ + scmTagParameters.isRemoteTagging() );
+ }
if ( tag == null || StringUtils.isEmpty( tag.trim() ) )
{
throw new ScmException( "tag must be specified" );
@@ -109,6 +116,7 @@
if (scmTagParameters.isRemoteTagging() && scmTagParameters.getScmRevision() == null)
{
String currentSvnRev = getCurrentSvnRev( fileSet );
+ getLogger().info( "tag with the current svn rev " + currentSvnRev );
scmTagParameters.setScmRevision( currentSvnRev );
}
@@ -233,11 +241,9 @@
cl.createArg().setValue( messageFile.getAbsolutePath() );
- String svnRev = null;
-
if ( scmTagParameters != null && scmTagParameters.getScmRevision() != null )
{
- cl.createArg().setValue( "--revision " + svnRev );
+ cl.createArg().setValue( "--revision " + scmTagParameters.getScmRevision() );
}
if ( scmTagParameters != null && scmTagParameters.isRemoteTagging() )