You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ol...@apache.org on 2012/10/13 21:40:29 UTC
git commit: add some debug to understand why that fail on jenkins
Updated Branches:
refs/heads/master 7f9e4fd91 -> 6a819bc79
add some debug to understand why that fail on jenkins
Project: http://git-wip-us.apache.org/repos/asf/maven-scm/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-scm/commit/6a819bc7
Tree: http://git-wip-us.apache.org/repos/asf/maven-scm/tree/6a819bc7
Diff: http://git-wip-us.apache.org/repos/asf/maven-scm/diff/6a819bc7
Branch: refs/heads/master
Commit: 6a819bc790948640f8e743514c2722089b5f816c
Parents: 7f9e4fd
Author: olivier lamy <ol...@apache.org>
Authored: Sat Oct 13 21:40:18 2012 +0200
Committer: olivier lamy <ol...@apache.org>
Committed: Sat Oct 13 21:40:18 2012 +0200
----------------------------------------------------------------------
.../java/org/apache/maven/scm/log/DefaultLog.java | 92 ++++++++++++---
.../gitexe/command/status/GitStatusConsumer.java | 22 +++-
.../command/status/GitStatusConsumerTest.java | 2 +-
3 files changed, 94 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/6a819bc7/maven-scm-api/src/main/java/org/apache/maven/scm/log/DefaultLog.java
----------------------------------------------------------------------
diff --git a/maven-scm-api/src/main/java/org/apache/maven/scm/log/DefaultLog.java b/maven-scm-api/src/main/java/org/apache/maven/scm/log/DefaultLog.java
index da28f2f..8bcd1c5 100644
--- a/maven-scm-api/src/main/java/org/apache/maven/scm/log/DefaultLog.java
+++ b/maven-scm-api/src/main/java/org/apache/maven/scm/log/DefaultLog.java
@@ -21,103 +21,159 @@ package org.apache.maven.scm.log;
/**
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
- *
*/
public class DefaultLog
implements ScmLogger
{
- /** {@inheritDoc} */
+ private boolean debug = false;
+
+ public DefaultLog()
+ {
+ // no op
+ }
+
+ public DefaultLog( boolean debug )
+ {
+ this.debug = debug;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
public boolean isDebugEnabled()
{
- return false;
+ return this.debug;
}
- /** {@inheritDoc} */
+ /**
+ * {@inheritDoc}
+ */
public void debug( String content )
{
+ if ( this.debug )
+ {
+ System.out.println( content );
+ }
}
- /** {@inheritDoc} */
+ /**
+ * {@inheritDoc}
+ */
public void debug( String content, Throwable error )
{
+ if ( this.debug )
+ {
+ System.out.println( content );
+ error.printStackTrace();
+ }
}
- /** {@inheritDoc} */
+ /**
+ * {@inheritDoc}
+ */
public void debug( Throwable error )
{
+ if ( this.debug )
+ {
+ error.printStackTrace();
+ }
}
- /** {@inheritDoc} */
+ /**
+ * {@inheritDoc}
+ */
public boolean isInfoEnabled()
{
return true;
}
- /** {@inheritDoc} */
+ /**
+ * {@inheritDoc}
+ */
public void info( String content )
{
System.out.println( content );
}
- /** {@inheritDoc} */
+ /**
+ * {@inheritDoc}
+ */
public void info( String content, Throwable error )
{
System.out.println( content );
error.printStackTrace();
}
- /** {@inheritDoc} */
+ /**
+ * {@inheritDoc}
+ */
public void info( Throwable error )
{
error.printStackTrace();
}
- /** {@inheritDoc} */
+ /**
+ * {@inheritDoc}
+ */
public boolean isWarnEnabled()
{
return true;
}
- /** {@inheritDoc} */
+ /**
+ * {@inheritDoc}
+ */
public void warn( String content )
{
System.out.println( content );
}
- /** {@inheritDoc} */
+ /**
+ * {@inheritDoc}
+ */
public void warn( String content, Throwable error )
{
System.out.println( content );
error.printStackTrace();
}
- /** {@inheritDoc} */
+ /**
+ * {@inheritDoc}
+ */
public void warn( Throwable error )
{
error.printStackTrace();
}
- /** {@inheritDoc} */
+ /**
+ * {@inheritDoc}
+ */
public boolean isErrorEnabled()
{
return true;
}
- /** {@inheritDoc} */
+ /**
+ * {@inheritDoc}
+ */
public void error( String content )
{
System.out.print( "[ERROR] " + content );
}
- /** {@inheritDoc} */
+ /**
+ * {@inheritDoc}
+ */
public void error( String content, Throwable error )
{
System.out.println( "[ERROR] " + content );
error.printStackTrace();
}
- /** {@inheritDoc} */
+ /**
+ * {@inheritDoc}
+ */
public void error( Throwable error )
{
error.printStackTrace();
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/6a819bc7/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/status/GitStatusConsumer.java
----------------------------------------------------------------------
diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/status/GitStatusConsumer.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/status/GitStatusConsumer.java
index 32c4eca..1dd9137 100644
--- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/status/GitStatusConsumer.java
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/status/GitStatusConsumer.java
@@ -33,7 +33,6 @@ import java.util.List;
/**
* @author <a href="mailto:struberg@yahoo.de">Mark Struberg</a>
- *
*/
public class GitStatusConsumer
implements StreamConsumer
@@ -133,7 +132,7 @@ public class GitStatusConsumer
if ( addedRegexp.match( line ) )
{
status = ScmFileStatus.ADDED;
- files.add(addedRegexp.getParen(1));
+ files.add( addedRegexp.getParen( 1 ) );
}
else if ( modifiedRegexp.match( line ) )
{
@@ -150,6 +149,8 @@ public class GitStatusConsumer
status = ScmFileStatus.RENAMED;
files.add( renamedRegexp.getParen( 1 ) );
files.add( renamedRegexp.getParen( 2 ) );
+ logger.debug( "RENAMED status for line '" + line + "' files added '" + renamedRegexp.getParen( 1 ) + "' '"
+ + renamedRegexp.getParen( 2 ) );
}
// If the file isn't a file; don't add it.
@@ -163,12 +164,26 @@ public class GitStatusConsumer
String newFilePath = files.get( 1 );
if ( new File( workingDirectory, oldFilePath ).isFile() )
{
+ logger.debug(
+ "file '" + new File( workingDirectory, oldFilePath ).getAbsolutePath() + "' is a file" );
return;
}
+ else
+ {
+ logger.debug(
+ "file '" + new File( workingDirectory, oldFilePath ).getAbsolutePath() + "' not a file" );
+ }
if ( !new File( workingDirectory, newFilePath ).isFile() )
{
+ logger.debug(
+ "file '" + new File( workingDirectory, newFilePath ).getAbsolutePath() + "' not a file" );
return;
}
+ else
+ {
+ logger.debug(
+ "file '" + new File( workingDirectory, newFilePath ).getAbsolutePath() + "' is a file" );
+ }
}
else if ( status == ScmFileStatus.DELETED )
{
@@ -186,7 +201,8 @@ public class GitStatusConsumer
}
}
- for(String file : files){
+ for ( String file : files )
+ {
changedFiles.add( new ScmFile( file, status ) );
}
}
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/6a819bc7/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/status/GitStatusConsumerTest.java
----------------------------------------------------------------------
diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/status/GitStatusConsumerTest.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/status/GitStatusConsumerTest.java
index a2d8935..67cccb5 100644
--- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/status/GitStatusConsumerTest.java
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/status/GitStatusConsumerTest.java
@@ -248,7 +248,7 @@ public class GitStatusConsumerTest
File dir = createTempDirectory();
FileUtils.fileAppend( dir.getCanonicalPath() + File.separator + "NewCapfile", "data" );
- GitStatusConsumer consumer = new GitStatusConsumer( new DefaultLog(), dir.getCanonicalFile() );
+ GitStatusConsumer consumer = new GitStatusConsumer( new DefaultLog( true ), dir.getCanonicalFile() );
consumer.consumeLine( "R OldCapfile -> NewCapFile" );