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 2011/01/09 14:41:49 UTC
svn commit: r1056929 - in
/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/
test/java/org/apache/maven/scm/provider/svn/svnexe/command/chang...
Author: olamy
Date: Sun Jan 9 13:41:48 2011
New Revision: 1056929
URL: http://svn.apache.org/viewvc?rev=1056929&view=rev
Log:
[SCM-595] Allow to use BASE in revision range for changelog command
Submitted by Evgeny Mandrikov
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/SvnChangeLogCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/changelog/SvnChangeLogCommandTest.java
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/SvnChangeLogCommand.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/SvnChangeLogCommand.java?rev=1056929&r1=1056928&r2=1056929&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/SvnChangeLogCommand.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/SvnChangeLogCommand.java Sun Jan 9 13:41:48 2011
@@ -182,7 +182,9 @@ public class SvnChangeLogCommand
}
}
- cl.createArg().setValue( repository.getUrl() );
+ if (endVersion == null || !StringUtils.equals("BASE", endVersion.getName())) {
+ cl.createArg().setValue( repository.getUrl() );
+ }
return cl;
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/changelog/SvnChangeLogCommandTest.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/changelog/SvnChangeLogCommandTest.java?rev=1056929&r1=1056928&r2=1056929&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/changelog/SvnChangeLogCommandTest.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/changelog/SvnChangeLogCommandTest.java Sun Jan 9 13:41:48 2011
@@ -141,6 +141,13 @@ public class SvnChangeLogCommandTest
"svn --non-interactive log -v -r 1 http://foo.com/svn/trunk" );
}
+ public void testCommandLineWithBaseVersion()
+ throws Exception
+ {
+ testCommandLine( "scm:svn:http://foo.com/svn/trunk", new ScmRevision("1"), new ScmRevision("BASE"),
+ "svn --non-interactive log -v -r 1:BASE" );
+ }
+
// ----------------------------------------------------------------------
//
// ----------------------------------------------------------------------
@@ -171,7 +178,6 @@ public class SvnChangeLogCommandTest
Commandline cl = SvnChangeLogCommand.createCommandLine( svnRepository, workingDirectory, null, null, null,
startVersion, endVersion );
-
assertCommandLine( commandLine, workingDirectory, cl );
}
}