You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ol...@apache.org on 2012/09/19 21:52:19 UTC
[3/3] git commit: fix tck test adding .git directory is not possible
anymore :-)
fix tck test adding .git directory is not possible anymore :-)
Project: http://git-wip-us.apache.org/repos/asf/maven-scm/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-scm/commit/49580884
Tree: http://git-wip-us.apache.org/repos/asf/maven-scm/tree/49580884
Diff: http://git-wip-us.apache.org/repos/asf/maven-scm/diff/49580884
Branch: refs/heads/master
Commit: 495808840b161b79cd8a3210ad3035c82dac0970
Parents: abd6a1f
Author: olivier lamy <ol...@apache.org>
Authored: Wed Sep 19 21:48:08 2012 +0200
Committer: olivier lamy <ol...@apache.org>
Committed: Wed Sep 19 21:48:08 2012 +0200
----------------------------------------------------------------------
.../gitexe/command/info/GitInfoCommandTckTest.java | 5 +++++
.../test/resources/git/info/dotgit/COMMIT_EDITMSG | 12 ++++++++++++
.../src/test/resources/git/info/dotgit/HEAD | 1 +
.../src/test/resources/git/info/dotgit/config | 6 ++++++
.../src/test/resources/git/info/dotgit/description | 1 +
.../test/resources/git/info/dotgit/hooks/empty.txt | 1 +
.../src/test/resources/git/info/dotgit/index | Bin 0 -> 104 bytes
.../test/resources/git/info/dotgit/info/exclude | 6 ++++++
.../src/test/resources/git/info/dotgit/logs/HEAD | 1 +
.../git/info/dotgit/logs/refs/heads/master | 1 +
.../1e/193b8e82a3454ae2fb6856ffe0fc301a4fe10b | Bin 0 -> 52 bytes
.../5a/3fecc90185cee3b2e78c5b4091123ea4e370e0 | Bin 0 -> 35 bytes
.../cd/3c0dfacb65955e6fbb35c56cc5b1bf8ce4f767 | 3 +++
.../resources/git/info/dotgit/refs/heads/master | 1 +
.../maven/scm/provider/git/GitScmTestUtils.java | 2 ++
pom.xml | 2 +-
16 files changed, 41 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/49580884/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/info/GitInfoCommandTckTest.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/info/GitInfoCommandTckTest.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/info/GitInfoCommandTckTest.java
index fe44195..e8160e2 100644
--- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/info/GitInfoCommandTckTest.java
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/info/GitInfoCommandTckTest.java
@@ -28,6 +28,7 @@ import org.apache.maven.scm.provider.ScmProvider;
import org.apache.maven.scm.provider.ScmProviderRepository;
import org.apache.maven.scm.provider.git.GitScmTestUtils;
import org.codehaus.plexus.PlexusTestCase;
+import org.codehaus.plexus.util.FileUtils;
import java.io.File;
@@ -42,6 +43,7 @@ public class GitInfoCommandTckTest
throws Exception
{
GitScmTestUtils.initRepo( "src/test/resources/git/info", getRepositoryRoot(), getWorkingCopy() );
+
ScmProvider provider = getScmManager().getProviderByUrl( getScmUrl() );
ScmProviderRepository repository = provider.makeProviderScmRepository( getRepositoryRoot() );
assertNotNull( repository );
@@ -56,6 +58,7 @@ public class GitInfoCommandTckTest
throws Exception
{
GitScmTestUtils.initRepo( "src/test/resources/git/info", getRepositoryRoot(), getWorkingCopy() );
+
ScmProvider provider = getScmManager().getProviderByUrl( getScmUrl() );
ScmProviderRepository repository = provider.makeProviderScmRepository( getRepositoryRoot() );
assertNotNull( repository );
@@ -71,6 +74,7 @@ public class GitInfoCommandTckTest
throws Exception
{
GitScmTestUtils.initRepo( "src/test/resources/git/info", getRepositoryRoot(), getWorkingCopy() );
+
ScmProvider provider = getScmManager().getProviderByUrl( getScmUrl() );
ScmProviderRepository repository = provider.makeProviderScmRepository( getRepositoryRoot() );
assertNotNull( repository );
@@ -87,6 +91,7 @@ public class GitInfoCommandTckTest
throws Exception
{
GitScmTestUtils.initRepo( "src/test/resources/git/info", getRepositoryRoot(), getWorkingCopy() );
+
ScmProvider provider = getScmManager().getProviderByUrl( getScmUrl() );
ScmProviderRepository repository = provider.makeProviderScmRepository( getRepositoryRoot() );
assertNotNull( repository );
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/49580884/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/resources/git/info/dotgit/COMMIT_EDITMSG
----------------------------------------------------------------------
diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/resources/git/info/dotgit/COMMIT_EDITMSG b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/resources/git/info/dotgit/COMMIT_EDITMSG
new file mode 100644
index 0000000..1d36373
--- /dev/null
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/resources/git/info/dotgit/COMMIT_EDITMSG
@@ -0,0 +1,12 @@
+test
+# Please enter the commit message for your changes. Lines starting
+# with '#' will be ignored, and an empty message aborts the commit.
+# On branch master
+#
+# Initial commit
+#
+# Changes to be committed:
+# (use "git rm --cached <file>..." to unstage)
+#
+# new file: foo.txt
+#
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/49580884/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/resources/git/info/dotgit/HEAD
----------------------------------------------------------------------
diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/resources/git/info/dotgit/HEAD b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/resources/git/info/dotgit/HEAD
new file mode 100644
index 0000000..cb089cd
--- /dev/null
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/resources/git/info/dotgit/HEAD
@@ -0,0 +1 @@
+ref: refs/heads/master
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/49580884/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/resources/git/info/dotgit/config
----------------------------------------------------------------------
diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/resources/git/info/dotgit/config b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/resources/git/info/dotgit/config
new file mode 100644
index 0000000..af10792
--- /dev/null
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/resources/git/info/dotgit/config
@@ -0,0 +1,6 @@
+[core]
+ repositoryformatversion = 0
+ filemode = true
+ bare = false
+ logallrefupdates = true
+ ignorecase = true
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/49580884/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/resources/git/info/dotgit/description
----------------------------------------------------------------------
diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/resources/git/info/dotgit/description b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/resources/git/info/dotgit/description
new file mode 100644
index 0000000..498b267
--- /dev/null
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/resources/git/info/dotgit/description
@@ -0,0 +1 @@
+Unnamed repository; edit this file 'description' to name the repository.
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/49580884/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/resources/git/info/dotgit/hooks/empty.txt
----------------------------------------------------------------------
diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/resources/git/info/dotgit/hooks/empty.txt b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/resources/git/info/dotgit/hooks/empty.txt
new file mode 100644
index 0000000..6068d6a
--- /dev/null
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/resources/git/info/dotgit/hooks/empty.txt
@@ -0,0 +1 @@
+empty file
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/49580884/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/resources/git/info/dotgit/index
----------------------------------------------------------------------
diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/resources/git/info/dotgit/index b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/resources/git/info/dotgit/index
new file mode 100644
index 0000000..18e5a6d
Binary files /dev/null and b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/resources/git/info/dotgit/index differ
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/49580884/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/resources/git/info/dotgit/info/exclude
----------------------------------------------------------------------
diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/resources/git/info/dotgit/info/exclude b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/resources/git/info/dotgit/info/exclude
new file mode 100644
index 0000000..a5196d1
--- /dev/null
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/resources/git/info/dotgit/info/exclude
@@ -0,0 +1,6 @@
+# git ls-files --others --exclude-from=.git/info/exclude
+# Lines that start with '#' are comments.
+# For a project mostly in C, the following would be a good set of
+# exclude patterns (uncomment them if you want to use them):
+# *.[oa]
+# *~
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/49580884/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/resources/git/info/dotgit/logs/HEAD
----------------------------------------------------------------------
diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/resources/git/info/dotgit/logs/HEAD b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/resources/git/info/dotgit/logs/HEAD
new file mode 100644
index 0000000..8836e81
--- /dev/null
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/resources/git/info/dotgit/logs/HEAD
@@ -0,0 +1 @@
+0000000000000000000000000000000000000000 cd3c0dfacb65955e6fbb35c56cc5b1bf8ce4f767 Olivier Lamy <ol...@apache.org> 1296030224 +0100 commit (initial): test
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/49580884/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/resources/git/info/dotgit/logs/refs/heads/master
----------------------------------------------------------------------
diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/resources/git/info/dotgit/logs/refs/heads/master b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/resources/git/info/dotgit/logs/refs/heads/master
new file mode 100644
index 0000000..8836e81
--- /dev/null
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/resources/git/info/dotgit/logs/refs/heads/master
@@ -0,0 +1 @@
+0000000000000000000000000000000000000000 cd3c0dfacb65955e6fbb35c56cc5b1bf8ce4f767 Olivier Lamy <ol...@apache.org> 1296030224 +0100 commit (initial): test
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/49580884/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/resources/git/info/dotgit/objects/1e/193b8e82a3454ae2fb6856ffe0fc301a4fe10b
----------------------------------------------------------------------
diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/resources/git/info/dotgit/objects/1e/193b8e82a3454ae2fb6856ffe0fc301a4fe10b b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/resources/git/info/dotgit/objects/1e/193b8e82a3454ae2fb6856ffe0fc301a4fe10b
new file mode 100644
index 0000000..d2f7513
Binary files /dev/null and b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/resources/git/info/dotgit/objects/1e/193b8e82a3454ae2fb6856ffe0fc301a4fe10b differ
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/49580884/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/resources/git/info/dotgit/objects/5a/3fecc90185cee3b2e78c5b4091123ea4e370e0
----------------------------------------------------------------------
diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/resources/git/info/dotgit/objects/5a/3fecc90185cee3b2e78c5b4091123ea4e370e0 b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/resources/git/info/dotgit/objects/5a/3fecc90185cee3b2e78c5b4091123ea4e370e0
new file mode 100644
index 0000000..f935ce8
Binary files /dev/null and b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/resources/git/info/dotgit/objects/5a/3fecc90185cee3b2e78c5b4091123ea4e370e0 differ
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/49580884/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/resources/git/info/dotgit/objects/cd/3c0dfacb65955e6fbb35c56cc5b1bf8ce4f767
----------------------------------------------------------------------
diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/resources/git/info/dotgit/objects/cd/3c0dfacb65955e6fbb35c56cc5b1bf8ce4f767 b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/resources/git/info/dotgit/objects/cd/3c0dfacb65955e6fbb35c56cc5b1bf8ce4f767
new file mode 100644
index 0000000..005465f
--- /dev/null
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/resources/git/info/dotgit/objects/cd/3c0dfacb65955e6fbb35c56cc5b1bf8ce4f767
@@ -0,0 +1,3 @@
+x��A
+1 @Q�=E��$m�v@��!-�S�R�Q�����_=~�U
+ǝ �٥(Ѳ�g�%�8�RKvH�&�/]���Z�U\�}���-~p^���� d����GB4�7ԍ�M��S�6�6
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/49580884/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/resources/git/info/dotgit/refs/heads/master
----------------------------------------------------------------------
diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/resources/git/info/dotgit/refs/heads/master b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/resources/git/info/dotgit/refs/heads/master
new file mode 100644
index 0000000..e4482ae
--- /dev/null
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/resources/git/info/dotgit/refs/heads/master
@@ -0,0 +1 @@
+cd3c0dfacb65955e6fbb35c56cc5b1bf8ce4f767
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/49580884/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/GitScmTestUtils.java
----------------------------------------------------------------------
diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/GitScmTestUtils.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/GitScmTestUtils.java
index 4684798..e9b107a 100644
--- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/GitScmTestUtils.java
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/GitScmTestUtils.java
@@ -63,6 +63,8 @@ public final class GitScmTestUtils
FileUtils.copyDirectoryStructure( src, repository );
+ FileUtils.copyDirectoryStructure( new File( src, "dotgit" ), new File( repository, ".git" ) );
+
// now let's get rid of all .svn directories in the copied folder
deleteAllDirectories( repository, ".svn" );
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/49580884/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 8ffc0eb..6784050 100644
--- a/pom.xml
+++ b/pom.xml
@@ -252,7 +252,7 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
- <version>3.0.3</version>
+ <version>3.0.7</version>
</dependency>
<dependency>