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 da...@apache.org on 2006/11/20 06:54:37 UTC
svn commit: r477058 - in
/maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src:
main/java/org/apache/maven/scm/provider/starteam/command/changelog/
main/java/org/apache/maven/scm/provider/starteam/command/update/
test/java/org/apache/mav...
Author: dantran
Date: Sun Nov 19 21:54:33 2006
New Revision: 477058
URL: http://svn.apache.org/viewvc?view=rev&rev=477058
Log:
Implement SCM-249 fix for changelog cmd
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/changelog/StarteamChangeLogCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/update/StarteamUpdateCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/changelog/StarteamChangeLogCommandTest.java
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/changelog/StarteamChangeLogCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/changelog/StarteamChangeLogCommand.java?view=diff&rev=477058&r1=477057&r2=477058
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/changelog/StarteamChangeLogCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/changelog/StarteamChangeLogCommand.java Sun Nov 19 21:54:33 2006
@@ -58,7 +58,7 @@
StarteamScmProviderRepository repository = (StarteamScmProviderRepository) repo;
// TODO: revision
- Commandline cl = createCommandLine( repository, fileSet.getBasedir(), startDate );
+ Commandline cl = createCommandLine( repository, fileSet, startDate );
StarteamChangeLogConsumer consumer =
new StarteamChangeLogConsumer( fileSet.getBasedir(), getLogger(), startDate, endDate, datePattern );
@@ -89,12 +89,12 @@
//
// ----------------------------------------------------------------------
- public static Commandline createCommandLine( StarteamScmProviderRepository repo, File workingDirectory,
+ public static Commandline createCommandLine( StarteamScmProviderRepository repo, ScmFileSet workingDirectory,
Date startDate )
{
- Commandline cl = StarteamCommandLineUtils.createStarteamBaseCommandLine( "hist", workingDirectory, repo );
-
- cl.createArgument().setValue( "-is" );
+ //return the full history since we dont know to get hist log from
+ // creation date to a specific date yet
+ return StarteamCommandLineUtils.createStarteamCommandLine( "hist", null, workingDirectory, repo );
/**
* unfortunately the below option only gives the hist from view creation date to
@@ -112,6 +112,5 @@
}
*/
- return cl;
}
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/update/StarteamUpdateCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/update/StarteamUpdateCommand.java?view=diff&rev=477058&r1=477057&r2=477058
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/update/StarteamUpdateCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/update/StarteamUpdateCommand.java Sun Nov 19 21:54:33 2006
@@ -123,9 +123,7 @@
args.add( tag );
}
- Commandline cl = StarteamCommandLineUtils.createStarteamCommandLine( "co", args, fileSet, repo );
-
- return cl;
+ return StarteamCommandLineUtils.createStarteamCommandLine( "co", args, fileSet, repo );
}
/**
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/changelog/StarteamChangeLogCommandTest.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/changelog/StarteamChangeLogCommandTest.java?view=diff&rev=477058&r1=477057&r2=477058
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/changelog/StarteamChangeLogCommandTest.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/changelog/StarteamChangeLogCommandTest.java Sun Nov 19 21:54:33 2006
@@ -16,6 +16,7 @@
* limitations under the License.
*/
+import org.apache.maven.scm.ScmFileSet;
import org.apache.maven.scm.ScmTestCase;
import org.apache.maven.scm.provider.starteam.command.StarteamCommandLineUtils;
import org.apache.maven.scm.provider.starteam.repository.StarteamScmProviderRepository;
@@ -35,32 +36,27 @@
public void testGetCommandLine()
throws Exception
{
- File workDir = new File( getBasedir() + "/target" );
+ ScmFileSet fileSet = new ScmFileSet( getWorkingCopy() );
- String workDirAbsolutePath = StarteamCommandLineUtils.toJavaPath( workDir.getAbsolutePath() );
-
- testCommandLine( "scm:starteam:myusername:mypassword@myhost:1234/projecturl", workDir,
- "stcmd hist -x -nologo -stop -p myusername:mypassword@myhost:1234/projecturl " + "-fp " +
- workDirAbsolutePath + " -is" );
+ String workingCopy = StarteamCommandLineUtils.toJavaPath( getWorkingCopy().getPath() );
+
+ String starteamUrl = "user:password@host:1234/project/view";
+ String mavenUrl = "scm:starteam:" + starteamUrl;
+
+ String expectedCmd = "stcmd hist -x -nologo -stop"
+ + " -p " + starteamUrl
+ + " -fp " + workingCopy
+ + " -is" ;
+
+ testCommandLine( mavenUrl, fileSet, expectedCmd );
}
- public void testGetCommandLineWithStartDate()
- throws Exception
- {
- File workDir = new File( getBasedir() + "/target" );
-
- String workDirAbsolutePath = StarteamCommandLineUtils.toJavaPath( workDir.getAbsolutePath() );
-
- testCommandLine( "scm:starteam:myusername:mypassword@myhost:1234/projecturl", workDir,
- "stcmd hist -x -nologo -stop -p myusername:mypassword@myhost:1234/projecturl " + "-fp " +
- workDirAbsolutePath + " -is" );
- }
// ----------------------------------------------------------------------
//
// ----------------------------------------------------------------------
- private void testCommandLine( String scmUrl, File workDir, String commandLine )
+ private void testCommandLine( String scmUrl, ScmFileSet workingCopy, String commandLine )
throws Exception
{
ScmRepository repository = getScmManager().makeScmRepository( scmUrl );
@@ -68,7 +64,7 @@
StarteamScmProviderRepository svnRepository =
(StarteamScmProviderRepository) repository.getProviderRepository();
- Commandline cl = StarteamChangeLogCommand.createCommandLine( svnRepository, workDir, null );
+ Commandline cl = StarteamChangeLogCommand.createCommandLine( svnRepository, workingCopy, null );
assertEquals( commandLine, cl.toString() );
}