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 mp...@apache.org on 2006/08/14 03:01:42 UTC
svn commit: r431276 - in
/maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src:
main/java/org/apache/maven/scm/provider/perforce/
test/java/org/apache/maven/scm/provider/perforce/command/add/
test/java/org/apache/maven/scm/provider/perfo...
Author: mperham
Date: Sun Aug 13 18:01:42 2006
New Revision: 431276
URL: http://svn.apache.org/viewvc?rev=431276&view=rev
Log:
PR: SCM-186
Wrong command line option used for server hostname
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/PerforceScmProvider.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/add/PerforceAddCommandTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/changelog/PerforceChangeLogCommandTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/checkin/PerforceCheckInCommandTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/checkout/PerforceCheckOutCommandTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/remove/PerforceRemoveCommandTest.java
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/PerforceScmProvider.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/PerforceScmProvider.java?rev=431276&r1=431275&r2=431276&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/PerforceScmProvider.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/PerforceScmProvider.java Sun Aug 13 18:01:42 2006
@@ -248,7 +248,7 @@
if ( repo.getHost() != null )
{
- command.createArgument().setValue( "-H" );
+ command.createArgument().setValue( "-p" );
String value = repo.getHost();
if ( repo.getPort() != 0 )
{
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/add/PerforceAddCommandTest.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/add/PerforceAddCommandTest.java?rev=431276&r1=431275&r2=431276&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/add/PerforceAddCommandTest.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/add/PerforceAddCommandTest.java Sun Aug 13 18:01:42 2006
@@ -42,14 +42,14 @@
throws Exception
{
testCommandLine( "scm:perforce:a:username@//depot/projects/pathname",
- "p4 -H a -u username add foo.xml bar.xml" );
+ "p4 -p a -u username add foo.xml bar.xml" );
}
public void testGetCommandLineWithHostAndPort()
throws Exception
{
testCommandLine( "scm:perforce:myhost:1234:username@//depot/projects/pathname",
- "p4 -H myhost:1234 -u username add foo.xml bar.xml" );
+ "p4 -p myhost:1234 -u username add foo.xml bar.xml" );
}
// ----------------------------------------------------------------------
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/changelog/PerforceChangeLogCommandTest.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/changelog/PerforceChangeLogCommandTest.java?rev=431276&r1=431275&r2=431276&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/changelog/PerforceChangeLogCommandTest.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/changelog/PerforceChangeLogCommandTest.java Sun Aug 13 18:01:42 2006
@@ -41,7 +41,7 @@
public void testGetCommandLineWithHost()
throws Exception
{
- testCommandLine( "scm:perforce:a:username@//depot/projects/pathname", "p4 -H a -u username filelog -t -l ..." );
+ testCommandLine( "scm:perforce:a:username@//depot/projects/pathname", "p4 -p a -u username filelog -t -l ..." );
}
public void testGetCommandLineWithHostAndPort()
@@ -49,7 +49,7 @@
{
System.setProperty( PerforceScmProvider.DEFAULT_CLIENTSPEC_PROPERTY, "foo" );
testCommandLine( "scm:perforce:myhost:1234:username@//depot/projects/pathname",
- "p4 -H myhost:1234 -u username -c foo filelog -t -l ..." );
+ "p4 -p myhost:1234 -u username -c foo filelog -t -l ..." );
}
// ----------------------------------------------------------------------
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/checkin/PerforceCheckInCommandTest.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/checkin/PerforceCheckInCommandTest.java?rev=431276&r1=431275&r2=431276&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/checkin/PerforceCheckInCommandTest.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/checkin/PerforceCheckInCommandTest.java Sun Aug 13 18:01:42 2006
@@ -41,14 +41,14 @@
public void testGetCommandLineWithHost()
throws Exception
{
- testCommandLine( "scm:perforce:a:username@//depot/projects/pathname", "p4 -H a -u username submit -i" );
+ testCommandLine( "scm:perforce:a:username@//depot/projects/pathname", "p4 -p a -u username submit -i" );
}
public void testGetCommandLineWithHostAndPort()
throws Exception
{
testCommandLine( "scm:perforce:myhost:1234:username@//depot/projects/pathname",
- "p4 -H myhost:1234 -u username submit -i" );
+ "p4 -p myhost:1234 -u username submit -i" );
}
// ----------------------------------------------------------------------
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/checkout/PerforceCheckOutCommandTest.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/checkout/PerforceCheckOutCommandTest.java?rev=431276&r1=431275&r2=431276&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/checkout/PerforceCheckOutCommandTest.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/checkout/PerforceCheckOutCommandTest.java Sun Aug 13 18:01:42 2006
@@ -42,14 +42,14 @@
throws Exception
{
testCommandLine( "scm:perforce:a:username@//depot/projects/pathname",
- "p4 -H a -u username -ctest-test-maven sync -f @somelabel" );
+ "p4 -p a -u username -ctest-test-maven sync -f @somelabel" );
}
public void testGetCommandLineWithHostAndPort()
throws Exception
{
testCommandLine( "scm:perforce:myhost:1234:username@//depot/projects/pathname",
- "p4 -H myhost:1234 -u username -ctest-test-maven sync -f @somelabel" );
+ "p4 -p myhost:1234 -u username -ctest-test-maven sync -f @somelabel" );
}
public void testClean()
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/remove/PerforceRemoveCommandTest.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/remove/PerforceRemoveCommandTest.java?rev=431276&r1=431275&r2=431276&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/remove/PerforceRemoveCommandTest.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/remove/PerforceRemoveCommandTest.java Sun Aug 13 18:01:42 2006
@@ -42,14 +42,14 @@
throws Exception
{
testCommandLine( "scm:perforce:a:username@//depot/projects/pathname",
- "p4 -H a -u username delete foo.xml bar.xml" );
+ "p4 -p a -u username delete foo.xml bar.xml" );
}
public void testGetCommandLineWithHostAndPort()
throws Exception
{
testCommandLine( "scm:perforce:myhost:1234:username@//depot/projects/pathname",
- "p4 -H myhost:1234 -u username delete foo.xml bar.xml" );
+ "p4 -p myhost:1234 -u username delete foo.xml bar.xml" );
}
// ----------------------------------------------------------------------