[jira] [Commented] (SCM-807) JGit impl check-in fails unless the Maven project is in the working copy root
[ https://issues.apache.org/jira/browse/SCM-807?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17572597#comment-17572597 ] ASF GitHub Bot commented on SCM-807: asfgit merged PR #158: URL: https://github.com/apache/maven-scm/pull/158 > JGit impl check-in fails unless the Maven project is in the working copy root > - > > Key: SCM-807 > URL: https://issues.apache.org/jira/browse/SCM-807 > Project: Maven SCM > Issue Type: Bug > Components: maven-scm-provider-gitexe >Affects Versions: 1.9.4 >Reporter: Richard DiCroce >Assignee: Michael Osipov >Priority: Major > Fix For: 2.0.0-M2 > > Attachments: scm-807.txt > > > Another problem exposed by maven-release-plugin: the JGit SCM > implementation's check-in fails unless the Maven project is in the working > copy root because it confuses the working copy's location with the Maven > project's location. > The attached patch resolves the issue. Combined with the patch attached to > SCM-806, release:prepare now mostly succeeds with the JGit implementation. > There is still a problem with the POM not being transformed correctly, but > that's a problem in maven-release-plugin. -- This message was sent by Atlassian Jira (v8.20.10#820010)
[jira] [Commented] (SCM-807) JGit impl check-in fails unless the Maven project is in the working copy root
[ https://issues.apache.org/jira/browse/SCM-807?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17570878#comment-17570878 ] ASF GitHub Bot commented on SCM-807: kwin commented on PR #158: URL: https://github.com/apache/maven-scm/pull/158#issuecomment-1193996650 Sounds, good. I created https://issues.apache.org/jira/browse/SCM-998 to track that and will make the test in this PR more lenient for the time being. > JGit impl check-in fails unless the Maven project is in the working copy root > - > > Key: SCM-807 > URL: https://issues.apache.org/jira/browse/SCM-807 > Project: Maven SCM > Issue Type: Bug > Components: maven-scm-provider-gitexe >Affects Versions: 1.9.4 >Reporter: Richard DiCroce >Assignee: Michael Osipov >Priority: Major > Fix For: 2.0.0-M2 > > Attachments: scm-807.txt > > > Another problem exposed by maven-release-plugin: the JGit SCM > implementation's check-in fails unless the Maven project is in the working > copy root because it confuses the working copy's location with the Maven > project's location. > The attached patch resolves the issue. Combined with the patch attached to > SCM-806, release:prepare now mostly succeeds with the JGit implementation. > There is still a problem with the POM not being transformed correctly, but > that's a problem in maven-release-plugin. -- This message was sent by Atlassian Jira (v8.20.10#820010)
[jira] [Commented] (SCM-807) JGit impl check-in fails unless the Maven project is in the working copy root
[ https://issues.apache.org/jira/browse/SCM-807?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17570848#comment-17570848 ] ASF GitHub Bot commented on SCM-807: michael-o commented on PR #158: URL: https://github.com/apache/maven-scm/pull/158#issuecomment-1193925482 I'd say lets make it consistent: Create a JIRA issue which shall document in JAvadoc that system-agnostic forward slashes need to be passed and will be returned, align all callers and returners for that. > JGit impl check-in fails unless the Maven project is in the working copy root > - > > Key: SCM-807 > URL: https://issues.apache.org/jira/browse/SCM-807 > Project: Maven SCM > Issue Type: Bug > Components: maven-scm-provider-gitexe >Affects Versions: 1.9.4 >Reporter: Richard DiCroce >Assignee: Michael Osipov >Priority: Major > Fix For: 2.0.0-M2 > > Attachments: scm-807.txt > > > Another problem exposed by maven-release-plugin: the JGit SCM > implementation's check-in fails unless the Maven project is in the working > copy root because it confuses the working copy's location with the Maven > project's location. > The attached patch resolves the issue. Combined with the patch attached to > SCM-806, release:prepare now mostly succeeds with the JGit implementation. > There is still a problem with the POM not being transformed correctly, but > that's a problem in maven-release-plugin. -- This message was sent by Atlassian Jira (v8.20.10#820010)
[jira] [Commented] (SCM-807) JGit impl check-in fails unless the Maven project is in the working copy root
[ https://issues.apache.org/jira/browse/SCM-807?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17570752#comment-17570752 ] ASF GitHub Bot commented on SCM-807: kwin commented on PR #158: URL: https://github.com/apache/maven-scm/pull/158#issuecomment-1193709528 But `CheckInScmResult` always returns `ScmFile` with forward slashes (even on Mercurial and Subversion) > JGit impl check-in fails unless the Maven project is in the working copy root > - > > Key: SCM-807 > URL: https://issues.apache.org/jira/browse/SCM-807 > Project: Maven SCM > Issue Type: Bug > Components: maven-scm-provider-gitexe >Affects Versions: 1.9.4 >Reporter: Richard DiCroce >Assignee: Michael Osipov >Priority: Major > Fix For: 2.0.0-M2 > > Attachments: scm-807.txt > > > Another problem exposed by maven-release-plugin: the JGit SCM > implementation's check-in fails unless the Maven project is in the working > copy root because it confuses the working copy's location with the Maven > project's location. > The attached patch resolves the issue. Combined with the patch attached to > SCM-806, release:prepare now mostly succeeds with the JGit implementation. > There is still a problem with the POM not being transformed correctly, but > that's a problem in maven-release-plugin. -- This message was sent by Atlassian Jira (v8.20.10#820010)
[jira] [Commented] (SCM-807) JGit impl check-in fails unless the Maven project is in the working copy root
[ https://issues.apache.org/jira/browse/SCM-807?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17570753#comment-17570753 ] ASF GitHub Bot commented on SCM-807: michael-o commented on PR #158: URL: https://github.com/apache/maven-scm/pull/158#issuecomment-1193710147 > But `CheckInScmResult` always returns `ScmFile` with forward slashes (even on Mercurial and Subversion) Well, the we need to define the behavior for 2.0.0 and apply it in Maven Release as well. It is up to us. > JGit impl check-in fails unless the Maven project is in the working copy root > - > > Key: SCM-807 > URL: https://issues.apache.org/jira/browse/SCM-807 > Project: Maven SCM > Issue Type: Bug > Components: maven-scm-provider-gitexe >Affects Versions: 1.9.4 >Reporter: Richard DiCroce >Assignee: Michael Osipov >Priority: Major > Fix For: 2.0.0-M2 > > Attachments: scm-807.txt > > > Another problem exposed by maven-release-plugin: the JGit SCM > implementation's check-in fails unless the Maven project is in the working > copy root because it confuses the working copy's location with the Maven > project's location. > The attached patch resolves the issue. Combined with the patch attached to > SCM-806, release:prepare now mostly succeeds with the JGit implementation. > There is still a problem with the POM not being transformed correctly, but > that's a problem in maven-release-plugin. -- This message was sent by Atlassian Jira (v8.20.10#820010)
[jira] [Commented] (SCM-807) JGit impl check-in fails unless the Maven project is in the working copy root
[ https://issues.apache.org/jira/browse/SCM-807?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17570720#comment-17570720 ] ASF GitHub Bot commented on SCM-807: michael-o commented on PR #158: URL: https://github.com/apache/maven-scm/pull/158#issuecomment-1193705024 I would consider that `ScmFile` is oriented towards the current OS/FS, totally SCM-agnostic. It is upto the provider to normalize to the SCM. It seems it is not documented. Subversion, like Mercurial, uses FS-dependent separators. > JGit impl check-in fails unless the Maven project is in the working copy root > - > > Key: SCM-807 > URL: https://issues.apache.org/jira/browse/SCM-807 > Project: Maven SCM > Issue Type: Bug > Components: maven-scm-provider-gitexe >Affects Versions: 1.9.4 >Reporter: Richard DiCroce >Assignee: Michael Osipov >Priority: Major > Fix For: 2.0.0-M2 > > Attachments: scm-807.txt > > > Another problem exposed by maven-release-plugin: the JGit SCM > implementation's check-in fails unless the Maven project is in the working > copy root because it confuses the working copy's location with the Maven > project's location. > The attached patch resolves the issue. Combined with the patch attached to > SCM-806, release:prepare now mostly succeeds with the JGit implementation. > There is still a problem with the POM not being transformed correctly, but > that's a problem in maven-release-plugin. -- This message was sent by Atlassian Jira (v8.20.10#820010)
[jira] [Commented] (SCM-807) JGit impl check-in fails unless the Maven project is in the working copy root
[ https://issues.apache.org/jira/browse/SCM-807?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17570718#comment-17570718 ] ASF GitHub Bot commented on SCM-807: kwin commented on PR #158: URL: https://github.com/apache/maven-scm/pull/158#issuecomment-1193692481 @michael-o Should the ScmFile path always have forward slashes? Currently mercurial uses backward slashes on Windows (at least for add(...)). > JGit impl check-in fails unless the Maven project is in the working copy root > - > > Key: SCM-807 > URL: https://issues.apache.org/jira/browse/SCM-807 > Project: Maven SCM > Issue Type: Bug > Components: maven-scm-provider-gitexe >Affects Versions: 1.9.4 >Reporter: Richard DiCroce >Assignee: Michael Osipov >Priority: Major > Fix For: 2.0.0-M2 > > Attachments: scm-807.txt > > > Another problem exposed by maven-release-plugin: the JGit SCM > implementation's check-in fails unless the Maven project is in the working > copy root because it confuses the working copy's location with the Maven > project's location. > The attached patch resolves the issue. Combined with the patch attached to > SCM-806, release:prepare now mostly succeeds with the JGit implementation. > There is still a problem with the POM not being transformed correctly, but > that's a problem in maven-release-plugin. -- This message was sent by Atlassian Jira (v8.20.10#820010)
[jira] [Commented] (SCM-807) JGit impl check-in fails unless the Maven project is in the working copy root
[ https://issues.apache.org/jira/browse/SCM-807?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17570702#comment-17570702 ] ASF GitHub Bot commented on SCM-807: kwin opened a new pull request, #158: URL: https://github.com/apache/maven-scm/pull/158 check returned file paths fix SVN returning path with leading spaces > JGit impl check-in fails unless the Maven project is in the working copy root > - > > Key: SCM-807 > URL: https://issues.apache.org/jira/browse/SCM-807 > Project: Maven SCM > Issue Type: Bug > Components: maven-scm-provider-gitexe >Affects Versions: 1.9.4 >Reporter: Richard DiCroce >Assignee: Michael Osipov >Priority: Major > Fix For: 2.0.0-M2 > > Attachments: scm-807.txt > > > Another problem exposed by maven-release-plugin: the JGit SCM > implementation's check-in fails unless the Maven project is in the working > copy root because it confuses the working copy's location with the Maven > project's location. > The attached patch resolves the issue. Combined with the patch attached to > SCM-806, release:prepare now mostly succeeds with the JGit implementation. > There is still a problem with the POM not being transformed correctly, but > that's a problem in maven-release-plugin. -- This message was sent by Atlassian Jira (v8.20.10#820010)
[jira] [Commented] (SCM-807) JGit impl check-in fails unless the Maven project is in the working copy root
[ https://issues.apache.org/jira/browse/SCM-807?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17570123#comment-17570123 ] ASF GitHub Bot commented on SCM-807: nielsbasjes commented on PR #152: URL: https://github.com/apache/maven-scm/pull/152#issuecomment-1192765707 It is the one on Github that failed (this time). > JGit impl check-in fails unless the Maven project is in the working copy root > - > > Key: SCM-807 > URL: https://issues.apache.org/jira/browse/SCM-807 > Project: Maven SCM > Issue Type: Bug > Components: maven-scm-provider-gitexe >Affects Versions: 1.9.4 >Reporter: Richard DiCroce >Assignee: Michael Osipov >Priority: Major > Fix For: 2.0.0-M2 > > Attachments: scm-807.txt > > > Another problem exposed by maven-release-plugin: the JGit SCM > implementation's check-in fails unless the Maven project is in the working > copy root because it confuses the working copy's location with the Maven > project's location. > The attached patch resolves the issue. Combined with the patch attached to > SCM-806, release:prepare now mostly succeeds with the JGit implementation. > There is still a problem with the POM not being transformed correctly, but > that's a problem in maven-release-plugin. -- This message was sent by Atlassian Jira (v8.20.10#820010)
[jira] [Commented] (SCM-807) JGit impl check-in fails unless the Maven project is in the working copy root
[ https://issues.apache.org/jira/browse/SCM-807?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17570059#comment-17570059 ] ASF GitHub Bot commented on SCM-807: kwin commented on PR #152: URL: https://github.com/apache/maven-scm/pull/152#issuecomment-1192637852 Which build failed? I don’t see it at https://ci-maven.apache.org/job/Maven/job/maven-box/job/maven-scm/job/master/. > JGit impl check-in fails unless the Maven project is in the working copy root > - > > Key: SCM-807 > URL: https://issues.apache.org/jira/browse/SCM-807 > Project: Maven SCM > Issue Type: Bug > Components: maven-scm-provider-gitexe >Affects Versions: 1.9.4 >Reporter: Richard DiCroce >Assignee: Michael Osipov >Priority: Major > Fix For: 2.0.0-M2 > > Attachments: scm-807.txt > > > Another problem exposed by maven-release-plugin: the JGit SCM > implementation's check-in fails unless the Maven project is in the working > copy root because it confuses the working copy's location with the Maven > project's location. > The attached patch resolves the issue. Combined with the patch attached to > SCM-806, release:prepare now mostly succeeds with the JGit implementation. > There is still a problem with the POM not being transformed correctly, but > that's a problem in maven-release-plugin. -- This message was sent by Atlassian Jira (v8.20.10#820010)
[jira] [Commented] (SCM-807) JGit impl check-in fails unless the Maven project is in the working copy root
[ https://issues.apache.org/jira/browse/SCM-807?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17570058#comment-17570058 ] ASF GitHub Bot commented on SCM-807: nielsbasjes commented on PR #152: URL: https://github.com/apache/maven-scm/pull/152#issuecomment-1192634638 No I do not have that information. I noticed the master build had failed and simply googled the error and what people wrote about how to solve it. I do not have more information than what I've already shared. > JGit impl check-in fails unless the Maven project is in the working copy root > - > > Key: SCM-807 > URL: https://issues.apache.org/jira/browse/SCM-807 > Project: Maven SCM > Issue Type: Bug > Components: maven-scm-provider-gitexe >Affects Versions: 1.9.4 >Reporter: Richard DiCroce >Assignee: Michael Osipov >Priority: Major > Fix For: 2.0.0-M2 > > Attachments: scm-807.txt > > > Another problem exposed by maven-release-plugin: the JGit SCM > implementation's check-in fails unless the Maven project is in the working > copy root because it confuses the working copy's location with the Maven > project's location. > The attached patch resolves the issue. Combined with the patch attached to > SCM-806, release:prepare now mostly succeeds with the JGit implementation. > There is still a problem with the POM not being transformed correctly, but > that's a problem in maven-release-plugin. -- This message was sent by Atlassian Jira (v8.20.10#820010)
[jira] [Commented] (SCM-807) JGit impl check-in fails unless the Maven project is in the working copy root
[ https://issues.apache.org/jira/browse/SCM-807?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17569988#comment-17569988 ] ASF GitHub Bot commented on SCM-807: kwin commented on PR #152: URL: https://github.com/apache/maven-scm/pull/152#issuecomment-1192520276 Also we use https://gerrit.googlesource.com/jgit/+/refs/heads/stable-5.13/org.eclipse.jgit/src/org/eclipse/jgit/util/FileUtils.java#147 with `RETRY` which should be fairly robust as it does retry 10 times (every 100ms). Maybe we can also set `IGNORE_ERRORS` to just continue in case there is still gc ongoing. > JGit impl check-in fails unless the Maven project is in the working copy root > - > > Key: SCM-807 > URL: https://issues.apache.org/jira/browse/SCM-807 > Project: Maven SCM > Issue Type: Bug > Components: maven-scm-provider-gitexe >Affects Versions: 1.9.4 >Reporter: Richard DiCroce >Assignee: Michael Osipov >Priority: Major > Fix For: 2.0.0-M2 > > Attachments: scm-807.txt > > > Another problem exposed by maven-release-plugin: the JGit SCM > implementation's check-in fails unless the Maven project is in the working > copy root because it confuses the working copy's location with the Maven > project's location. > The attached patch resolves the issue. Combined with the patch attached to > SCM-806, release:prepare now mostly succeeds with the JGit implementation. > There is still a problem with the POM not being transformed correctly, but > that's a problem in maven-release-plugin. -- This message was sent by Atlassian Jira (v8.20.10#820010)
[jira] [Commented] (SCM-807) JGit impl check-in fails unless the Maven project is in the working copy root
[ https://issues.apache.org/jira/browse/SCM-807?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17569985#comment-17569985 ] ASF GitHub Bot commented on SCM-807: kwin commented on PR #152: URL: https://github.com/apache/maven-scm/pull/152#issuecomment-1192514086 @nielsbasjes Do you know whether this flaw is tracked in JGit Bugzilla? Do you know how/where to apply the workaround (only for tests)? > JGit impl check-in fails unless the Maven project is in the working copy root > - > > Key: SCM-807 > URL: https://issues.apache.org/jira/browse/SCM-807 > Project: Maven SCM > Issue Type: Bug > Components: maven-scm-provider-gitexe >Affects Versions: 1.9.4 >Reporter: Richard DiCroce >Assignee: Michael Osipov >Priority: Major > Fix For: 2.0.0-M2 > > Attachments: scm-807.txt > > > Another problem exposed by maven-release-plugin: the JGit SCM > implementation's check-in fails unless the Maven project is in the working > copy root because it confuses the working copy's location with the Maven > project's location. > The attached patch resolves the issue. Combined with the patch attached to > SCM-806, release:prepare now mostly succeeds with the JGit implementation. > There is still a problem with the POM not being transformed correctly, but > that's a problem in maven-release-plugin. -- This message was sent by Atlassian Jira (v8.20.10#820010)
[jira] [Commented] (SCM-807) JGit impl check-in fails unless the Maven project is in the working copy root
[ https://issues.apache.org/jira/browse/SCM-807?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17569981#comment-17569981 ] ASF GitHub Bot commented on SCM-807: nielsbasjes commented on PR #152: URL: https://github.com/apache/maven-scm/pull/152#issuecomment-1192507002 @kwin / @michael-o : The build failed with ``` java.io.IOException: Could not delete file D:\a\maven-scm\maven-scm\maven-scm-providers\maven-scm-providers-git\maven-scm-provider-jgit\target\scm-test\assertion-copy\.git\gc.log.lock ``` Seems like this is a (random) failure cause by jgit doing stuff in the background: https://www.eclipse.org/lists/jgit-dev/msg03370.html https://www.eclipse.org/lists/jgit-dev/msg03384.html Seems like we need to set `receive.autogc=false` to avoid these (random) problems. https://www.eclipse.org/lists/jgit-dev/msg03736.html > JGit impl check-in fails unless the Maven project is in the working copy root > - > > Key: SCM-807 > URL: https://issues.apache.org/jira/browse/SCM-807 > Project: Maven SCM > Issue Type: Bug > Components: maven-scm-provider-gitexe >Affects Versions: 1.9.4 >Reporter: Richard DiCroce >Assignee: Michael Osipov >Priority: Major > Fix For: 2.0.0-M2 > > Attachments: scm-807.txt > > > Another problem exposed by maven-release-plugin: the JGit SCM > implementation's check-in fails unless the Maven project is in the working > copy root because it confuses the working copy's location with the Maven > project's location. > The attached patch resolves the issue. Combined with the patch attached to > SCM-806, release:prepare now mostly succeeds with the JGit implementation. > There is still a problem with the POM not being transformed correctly, but > that's a problem in maven-release-plugin. -- This message was sent by Atlassian Jira (v8.20.10#820010)
[jira] [Commented] (SCM-807) JGit impl check-in fails unless the Maven project is in the working copy root
[ https://issues.apache.org/jira/browse/SCM-807?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17569881#comment-17569881 ] ASF GitHub Bot commented on SCM-807: asfgit merged PR #152: URL: https://github.com/apache/maven-scm/pull/152 > JGit impl check-in fails unless the Maven project is in the working copy root > - > > Key: SCM-807 > URL: https://issues.apache.org/jira/browse/SCM-807 > Project: Maven SCM > Issue Type: Bug > Components: maven-scm-provider-gitexe >Affects Versions: 1.9.4 >Reporter: Richard DiCroce >Assignee: Michael Osipov >Priority: Major > Fix For: 2.0.0-M2 > > Attachments: scm-807.txt > > > Another problem exposed by maven-release-plugin: the JGit SCM > implementation's check-in fails unless the Maven project is in the working > copy root because it confuses the working copy's location with the Maven > project's location. > The attached patch resolves the issue. Combined with the patch attached to > SCM-806, release:prepare now mostly succeeds with the JGit implementation. > There is still a problem with the POM not being transformed correctly, but > that's a problem in maven-release-plugin. -- This message was sent by Atlassian Jira (v8.20.10#820010)
[jira] [Commented] (SCM-807) JGit impl check-in fails unless the Maven project is in the working copy root
[
https://issues.apache.org/jira/browse/SCM-807?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17569839#comment-17569839
]
ASF GitHub Bot commented on SCM-807:
kwin commented on code in PR #152:
URL: https://github.com/apache/maven-scm/pull/152#discussion_r927339969
##
maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/JGitUtils.java:
##
@@ -308,7 +336,7 @@ public static List addAllFiles( Git git,
ScmFileSet fileSet )
if ( file.exists() )
{
-String path = relativize( baseUri, file );
Review Comment:
No need to normalize if it is already forward slashes.
> JGit impl check-in fails unless the Maven project is in the working copy root
> -
>
> Key: SCM-807
> URL: https://issues.apache.org/jira/browse/SCM-807
> Project: Maven SCM
> Issue Type: Bug
> Components: maven-scm-provider-gitexe
>Affects Versions: 1.9.4
>Reporter: Richard DiCroce
>Assignee: Michael Osipov
>Priority: Major
> Fix For: 2.0.0-M2
>
> Attachments: scm-807.txt
>
>
> Another problem exposed by maven-release-plugin: the JGit SCM
> implementation's check-in fails unless the Maven project is in the working
> copy root because it confuses the working copy's location with the Maven
> project's location.
> The attached patch resolves the issue. Combined with the patch attached to
> SCM-806, release:prepare now mostly succeeds with the JGit implementation.
> There is still a problem with the POM not being transformed correctly, but
> that's a problem in maven-release-plugin.
--
This message was sent by Atlassian Jira
(v8.20.10#820010)
[jira] [Commented] (SCM-807) JGit impl check-in fails unless the Maven project is in the working copy root
[ https://issues.apache.org/jira/browse/SCM-807?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17569827#comment-17569827 ] ASF GitHub Bot commented on SCM-807: kwin commented on PR #152: URL: https://github.com/apache/maven-scm/pull/152#issuecomment-1192220681 @michael-o The commit https://github.com/apache/maven-scm/pull/152/commits/0dd92f82d56fc2a11990bf86910267e09cc257af broke also the existing tests in LocalCheckCommandTckTest yet. This line seems to be the culprit: https://github.com/apache/maven-scm/pull/152/commits/0dd92f82d56fc2a11990bf86910267e09cc257af#diff-fc1fb3d036855019d7163726f1ac5656df1aa8831b857db7d0e2e733ac14083cR101 > JGit impl check-in fails unless the Maven project is in the working copy root > - > > Key: SCM-807 > URL: https://issues.apache.org/jira/browse/SCM-807 > Project: Maven SCM > Issue Type: Bug > Components: maven-scm-provider-gitexe >Affects Versions: 1.9.4 >Reporter: Richard DiCroce >Assignee: Michael Osipov >Priority: Major > Fix For: 2.0.0-M2 > > Attachments: scm-807.txt > > > Another problem exposed by maven-release-plugin: the JGit SCM > implementation's check-in fails unless the Maven project is in the working > copy root because it confuses the working copy's location with the Maven > project's location. > The attached patch resolves the issue. Combined with the patch attached to > SCM-806, release:prepare now mostly succeeds with the JGit implementation. > There is still a problem with the POM not being transformed correctly, but > that's a problem in maven-release-plugin. -- This message was sent by Atlassian Jira (v8.20.10#820010)
[jira] [Commented] (SCM-807) JGit impl check-in fails unless the Maven project is in the working copy root
[ https://issues.apache.org/jira/browse/SCM-807?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17568985#comment-17568985 ] ASF GitHub Bot commented on SCM-807: michael-o commented on PR #152: URL: https://github.com/apache/maven-scm/pull/152#issuecomment-1190161998 Regarding basedir: I'd expect a consistent behavior across providers to realign paths if basedir isn't root dir. > JGit impl check-in fails unless the Maven project is in the working copy root > - > > Key: SCM-807 > URL: https://issues.apache.org/jira/browse/SCM-807 > Project: Maven SCM > Issue Type: Bug > Components: maven-scm-provider-gitexe >Affects Versions: 1.9.4 >Reporter: Richard DiCroce >Assignee: Michael Osipov >Priority: Major > Fix For: 2.0.0-M2 > > Attachments: scm-807.txt > > > Another problem exposed by maven-release-plugin: the JGit SCM > implementation's check-in fails unless the Maven project is in the working > copy root because it confuses the working copy's location with the Maven > project's location. > The attached patch resolves the issue. Combined with the patch attached to > SCM-806, release:prepare now mostly succeeds with the JGit implementation. > There is still a problem with the POM not being transformed correctly, but > that's a problem in maven-release-plugin. -- This message was sent by Atlassian Jira (v8.20.10#820010)
[jira] [Commented] (SCM-807) JGit impl check-in fails unless the Maven project is in the working copy root
[
https://issues.apache.org/jira/browse/SCM-807?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17568957#comment-17568957
]
ASF GitHub Bot commented on SCM-807:
michael-o commented on code in PR #152:
URL: https://github.com/apache/maven-scm/pull/152#discussion_r925371106
##
maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/JGitUtils.java:
##
@@ -308,7 +336,7 @@ public static List addAllFiles( Git git,
ScmFileSet fileSet )
if ( file.exists() )
{
-String path = relativize( baseUri, file );
Review Comment:
This, I don't understand. It returns the path from the URI which will always
be forward slash. Why normalize?
> JGit impl check-in fails unless the Maven project is in the working copy root
> -
>
> Key: SCM-807
> URL: https://issues.apache.org/jira/browse/SCM-807
> Project: Maven SCM
> Issue Type: Bug
> Components: maven-scm-provider-gitexe
>Affects Versions: 1.9.4
>Reporter: Richard DiCroce
>Assignee: Michael Osipov
>Priority: Major
> Fix For: 2.0.0-M2
>
> Attachments: scm-807.txt
>
>
> Another problem exposed by maven-release-plugin: the JGit SCM
> implementation's check-in fails unless the Maven project is in the working
> copy root because it confuses the working copy's location with the Maven
> project's location.
> The attached patch resolves the issue. Combined with the patch attached to
> SCM-806, release:prepare now mostly succeeds with the JGit implementation.
> There is still a problem with the POM not being transformed correctly, but
> that's a problem in maven-release-plugin.
--
This message was sent by Atlassian Jira
(v8.20.10#820010)
[jira] [Commented] (SCM-807) JGit impl check-in fails unless the Maven project is in the working copy root
[
https://issues.apache.org/jira/browse/SCM-807?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17568954#comment-17568954
]
ASF GitHub Bot commented on SCM-807:
michael-o commented on code in PR #152:
URL: https://github.com/apache/maven-scm/pull/152#discussion_r925371335
##
maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/JGitUtils.java:
##
@@ -308,7 +336,7 @@ public static List addAllFiles( Git git,
ScmFileSet fileSet )
if ( file.exists() )
{
-String path = relativize( baseUri, file );
+String path = relativize( workingCopyRootUri, file );
add.addFilepattern( path );
add.addFilepattern( file.getAbsolutePath() );
Review Comment:
Then drop please.
> JGit impl check-in fails unless the Maven project is in the working copy root
> -
>
> Key: SCM-807
> URL: https://issues.apache.org/jira/browse/SCM-807
> Project: Maven SCM
> Issue Type: Bug
> Components: maven-scm-provider-gitexe
>Affects Versions: 1.9.4
>Reporter: Richard DiCroce
>Assignee: Michael Osipov
>Priority: Major
> Fix For: 2.0.0-M2
>
> Attachments: scm-807.txt
>
>
> Another problem exposed by maven-release-plugin: the JGit SCM
> implementation's check-in fails unless the Maven project is in the working
> copy root because it confuses the working copy's location with the Maven
> project's location.
> The attached patch resolves the issue. Combined with the patch attached to
> SCM-806, release:prepare now mostly succeeds with the JGit implementation.
> There is still a problem with the POM not being transformed correctly, but
> that's a problem in maven-release-plugin.
--
This message was sent by Atlassian Jira
(v8.20.10#820010)
[jira] [Commented] (SCM-807) JGit impl check-in fails unless the Maven project is in the working copy root
[
https://issues.apache.org/jira/browse/SCM-807?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17568956#comment-17568956
]
ASF GitHub Bot commented on SCM-807:
michael-o commented on code in PR #152:
URL: https://github.com/apache/maven-scm/pull/152#discussion_r925371845
##
maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/JGitUtils.java:
##
@@ -328,15 +356,20 @@ public static List addAllFiles( Git git,
ScmFileSet fileSet )
// rewrite all detected files to now have status 'checked_in'
for ( String entry : allInIndex )
{
-ScmFile scmfile = new ScmFile( entry, ScmFileStatus.ADDED );
-
// if a specific fileSet is given, we have to check if the file is
// really tracked
-for ( Iterator itfl = fileSet.getFileList().iterator();
itfl.hasNext(); )
+for ( File file : fileSet.getFileList() )
{
-String path = FilenameUtils.normalizeFilename( relativize(
baseUri, itfl.next() ) );
-if ( path.equals( FilenameUtils.normalizeFilename(
scmfile.getPath() ) ) )
+if ( !file.isAbsolute() )
+{
+file = new File( fileSet.getBasedir().getPath(),
file.getPath() );
Review Comment:
Why not retain basedir als `File`?
> JGit impl check-in fails unless the Maven project is in the working copy root
> -
>
> Key: SCM-807
> URL: https://issues.apache.org/jira/browse/SCM-807
> Project: Maven SCM
> Issue Type: Bug
> Components: maven-scm-provider-gitexe
>Affects Versions: 1.9.4
>Reporter: Richard DiCroce
>Assignee: Michael Osipov
>Priority: Major
> Fix For: 2.0.0-M2
>
> Attachments: scm-807.txt
>
>
> Another problem exposed by maven-release-plugin: the JGit SCM
> implementation's check-in fails unless the Maven project is in the working
> copy root because it confuses the working copy's location with the Maven
> project's location.
> The attached patch resolves the issue. Combined with the patch attached to
> SCM-806, release:prepare now mostly succeeds with the JGit implementation.
> There is still a problem with the POM not being transformed correctly, but
> that's a problem in maven-release-plugin.
--
This message was sent by Atlassian Jira
(v8.20.10#820010)
[jira] [Commented] (SCM-807) JGit impl check-in fails unless the Maven project is in the working copy root
[
https://issues.apache.org/jira/browse/SCM-807?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17568952#comment-17568952
]
ASF GitHub Bot commented on SCM-807:
michael-o commented on code in PR #152:
URL: https://github.com/apache/maven-scm/pull/152#discussion_r925371106
##
maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/JGitUtils.java:
##
@@ -308,7 +336,7 @@ public static List addAllFiles( Git git,
ScmFileSet fileSet )
if ( file.exists() )
{
-String path = relativize( baseUri, file );
Review Comment:
This, I don't understand. It returns the path from the URI which will always
be forward slash. By normalize?
> JGit impl check-in fails unless the Maven project is in the working copy root
> -
>
> Key: SCM-807
> URL: https://issues.apache.org/jira/browse/SCM-807
> Project: Maven SCM
> Issue Type: Bug
> Components: maven-scm-provider-gitexe
>Affects Versions: 1.9.4
>Reporter: Richard DiCroce
>Assignee: Michael Osipov
>Priority: Major
> Fix For: 2.0.0-M2
>
> Attachments: scm-807.txt
>
>
> Another problem exposed by maven-release-plugin: the JGit SCM
> implementation's check-in fails unless the Maven project is in the working
> copy root because it confuses the working copy's location with the Maven
> project's location.
> The attached patch resolves the issue. Combined with the patch attached to
> SCM-806, release:prepare now mostly succeeds with the JGit implementation.
> There is still a problem with the POM not being transformed correctly, but
> that's a problem in maven-release-plugin.
--
This message was sent by Atlassian Jira
(v8.20.10#820010)
[jira] [Commented] (SCM-807) JGit impl check-in fails unless the Maven project is in the working copy root
[
https://issues.apache.org/jira/browse/SCM-807?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17568941#comment-17568941
]
ASF GitHub Bot commented on SCM-807:
michael-o commented on code in PR #152:
URL: https://github.com/apache/maven-scm/pull/152#discussion_r925347105
##
maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/JGitUtils.java:
##
@@ -308,7 +336,7 @@ public static List addAllFiles( Git git,
ScmFileSet fileSet )
if ( file.exists() )
{
-String path = relativize( baseUri, file );
Review Comment:
Interesting, this isn't enforced upto the `PathFilter`. Maybe this should be
done in relativize directly...
> JGit impl check-in fails unless the Maven project is in the working copy root
> -
>
> Key: SCM-807
> URL: https://issues.apache.org/jira/browse/SCM-807
> Project: Maven SCM
> Issue Type: Bug
> Components: maven-scm-provider-gitexe
>Affects Versions: 1.9.4
>Reporter: Richard DiCroce
>Priority: Major
> Attachments: scm-807.txt
>
>
> Another problem exposed by maven-release-plugin: the JGit SCM
> implementation's check-in fails unless the Maven project is in the working
> copy root because it confuses the working copy's location with the Maven
> project's location.
> The attached patch resolves the issue. Combined with the patch attached to
> SCM-806, release:prepare now mostly succeeds with the JGit implementation.
> There is still a problem with the POM not being transformed correctly, but
> that's a problem in maven-release-plugin.
--
This message was sent by Atlassian Jira
(v8.20.10#820010)
[jira] [Commented] (SCM-807) JGit impl check-in fails unless the Maven project is in the working copy root
[
https://issues.apache.org/jira/browse/SCM-807?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17568936#comment-17568936
]
ASF GitHub Bot commented on SCM-807:
kwin commented on code in PR #152:
URL: https://github.com/apache/maven-scm/pull/152#discussion_r925338741
##
maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/JGitUtils.java:
##
@@ -308,7 +336,7 @@ public static List addAllFiles( Git git,
ScmFileSet fileSet )
if ( file.exists() )
{
-String path = relativize( baseUri, file );
Review Comment:
No, all JGit commands take relative repo paths with forward slashes
(independent of OS/FS)
(https://archive.eclipse.org/jgit/site/4.6.0.201612231935-r/apidocs/org/eclipse/jgit/api/AddCommand.html#addFilepattern-java.lang.String-)
> JGit impl check-in fails unless the Maven project is in the working copy root
> -
>
> Key: SCM-807
> URL: https://issues.apache.org/jira/browse/SCM-807
> Project: Maven SCM
> Issue Type: Bug
> Components: maven-scm-provider-gitexe
>Affects Versions: 1.9.4
>Reporter: Richard DiCroce
>Priority: Major
> Attachments: scm-807.txt
>
>
> Another problem exposed by maven-release-plugin: the JGit SCM
> implementation's check-in fails unless the Maven project is in the working
> copy root because it confuses the working copy's location with the Maven
> project's location.
> The attached patch resolves the issue. Combined with the patch attached to
> SCM-806, release:prepare now mostly succeeds with the JGit implementation.
> There is still a problem with the POM not being transformed correctly, but
> that's a problem in maven-release-plugin.
--
This message was sent by Atlassian Jira
(v8.20.10#820010)
[jira] [Commented] (SCM-807) JGit impl check-in fails unless the Maven project is in the working copy root
[
https://issues.apache.org/jira/browse/SCM-807?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17568934#comment-17568934
]
ASF GitHub Bot commented on SCM-807:
michael-o commented on code in PR #152:
URL: https://github.com/apache/maven-scm/pull/152#discussion_r925337193
##
maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/JGitUtils.java:
##
@@ -308,7 +336,7 @@ public static List addAllFiles( Git git,
ScmFileSet fileSet )
if ( file.exists() )
{
-String path = relativize( baseUri, file );
Review Comment:
You mean to normalize to FS path separators?
> JGit impl check-in fails unless the Maven project is in the working copy root
> -
>
> Key: SCM-807
> URL: https://issues.apache.org/jira/browse/SCM-807
> Project: Maven SCM
> Issue Type: Bug
> Components: maven-scm-provider-gitexe
>Affects Versions: 1.9.4
>Reporter: Richard DiCroce
>Priority: Major
> Attachments: scm-807.txt
>
>
> Another problem exposed by maven-release-plugin: the JGit SCM
> implementation's check-in fails unless the Maven project is in the working
> copy root because it confuses the working copy's location with the Maven
> project's location.
> The attached patch resolves the issue. Combined with the patch attached to
> SCM-806, release:prepare now mostly succeeds with the JGit implementation.
> There is still a problem with the POM not being transformed correctly, but
> that's a problem in maven-release-plugin.
--
This message was sent by Atlassian Jira
(v8.20.10#820010)
[jira] [Commented] (SCM-807) JGit impl check-in fails unless the Maven project is in the working copy root
[
https://issues.apache.org/jira/browse/SCM-807?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17568875#comment-17568875
]
ASF GitHub Bot commented on SCM-807:
kwin commented on code in PR #152:
URL: https://github.com/apache/maven-scm/pull/152#discussion_r925226795
##
maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/JGitUtils.java:
##
@@ -308,7 +336,7 @@ public static List addAllFiles( Git git,
ScmFileSet fileSet )
if ( file.exists() )
{
-String path = relativize( baseUri, file );
Review Comment:
this needs to have normalized backslashes
> JGit impl check-in fails unless the Maven project is in the working copy root
> -
>
> Key: SCM-807
> URL: https://issues.apache.org/jira/browse/SCM-807
> Project: Maven SCM
> Issue Type: Bug
> Components: maven-scm-provider-gitexe
>Affects Versions: 1.9.4
>Reporter: Richard DiCroce
>Priority: Major
> Attachments: scm-807.txt
>
>
> Another problem exposed by maven-release-plugin: the JGit SCM
> implementation's check-in fails unless the Maven project is in the working
> copy root because it confuses the working copy's location with the Maven
> project's location.
> The attached patch resolves the issue. Combined with the patch attached to
> SCM-806, release:prepare now mostly succeeds with the JGit implementation.
> There is still a problem with the POM not being transformed correctly, but
> that's a problem in maven-release-plugin.
--
This message was sent by Atlassian Jira
(v8.20.10#820010)
[jira] [Commented] (SCM-807) JGit impl check-in fails unless the Maven project is in the working copy root
[
https://issues.apache.org/jira/browse/SCM-807?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17568873#comment-17568873
]
ASF GitHub Bot commented on SCM-807:
kwin commented on code in PR #152:
URL: https://github.com/apache/maven-scm/pull/152#discussion_r925226522
##
maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/JGitUtils.java:
##
@@ -308,7 +336,7 @@ public static List addAllFiles( Git git,
ScmFileSet fileSet )
if ( file.exists() )
{
-String path = relativize( baseUri, file );
+String path = relativize( workingCopyRootUri, file );
add.addFilepattern( path );
add.addFilepattern( file.getAbsolutePath() );
Review Comment:
this can be removed
> JGit impl check-in fails unless the Maven project is in the working copy root
> -
>
> Key: SCM-807
> URL: https://issues.apache.org/jira/browse/SCM-807
> Project: Maven SCM
> Issue Type: Bug
> Components: maven-scm-provider-gitexe
>Affects Versions: 1.9.4
>Reporter: Richard DiCroce
>Priority: Major
> Attachments: scm-807.txt
>
>
> Another problem exposed by maven-release-plugin: the JGit SCM
> implementation's check-in fails unless the Maven project is in the working
> copy root because it confuses the working copy's location with the Maven
> project's location.
> The attached patch resolves the issue. Combined with the patch attached to
> SCM-806, release:prepare now mostly succeeds with the JGit implementation.
> There is still a problem with the POM not being transformed correctly, but
> that's a problem in maven-release-plugin.
--
This message was sent by Atlassian Jira
(v8.20.10#820010)
[jira] [Commented] (SCM-807) JGit impl check-in fails unless the Maven project is in the working copy root
[ https://issues.apache.org/jira/browse/SCM-807?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17563915#comment-17563915 ] ASF GitHub Bot commented on SCM-807: kwin commented on PR #152: URL: https://github.com/apache/maven-scm/pull/152#issuecomment-1178024189 I only added a test for `ScmManager.add(...)` and `ScmManager.checkIn(...)`. All other `ScmManager` methods which return file paths and take a `ScmFileSet` should be checked as well. They should IMHO all behave the same (either all always relative to the working copy root or all relative to the passed `ScmFileSet.getBasedir()`) > JGit impl check-in fails unless the Maven project is in the working copy root > - > > Key: SCM-807 > URL: https://issues.apache.org/jira/browse/SCM-807 > Project: Maven SCM > Issue Type: Bug > Components: maven-scm-provider-gitexe >Affects Versions: 1.9.4 >Reporter: Richard DiCroce >Priority: Major > Attachments: scm-807.txt > > > Another problem exposed by maven-release-plugin: the JGit SCM > implementation's check-in fails unless the Maven project is in the working > copy root because it confuses the working copy's location with the Maven > project's location. > The attached patch resolves the issue. Combined with the patch attached to > SCM-806, release:prepare now mostly succeeds with the JGit implementation. > There is still a problem with the POM not being transformed correctly, but > that's a problem in maven-release-plugin. -- This message was sent by Atlassian Jira (v8.20.10#820010)
[jira] [Commented] (SCM-807) JGit impl check-in fails unless the Maven project is in the working copy root
[ https://issues.apache.org/jira/browse/SCM-807?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17563913#comment-17563913 ] ASF GitHub Bot commented on SCM-807: michael-o commented on PR #152: URL: https://github.com/apache/maven-scm/pull/152#issuecomment-1178013993 Will do and I cross check with Maven Release, but that needs to be upgraded first. See my PR discussions with @nielsbasjes . > JGit impl check-in fails unless the Maven project is in the working copy root > - > > Key: SCM-807 > URL: https://issues.apache.org/jira/browse/SCM-807 > Project: Maven SCM > Issue Type: Bug > Components: maven-scm-provider-gitexe >Affects Versions: 1.9.4 >Reporter: Richard DiCroce >Priority: Major > Attachments: scm-807.txt > > > Another problem exposed by maven-release-plugin: the JGit SCM > implementation's check-in fails unless the Maven project is in the working > copy root because it confuses the working copy's location with the Maven > project's location. > The attached patch resolves the issue. Combined with the patch attached to > SCM-806, release:prepare now mostly succeeds with the JGit implementation. > There is still a problem with the POM not being transformed correctly, but > that's a problem in maven-release-plugin. -- This message was sent by Atlassian Jira (v8.20.10#820010)
[jira] [Commented] (SCM-807) JGit impl check-in fails unless the Maven project is in the working copy root
[ https://issues.apache.org/jira/browse/SCM-807?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17563911#comment-17563911 ] ASF GitHub Bot commented on SCM-807: kwin commented on PR #152: URL: https://github.com/apache/maven-scm/pull/152#issuecomment-1178010241 @michael-o Please have a look, I am not sure whether it is correct that add and checkin should both return paths which are relative to the basedir of the passed FileSet. I had to disable the provider `local` as that one is also not returning correct relative path names. > JGit impl check-in fails unless the Maven project is in the working copy root > - > > Key: SCM-807 > URL: https://issues.apache.org/jira/browse/SCM-807 > Project: Maven SCM > Issue Type: Bug > Components: maven-scm-provider-gitexe >Affects Versions: 1.9.4 >Reporter: Richard DiCroce >Priority: Major > Attachments: scm-807.txt > > > Another problem exposed by maven-release-plugin: the JGit SCM > implementation's check-in fails unless the Maven project is in the working > copy root because it confuses the working copy's location with the Maven > project's location. > The attached patch resolves the issue. Combined with the patch attached to > SCM-806, release:prepare now mostly succeeds with the JGit implementation. > There is still a problem with the POM not being transformed correctly, but > that's a problem in maven-release-plugin. -- This message was sent by Atlassian Jira (v8.20.10#820010)
[jira] [Commented] (SCM-807) JGit impl check-in fails unless the Maven project is in the working copy root
[ https://issues.apache.org/jira/browse/SCM-807?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16729959#comment-16729959 ] Michael Osipov commented on SCM-807: Still waiting for answers... > JGit impl check-in fails unless the Maven project is in the working copy root > - > > Key: SCM-807 > URL: https://issues.apache.org/jira/browse/SCM-807 > Project: Maven SCM > Issue Type: Bug > Components: maven-scm-provider-gitexe >Affects Versions: 1.9.4 >Reporter: Richard DiCroce >Priority: Major > Fix For: waiting-for-feedback > > Attachments: scm-807.txt > > > Another problem exposed by maven-release-plugin: the JGit SCM > implementation's check-in fails unless the Maven project is in the working > copy root because it confuses the working copy's location with the Maven > project's location. > The attached patch resolves the issue. Combined with the patch attached to > SCM-806, release:prepare now mostly succeeds with the JGit implementation. > There is still a problem with the POM not being transformed correctly, but > that's a problem in maven-release-plugin. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (SCM-807) JGit impl check-in fails unless the Maven project is in the working copy root
[ https://issues.apache.org/jira/browse/SCM-807?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16598370#comment-16598370 ] Michael Osipov commented on SCM-807: Can someone provide a sample? I'd like to reproduce first and then apply the patch. > JGit impl check-in fails unless the Maven project is in the working copy root > - > > Key: SCM-807 > URL: https://issues.apache.org/jira/browse/SCM-807 > Project: Maven SCM > Issue Type: Bug > Components: maven-scm-provider-gitexe >Affects Versions: 1.9.4 >Reporter: Richard DiCroce >Priority: Major > Attachments: scm-807.txt > > > Another problem exposed by maven-release-plugin: the JGit SCM > implementation's check-in fails unless the Maven project is in the working > copy root because it confuses the working copy's location with the Maven > project's location. > The attached patch resolves the issue. Combined with the patch attached to > SCM-806, release:prepare now mostly succeeds with the JGit implementation. > There is still a problem with the POM not being transformed correctly, but > that's a problem in maven-release-plugin. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (SCM-807) JGit impl check-in fails unless the Maven project is in the working copy root
[ https://issues.apache.org/jira/browse/SCM-807?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16598362#comment-16598362 ] Michael Osipov commented on SCM-807: Does this patch apply cleanly? > JGit impl check-in fails unless the Maven project is in the working copy root > - > > Key: SCM-807 > URL: https://issues.apache.org/jira/browse/SCM-807 > Project: Maven SCM > Issue Type: Bug > Components: maven-scm-provider-gitexe >Affects Versions: 1.9.4 >Reporter: Richard DiCroce >Priority: Major > Attachments: scm-807.txt > > > Another problem exposed by maven-release-plugin: the JGit SCM > implementation's check-in fails unless the Maven project is in the working > copy root because it confuses the working copy's location with the Maven > project's location. > The attached patch resolves the issue. Combined with the patch attached to > SCM-806, release:prepare now mostly succeeds with the JGit implementation. > There is still a problem with the POM not being transformed correctly, but > that's a problem in maven-release-plugin. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (SCM-807) JGit impl check-in fails unless the Maven project is in the working copy root
[ https://issues.apache.org/jira/browse/SCM-807?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16598342#comment-16598342 ] Konrad Windszus commented on SCM-807: - Ping: Could someone look at this maybe. At least for me the fix works fine. > JGit impl check-in fails unless the Maven project is in the working copy root > - > > Key: SCM-807 > URL: https://issues.apache.org/jira/browse/SCM-807 > Project: Maven SCM > Issue Type: Bug > Components: maven-scm-provider-gitexe >Affects Versions: 1.9.4 >Reporter: Richard DiCroce >Priority: Major > Attachments: scm-807.txt > > > Another problem exposed by maven-release-plugin: the JGit SCM > implementation's check-in fails unless the Maven project is in the working > copy root because it confuses the working copy's location with the Maven > project's location. > The attached patch resolves the issue. Combined with the patch attached to > SCM-806, release:prepare now mostly succeeds with the JGit implementation. > There is still a problem with the POM not being transformed correctly, but > that's a problem in maven-release-plugin. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (SCM-807) JGit impl check-in fails unless the Maven project is in the working copy root
[
https://issues.apache.org/jira/browse/SCM-807?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15991436#comment-15991436
]
Richard DiCroce commented on SCM-807:
-
It's been quite a while now since I wrote this patch, but if memory serves,
that block of code was there to sort out which files are actually tracked by
Git in order to filter the list of returned files so that it only contains
files that were really added instead of ALL files in that directory (and
subdirectories). That is now handled by the block of code I added above the
loop, right under the comment {code}// we may have tried to add files covered
by .gitignore (so they weren't actually added){code}
> JGit impl check-in fails unless the Maven project is in the working copy root
> -
>
> Key: SCM-807
> URL: https://issues.apache.org/jira/browse/SCM-807
> Project: Maven SCM
> Issue Type: Bug
> Components: maven-scm-provider-gitexe
>Affects Versions: 1.9.4
>Reporter: Richard DiCroce
> Attachments: scm-807.txt
>
>
> Another problem exposed by maven-release-plugin: the JGit SCM
> implementation's check-in fails unless the Maven project is in the working
> copy root because it confuses the working copy's location with the Maven
> project's location.
> The attached patch resolves the issue. Combined with the patch attached to
> SCM-806, release:prepare now mostly succeeds with the JGit implementation.
> There is still a problem with the POM not being transformed correctly, but
> that's a problem in maven-release-plugin.
--
This message was sent by Atlassian JIRA
(v6.3.15#6346)
[jira] [Commented] (SCM-807) JGit impl check-in fails unless the Maven project is in the working copy root
[
https://issues.apache.org/jira/browse/SCM-807?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15991214#comment-15991214
]
Robert Scholte commented on SCM-807:
Having unittests would indeed help.
And I'm a bit woried about the complete removal of the last block with the
comment: {{// if a specific fileSet is given, we have to check if the file is
really tracked}}. Not familiar with that piece of code, so can't say if it can
be removed safely.
> JGit impl check-in fails unless the Maven project is in the working copy root
> -
>
> Key: SCM-807
> URL: https://issues.apache.org/jira/browse/SCM-807
> Project: Maven SCM
> Issue Type: Bug
> Components: maven-scm-provider-gitexe
>Affects Versions: 1.9.4
>Reporter: Richard DiCroce
> Attachments: scm-807.txt
>
>
> Another problem exposed by maven-release-plugin: the JGit SCM
> implementation's check-in fails unless the Maven project is in the working
> copy root because it confuses the working copy's location with the Maven
> project's location.
> The attached patch resolves the issue. Combined with the patch attached to
> SCM-806, release:prepare now mostly succeeds with the JGit implementation.
> There is still a problem with the POM not being transformed correctly, but
> that's a problem in maven-release-plugin.
--
This message was sent by Atlassian JIRA
(v6.3.15#6346)
[jira] [Commented] (SCM-807) JGit impl check-in fails unless the Maven project is in the working copy root
[ https://issues.apache.org/jira/browse/SCM-807?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15989854#comment-15989854 ] Konrad Windszus commented on SCM-807: - This patch works for me and fixes the issue described in SCM-845. Does anything speaks against committing it (except that there is no test for it)? > JGit impl check-in fails unless the Maven project is in the working copy root > - > > Key: SCM-807 > URL: https://issues.apache.org/jira/browse/SCM-807 > Project: Maven SCM > Issue Type: Bug > Components: maven-scm-provider-gitexe >Affects Versions: 1.9.4 >Reporter: Richard DiCroce > Attachments: scm-807.txt > > > Another problem exposed by maven-release-plugin: the JGit SCM > implementation's check-in fails unless the Maven project is in the working > copy root because it confuses the working copy's location with the Maven > project's location. > The attached patch resolves the issue. Combined with the patch attached to > SCM-806, release:prepare now mostly succeeds with the JGit implementation. > There is still a problem with the POM not being transformed correctly, but > that's a problem in maven-release-plugin. -- This message was sent by Atlassian JIRA (v6.3.15#6346)
[jira] [Commented] (SCM-807) JGit impl check-in fails unless the Maven project is in the working copy root
[ https://issues.apache.org/jira/browse/SCM-807?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15308731#comment-15308731 ] Richard DiCroce commented on SCM-807: - It's been 7.5 months since I submitted the patch, so my memory is a bit foggy here. But if I'm reading the patch correctly, there is still a call to AddCommand#addFilepattern(String) in the loop, passing a path relative to the repository root. IIRC there were two calls to addFilepattern, but JGit only works on paths relative to the repository root, so the second call to addFilepattern using an absolute path is completely pointless. Hence the reason I removed it. > JGit impl check-in fails unless the Maven project is in the working copy root > - > > Key: SCM-807 > URL: https://issues.apache.org/jira/browse/SCM-807 > Project: Maven SCM > Issue Type: Bug > Components: maven-scm-provider-git >Affects Versions: 1.9.4 >Reporter: Richard DiCroce > Attachments: scm-807.txt > > > Another problem exposed by maven-release-plugin: the JGit SCM > implementation's check-in fails unless the Maven project is in the working > copy root because it confuses the working copy's location with the Maven > project's location. > The attached patch resolves the issue. Combined with the patch attached to > SCM-806, release:prepare now mostly succeeds with the JGit implementation. > There is still a problem with the POM not being transformed correctly, but > that's a problem in maven-release-plugin. -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[jira] [Commented] (SCM-807) JGit impl check-in fails unless the Maven project is in the working copy root
[
https://issues.apache.org/jira/browse/SCM-807?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15306967#comment-15306967
]
Robert Scholte commented on SCM-807:
Looks to me like the {{add.call()}} now simply adds all files instead of
respecting the filepatterns. I don't think that's correct.
> JGit impl check-in fails unless the Maven project is in the working copy root
> -
>
> Key: SCM-807
> URL: https://issues.apache.org/jira/browse/SCM-807
> Project: Maven SCM
> Issue Type: Bug
> Components: maven-scm-provider-git
>Affects Versions: 1.9.4
>Reporter: Richard DiCroce
> Attachments: scm-807.txt
>
>
> Another problem exposed by maven-release-plugin: the JGit SCM
> implementation's check-in fails unless the Maven project is in the working
> copy root because it confuses the working copy's location with the Maven
> project's location.
> The attached patch resolves the issue. Combined with the patch attached to
> SCM-806, release:prepare now mostly succeeds with the JGit implementation.
> There is still a problem with the POM not being transformed correctly, but
> that's a problem in maven-release-plugin.
--
This message was sent by Atlassian JIRA
(v6.3.4#6332)
