You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2013/01/03 18:55:07 UTC
git commit: [SCM-709] Improve regular expression for 'renamed'
matching
Updated Branches:
refs/heads/master 1bb2d4faf -> fa8674cc6
[SCM-709] Improve regular expression for 'renamed' matching
Project: http://git-wip-us.apache.org/repos/asf/maven-scm/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-scm/commit/fa8674cc
Tree: http://git-wip-us.apache.org/repos/asf/maven-scm/tree/fa8674cc
Diff: http://git-wip-us.apache.org/repos/asf/maven-scm/diff/fa8674cc
Branch: refs/heads/master
Commit: fa8674cc620c8253c03e8113da68814e03938464
Parents: 1bb2d4f
Author: rfscholte <rf...@apache.org>
Authored: Thu Jan 3 18:54:42 2013 +0100
Committer: rfscholte <rf...@apache.org>
Committed: Thu Jan 3 18:54:42 2013 +0100
----------------------------------------------------------------------
.../gitexe/command/status/GitStatusConsumer.java | 6 +++---
.../command/status/GitStatusConsumerTest.java | 2 ++
2 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/fa8674cc/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/status/GitStatusConsumer.java
----------------------------------------------------------------------
diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/status/GitStatusConsumer.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/status/GitStatusConsumer.java
index c696571..d785039 100644
--- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/status/GitStatusConsumer.java
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/status/GitStatusConsumer.java
@@ -56,7 +56,7 @@ public class GitStatusConsumer
/**
* The pattern used to match renamed file lines
*/
- private Pattern renamedRegexp = Pattern.compile( "R (.*) -> (.*)$" );
+ private Pattern renamedRegexp = Pattern.compile( "^R (.*) -> (.*)$" );
private ScmLogger logger;
@@ -115,8 +115,8 @@ public class GitStatusConsumer
else if ( ( matcher = renamedRegexp.matcher( line ) ).find() )
{
status = ScmFileStatus.RENAMED;
- files.add( StringUtils.trim( matcher.group( 1 ) ) );
- files.add( StringUtils.trim( matcher.group( 2 ) ) );
+ files.add( matcher.group( 1 ) );
+ files.add( matcher.group( 2 ) );
logger.debug( "RENAMED status for line '" + line + "' files added '" + matcher.group( 1 ) + "' '"
+ matcher.group( 2 ) );
}
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/fa8674cc/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/status/GitStatusConsumerTest.java
----------------------------------------------------------------------
diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/status/GitStatusConsumerTest.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/status/GitStatusConsumerTest.java
index 04d5fda..dab9829 100644
--- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/status/GitStatusConsumerTest.java
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/status/GitStatusConsumerTest.java
@@ -233,6 +233,8 @@ public class GitStatusConsumerTest
assertNotNull( changedFiles );
assertEquals( 2, changedFiles.size() );
+ assertEquals( "OldCapfile", changedFiles.get(0).getPath() );
+ assertEquals( "NewCapFile", changedFiles.get(1).getPath() );
FileUtils.deleteDirectory( dir );
}