CLI fetch command should support --tags
Bug: 419638 Change-Id: I1dc99fd38e678e091a1d141d741328f0dec1756a Signed-off-by: Kaloyan Raev <kaloyan.r@zend.com> Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
This commit is contained in:
parent
9b1c965446
commit
40e8ba4186
|
@ -18,6 +18,7 @@ Import-Package: org.eclipse.jgit.api;version="[3.2.0,3.3.0)",
|
||||||
org.eclipse.jgit.pgm.opt;version="[3.2.0,3.3.0)",
|
org.eclipse.jgit.pgm.opt;version="[3.2.0,3.3.0)",
|
||||||
org.eclipse.jgit.revwalk;version="[3.2.0,3.3.0)",
|
org.eclipse.jgit.revwalk;version="[3.2.0,3.3.0)",
|
||||||
org.eclipse.jgit.storage.file;version="[3.2.0,3.3.0)",
|
org.eclipse.jgit.storage.file;version="[3.2.0,3.3.0)",
|
||||||
|
org.eclipse.jgit.transport;version="[3.2.0,3.3.0)",
|
||||||
org.eclipse.jgit.util;version="[3.2.0,3.3.0)",
|
org.eclipse.jgit.util;version="[3.2.0,3.3.0)",
|
||||||
org.eclipse.jgit.util.io;version="[3.2.0,3.3.0)",
|
org.eclipse.jgit.util.io;version="[3.2.0,3.3.0)",
|
||||||
org.hamcrest.core;bundle-version="[1.1.0,2.0.0)",
|
org.hamcrest.core;bundle-version="[1.1.0,2.0.0)",
|
||||||
|
|
|
@ -0,0 +1,110 @@
|
||||||
|
/*
|
||||||
|
* Copyright (C) 2013, Chris Aniszczyk <zx@twitter.com> and others.
|
||||||
|
* 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.assertEquals;
|
||||||
|
|
||||||
|
import org.eclipse.jgit.api.Git;
|
||||||
|
import org.eclipse.jgit.lib.CLIRepositoryTestCase;
|
||||||
|
import org.eclipse.jgit.lib.Repository;
|
||||||
|
import org.eclipse.jgit.lib.StoredConfig;
|
||||||
|
import org.eclipse.jgit.transport.RemoteConfig;
|
||||||
|
import org.eclipse.jgit.transport.URIish;
|
||||||
|
import org.junit.Before;
|
||||||
|
import org.junit.Test;
|
||||||
|
|
||||||
|
public class FetchTest extends CLIRepositoryTestCase {
|
||||||
|
private Git git;
|
||||||
|
|
||||||
|
private Git remoteGit;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
@Before
|
||||||
|
public void setUp() throws Exception {
|
||||||
|
super.setUp();
|
||||||
|
git = new Git(db);
|
||||||
|
git.commit().setMessage("initial commit").call();
|
||||||
|
|
||||||
|
Repository remoteRepository = createWorkRepository();
|
||||||
|
remoteGit = new Git(remoteRepository);
|
||||||
|
|
||||||
|
// setup the first repository to fetch from the second repository
|
||||||
|
final StoredConfig config = db.getConfig();
|
||||||
|
RemoteConfig remoteConfig = new RemoteConfig(config, "test");
|
||||||
|
URIish uri = new URIish(remoteRepository.getDirectory().toURI().toURL());
|
||||||
|
remoteConfig.addURI(uri);
|
||||||
|
remoteConfig.update(config);
|
||||||
|
config.save();
|
||||||
|
|
||||||
|
remoteGit.commit().setMessage("initial commit").call();
|
||||||
|
remoteGit.tag().setName("tag").call();
|
||||||
|
remoteGit.checkout().setName("other").setCreateBranch(true).call();
|
||||||
|
remoteGit.commit().setMessage("commit2").call();
|
||||||
|
remoteGit.tag().setName("foo").call();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testFetchDefault() throws Exception {
|
||||||
|
String[] result = execute("git fetch test refs/heads/master:refs/remotes/origin/master");
|
||||||
|
assertEquals(" * [new branch] master -> origin/master",
|
||||||
|
result[1]);
|
||||||
|
assertEquals(" * [new tag] tag -> tag", result[2]);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testFetchNoTags() throws Exception {
|
||||||
|
String[] result = execute("git fetch --no-tags test refs/heads/master:refs/remotes/origin/master");
|
||||||
|
assertEquals(" * [new branch] master -> origin/master",
|
||||||
|
result[1]);
|
||||||
|
assertEquals("", result[2]);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testFetchAllTags() throws Exception {
|
||||||
|
String[] result = execute("git fetch --tags test refs/heads/master:refs/remotes/origin/master");
|
||||||
|
assertEquals(" * [new branch] master -> origin/master",
|
||||||
|
result[1]);
|
||||||
|
assertEquals(" * [new tag] foo -> foo", result[2]);
|
||||||
|
assertEquals(" * [new tag] tag -> tag", result[3]);
|
||||||
|
}
|
||||||
|
}
|
|
@ -315,6 +315,8 @@ usage_showNotes=Add this ref to the list of note branches from which notes are d
|
||||||
usage_squash=Squash commits as if a real merge happened, but do not make a commit or move the HEAD.
|
usage_squash=Squash commits as if a real merge happened, but do not make a commit or move the HEAD.
|
||||||
usage_srcPrefix=show the source prefix instead of "a/"
|
usage_srcPrefix=show the source prefix instead of "a/"
|
||||||
usage_symbolicVersionForTheProject=Symbolic version for the project
|
usage_symbolicVersionForTheProject=Symbolic version for the project
|
||||||
|
usage_tags=fetch all tags
|
||||||
|
usage_notags=do not fetch tags
|
||||||
usage_tagMessage=tag message
|
usage_tagMessage=tag message
|
||||||
usage_updateRemoteRefsFromAnotherRepository=Update remote refs from another repository
|
usage_updateRemoteRefsFromAnotherRepository=Update remote refs from another repository
|
||||||
usage_useNameInsteadOfOriginToTrackUpstream=use <name> instead of 'origin' to track upstream
|
usage_useNameInsteadOfOriginToTrackUpstream=use <name> instead of 'origin' to track upstream
|
||||||
|
|
|
@ -53,6 +53,7 @@
|
||||||
import org.eclipse.jgit.lib.TextProgressMonitor;
|
import org.eclipse.jgit.lib.TextProgressMonitor;
|
||||||
import org.eclipse.jgit.transport.FetchResult;
|
import org.eclipse.jgit.transport.FetchResult;
|
||||||
import org.eclipse.jgit.transport.RefSpec;
|
import org.eclipse.jgit.transport.RefSpec;
|
||||||
|
import org.eclipse.jgit.transport.TagOpt;
|
||||||
import org.kohsuke.args4j.Argument;
|
import org.kohsuke.args4j.Argument;
|
||||||
import org.kohsuke.args4j.Option;
|
import org.kohsuke.args4j.Option;
|
||||||
|
|
||||||
|
@ -86,6 +87,15 @@ void nothin(@SuppressWarnings("unused") final boolean ignored) {
|
||||||
@Option(name = "--quiet", usage = "usage_quiet")
|
@Option(name = "--quiet", usage = "usage_quiet")
|
||||||
private Boolean quiet;
|
private Boolean quiet;
|
||||||
|
|
||||||
|
@Option(name = "--tags", usage="usage_tags", aliases = { "-t" })
|
||||||
|
private Boolean tags;
|
||||||
|
|
||||||
|
@Option(name = "--no-tags", usage = "usage_notags", aliases = { "-n" })
|
||||||
|
void notags(@SuppressWarnings("unused")
|
||||||
|
final boolean ignored) {
|
||||||
|
tags = Boolean.FALSE;
|
||||||
|
}
|
||||||
|
|
||||||
@Argument(index = 0, metaVar = "metaVar_uriish")
|
@Argument(index = 0, metaVar = "metaVar_uriish")
|
||||||
private String remote = Constants.DEFAULT_REMOTE_NAME;
|
private String remote = Constants.DEFAULT_REMOTE_NAME;
|
||||||
|
|
||||||
|
@ -102,6 +112,10 @@ protected void run() throws Exception {
|
||||||
fetch.setRemoveDeletedRefs(prune.booleanValue());
|
fetch.setRemoveDeletedRefs(prune.booleanValue());
|
||||||
if (toget != null)
|
if (toget != null)
|
||||||
fetch.setRefSpecs(toget);
|
fetch.setRefSpecs(toget);
|
||||||
|
if (tags != null) {
|
||||||
|
fetch.setTagOpt(tags.booleanValue() ? TagOpt.FETCH_TAGS
|
||||||
|
: TagOpt.NO_TAGS);
|
||||||
|
}
|
||||||
if (0 <= timeout)
|
if (0 <= timeout)
|
||||||
fetch.setTimeout(timeout);
|
fetch.setTimeout(timeout);
|
||||||
fetch.setDryRun(dryRun);
|
fetch.setDryRun(dryRun);
|
||||||
|
|
Loading…
Reference in New Issue