Browse Source
* stable-3.6: Prepare 3.6.1-SNAPSHOT builds JGit v3.6.0.201412230720-r [pgm] Add option --bare to clone command [pgm] Implement clone using CloneCommand Fix junit tests under windows when the platform is explicitly changed Fix unit tests for windows by explicitly closing test repos [pgm] Add option --tags for ls-remote [pgm] Add option --heads for ls-remote [pgm] Use LsRemoteCommand to implement ls-remote and add a test Change-Id: I8f31e76cb7e9416919f37e02c7e51ab1d221df40 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>stable-3.7
Matthias Sohn
10 years ago
64 changed files with 640 additions and 408 deletions
@ -0,0 +1,156 @@ |
|||||||
|
/* |
||||||
|
* Copyright (C) 2014 Matthias Sohn <matthias.sohn@sap.com> |
||||||
|
* and other copyright owners as documented in the project's IP log. |
||||||
|
* |
||||||
|
* This program and the accompanying materials are made available |
||||||
|
* under the terms of the Eclipse Distribution License v1.0 which |
||||||
|
* accompanies this distribution, is reproduced below, and is |
||||||
|
* available at http://www.eclipse.org/org/documents/edl-v10.php
|
||||||
|
* |
||||||
|
* All rights reserved. |
||||||
|
* |
||||||
|
* Redistribution and use in source and binary forms, with or |
||||||
|
* without modification, are permitted provided that the following |
||||||
|
* conditions are met: |
||||||
|
* |
||||||
|
* - Redistributions of source code must retain the above copyright |
||||||
|
* notice, this list of conditions and the following disclaimer. |
||||||
|
* |
||||||
|
* - Redistributions in binary form must reproduce the above |
||||||
|
* copyright notice, this list of conditions and the following |
||||||
|
* disclaimer in the documentation and/or other materials provided |
||||||
|
* with the distribution. |
||||||
|
* |
||||||
|
* - Neither the name of the Eclipse Foundation, Inc. nor the |
||||||
|
* names of its contributors may be used to endorse or promote |
||||||
|
* products derived from this software without specific prior |
||||||
|
* written permission. |
||||||
|
* |
||||||
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND |
||||||
|
* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, |
||||||
|
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES |
||||||
|
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
||||||
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR |
||||||
|
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
||||||
|
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT |
||||||
|
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; |
||||||
|
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER |
||||||
|
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, |
||||||
|
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) |
||||||
|
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF |
||||||
|
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
||||||
|
*/ |
||||||
|
package org.eclipse.jgit.pgm; |
||||||
|
|
||||||
|
import static org.junit.Assert.assertArrayEquals; |
||||||
|
import static org.junit.Assert.assertEquals; |
||||||
|
import static org.junit.Assert.assertTrue; |
||||||
|
|
||||||
|
import java.io.File; |
||||||
|
import java.util.List; |
||||||
|
|
||||||
|
import org.eclipse.jgit.api.Git; |
||||||
|
import org.eclipse.jgit.junit.JGitTestUtil; |
||||||
|
import org.eclipse.jgit.junit.MockSystemReader; |
||||||
|
import org.eclipse.jgit.lib.CLIRepositoryTestCase; |
||||||
|
import org.eclipse.jgit.lib.Constants; |
||||||
|
import org.eclipse.jgit.lib.Ref; |
||||||
|
import org.eclipse.jgit.transport.URIish; |
||||||
|
import org.eclipse.jgit.util.SystemReader; |
||||||
|
import org.junit.Before; |
||||||
|
import org.junit.Test; |
||||||
|
|
||||||
|
public class CloneTest extends CLIRepositoryTestCase { |
||||||
|
|
||||||
|
private Git git; |
||||||
|
|
||||||
|
@Override |
||||||
|
@Before |
||||||
|
public void setUp() throws Exception { |
||||||
|
super.setUp(); |
||||||
|
git = new Git(db); |
||||||
|
} |
||||||
|
|
||||||
|
@Test |
||||||
|
public void testClone() throws Exception { |
||||||
|
createInitialCommit(); |
||||||
|
|
||||||
|
File gitDir = db.getDirectory(); |
||||||
|
String sourceURI = gitDir.toURI().toString(); |
||||||
|
File target = createTempDirectory("target"); |
||||||
|
StringBuilder cmd = new StringBuilder("git clone ").append(sourceURI |
||||||
|
+ " " + target.getPath()); |
||||||
|
String[] result = execute(cmd.toString()); |
||||||
|
assertArrayEquals(new String[] { |
||||||
|
"Cloning into '" + target.getPath() + "'...", |
||||||
|
"", "" }, result); |
||||||
|
|
||||||
|
Git git2 = Git.open(target); |
||||||
|
List<Ref> branches = git2.branchList().call(); |
||||||
|
assertEquals("expected 1 branch", 1, branches.size()); |
||||||
|
} |
||||||
|
|
||||||
|
private void createInitialCommit() throws Exception { |
||||||
|
JGitTestUtil.writeTrashFile(db, "hello.txt", "world"); |
||||||
|
git.add().addFilepattern("hello.txt").call(); |
||||||
|
git.commit().setMessage("Initial commit").call(); |
||||||
|
} |
||||||
|
|
||||||
|
@Test |
||||||
|
public void testCloneEmpty() throws Exception { |
||||||
|
File gitDir = db.getDirectory(); |
||||||
|
String sourceURI = gitDir.toURI().toString(); |
||||||
|
File target = createTempDirectory("target"); |
||||||
|
StringBuilder cmd = new StringBuilder("git clone ").append(sourceURI |
||||||
|
+ " " + target.getPath()); |
||||||
|
String[] result = execute(cmd.toString()); |
||||||
|
assertArrayEquals(new String[] { |
||||||
|
"Cloning into '" + target.getPath() + "'...", |
||||||
|
"warning: You appear to have cloned an empty repository.", "", |
||||||
|
"" }, result); |
||||||
|
|
||||||
|
Git git2 = Git.open(target); |
||||||
|
List<Ref> branches = git2.branchList().call(); |
||||||
|
assertEquals("expected 0 branch", 0, branches.size()); |
||||||
|
} |
||||||
|
|
||||||
|
@Test |
||||||
|
public void testCloneIntoCurrentDir() throws Exception { |
||||||
|
createInitialCommit(); |
||||||
|
File target = createTempDirectory("target"); |
||||||
|
|
||||||
|
MockSystemReader sr = (MockSystemReader) SystemReader.getInstance(); |
||||||
|
sr.setProperty(Constants.OS_USER_DIR, target.getAbsolutePath()); |
||||||
|
|
||||||
|
File gitDir = db.getDirectory(); |
||||||
|
String sourceURI = gitDir.toURI().toString(); |
||||||
|
String name = new URIish(sourceURI).getHumanishName(); |
||||||
|
StringBuilder cmd = new StringBuilder("git clone ").append(sourceURI); |
||||||
|
String[] result = execute(cmd.toString()); |
||||||
|
assertArrayEquals(new String[] { |
||||||
|
"Cloning into '" + new File(target, name).getName() + "'...", |
||||||
|
"", "" }, result); |
||||||
|
Git git2 = Git.open(new File(target, name)); |
||||||
|
List<Ref> branches = git2.branchList().call(); |
||||||
|
assertEquals("expected 1 branch", 1, branches.size()); |
||||||
|
} |
||||||
|
|
||||||
|
public void testCloneBare() throws Exception { |
||||||
|
createInitialCommit(); |
||||||
|
|
||||||
|
File gitDir = db.getDirectory(); |
||||||
|
String sourcePath = gitDir.getAbsolutePath(); |
||||||
|
String targetPath = (new File(sourcePath)).getParentFile() |
||||||
|
.getParentFile().getAbsolutePath() |
||||||
|
+ "/target.git"; |
||||||
|
StringBuilder cmd = new StringBuilder("git clone --bare ") |
||||||
|
.append(sourcePath + " " + targetPath); |
||||||
|
String[] result = execute(cmd.toString()); |
||||||
|
assertArrayEquals(new String[] { |
||||||
|
"Cloning into '" + targetPath + "'...", "", "" }, result); |
||||||
|
Git git2 = Git.open(new File(targetPath)); |
||||||
|
List<Ref> branches = git2.branchList().call(); |
||||||
|
assertEquals("expected 1 branch", 1, branches.size()); |
||||||
|
assertTrue("expected bare repository", git2.getRepository().isBare()); |
||||||
|
} |
||||||
|
} |
||||||
@ -0,0 +1,138 @@ |
|||||||
|
/* |
||||||
|
* Copyright (C) 2014, Matthias Sohn <matthias.sohn@sap.com> |
||||||
|
* and other copyright owners as documented in the project's IP log. |
||||||
|
* |
||||||
|
* This program and the accompanying materials are made available |
||||||
|
* under the terms of the Eclipse Distribution License v1.0 which |
||||||
|
* accompanies this distribution, is reproduced below, and is |
||||||
|
* available at http://www.eclipse.org/org/documents/edl-v10.php
|
||||||
|
* |
||||||
|
* All rights reserved. |
||||||
|
* |
||||||
|
* Redistribution and use in source and binary forms, with or |
||||||
|
* without modification, are permitted provided that the following |
||||||
|
* conditions are met: |
||||||
|
* |
||||||
|
* - Redistributions of source code must retain the above copyright |
||||||
|
* notice, this list of conditions and the following disclaimer. |
||||||
|
* |
||||||
|
* - Redistributions in binary form must reproduce the above |
||||||
|
* copyright notice, this list of conditions and the following |
||||||
|
* disclaimer in the documentation and/or other materials provided |
||||||
|
* with the distribution. |
||||||
|
* |
||||||
|
* - Neither the name of the Eclipse Foundation, Inc. nor the |
||||||
|
* names of its contributors may be used to endorse or promote |
||||||
|
* products derived from this software without specific prior |
||||||
|
* written permission. |
||||||
|
* |
||||||
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND |
||||||
|
* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, |
||||||
|
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES |
||||||
|
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
||||||
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR |
||||||
|
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
||||||
|
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT |
||||||
|
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; |
||||||
|
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER |
||||||
|
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, |
||||||
|
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) |
||||||
|
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF |
||||||
|
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
||||||
|
*/ |
||||||
|
package org.eclipse.jgit.pgm; |
||||||
|
|
||||||
|
import static org.junit.Assert.assertArrayEquals; |
||||||
|
|
||||||
|
import java.util.List; |
||||||
|
|
||||||
|
import org.eclipse.jgit.api.Git; |
||||||
|
import org.eclipse.jgit.lib.CLIRepositoryTestCase; |
||||||
|
import org.eclipse.jgit.lib.Constants; |
||||||
|
import org.eclipse.jgit.lib.RefUpdate; |
||||||
|
import org.junit.Before; |
||||||
|
import org.junit.Test; |
||||||
|
|
||||||
|
public class LsRemoteTest extends CLIRepositoryTestCase { |
||||||
|
private Git git; |
||||||
|
|
||||||
|
@Override |
||||||
|
@Before |
||||||
|
public void setUp() throws Exception { |
||||||
|
super.setUp(); |
||||||
|
git = new Git(db); |
||||||
|
// commit something
|
||||||
|
writeTrashFile("Test.txt", "Hello world"); |
||||||
|
git.add().addFilepattern("Test.txt").call(); |
||||||
|
git.commit().setMessage("Initial commit").call(); |
||||||
|
|
||||||
|
// create a master branch and switch to it
|
||||||
|
git.branchCreate().setName("test").call(); |
||||||
|
RefUpdate rup = db.updateRef(Constants.HEAD); |
||||||
|
rup.link("refs/heads/test"); |
||||||
|
|
||||||
|
// tags
|
||||||
|
git.tag().setName("tag1").call(); |
||||||
|
git.tag().setName("tag2").call(); |
||||||
|
git.tag().setName("tag3").call(); |
||||||
|
} |
||||||
|
|
||||||
|
@Test |
||||||
|
public void testLsRemote() throws Exception { |
||||||
|
final List<String> result = CLIGitCommand.execute( |
||||||
|
"git ls-remote " + db.getDirectory(), db); |
||||||
|
assertArrayEquals(new String[] { |
||||||
|
"d0b1ef2b3dea02bb2ca824445c04e6def012c32c HEAD", |
||||||
|
"d0b1ef2b3dea02bb2ca824445c04e6def012c32c refs/heads/master", |
||||||
|
"d0b1ef2b3dea02bb2ca824445c04e6def012c32c refs/heads/test", |
||||||
|
"efc02078d83a5226986ae917323acec7e1e8b7cb refs/tags/tag1", |
||||||
|
"d0b1ef2b3dea02bb2ca824445c04e6def012c32c refs/tags/tag1^{}", |
||||||
|
"4e4b837e0fd4ba83c003678b03592dc1509a4115 refs/tags/tag2", |
||||||
|
"d0b1ef2b3dea02bb2ca824445c04e6def012c32c refs/tags/tag2^{}", |
||||||
|
"489384bf8ace47522fe32093d2ceb85b65a6cbb1 refs/tags/tag3", |
||||||
|
"d0b1ef2b3dea02bb2ca824445c04e6def012c32c refs/tags/tag3^{}", |
||||||
|
"" }, result.toArray()); |
||||||
|
} |
||||||
|
|
||||||
|
@Test |
||||||
|
public void testLsRemoteHeads() throws Exception { |
||||||
|
final List<String> result = CLIGitCommand.execute( |
||||||
|
"git ls-remote --heads " |
||||||
|
+ db.getDirectory(), db); |
||||||
|
assertArrayEquals(new String[] { |
||||||
|
"d0b1ef2b3dea02bb2ca824445c04e6def012c32c refs/heads/master", |
||||||
|
"d0b1ef2b3dea02bb2ca824445c04e6def012c32c refs/heads/test", |
||||||
|
"" }, result.toArray()); |
||||||
|
} |
||||||
|
|
||||||
|
@Test |
||||||
|
public void testLsRemoteTags() throws Exception { |
||||||
|
final List<String> result = CLIGitCommand.execute( |
||||||
|
"git ls-remote --tags " + db.getDirectory(), db); |
||||||
|
assertArrayEquals(new String[] { |
||||||
|
"efc02078d83a5226986ae917323acec7e1e8b7cb refs/tags/tag1", |
||||||
|
"d0b1ef2b3dea02bb2ca824445c04e6def012c32c refs/tags/tag1^{}", |
||||||
|
"4e4b837e0fd4ba83c003678b03592dc1509a4115 refs/tags/tag2", |
||||||
|
"d0b1ef2b3dea02bb2ca824445c04e6def012c32c refs/tags/tag2^{}", |
||||||
|
"489384bf8ace47522fe32093d2ceb85b65a6cbb1 refs/tags/tag3", |
||||||
|
"d0b1ef2b3dea02bb2ca824445c04e6def012c32c refs/tags/tag3^{}", |
||||||
|
"" }, result.toArray()); |
||||||
|
} |
||||||
|
|
||||||
|
@Test |
||||||
|
public void testLsRemoteHeadsTags() throws Exception { |
||||||
|
final List<String> result = CLIGitCommand.execute( |
||||||
|
"git ls-remote --heads --tags " + db.getDirectory(), db); |
||||||
|
assertArrayEquals(new String[] { |
||||||
|
"d0b1ef2b3dea02bb2ca824445c04e6def012c32c refs/heads/master", |
||||||
|
"d0b1ef2b3dea02bb2ca824445c04e6def012c32c refs/heads/test", |
||||||
|
"efc02078d83a5226986ae917323acec7e1e8b7cb refs/tags/tag1", |
||||||
|
"d0b1ef2b3dea02bb2ca824445c04e6def012c32c refs/tags/tag1^{}", |
||||||
|
"4e4b837e0fd4ba83c003678b03592dc1509a4115 refs/tags/tag2", |
||||||
|
"d0b1ef2b3dea02bb2ca824445c04e6def012c32c refs/tags/tag2^{}", |
||||||
|
"489384bf8ace47522fe32093d2ceb85b65a6cbb1 refs/tags/tag3", |
||||||
|
"d0b1ef2b3dea02bb2ca824445c04e6def012c32c refs/tags/tag3^{}", |
||||||
|
"" }, result.toArray()); |
||||||
|
} |
||||||
|
|
||||||
|
} |
||||||
Loading…
Reference in new issue