Browse Source
* stable-3.7: Add option --orphan for checkout Prepare post 3.7.0.201502031740-rc1 builds JGit v3.7.0.201502031740-rc1 Support for the pre-commit hook Fix FileUtils.testRelativize_mixedCase which failed on Mac OS X Add a hook test Introduce hook support into the FS implementations If a pack isn't found on disk remove it from pack list Conflicts: org.eclipse.jgit.java7.test/META-INF/MANIFEST.MF Change-Id: I936acd24d47b911fa30ab29856094e1b2c6ac3db Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>stable-4.0
Matthias Sohn
10 years ago
22 changed files with 1117 additions and 11 deletions
@ -0,0 +1,136 @@
|
||||
/* |
||||
* 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.util; |
||||
|
||||
import static org.junit.Assert.assertEquals; |
||||
import static org.junit.Assert.assertNull; |
||||
import static org.junit.Assert.fail; |
||||
|
||||
import java.io.ByteArrayOutputStream; |
||||
import java.io.File; |
||||
import java.io.IOException; |
||||
import java.io.PrintStream; |
||||
|
||||
import org.eclipse.jgit.api.Git; |
||||
import org.eclipse.jgit.api.errors.RejectCommitException; |
||||
import org.eclipse.jgit.junit.JGitTestUtil; |
||||
import org.eclipse.jgit.junit.RepositoryTestCase; |
||||
import org.junit.Assume; |
||||
import org.junit.Test; |
||||
|
||||
public class HookTest extends RepositoryTestCase { |
||||
|
||||
@Test |
||||
public void testFindHook() throws Exception { |
||||
assumeSupportedPlatform(); |
||||
|
||||
Hook h = Hook.PRE_COMMIT; |
||||
assertNull("no hook should be installed", FS.DETECTED.findHook(db, h)); |
||||
File hookFile = writeHookFile(h.getName(), |
||||
"#!/bin/bash\necho \"test $1 $2\""); |
||||
assertEquals("exected to find pre-commit hook", hookFile, |
||||
FS.DETECTED.findHook(db, h)); |
||||
} |
||||
|
||||
@Test |
||||
public void testRunHook() throws Exception { |
||||
assumeSupportedPlatform(); |
||||
|
||||
Hook h = Hook.PRE_COMMIT; |
||||
writeHookFile( |
||||
h.getName(), |
||||
"#!/bin/sh\necho \"test $1 $2\"\nread INPUT\necho $INPUT\necho 1>&2 \"stderr\""); |
||||
ByteArrayOutputStream out = new ByteArrayOutputStream(); |
||||
ByteArrayOutputStream err = new ByteArrayOutputStream(); |
||||
ProcessResult res = FS.DETECTED.runIfPresent(db, h, new String[] { |
||||
"arg1", "arg2" }, |
||||
new PrintStream(out), new PrintStream(err), "stdin"); |
||||
assertEquals("unexpected hook output", "test arg1 arg2\nstdin\n", |
||||
out.toString("UTF-8")); |
||||
assertEquals("unexpected output on stderr stream", "stderr\n", |
||||
err.toString("UTF-8")); |
||||
assertEquals("unexpected exit code", 0, res.getExitCode()); |
||||
assertEquals("unexpected process status", ProcessResult.Status.OK, |
||||
res.getStatus()); |
||||
} |
||||
|
||||
@Test |
||||
public void testPreCommitHook() throws Exception { |
||||
assumeSupportedPlatform(); |
||||
|
||||
Hook h = Hook.PRE_COMMIT; |
||||
writeHookFile(h.getName(), |
||||
"#!/bin/sh\necho \"test\"\n\necho 1>&2 \"stderr\"\nexit 1"); |
||||
Git git = Git.wrap(db); |
||||
String path = "a.txt"; |
||||
writeTrashFile(path, "content"); |
||||
git.add().addFilepattern(path).call(); |
||||
ByteArrayOutputStream out = new ByteArrayOutputStream(); |
||||
try { |
||||
git.commit().setMessage("commit") |
||||
.setHookOutputStream(new PrintStream(out)).call(); |
||||
fail("expected pre-commit hook to abort commit"); |
||||
} catch (RejectCommitException e) { |
||||
assertEquals("unexpected error message from pre-commit hook", |
||||
"Commit rejected by \"pre-commit\" hook.\nstderr\n", |
||||
e.getMessage()); |
||||
assertEquals("unexpected output from pre-commit hook", "test\n", |
||||
out.toString()); |
||||
} catch (Throwable e) { |
||||
fail("unexpected exception thrown by pre-commit hook: " + e); |
||||
} |
||||
} |
||||
|
||||
private File writeHookFile(final String name, final String data) |
||||
throws IOException { |
||||
File path = new File(db.getWorkTree() + "/.git/hooks/", name); |
||||
JGitTestUtil.write(path, data); |
||||
FS.DETECTED.setExecute(path, true); |
||||
return path; |
||||
} |
||||
|
||||
private void assumeSupportedPlatform() { |
||||
Assume.assumeTrue(FS.DETECTED instanceof FS_POSIX |
||||
|| FS.DETECTED instanceof FS_Win32_Java7Cygwin); |
||||
} |
||||
} |
||||
@ -0,0 +1,61 @@
|
||||
/* |
||||
* Copyright (C) 2015 Obeo. |
||||
* 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.errors; |
||||
|
||||
/** |
||||
* Exception thrown when a commit is rejected by a hook (either |
||||
* {@link org.eclipse.jgit.util.Hook#PRE_COMMIT pre-commit} or |
||||
* {@link org.eclipse.jgit.util.Hook#COMMIT_MSG commit-msg}). |
||||
* |
||||
* @since 3.7 |
||||
*/ |
||||
public class RejectCommitException extends GitAPIException { |
||||
private static final long serialVersionUID = 1L; |
||||
|
||||
/** |
||||
* @param message |
||||
*/ |
||||
public RejectCommitException(String message) { |
||||
super(message); |
||||
} |
||||
} |
||||
@ -0,0 +1,149 @@
|
||||
/* |
||||
* Copyright (C) 2014 Obeo. |
||||
* 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.util; |
||||
|
||||
/** |
||||
* An enum describing the different hooks a user can implement to customize his |
||||
* repositories. |
||||
* |
||||
* @since 3.7 |
||||
*/ |
||||
public enum Hook { |
||||
/** |
||||
* Literal for the "pre-commit" git hook. |
||||
* <p> |
||||
* This hook is invoked by git commit, and can be bypassed with the |
||||
* "no-verify" option. It takes no parameter, and is invoked before |
||||
* obtaining the proposed commit log message and making a commit. |
||||
* </p> |
||||
* <p> |
||||
* A non-zero exit code from the called hook means that the commit should be |
||||
* aborted. |
||||
* </p> |
||||
*/ |
||||
PRE_COMMIT("pre-commit"), //$NON-NLS-1$
|
||||
|
||||
/** |
||||
* Literal for the "prepare-commit-msg" git hook. |
||||
* <p> |
||||
* This hook is invoked by git commit right after preparing the default |
||||
* message, and before any editing possibility is displayed to the user. |
||||
* </p> |
||||
* <p> |
||||
* A non-zero exit code from the called hook means that the commit should be |
||||
* aborted. |
||||
* </p> |
||||
*/ |
||||
PREPARE_COMMIT_MSG("prepare-commit-msg"), //$NON-NLS-1$
|
||||
|
||||
/** |
||||
* Literal for the "commit-msg" git hook. |
||||
* <p> |
||||
* This hook is invoked by git commit, and can be bypassed with the |
||||
* "no-verify" option. Its single parameter is the path to the file |
||||
* containing the prepared commit message (typically |
||||
* "<gitdir>/COMMIT-EDITMSG"). |
||||
* </p> |
||||
* <p> |
||||
* A non-zero exit code from the called hook means that the commit should be |
||||
* aborted. |
||||
* </p> |
||||
*/ |
||||
COMMIT_MSG("commit-msg"), //$NON-NLS-1$
|
||||
|
||||
/** |
||||
* Literal for the "post-commit" git hook. |
||||
* <p> |
||||
* This hook is invoked by git commit. It takes no parameter and is invoked |
||||
* after a commit has been made. |
||||
* </p> |
||||
* <p> |
||||
* The exit code of this hook has no significance. |
||||
* </p> |
||||
*/ |
||||
POST_COMMIT("post-commit"), //$NON-NLS-1$
|
||||
|
||||
/** |
||||
* Literal for the "post-rewrite" git hook. |
||||
* <p> |
||||
* This hook is invoked after commands that rewrite commits (currently, only |
||||
* "git rebase" and "git commit --amend"). It a single argument denoting the |
||||
* source of the call (one of <code>rebase</code> or <code>amend</code>). It |
||||
* then accepts a list of rewritten commits through stdin, in the form |
||||
* <code><old SHA-1> <new SHA-1>LF</code>. |
||||
* </p> |
||||
* <p> |
||||
* The exit code of this hook has no significance. |
||||
* </p> |
||||
*/ |
||||
POST_REWRITE("post-rewrite"), //$NON-NLS-1$
|
||||
|
||||
/** |
||||
* Literal for the "pre-rebase" git hook. |
||||
* <p> |
||||
* </p> |
||||
* This hook is invoked right before the rebase operation runs. It accepts |
||||
* up to two parameters, the first being the upstream from which the branch |
||||
* to rebase has been forked. If the tip of the series of commits to rebase |
||||
* is HEAD, the other parameter is unset. Otherwise, that tip is passed as |
||||
* the second parameter of the script. |
||||
* <p> |
||||
* A non-zero exit code from the called hook means that the rebase should be |
||||
* aborted. |
||||
* </p> |
||||
*/ |
||||
PRE_REBASE("pre-rebase"); //$NON-NLS-1$
|
||||
|
||||
private final String name; |
||||
|
||||
private Hook(String name) { |
||||
this.name = name; |
||||
} |
||||
|
||||
/** |
||||
* @return The name of this hook. |
||||
*/ |
||||
public String getName() { |
||||
return name; |
||||
} |
||||
} |
||||
@ -0,0 +1,112 @@
|
||||
/* |
||||
* Copyright (C) 2014 Obeo. |
||||
* 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.util; |
||||
|
||||
/** |
||||
* Describes the result of running an external process. |
||||
* |
||||
* @since 3.7 |
||||
*/ |
||||
public class ProcessResult { |
||||
/** |
||||
* Status of a process' execution. |
||||
*/ |
||||
public static enum Status { |
||||
/** |
||||
* The script was found and launched properly. It may still have exited |
||||
* with a non-zero {@link #exitCode}. |
||||
*/ |
||||
OK, |
||||
|
||||
/** The script was not found on disk and thus could not be launched. */ |
||||
NOT_PRESENT, |
||||
|
||||
/** |
||||
* The script was found but could not be launched since it was not |
||||
* supported by the current {@link FS}. |
||||
*/ |
||||
NOT_SUPPORTED; |
||||
} |
||||
|
||||
/** The exit code of the process. */ |
||||
private final int exitCode; |
||||
|
||||
/** Status of the process' execution. */ |
||||
private final Status status; |
||||
|
||||
/** |
||||
* Instantiates a process result with the given status and an exit code of |
||||
* <code>-1</code>. |
||||
* |
||||
* @param status |
||||
* Status describing the execution of the external process. |
||||
*/ |
||||
public ProcessResult(Status status) { |
||||
this(-1, status); |
||||
} |
||||
|
||||
/** |
||||
* @param exitCode |
||||
* Exit code of the process. |
||||
* @param status |
||||
* Status describing the execution of the external process. |
||||
*/ |
||||
public ProcessResult(int exitCode, Status status) { |
||||
this.exitCode = exitCode; |
||||
this.status = status; |
||||
} |
||||
|
||||
/** |
||||
* @return The exit code of the process. |
||||
*/ |
||||
public int getExitCode() { |
||||
return exitCode; |
||||
} |
||||
|
||||
/** |
||||
* @return The status of the process' execution. |
||||
*/ |
||||
public Status getStatus() { |
||||
return status; |
||||
} |
||||
} |
||||
Loading…
Reference in new issue