svn commit: r684423 - /maven/scm/trunk/maven-scm-site/
Author: olamy Date: Sun Aug 10 01:58:11 2008 New Revision: 684423 URL: http://svn.apache.org/viewvc?rev=684423&view=rev Log: ignore eclipse file Modified: maven/scm/trunk/maven-scm-site/ (props changed) Propchange: maven/scm/trunk/maven-scm-site/ -- --- svn:ignore (original) +++ svn:ignore Sun Aug 10 01:58:11 2008 @@ -1 +1,2 @@ target +.project
svn commit: r684432 - in /maven/scm/trunk/maven-scm-site/src/site: apt/accurev.apt apt/git.apt apt/scms-overview.apt site.xml
Author: olamy
Date: Sun Aug 10 02:35:21 2008
New Revision: 684432
URL: http://svn.apache.org/viewvc?rev=684432&view=rev
Log:
start documentation on git support
add blank page for accurev support (I don't know this one :-) )
Added:
maven/scm/trunk/maven-scm-site/src/site/apt/accurev.apt (with props)
maven/scm/trunk/maven-scm-site/src/site/apt/git.apt (with props)
Modified:
maven/scm/trunk/maven-scm-site/src/site/apt/scms-overview.apt
maven/scm/trunk/maven-scm-site/src/site/site.xml
Added: maven/scm/trunk/maven-scm-site/src/site/apt/accurev.apt
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-site/src/site/apt/accurev.apt?rev=684432&view=auto
==
--- maven/scm/trunk/maven-scm-site/src/site/apt/accurev.apt (added)
+++ maven/scm/trunk/maven-scm-site/src/site/apt/accurev.apt Sun Aug 10 02:35:21
2008
@@ -0,0 +1,19 @@
+ --
+ SCM Implementation: Accurev
+ --
+ Olivier Lamy
+ --
+ 2008-08-10
+ --
+
+SCM Implementation: Accurev
+
+* General Info
+
+Link : {{http://www.accurev.com//}}
+
+License : Commercial
+
+* SCM Url
+
+TO COMPLETE
\ No newline at end of file
Propchange: maven/scm/trunk/maven-scm-site/src/site/apt/accurev.apt
--
svn:eol-style = native
Propchange: maven/scm/trunk/maven-scm-site/src/site/apt/accurev.apt
--
svn:keywords = "Author Date Id Revision"
Added: maven/scm/trunk/maven-scm-site/src/site/apt/git.apt
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-site/src/site/apt/git.apt?rev=684432&view=auto
==
--- maven/scm/trunk/maven-scm-site/src/site/apt/git.apt (added)
+++ maven/scm/trunk/maven-scm-site/src/site/apt/git.apt Sun Aug 10 02:35:21 2008
@@ -0,0 +1,49 @@
+ --
+ SCM Implementation: Git
+ --
+ Olivier Lamy
+ --
+ 2008-08-10
+ --
+
+SCM Implementation: Git
+
+* General Info
+
+Link : {{http://git-scm.com/}}
+
+License : GNU General Public License v2
+
+* SCM Url
+
+For all URLs below, we use a colon (:) as separator. If you use a colon
for one of the variables (e.g. a windows path), then use a pipe (|) as
separator.
+
+---
+scm:git:git://server_name[:port]/path_to_repository
+scm:git:http://server_name[:port]/path_to_repository
+scm:git:https://server_name[:port]/path_to_repository
+scm:git:ssh://server_name[:port]/path_to_repository
+scm:git:file://[hostname]/path_to_repository
+---
+
+* Examples
+
+---
+scm:git:git://github.com/path_to_repository
+scm:git:http://github.com/path_to_repository
+scm:git:https://github.com/path_to_repository
+scm:git:ssh://github.com/path_to_repository
+scm:git:file://localhost/path_to_repository
+---
+
+* Provider Configuration
+
+ The provider configuration is defined in ${user.home}/.scm/git-settings.xml.
+
+---
+
+
+ false
+
+---
+
Propchange: maven/scm/trunk/maven-scm-site/src/site/apt/git.apt
--
svn:eol-style = native
Propchange: maven/scm/trunk/maven-scm-site/src/site/apt/git.apt
--
svn:keywords = "Author Date Id Revision"
Modified: maven/scm/trunk/maven-scm-site/src/site/apt/scms-overview.apt
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-site/src/site/apt/scms-overview.apt?rev=684432&r1=684431&r2=684432&view=diff
==
--- maven/scm/trunk/maven-scm-site/src/site/apt/scms-overview.apt (original)
+++ maven/scm/trunk/maven-scm-site/src/site/apt/scms-overview.apt Sun Aug 10
02:35:21 2008
@@ -28,7 +28,11 @@
* Partially implemented SCM's
+ * {{{accurev.html}Accurev}}
+
* {{{clearcase.html}ClearCase}}
+
+ * {{{git.html}Git}}
* {{{local.html}File system}}
@@ -38,8 +42,6 @@
This is a list of all the known SCM's that are not implemented currently.
- * Accurev
-
* Aegis
* Arch
Modified: maven/scm/trunk/maven-scm-site/src/site/site.xml
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-site/src/site/site.xml?rev=684432&r1=684431&r2=684432&view=diff
==
--- maven/scm/trunk/maven-scm-site/src/site/site.xml (original)
+++ maven/scm/trunk/maven-scm-site/src/site/site.xml Sun Aug 10 02:35:21 2008
@@ -47,11 +47,13 @@
+
+
svn commit: r684464 - in /maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src: main/java/org/apache/maven/scm/provider/git/gitexe/ main/java/org/apache/maven/scm/
Author: olamy
Date: Sun Aug 10 04:35:16 2008
New Revision: 684464
URL: http://svn.apache.org/viewvc?rev=684464&view=rev
Log:
[SCM-396] git provider implements scm update
start implementation (TODO finish correct implementation of ScmFileStatus)
Added:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/update/
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/update/GitUpdateCommand.java
(with props)
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/update/GitUpdateCommandConsumer.java
(with props)
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/update/
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/update/GitUpdateCommandConsumerTest.java
(with props)
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/resources/git/update/
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/resources/git/update/git-update-add-delete.out
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/resources/git/update/git-update-one-other-format.out
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/resources/git/update/git-update-one.out
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/resources/git/update/git-update-up-to-date.out
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/resources/git/update/git-update.out
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/GitExeScmProvider.java
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/GitExeScmProvider.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/GitExeScmProvider.java?rev=684464&r1=684463&r2=684464&view=diff
==
---
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/GitExeScmProvider.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/GitExeScmProvider.java
Sun Aug 10 04:35:16 2008
@@ -34,6 +34,7 @@
import
org.apache.maven.scm.provider.git.gitexe.command.remove.GitRemoveCommand;
import
org.apache.maven.scm.provider.git.gitexe.command.status.GitStatusCommand;
import org.apache.maven.scm.provider.git.gitexe.command.tag.GitTagCommand;
+import
org.apache.maven.scm.provider.git.gitexe.command.update.GitUpdateCommand;
import org.apache.maven.scm.repository.ScmRepositoryException;
import java.io.File;
@@ -98,7 +99,7 @@
protected GitCommand getUpdateCommand()
{
-return null; //X TODO
+return new GitUpdateCommand();
}
protected GitCommand getListCommand()
Added:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/update/GitUpdateCommand.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/update/GitUpdateCommand.java?rev=684464&view=auto
==
---
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/update/GitUpdateCommand.java
(added)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/update/GitUpdateCommand.java
Sun Aug 10 04:35:16 2008
@@ -0,0 +1,85 @@
+package org.apache.maven.scm.provider.git.gitexe.command.update;
+
+import java.util.Collections;
+
+import org.apache.maven.scm.ScmException;
+import org.apache.maven.scm.ScmFileSet;
+import org.apache.maven.scm.ScmVersion;
+import org.apache.maven.scm.command.changelog.ChangeLogCommand;
+import org.apache.maven.scm.command.update.AbstractUpdateCommand;
+imp
svn commit: r684588 - in /maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons: ./ src/test/java/org/apache/maven/scm/provider/git/command/diff/ src/test/resource
Author: olamy
Date: Sun Aug 10 13:51:41 2008
New Revision: 684588
URL: http://svn.apache.org/viewvc?rev=684588&view=rev
Log:
[SCM-374] maven-scm-providers-git is missing some testdata
add unit tests for the git diff consumer
Added:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/test/resources/git/diff/git-diff-empty.log
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/test/resources/git/diff/git-diff1.log
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/test/resources/git/diff/git-diff2.log
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/pom.xml
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/test/java/org/apache/maven/scm/provider/git/command/diff/GitDiffConsumerTest.java
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/pom.xml
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/pom.xml?rev=684588&r1=684587&r2=684588&view=diff
==
---
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/pom.xml
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/pom.xml
Sun Aug 10 13:51:41 2008
@@ -37,14 +37,6 @@
-maven-surefire-plugin
-
-
-**/GitDiffConsumerTest.*
-
-
-
-
org.codehaus.modello
modello-maven-plugin
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/test/java/org/apache/maven/scm/provider/git/command/diff/GitDiffConsumerTest.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/test/java/org/apache/maven/scm/provider/git/command/diff/GitDiffConsumerTest.java?rev=684588&r1=684587&r2=684588&view=diff
==
---
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/test/java/org/apache/maven/scm/provider/git/command/diff/GitDiffConsumerTest.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/test/java/org/apache/maven/scm/provider/git/command/diff/GitDiffConsumerTest.java
Sun Aug 10 13:51:41 2008
@@ -38,7 +38,7 @@
{
public void testEmptyLogConsumer()
-throws Exception
+throws Exception
{
GitDiffConsumer consumer = new GitDiffConsumer( new DefaultLog(), null
);
@@ -54,12 +54,12 @@
}
List changedFiles = consumer.getChangedFiles();
-
+
assertEquals( 0, changedFiles.size() );
- }
+}
public void testLog1Consumer()
-throws Exception
+throws Exception
{
GitDiffConsumer consumer = new GitDiffConsumer( new DefaultLog(), null
);
@@ -75,21 +75,21 @@
}
List changedFiles = consumer.getChangedFiles();
-
+
assertEquals( 1, changedFiles.size() );
-testScmFile( (ScmFile) changedFiles.get( 0 ), "readme.txt" ,
ScmFileStatus.MODIFIED );
-
+testScmFile( (ScmFile) changedFiles.get( 0 ), "olamy.test",
ScmFileStatus.MODIFIED );
+
Map differences = consumer.getDifferences();
assertNotNull( differences );
-
-StringBuffer readmeDiffs = (StringBuffer) differences.get(
"readme.txt" );
+
+StringBuffer readmeDiffs = (StringBuffer) differences.get(
"olamy.test" );
assertNotNull( readmeDiffs );
-assertTrue( readmeDiffs.indexOf( "-/readme.txt" ) >= 0 );
- }
-
+assertTrue( readmeDiffs.indexOf( "+new line" ) >= 0 );
+}
+
public void testLog2Consumer()
-throws Exception
+throws Exception
{
GitDiffConsumer consumer = new GitDiffConsumer( new DefaultLog(), null
);
@@ -105,26 +105,25 @@
}
List changedFiles = consumer.getChangedFiles();
-
-assertEquals( 12, changedFiles.size() );
-
-testScmFile( (ScmFile) changedFiles.get( 0 ),
-
"maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/add/GitAddCommand.java",
-ScmFileStatus.MODIFIED );
-
-testScmFile( (ScmFile) changedFiles.get( 1 ),
-
"maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/branch/GitBranchCommand.java",
-ScmFileStatus.MODIFIED );
-
+
+assertEquals( 2, c
svn commit: r684601 - in /maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src: main/java/org/apache/maven/scm/provider/git/gitexe/command/update/ test/java/org/ap
Author: olamy
Date: Sun Aug 10 14:49:32 2008
New Revision: 684601
URL: http://svn.apache.org/viewvc?rev=684601&view=rev
Log:
[SCM-396] git provider implements scm update
finish implementation of ScmFileStatus
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/update/GitUpdateCommandConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/update/GitUpdateCommandConsumerTest.java
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/update/GitUpdateCommandConsumer.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/update/GitUpdateCommandConsumer.java?rev=684601&r1=684600&r2=684601&view=diff
==
---
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/update/GitUpdateCommandConsumer.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/update/GitUpdateCommandConsumer.java
Sun Aug 10 14:49:32 2008
@@ -2,7 +2,9 @@
import java.io.File;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import org.apache.maven.scm.ScmFile;
import org.apache.maven.scm.ScmFileStatus;
@@ -39,10 +41,10 @@
{
private boolean updatingFound;
-
+
private boolean summaryFound;
-private List scmFiles = new ArrayList();
+private Map scmFiles = new HashMap();
public GitUpdateCommandConsumer( ScmLogger logger, File workingDirectory )
{
@@ -69,17 +71,18 @@
if ( line.indexOf( "files changed" ) >= 0 )
{
summaryFound = true;
-
+return;
}
if ( updatingFound && !summaryFound )
{
// test format : pom.xmlâ[m |1 â[32m+â[m
int index = line.indexOf( "â[" );
-
+
if ( index >= 0 )
{
String fileName = StringUtils.trim( line.substring( 0, index )
);
-scmFiles.add( new ScmFile( fileName, ScmFileStatus.UPDATED ) );
+scmFiles.put( fileName, new ScmFile( fileName,
ScmFileStatus.UPDATED ) );
+return;
}
else
{
@@ -88,20 +91,45 @@
if ( index >= 0 )
{
String fileName = StringUtils.trim( line.substring( 0,
index ) );
-scmFiles.add( new ScmFile( fileName, ScmFileStatus.UPDATED
) );
+scmFiles.put( fileName, new ScmFile( fileName,
ScmFileStatus.UPDATED ) );
+return;
}
}
}
-// here we have status/name of added/remove and we update if create or
remove
-//3 files changed, 1 insertions(+), 3 deletions(-)â[m
-// delete mode 100644 README
-//create mode 100644 test.txt
+if ( updatingFound && summaryFound )
+{
+// here we have status/name of added/remove and we update if
create or remove
+// 3 files changed, 1 insertions(+), 3 deletions(-)â[m
+// delete mode 100644 README
+// create mode 100644 test.txt
+String[] changedFileLine = StringUtils.split( line, " " );
+if ( changedFileLine != null )
+{
+if ( changedFileLine.length >= 4 )
+{
+String status = changedFileLine[0];
+String fileName = changedFileLine[3];
+ScmFile scmFile = (ScmFile) scmFiles.get( fileName );
+if ( scmFile != null )
+{
+if ( StringUtils.equalsIgnoreCase( "delete", status ) )
+{
+scmFiles.put( fileName, new ScmFile( fileName,
ScmFileStatus.DELETED ) );
+}
+if ( StringUtils.equalsIgnoreCase( "create", status ) )
+{
+scmFiles.put( fileName, new ScmFile( fileName,
ScmFileStatus.ADDED ) );
+}
+}
+}
+}
+}
}
public List getUpdatedFiles()
{
getLogger().debug( " updatedFiles size " + scmFiles.size() );
-return scmFiles;
+return new ArrayList( scmFiles.values() );
}
}
Modified:
maven/scm/trunk/m
svn commit: r684607 - in /maven/scm/trunk: maven-scm-site/pom.xml pom.xml
Author: olamy Date: Sun Aug 10 15:33:55 2008 New Revision: 684607 URL: http://svn.apache.org/viewvc?rev=684607&view=rev Log: update to last scm parent Modified: maven/scm/trunk/maven-scm-site/pom.xml maven/scm/trunk/pom.xml Modified: maven/scm/trunk/maven-scm-site/pom.xml URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-site/pom.xml?rev=684607&r1=684606&r2=684607&view=diff == --- maven/scm/trunk/maven-scm-site/pom.xml (original) +++ maven/scm/trunk/maven-scm-site/pom.xml Sun Aug 10 15:33:55 2008 @@ -21,7 +21,7 @@ maven-scm org.apache.maven.scm -1.0-SNAPSHOT +1.1-SNAPSHOT 4.0.0 maven-scm-site Modified: maven/scm/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/scm/trunk/pom.xml?rev=684607&r1=684606&r2=684607&view=diff == --- maven/scm/trunk/pom.xml (original) +++ maven/scm/trunk/pom.xml Sun Aug 10 15:33:55 2008 @@ -189,8 +189,6 @@ - -
svn commit: r684610 - /maven/scm/trunk/pom.xml
Author: olamy Date: Sun Aug 10 16:13:42 2008 New Revision: 684610 URL: http://svn.apache.org/viewvc?rev=684610&view=rev Log: Downgrade maven parent pom for release Modified: maven/scm/trunk/pom.xml Modified: maven/scm/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/scm/trunk/pom.xml?rev=684610&r1=684609&r2=684610&view=diff == --- maven/scm/trunk/pom.xml (original) +++ maven/scm/trunk/pom.xml Sun Aug 10 16:13:42 2008 @@ -21,7 +21,7 @@ org.apache.maven maven-parent -9-SNAPSHOT +8 ../pom/maven/pom.xml 4.0.0
svn commit: r684612 - /maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/update/GitUpdateCommandConsu
Author: olamy
Date: Sun Aug 10 16:38:44 2008
New Revision: 684612
URL: http://svn.apache.org/viewvc?rev=684612&view=rev
Log:
use unicode character
use LinkedHashMap to ensure order
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/update/GitUpdateCommandConsumer.java
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/update/GitUpdateCommandConsumer.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/update/GitUpdateCommandConsumer.java?rev=684612&r1=684611&r2=684612&view=diff
==
---
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/update/GitUpdateCommandConsumer.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/update/GitUpdateCommandConsumer.java
Sun Aug 10 16:38:44 2008
@@ -2,7 +2,7 @@
import java.io.File;
import java.util.ArrayList;
-import java.util.HashMap;
+import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
@@ -33,7 +33,6 @@
/**
* @author mailto:[EMAIL PROTECTED]">olamy
- * @since 10 août 2008
* @version $Id$
*/
public class GitUpdateCommandConsumer
@@ -44,7 +43,7 @@
private boolean summaryFound;
-private Map scmFiles = new HashMap();
+private Map scmFiles = new LinkedHashMap();
public GitUpdateCommandConsumer( ScmLogger logger, File workingDirectory )
{
@@ -75,8 +74,8 @@
}
if ( updatingFound && !summaryFound )
{
-// test format : pom.xmlâ[m |1 â[32m+â[m
-int index = line.indexOf( "â[" );
+// test format : pom.xml\u2190[m |
+int index = line.indexOf( "\u2190[" );
if ( index >= 0 )
{
@@ -100,7 +99,7 @@
if ( updatingFound && summaryFound )
{
// here we have status/name of added/remove and we update if
create or remove
-// 3 files changed, 1 insertions(+), 3 deletions(-)â[m
+// 3 files changed, 1 insertions(+), 3 deletions(-)\u2190[m
// delete mode 100644 README
// create mode 100644 test.txt
String[] changedFileLine = StringUtils.split( line, " " );
