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:21 UTC
[maven-scm] branch master updated (34dcd05 -> ccdfdca)
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/maven-scm.git.
from 34dcd05 [SCM-896] Subversion config file path incorrectly calculated on Windows
new fb4e948 [SCM-745] Perforce blame result parsing too greedy
new ccdfdca [SCM-628] scm:checkout parsing URL for clone does not match what is passed in with -DconnectionUrl
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../scm/provider/hg/repository/HgScmProviderRepository.java | 4 +---
.../provider/hg/repository/HgScmProviderRepositoryTest.java | 10 +++++++++-
.../perforce/command/blame/PerforceFilelogConsumer.java | 2 +-
.../perforce/command/blame/PerforceFilelogConsumerTest.java | 2 ++
.../src/test/resources/perforce/filelog.txt | 2 ++
5 files changed, 15 insertions(+), 5 deletions(-)
[maven-scm] 01/02: [SCM-745] Perforce blame result parsing too
greedy
Posted by mi...@apache.org.
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 fb4e948aff7f21e77fef669e0364ea4e9afb2f2d
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Sun Aug 19 00:46:05 2018 +0200
[SCM-745] Perforce blame result parsing too greedy
Submitted by: Todd Currie
---
.../scm/provider/perforce/command/blame/PerforceFilelogConsumer.java | 2 +-
.../provider/perforce/command/blame/PerforceFilelogConsumerTest.java | 2 ++
.../maven-scm-provider-perforce/src/test/resources/perforce/filelog.txt | 2 ++
3 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/blame/PerforceFilelogConsumer.java b/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/blame/PerforceFilelogConsumer.java
index 3dc364f..c32b100 100644
--- a/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/blame/PerforceFilelogConsumer.java
+++ b/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/blame/PerforceFilelogConsumer.java
@@ -37,7 +37,7 @@ public class PerforceFilelogConsumer
{
private static final String PERFORCE_TIMESTAMP_PATTERN = "yyyy/MM/dd";
- private static final Pattern LINE_PATTERN = Pattern.compile( "#(\\d+).*on (.*) by (.*)@" );
+ private static final Pattern LINE_PATTERN = Pattern.compile( "#(\\d+).*?on (.*?) by (.*?)@" );
private Map<String, Date> dates = new HashMap<String, Date>();
diff --git a/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/blame/PerforceFilelogConsumerTest.java b/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/blame/PerforceFilelogConsumerTest.java
index 46ea345..e9837ef 100644
--- a/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/blame/PerforceFilelogConsumerTest.java
+++ b/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/blame/PerforceFilelogConsumerTest.java
@@ -42,8 +42,10 @@ public class PerforceFilelogConsumerTest
ConsumerUtils.consumeFile( testFile, consumer );
+ Assert.assertEquals( "tom", consumer.getAuthor( "36" ) );
Assert.assertEquals( "earl", consumer.getAuthor( "35" ) );
Assert.assertEquals( "raj", consumer.getAuthor( "34" ) );
+ Assert.assertEquals( "dick", consumer.getAuthor( "32" ) );
}
}
diff --git a/maven-scm-providers/maven-scm-provider-perforce/src/test/resources/perforce/filelog.txt b/maven-scm-providers/maven-scm-provider-perforce/src/test/resources/perforce/filelog.txt
index d291fb0..90dc142 100644
--- a/maven-scm-providers/maven-scm-provider-perforce/src/test/resources/perforce/filelog.txt
+++ b/maven-scm-providers/maven-scm-provider-perforce/src/test/resources/perforce/filelog.txt
@@ -1,4 +1,6 @@
//depot/dev/main/jam/jam.c
+... #36 change 789 edit on 2001/12/13 by tom@tom-dev-yew (text) 'Handle @ symbols in description'
... #35 change 627 edit on 2001/11/13 by earl@earl-dev-yew (text) 'Handle platform variants better'
... #34 change 598 edit on 2001/10/24 by raj@raj-althea (text) 'Reverse previous attempt at fix'
... #33 change 581 edit on 2001/10/03 by gale@gale-jam-oak (text) 'Version strings & release notes'
+... #32 change 432 edit on 2001/09/03 by dick@dick-pine (text) 'Merge in change on 2001/08/27 by jim@nowhere.com'
[maven-scm] 02/02: [SCM-628] scm:checkout parsing URL for clone
does not match what is passed in with -DconnectionUrl
Posted by mi...@apache.org.
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
+}