Repository: maven-scm Updated Branches: refs/heads/master 5c84faeea -> 473a094b8
[SCM-866] fix wrong parser assigned by CvsExe to cvs rls output see also SCM-380 [SCM-866] fix CvsListConsumer: dirs have no forward slash Project: http://git-wip-us.apache.org/repos/asf/maven-scm/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-scm/commit/411123cf Tree: http://git-wip-us.apache.org/repos/asf/maven-scm/tree/411123cf Diff: http://git-wip-us.apache.org/repos/asf/maven-scm/diff/411123cf Branch: refs/heads/master Commit: 411123cf44deb5a41b2c588360d4c9def30bf4b0 Parents: 6f7dd0c Author: Ilya Basin <basini...@gmail.com> Authored: Sun Feb 18 14:08:46 2018 +0300 Committer: olivier lamy <ol...@apache.org> Committed: Sat Mar 3 20:39:44 2018 +1000 ---------------------------------------------------------------------- .../scm/provider/cvslib/command/list/CvsListConsumer.java | 3 ++- .../provider/cvslib/cvsexe/command/list/CvsExeListCommand.java | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven-scm/blob/411123cf/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/list/CvsListConsumer.java ---------------------------------------------------------------------- diff --git a/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/list/CvsListConsumer.java b/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/list/CvsListConsumer.java index fbd54a8..8668292 100644 --- a/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/list/CvsListConsumer.java +++ b/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/list/CvsListConsumer.java @@ -79,7 +79,8 @@ public class CvsListConsumer } else { - entries.add( new ScmFile( params[1], ScmFileStatus.UNKNOWN ) ); + String dirSuf = params[0].indexOf( 'D' ) == -1 ? "" : "/"; + entries.add( new ScmFile( params[1] + dirSuf, ScmFileStatus.UNKNOWN ) ); } } http://git-wip-us.apache.org/repos/asf/maven-scm/blob/411123cf/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsexe/src/main/java/org/apache/maven/scm/provider/cvslib/cvsexe/command/list/CvsExeListCommand.java ---------------------------------------------------------------------- diff --git a/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsexe/src/main/java/org/apache/maven/scm/provider/cvslib/cvsexe/command/list/CvsExeListCommand.java b/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsexe/src/main/java/org/apache/maven/scm/provider/cvslib/cvsexe/command/list/CvsExeListCommand.java index 738787f..70f2176 100644 --- a/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsexe/src/main/java/org/apache/maven/scm/provider/cvslib/cvsexe/command/list/CvsExeListCommand.java +++ b/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsexe/src/main/java/org/apache/maven/scm/provider/cvslib/cvsexe/command/list/CvsExeListCommand.java @@ -22,7 +22,7 @@ package org.apache.maven.scm.provider.cvslib.cvsexe.command.list; import org.apache.maven.scm.ScmException; import org.apache.maven.scm.command.list.ListScmResult; import org.apache.maven.scm.provider.cvslib.command.list.AbstractCvsListCommand; -import org.apache.maven.scm.provider.cvslib.command.status.CvsStatusConsumer; +import org.apache.maven.scm.provider.cvslib.command.list.CvsListConsumer; import org.codehaus.plexus.util.cli.CommandLineException; import org.codehaus.plexus.util.cli.CommandLineUtils; import org.codehaus.plexus.util.cli.Commandline; @@ -38,7 +38,7 @@ public class CvsExeListCommand protected ListScmResult executeCvsCommand( Commandline cl ) throws ScmException { - CvsStatusConsumer consumer = new CvsStatusConsumer( getLogger(), cl.getWorkingDirectory() ); + CvsListConsumer consumer = new CvsListConsumer( getLogger() ); CommandLineUtils.StringStreamConsumer stderr = new CommandLineUtils.StringStreamConsumer(); @@ -58,7 +58,7 @@ public class CvsExeListCommand return new ListScmResult( cl.toString(), "The cvs command failed.", stderr.getOutput(), false ); } - return new ListScmResult( cl.toString(), consumer.getChangedFiles() ); + return new ListScmResult( cl.toString(), consumer.getEntries() ); } }
