svn commit: r756929 - in /maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src: main/java/org/apache/maven/scm/provider/perforce/command/diff/ test/java/org/apache/maven/scm/provider/perforce/command/diff/

[olamy]

Author: olamy
Date: Sat Mar 21 12:56:36 2009
New Revision: 756929

URL: http://svn.apache.org/viewvc?rev=756929&view=rev
Log:
[SCM-417] PerforceDiffCommand uses "head" instead of "now" pseudo-revision
Submitted by Peter Janes


Modified:
    
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/diff/PerforceDiffCommand.java
    
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/diff/PerforceDiffCommandTest.java

Modified: 
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/diff/PerforceDiffCommand.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/command/diff/PerforceDiffCommand.java?rev=756929&r1=756928&r2=756929&view=diff
==============================================================================
--- 
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/diff/PerforceDiffCommand.java
 (original)
+++ 
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/diff/PerforceDiffCommand.java
 Sat Mar 21 12:56:36 2009
@@ -88,7 +88,7 @@
                                                  ScmVersion startRev, 
ScmVersion endRev )
     {
         String start = startRev != null && StringUtils.isNotEmpty( 
startRev.getName() ) ? "@" + startRev.getName() : "";
-        String end = endRev != null && StringUtils.isNotEmpty( 
endRev.getName() ) ? endRev.getName() : "head";
+        String end = endRev != null && StringUtils.isNotEmpty( 
endRev.getName() ) ? endRev.getName() : "now";
 
         Commandline command = PerforceScmProvider.createP4Command( repo, 
workingDirectory );
 

Modified: 
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/diff/PerforceDiffCommandTest.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/diff/PerforceDiffCommandTest.java?rev=756929&r1=756928&r2=756929&view=diff
==============================================================================
--- 
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/diff/PerforceDiffCommandTest.java
 (original)
+++ 
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/diff/PerforceDiffCommandTest.java
 Sat Mar 21 12:56:36 2009
@@ -42,7 +42,7 @@
     public void testGetCommandLine()
         throws Exception
     {
-        testCommandLine( new ScmRevision( "somelabel" ), null, cmdPrefix + " 
diff2 -u ....@somelabel ....@head" );
+        testCommandLine( new ScmRevision( "somelabel" ), null, cmdPrefix + " 
diff2 -u ....@somelabel ....@now" );
     }
 
     public void testGetCommandLineWithRevs()