You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2018/08/18 23:26:23 UTC
[maven-scm] 02/02: [SCM-628] scm:checkout parsing URL for clone
does not match what is passed in with -DconnectionUrl
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-scm.git
commit ccdfdcaa37dbb30ef11a68734c3f02e0a0bc5e17
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Sun Aug 19 00:58:09 2018 +0200
[SCM-628] scm:checkout parsing URL for clone does not match what is passed in with -DconnectionUrl
Submitted-by: Hubert Sugeng
---
.../scm/provider/hg/repository/HgScmProviderRepository.java | 4 +---
.../provider/hg/repository/HgScmProviderRepositoryTest.java | 10 +++++++++-
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/repository/HgScmProviderRepository.java b/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/repository/HgScmProviderRepository.java
index 5331385..d662a40 100644
--- a/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/repository/HgScmProviderRepository.java
+++ b/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/repository/HgScmProviderRepository.java
@@ -149,20 +149,18 @@ public class HgScmProviderRepository
if ( indexSlash > 0 )
{
hostPort = url.substring( 0, indexSlash );
+ url = url.substring( indexSlash );
}
int indexColon = hostPort.indexOf( ':' );
if ( indexColon > 0 )
{
setHost( hostPort.substring( 0, indexColon ) );
- url = StringUtils.replace( url, getHost(), "" );
setPort( Integer.parseInt( hostPort.substring( indexColon + 1 ) ) );
- url = StringUtils.replace( url, ":" + getPort(), "" );
}
else
{
setHost( hostPort );
- url = StringUtils.replace( url, getHost(), "" );
}
}
diff --git a/maven-scm-providers/maven-scm-provider-hg/src/test/java/org/apache/maven/scm/provider/hg/repository/HgScmProviderRepositoryTest.java b/maven-scm-providers/maven-scm-provider-hg/src/test/java/org/apache/maven/scm/provider/hg/repository/HgScmProviderRepositoryTest.java
index 4928db7..dca9385 100644
--- a/maven-scm-providers/maven-scm-provider-hg/src/test/java/org/apache/maven/scm/provider/hg/repository/HgScmProviderRepositoryTest.java
+++ b/maven-scm-providers/maven-scm-provider-hg/src/test/java/org/apache/maven/scm/provider/hg/repository/HgScmProviderRepositoryTest.java
@@ -105,6 +105,14 @@ public class HgScmProviderRepositoryTest
assertTrue( true );
}
+ public void testHTTPRepoWithHgInUrl()
+ {
+ String url = "http://hg/hg/maven";
+ HgScmProviderRepository repo = new HgScmProviderRepository( url );
+ assertEquals( url, repo.getURI() );
+ assertEquals( null, repo.validateURI() );
+ }
+
/**
* Test SCM-391
*
@@ -146,4 +154,4 @@ public class HgScmProviderRepositoryTest
repo = new HgScmProviderRepository( url );
assertEquals( url, repo.getURI() );
}
-}
\ No newline at end of file
+}