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 2018/03/03 10:06:01 UTC
[1/2] maven-scm git commit: [SCM-864] fix module name not passed to
cvs rls
Repository: maven-scm
Updated Branches:
refs/heads/master 9282d0ed1 -> 558d49694
[SCM-864] fix module name not passed to cvs rls
Project: http://git-wip-us.apache.org/repos/asf/maven-scm/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-scm/commit/83b9c548
Tree: http://git-wip-us.apache.org/repos/asf/maven-scm/tree/83b9c548
Diff: http://git-wip-us.apache.org/repos/asf/maven-scm/diff/83b9c548
Branch: refs/heads/master
Commit: 83b9c548d99b361da800b2da1204f4f182bd6483
Parents: 6f7dd0c
Author: Ilya Basin <ba...@gmail.com>
Authored: Sun Feb 18 11:10:48 2018 +0300
Committer: Ilya Basin <ba...@gmail.com>
Committed: Sun Feb 18 13:26:36 2018 +0300
----------------------------------------------------------------------
.../cvslib/command/list/AbstractCvsListCommand.java | 11 +++++++++++
1 file changed, 11 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/83b9c548/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/list/AbstractCvsListCommand.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/AbstractCvsListCommand.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/AbstractCvsListCommand.java
index 5c7d1d0..58a00b4 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/AbstractCvsListCommand.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/AbstractCvsListCommand.java
@@ -65,6 +65,16 @@ public abstract class AbstractCvsListCommand
cl.createArg().setValue( "-R" );
}
+ String modulePref = repository.getModule();
+ if ( !StringUtils.isEmpty( modulePref ) )
+ {
+ modulePref += File.separatorChar;
+ }
+ else
+ {
+ modulePref = "";
+ }
+
for ( Iterator<File> it = fileSet.getFileList().iterator(); it.hasNext(); )
{
File target = (File) it.next();
@@ -73,6 +83,7 @@ public abstract class AbstractCvsListCommand
{
path = path.substring( 1 );
}
+ path = modulePref + path;
cl.createArg().setValue( path );
}
[2/2] maven-scm git commit: Merge branch 'pr-62'
Posted by ol...@apache.org.
Merge branch 'pr-62'
This closes #62
Project: http://git-wip-us.apache.org/repos/asf/maven-scm/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-scm/commit/558d4969
Tree: http://git-wip-us.apache.org/repos/asf/maven-scm/tree/558d4969
Diff: http://git-wip-us.apache.org/repos/asf/maven-scm/diff/558d4969
Branch: refs/heads/master
Commit: 558d49694e7b8557f9b4910aba1474fd8f5d0c25
Parents: 9282d0e 83b9c54
Author: olivier lamy <ol...@apache.org>
Authored: Sat Mar 3 20:05:38 2018 +1000
Committer: olivier lamy <ol...@apache.org>
Committed: Sat Mar 3 20:05:38 2018 +1000
----------------------------------------------------------------------
.../cvslib/command/list/AbstractCvsListCommand.java | 11 +++++++++++
1 file changed, 11 insertions(+)
----------------------------------------------------------------------