You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

RevertCommand.java 7.3KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212
  1. /*
  2. * Copyright (C) 2010, Christian Halstrick <christian.halstrick@sap.com>
  3. * and other copyright owners as documented in the project's IP log.
  4. *
  5. * This program and the accompanying materials are made available
  6. * under the terms of the Eclipse Distribution License v1.0 which
  7. * accompanies this distribution, is reproduced below, and is
  8. * available at http://www.eclipse.org/org/documents/edl-v10.php
  9. *
  10. * All rights reserved.
  11. *
  12. * Redistribution and use in source and binary forms, with or
  13. * without modification, are permitted provided that the following
  14. * conditions are met:
  15. *
  16. * - Redistributions of source code must retain the above copyright
  17. * notice, this list of conditions and the following disclaimer.
  18. *
  19. * - Redistributions in binary form must reproduce the above
  20. * copyright notice, this list of conditions and the following
  21. * disclaimer in the documentation and/or other materials provided
  22. * with the distribution.
  23. *
  24. * - Neither the name of the Eclipse Foundation, Inc. nor the
  25. * names of its contributors may be used to endorse or promote
  26. * products derived from this software without specific prior
  27. * written permission.
  28. *
  29. * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
  30. * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
  31. * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  32. * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  33. * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
  34. * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  35. * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  36. * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  37. * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
  38. * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
  39. * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  40. * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  41. * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  42. */
  43. package org.eclipse.jgit.api;
  44. import java.io.IOException;
  45. import java.text.MessageFormat;
  46. import java.util.LinkedList;
  47. import java.util.List;
  48. import org.eclipse.jgit.JGitText;
  49. import org.eclipse.jgit.api.errors.GitAPIException;
  50. import org.eclipse.jgit.api.errors.MultipleParentsNotAllowedException;
  51. import org.eclipse.jgit.api.errors.JGitInternalException;
  52. import org.eclipse.jgit.api.errors.NoHeadException;
  53. import org.eclipse.jgit.dircache.DirCacheCheckout;
  54. import org.eclipse.jgit.lib.AnyObjectId;
  55. import org.eclipse.jgit.lib.Constants;
  56. import org.eclipse.jgit.lib.ObjectId;
  57. import org.eclipse.jgit.lib.ObjectIdRef;
  58. import org.eclipse.jgit.lib.Ref;
  59. import org.eclipse.jgit.lib.Ref.Storage;
  60. import org.eclipse.jgit.lib.Repository;
  61. import org.eclipse.jgit.merge.MergeStrategy;
  62. import org.eclipse.jgit.merge.ResolveMerger;
  63. import org.eclipse.jgit.revwalk.RevCommit;
  64. import org.eclipse.jgit.revwalk.RevWalk;
  65. import org.eclipse.jgit.treewalk.FileTreeIterator;
  66. /**
  67. * A class used to execute a {@code revert} command. It has setters for all
  68. * supported options and arguments of this command and a {@link #call()} method
  69. * to finally execute the command. Each instance of this class should only be
  70. * used for one invocation of the command (means: one call to {@link #call()})
  71. *
  72. * @see <a
  73. * href="http://www.kernel.org/pub/software/scm/git/docs/git-revert.html"
  74. * >Git documentation about revert</a>
  75. */
  76. public class RevertCommand extends GitCommand<RevCommit> {
  77. private List<Ref> commits = new LinkedList<Ref>();
  78. private List<Ref> revertedRefs = new LinkedList<Ref>();
  79. /**
  80. * @param repo
  81. */
  82. protected RevertCommand(Repository repo) {
  83. super(repo);
  84. }
  85. /**
  86. * Executes the {@code revert} command with all the options and parameters
  87. * collected by the setter methods (e.g. {@link #include(Ref)} of this
  88. * class. Each instance of this class should only be used for one invocation
  89. * of the command. Don't call this method twice on an instance.
  90. *
  91. * @return on success the {@link RevCommit} pointed to by the new HEAD is
  92. * returned. If a failure occurred during revert <code>null</code>
  93. * is returned. The list of successfully reverted {@link Ref}'s can
  94. * be obtained by calling {@link #getRevertedRefs()}
  95. */
  96. public RevCommit call() throws GitAPIException {
  97. RevCommit newHead = null;
  98. checkCallable();
  99. RevWalk revWalk = new RevWalk(repo);
  100. try {
  101. // get the head commit
  102. Ref headRef = repo.getRef(Constants.HEAD);
  103. if (headRef == null)
  104. throw new NoHeadException(
  105. JGitText.get().commitOnRepoWithoutHEADCurrentlyNotSupported);
  106. RevCommit headCommit = revWalk.parseCommit(headRef.getObjectId());
  107. newHead = headCommit;
  108. // loop through all refs to be reverted
  109. for (Ref src : commits) {
  110. // get the commit to be reverted
  111. // handle annotated tags
  112. ObjectId srcObjectId = src.getPeeledObjectId();
  113. if (srcObjectId == null)
  114. srcObjectId = src.getObjectId();
  115. RevCommit srcCommit = revWalk.parseCommit(srcObjectId);
  116. // get the parent of the commit to revert
  117. if (srcCommit.getParentCount() != 1) {
  118. throw new MultipleParentsNotAllowedException(
  119. JGitText.get().canOnlyRevertCommitsWithOneParent);
  120. }
  121. RevCommit srcParent = srcCommit.getParent(0);
  122. revWalk.parseHeaders(srcParent);
  123. ResolveMerger merger = (ResolveMerger) MergeStrategy.RESOLVE
  124. .newMerger(repo);
  125. merger.setWorkingTreeIterator(new FileTreeIterator(repo));
  126. merger.setBase(srcCommit.getTree());
  127. if (merger.merge(headCommit, srcParent)) {
  128. if (AnyObjectId.equals(headCommit.getTree().getId(), merger
  129. .getResultTreeId()))
  130. continue;
  131. DirCacheCheckout dco = new DirCacheCheckout(repo,
  132. headCommit.getTree(), repo.lockDirCache(),
  133. merger.getResultTreeId());
  134. dco.setFailOnConflict(true);
  135. dco.checkout();
  136. String newMessage = "Revert \""
  137. + srcCommit.getShortMessage() + "\"" + "\n\n"
  138. + "This reverts commit "
  139. + srcCommit.getId().getName() + "\n";
  140. newHead = new Git(getRepository()).commit().setMessage(
  141. newMessage).call();
  142. revertedRefs.add(src);
  143. } else {
  144. return null;
  145. }
  146. }
  147. } catch (IOException e) {
  148. throw new JGitInternalException(
  149. MessageFormat.format(
  150. JGitText.get().exceptionCaughtDuringExecutionOfRevertCommand,
  151. e), e);
  152. } finally {
  153. revWalk.release();
  154. }
  155. return newHead;
  156. }
  157. /**
  158. * @param commit
  159. * a reference to a commit which is reverted into the current
  160. * head
  161. * @return {@code this}
  162. */
  163. public RevertCommand include(Ref commit) {
  164. checkCallable();
  165. commits.add(commit);
  166. return this;
  167. }
  168. /**
  169. * @param commit
  170. * the Id of a commit which is reverted into the current head
  171. * @return {@code this}
  172. */
  173. public RevertCommand include(AnyObjectId commit) {
  174. return include(commit.getName(), commit);
  175. }
  176. /**
  177. * @param name
  178. * a name given to the commit
  179. * @param commit
  180. * the Id of a commit which is reverted into the current head
  181. * @return {@code this}
  182. */
  183. public RevertCommand include(String name, AnyObjectId commit) {
  184. return include(new ObjectIdRef.Unpeeled(Storage.LOOSE, name,
  185. commit.copy()));
  186. }
  187. /**
  188. * @return the list of successfully reverted {@link Ref}'s. Never
  189. * <code>null</code> but maybe an empty list if no commit was
  190. * successfully cherry-picked
  191. */
  192. public List<Ref> getRevertedRefs() {
  193. return revertedRefs;
  194. }
  195. }