[pgm] Use LsRemoteCommand to implement ls-remote and add a test
Change-Id: Ic266f844c23e2519df5770ca56284b26e4cfe1f4 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
This commit is contained in:
parent
53ff052998
commit
816de9e9fa
|
@ -0,0 +1,96 @@
|
||||||
|
/*
|
||||||
|
* 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());
|
||||||
|
}
|
||||||
|
}
|
|
@ -46,13 +46,15 @@
|
||||||
package org.eclipse.jgit.pgm;
|
package org.eclipse.jgit.pgm;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
import java.util.Comparator;
|
||||||
|
import java.util.TreeSet;
|
||||||
|
|
||||||
import org.kohsuke.args4j.Argument;
|
import org.eclipse.jgit.api.Git;
|
||||||
import org.kohsuke.args4j.Option;
|
import org.eclipse.jgit.api.LsRemoteCommand;
|
||||||
import org.eclipse.jgit.lib.AnyObjectId;
|
import org.eclipse.jgit.lib.AnyObjectId;
|
||||||
import org.eclipse.jgit.lib.Ref;
|
import org.eclipse.jgit.lib.Ref;
|
||||||
import org.eclipse.jgit.transport.FetchConnection;
|
import org.kohsuke.args4j.Argument;
|
||||||
import org.eclipse.jgit.transport.Transport;
|
import org.kohsuke.args4j.Option;
|
||||||
|
|
||||||
@Command(common = true, usage = "usage_LsRemote")
|
@Command(common = true, usage = "usage_LsRemote")
|
||||||
class LsRemote extends TextBuiltin {
|
class LsRemote extends TextBuiltin {
|
||||||
|
@ -64,19 +66,19 @@ class LsRemote extends TextBuiltin {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void run() throws Exception {
|
protected void run() throws Exception {
|
||||||
final Transport tn = Transport.open(db, remote);
|
LsRemoteCommand command = Git.lsRemoteRepository().setRemote(remote)
|
||||||
if (0 <= timeout)
|
.setTimeout(timeout);
|
||||||
tn.setTimeout(timeout);
|
TreeSet<Ref> refs = new TreeSet<Ref>(new Comparator<Ref>() {
|
||||||
final FetchConnection c = tn.openFetch();
|
|
||||||
try {
|
public int compare(Ref r1, Ref r2) {
|
||||||
for (final Ref r : c.getRefs()) {
|
return r1.getName().compareTo(r2.getName());
|
||||||
show(r.getObjectId(), r.getName());
|
|
||||||
if (r.getPeeledObjectId() != null)
|
|
||||||
show(r.getPeeledObjectId(), r.getName() + "^{}"); //$NON-NLS-1$
|
|
||||||
}
|
}
|
||||||
} finally {
|
});
|
||||||
c.close();
|
refs.addAll(command.call());
|
||||||
tn.close();
|
for (final Ref r : refs) {
|
||||||
|
show(r.getObjectId(), r.getName());
|
||||||
|
if (r.getPeeledObjectId() != null)
|
||||||
|
show(r.getPeeledObjectId(), r.getName() + "^{}"); //$NON-NLS-1$
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue