From f7a566c1aaed71f275567a2047dff1c806240449 Mon Sep 17 00:00:00 2001 From: Chris Aniszczyk Date: Thu, 2 Dec 2010 20:10:08 -0600 Subject: [PATCH] Add InitCommand Adds git-init support to the Git API. Change-Id: I1428b861f22cabe4d92cadf3d9114dddeec75b40 Signed-off-by: Chris Aniszczyk --- .../org/eclipse/jgit/api/InitCommandTest.java | 100 +++++++++++++++ .../src/org/eclipse/jgit/api/Git.java | 15 ++- .../src/org/eclipse/jgit/api/InitCommand.java | 120 ++++++++++++++++++ 3 files changed, 234 insertions(+), 1 deletion(-) create mode 100644 org.eclipse.jgit.test/tst/org/eclipse/jgit/api/InitCommandTest.java create mode 100644 org.eclipse.jgit/src/org/eclipse/jgit/api/InitCommand.java diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/InitCommandTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/InitCommandTest.java new file mode 100644 index 000000000..428cad850 --- /dev/null +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/InitCommandTest.java @@ -0,0 +1,100 @@ +/* + * Copyright (C) 2010, Chris Aniszczyk + * 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.api; + +import java.io.File; +import java.io.IOException; + +import org.eclipse.jgit.lib.Repository; +import org.eclipse.jgit.lib.RepositoryTestCase; + +public class InitCommandTest extends RepositoryTestCase { + + @Override + protected void setUp() throws Exception { + super.setUp(); + } + + public void testInitRepository() { + try { + File directory = createTempDirectory("testInitRepository"); + InitCommand command = new InitCommand(); + command.setDirectory(directory); + Repository repository = command.call().getRepository(); + assertNotNull(repository); + } catch (Exception e) { + fail(e.getMessage()); + } + } + + public void testInitBareRepository() { + try { + File directory = createTempDirectory("testInitBareRepository"); + InitCommand command = new InitCommand(); + command.setDirectory(directory); + command.setBare(true); + Repository repository = command.call().getRepository(); + assertNotNull(repository); + assertTrue(repository.isBare()); + } catch (Exception e) { + fail(e.getMessage()); + } + } + + public static File createTempDirectory(String name) throws IOException { + final File temp; + temp = File.createTempFile(name, Long.toString(System.nanoTime())); + + if (!(temp.delete())) { + throw new IOException("Could not delete temp file: " + + temp.getAbsolutePath()); + } + + if (!(temp.mkdir())) { + throw new IOException("Could not create temp directory: " + + temp.getAbsolutePath()); + } + return temp; + } + +} diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/Git.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/Git.java index 8623bb76a..8564570d3 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/Git.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/Git.java @@ -258,7 +258,7 @@ public RebaseCommand rebase() { /** * Returns a command object to execute a {@code rm} command - * + * * @see Git documentation about rm @@ -282,6 +282,19 @@ public CheckoutCommand checkout() { return new CheckoutCommand(repo); } + /** + * Returns a command object to execute a {@code init} command + * + * @see Git documentation about init + * @return a {@link InitCommand} used to collect all optional parameters and + * to finally execute the {@code init} command + */ + static public InitCommand init() { + return new InitCommand(); + } + /** * @return the git repository this class is interacting with */ diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/InitCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/InitCommand.java new file mode 100644 index 000000000..fdadf9690 --- /dev/null +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/InitCommand.java @@ -0,0 +1,120 @@ +/* + * Copyright (C) 2010, Chris Aniszczyk + * 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.api; + +import java.io.File; +import java.io.IOException; +import java.util.concurrent.Callable; + +import org.eclipse.jgit.api.errors.JGitInternalException; +import org.eclipse.jgit.lib.Constants; +import org.eclipse.jgit.lib.Repository; +import org.eclipse.jgit.lib.RepositoryBuilder; + +/** + * Create an empty git repository + * + * @see Git documentation about init + */ +public class InitCommand implements Callable { + private File directory; + + private boolean bare; + + /** + * Executes the {@code Init} command. + * + * @throws JGitInternalException + * if the repository can't be created + * @return the newly created {@code Git} object with associated repository + */ + public Git call() throws JGitInternalException { + try { + RepositoryBuilder builder = new RepositoryBuilder(); + if (bare) + builder.setBare(); + builder.readEnvironment(); + if (directory != null) { + File d = directory; + if (!bare) + d = new File(d, Constants.DOT_GIT); + builder.setGitDir(d); + } else if (builder.getGitDir() == null) { + File d = new File("."); + if (!bare) + d = new File(d, Constants.DOT_GIT); + builder.setGitDir(d); + } + Repository repository = builder.build(); + repository.create(bare); + return new Git(repository); + } catch (IOException e) { + throw new JGitInternalException(e.getMessage(), e); + } + } + + /** + * The optional directory associated with the init operation. If no + * directory is set, we'll use the current directory + * + * @param directory + * the directory to init to + * @return this instance + */ + public InitCommand setDirectory(File directory) { + this.directory = directory; + return this; + } + + /** + * @param bare + * whether the repository is bare or not + * @return this instance + */ + public InitCommand setBare(boolean bare) { + this.bare = bare; + return this; + } + +}