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 ev...@apache.org on 2006/03/06 14:28:01 UTC
svn commit: r383531 - in
/maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src:
main/java/org/apache/maven/scm/provider/bazaar/
main/java/org/apache/maven/scm/provider/bazaar/command/
test/java/org/apache/maven/scm/provider/bazaar/
Author: evenisse
Date: Mon Mar 6 05:27:59 2006
New Revision: 383531
URL: http://svn.apache.org/viewcvs?rev=383531&view=rev
Log: (empty)
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/BazaarUtils.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/BazaarConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/test/java/org/apache/maven/scm/provider/bazaar/BazaarTestUtils.java
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/BazaarUtils.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/BazaarUtils.java?rev=383531&r1=383530&r2=383531&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/BazaarUtils.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/BazaarUtils.java Mon Mar 6 05:27:59 2006
@@ -60,7 +60,7 @@
//Diff is different
List diffExitCodes = new ArrayList();
diffExitCodes.add( new Integer( 0 ) ); //No difference
- diffExitCodes.add( new Integer( 1 ) ); //Difference exisits
+ diffExitCodes.add( new Integer( 1 ) ); //Difference exists
exitCodeMap.put( BazaarCommand.DIFF_CMD, diffExitCodes );
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/BazaarConsumer.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/BazaarConsumer.java?rev=383531&r1=383530&r2=383531&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/BazaarConsumer.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/BazaarConsumer.java Mon Mar 6 05:27:59 2006
@@ -83,7 +83,7 @@
public void consumeLine( String line )
{
- getLogger().debug( line );
+ getLogger().info( line );
String trimmedLine = line.trim();
String statusStr = processInputForKnownIdentifiers( trimmedLine );
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/test/java/org/apache/maven/scm/provider/bazaar/BazaarTestUtils.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/test/java/org/apache/maven/scm/provider/bazaar/BazaarTestUtils.java?rev=383531&r1=383530&r2=383531&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/test/java/org/apache/maven/scm/provider/bazaar/BazaarTestUtils.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/test/java/org/apache/maven/scm/provider/bazaar/BazaarTestUtils.java Mon Mar 6 05:27:59 2006
@@ -17,6 +17,7 @@
*/
import org.apache.maven.scm.ScmFileSet;
+import org.apache.maven.scm.ScmResult;
import org.apache.maven.scm.provider.bazaar.command.BazaarCommand;
import org.codehaus.plexus.util.FileUtils;
@@ -99,10 +100,20 @@
String[] add_cmd = new String[]{BazaarCommand.ADD_CMD};
ScmFileSet filesToAdd = new ScmFileSet( new File( "" ), (File[]) files.toArray( new File[0] ) );
add_cmd = BazaarUtils.expandCommandLine( add_cmd, filesToAdd );
- BazaarUtils.execute( WORKING_DIR, add_cmd );
+ ScmResult result = BazaarUtils.execute( WORKING_DIR, add_cmd );
+ if ( !result.isSuccess() )
+ {
+ String message = "Provider message: " + result.getProviderMessage() + "\n" + "Output: " + result.getCommandOutput();
+ throw new Exception( message );
+ }
// Commit the initial repository
String[] commit_cmd = new String[]{BazaarCommand.COMMIT_CMD, BazaarCommand.MESSAGE_OPTION, COMMIT_MESSAGE};
- BazaarUtils.execute( WORKING_DIR, commit_cmd );
+ result = BazaarUtils.execute( WORKING_DIR, commit_cmd );
+ if ( !result.isSuccess() )
+ {
+ String message = "Provider message: " + result.getProviderMessage() + "\n" + "Output: " + result.getCommandOutput();
+ throw new Exception( message );
+ }
}
}