Browse Source
This is almost reverted cherry-pick, and the implementation is almost identical. It orders the input to merge differently to get the effect and produces a different commit message with the default author, rather than the original author. Change-Id: I39970091d9f7406ae7168b8efaab23a5e2c16bad Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>stable-0.11
Robin Rosenberg
14 years ago
6 changed files with 384 additions and 1 deletions
@ -0,0 +1,101 @@
|
||||
/* |
||||
* Copyright (C) 2011, Robin Rosenberg |
||||
* 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 static org.junit.Assert.*; |
||||
|
||||
import java.io.File; |
||||
import java.io.IOException; |
||||
import java.util.Iterator; |
||||
|
||||
import org.eclipse.jgit.api.errors.GitAPIException; |
||||
import org.eclipse.jgit.api.errors.JGitInternalException; |
||||
import org.eclipse.jgit.lib.RepositoryTestCase; |
||||
import org.eclipse.jgit.revwalk.RevCommit; |
||||
import org.junit.Test; |
||||
|
||||
/** |
||||
* Test cherry-pick command |
||||
*/ |
||||
public class RevertCommandTest extends RepositoryTestCase { |
||||
@Test |
||||
public void testRevert() throws IOException, JGitInternalException, |
||||
GitAPIException { |
||||
Git git = new Git(db); |
||||
|
||||
writeTrashFile("a", "first line\nsec. line\nthird line\n"); |
||||
git.add().addFilepattern("a").call(); |
||||
git.commit().setMessage("create a").call(); |
||||
|
||||
writeTrashFile("b", "content\n"); |
||||
git.add().addFilepattern("b").call(); |
||||
git.commit().setMessage("create b").call(); |
||||
|
||||
writeTrashFile("a", "first line\nsec. line\nthird line\nfourth line\n"); |
||||
git.add().addFilepattern("a").call(); |
||||
git.commit().setMessage("enlarged a").call(); |
||||
|
||||
writeTrashFile("a", |
||||
"first line\nsecond line\nthird line\nfourth line\n"); |
||||
git.add().addFilepattern("a").call(); |
||||
RevCommit fixingA = git.commit().setMessage("fixed a").call(); |
||||
|
||||
writeTrashFile("b", "first line\n"); |
||||
git.add().addFilepattern("b").call(); |
||||
git.commit().setMessage("fixed b").call(); |
||||
|
||||
git.revert().include(fixingA).call(); |
||||
|
||||
assertTrue(new File(db.getWorkTree(), "b").exists()); |
||||
checkFile(new File(db.getWorkTree(), "a"), |
||||
"first line\nsec. line\nthird line\nfourth line\n"); |
||||
Iterator<RevCommit> history = git.log().call().iterator(); |
||||
assertEquals("Revert \"fixed a\"", history.next().getShortMessage()); |
||||
assertEquals("fixed b", history.next().getFullMessage()); |
||||
assertEquals("fixed a", history.next().getFullMessage()); |
||||
assertEquals("enlarged a", history.next().getFullMessage()); |
||||
assertEquals("create b", history.next().getFullMessage()); |
||||
assertEquals("create a", history.next().getFullMessage()); |
||||
assertFalse(history.hasNext()); |
||||
} |
||||
} |
||||
@ -0,0 +1,207 @@
|
||||
/* |
||||
* Copyright (C) 2010, Christian Halstrick <christian.halstrick@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.api; |
||||
|
||||
import java.io.IOException; |
||||
import java.text.MessageFormat; |
||||
import java.util.LinkedList; |
||||
import java.util.List; |
||||
|
||||
import org.eclipse.jgit.JGitText; |
||||
import org.eclipse.jgit.api.errors.GitAPIException; |
||||
import org.eclipse.jgit.api.errors.MultipleParentsNotAllowedException; |
||||
import org.eclipse.jgit.api.errors.JGitInternalException; |
||||
import org.eclipse.jgit.api.errors.NoHeadException; |
||||
import org.eclipse.jgit.dircache.DirCacheCheckout; |
||||
import org.eclipse.jgit.lib.AnyObjectId; |
||||
import org.eclipse.jgit.lib.Constants; |
||||
import org.eclipse.jgit.lib.ObjectId; |
||||
import org.eclipse.jgit.lib.ObjectIdRef; |
||||
import org.eclipse.jgit.lib.Ref; |
||||
import org.eclipse.jgit.lib.Ref.Storage; |
||||
import org.eclipse.jgit.lib.Repository; |
||||
import org.eclipse.jgit.merge.MergeStrategy; |
||||
import org.eclipse.jgit.merge.ResolveMerger; |
||||
import org.eclipse.jgit.revwalk.RevCommit; |
||||
import org.eclipse.jgit.revwalk.RevWalk; |
||||
import org.eclipse.jgit.treewalk.FileTreeIterator; |
||||
|
||||
/** |
||||
* A class used to execute a {@code revert} command. It has setters for all |
||||
* supported options and arguments of this command and a {@link #call()} method |
||||
* to finally execute the command. Each instance of this class should only be |
||||
* used for one invocation of the command (means: one call to {@link #call()}) |
||||
* |
||||
* @see <a |
||||
* href="http://www.kernel.org/pub/software/scm/git/docs/git-revert.html" |
||||
* >Git documentation about revert</a> |
||||
*/ |
||||
public class RevertCommand extends GitCommand<RevCommit> { |
||||
private List<Ref> commits = new LinkedList<Ref>(); |
||||
|
||||
private List<Ref> revertedRefs = new LinkedList<Ref>(); |
||||
|
||||
/** |
||||
* @param repo |
||||
*/ |
||||
protected RevertCommand(Repository repo) { |
||||
super(repo); |
||||
} |
||||
|
||||
/** |
||||
* Executes the {@code revert} command with all the options and parameters |
||||
* collected by the setter methods (e.g. {@link #include(Ref)} of this |
||||
* class. Each instance of this class should only be used for one invocation |
||||
* of the command. Don't call this method twice on an instance. |
||||
* |
||||
* @return on success the {@link RevCommit} pointed to by the new HEAD is |
||||
* returned. If a failure occurred during revert <code>null</code> |
||||
* is returned. The list of successfully reverted {@link Ref}'s can |
||||
* be obtained by calling {@link #getRevertedRefs()} |
||||
*/ |
||||
public RevCommit call() throws GitAPIException { |
||||
RevCommit newHead = null; |
||||
checkCallable(); |
||||
|
||||
RevWalk revWalk = new RevWalk(repo); |
||||
try { |
||||
|
||||
// get the head commit
|
||||
Ref headRef = repo.getRef(Constants.HEAD); |
||||
if (headRef == null) |
||||
throw new NoHeadException( |
||||
JGitText.get().commitOnRepoWithoutHEADCurrentlyNotSupported); |
||||
RevCommit headCommit = revWalk.parseCommit(headRef.getObjectId()); |
||||
|
||||
// loop through all refs to be reverted
|
||||
for (Ref src : commits) { |
||||
// get the commit to be reverted
|
||||
// handle annotated tags
|
||||
ObjectId srcObjectId = src.getPeeledObjectId(); |
||||
if (srcObjectId == null) |
||||
srcObjectId = src.getObjectId(); |
||||
RevCommit srcCommit = revWalk.parseCommit(srcObjectId); |
||||
|
||||
// get the parent of the commit to revert
|
||||
if (srcCommit.getParentCount() != 1) { |
||||
throw new MultipleParentsNotAllowedException( |
||||
JGitText.get().canOnlyRevertCommitsWithOneParent); |
||||
} |
||||
RevCommit srcParent = srcCommit.getParent(0); |
||||
revWalk.parseHeaders(srcParent); |
||||
|
||||
ResolveMerger merger = (ResolveMerger) MergeStrategy.RESOLVE |
||||
.newMerger(repo); |
||||
merger.setWorkingTreeIterator(new FileTreeIterator(repo)); |
||||
merger.setBase(srcCommit.getTree()); |
||||
|
||||
if (merger.merge(headCommit, srcParent)) { |
||||
DirCacheCheckout dco = new DirCacheCheckout(repo, |
||||
headCommit.getTree(), repo.lockDirCache(), |
||||
merger.getResultTreeId()); |
||||
dco.setFailOnConflict(true); |
||||
dco.checkout(); |
||||
String newMessage = "Revert \"" |
||||
+ srcCommit.getShortMessage() + "\"" + "\n\n" |
||||
+ "This reverts commit " |
||||
+ srcCommit.getId().getName() + "\n"; |
||||
newHead = new Git(getRepository()).commit().setMessage( |
||||
newMessage).call(); |
||||
revertedRefs.add(src); |
||||
} else { |
||||
return null; |
||||
} |
||||
} |
||||
} catch (IOException e) { |
||||
throw new JGitInternalException( |
||||
MessageFormat.format( |
||||
JGitText.get().exceptionCaughtDuringExecutionOfRevertCommand, |
||||
e), e); |
||||
} finally { |
||||
revWalk.release(); |
||||
} |
||||
return newHead; |
||||
} |
||||
|
||||
/** |
||||
* @param commit |
||||
* a reference to a commit which is reverted into the current |
||||
* head |
||||
* @return {@code this} |
||||
*/ |
||||
public RevertCommand include(Ref commit) { |
||||
checkCallable(); |
||||
commits.add(commit); |
||||
return this; |
||||
} |
||||
|
||||
/** |
||||
* @param commit |
||||
* the Id of a commit which is reverted into the current head |
||||
* @return {@code this} |
||||
*/ |
||||
public RevertCommand include(AnyObjectId commit) { |
||||
return include(commit.getName(), commit); |
||||
} |
||||
|
||||
/** |
||||
* @param name |
||||
* a name given to the commit |
||||
* @param commit |
||||
* the Id of a commit which is reverted into the current head |
||||
* @return {@code this} |
||||
*/ |
||||
public RevertCommand include(String name, AnyObjectId commit) { |
||||
return include(new ObjectIdRef.Unpeeled(Storage.LOOSE, name, |
||||
commit.copy())); |
||||
} |
||||
|
||||
/** |
||||
* @return the list of successfully reverted {@link Ref}'s. Never |
||||
* <code>null</code> but maybe an empty list if no commit was |
||||
* successfully cherry-picked |
||||
*/ |
||||
public List<Ref> getRevertedRefs() { |
||||
return revertedRefs; |
||||
} |
||||
} |
||||
Loading…
Reference in new issue