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.

ResetCommand.java 11KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379
  1. /*
  2. * Copyright (C) 2011-2012, Chris Aniszczyk <caniszczyk@gmail.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.Collection;
  47. import java.util.LinkedList;
  48. import org.eclipse.jgit.api.errors.CheckoutConflictException;
  49. import org.eclipse.jgit.api.errors.GitAPIException;
  50. import org.eclipse.jgit.api.errors.JGitInternalException;
  51. import org.eclipse.jgit.dircache.DirCache;
  52. import org.eclipse.jgit.dircache.DirCacheBuildIterator;
  53. import org.eclipse.jgit.dircache.DirCacheBuilder;
  54. import org.eclipse.jgit.dircache.DirCacheCheckout;
  55. import org.eclipse.jgit.dircache.DirCacheEntry;
  56. import org.eclipse.jgit.dircache.DirCacheIterator;
  57. import org.eclipse.jgit.internal.JGitText;
  58. import org.eclipse.jgit.lib.Constants;
  59. import org.eclipse.jgit.lib.ObjectId;
  60. import org.eclipse.jgit.lib.Ref;
  61. import org.eclipse.jgit.lib.RefUpdate;
  62. import org.eclipse.jgit.lib.Repository;
  63. import org.eclipse.jgit.lib.RepositoryState;
  64. import org.eclipse.jgit.revwalk.RevCommit;
  65. import org.eclipse.jgit.revwalk.RevWalk;
  66. import org.eclipse.jgit.treewalk.AbstractTreeIterator;
  67. import org.eclipse.jgit.treewalk.CanonicalTreeParser;
  68. import org.eclipse.jgit.treewalk.TreeWalk;
  69. import org.eclipse.jgit.treewalk.filter.PathFilterGroup;
  70. /**
  71. * A class used to execute a {@code Reset} command. It has setters for all
  72. * supported options and arguments of this command and a {@link #call()} method
  73. * to finally execute the command. Each instance of this class should only be
  74. * used for one invocation of the command (means: one call to {@link #call()})
  75. *
  76. * @see <a href="http://www.kernel.org/pub/software/scm/git/docs/git-reset.html"
  77. * >Git documentation about Reset</a>
  78. */
  79. public class ResetCommand extends GitCommand<Ref> {
  80. /**
  81. * Kind of reset
  82. */
  83. public enum ResetType {
  84. /**
  85. * Just change the ref, the index and workdir are not changed.
  86. */
  87. SOFT,
  88. /**
  89. * Change the ref and the index, the workdir is not changed.
  90. */
  91. MIXED,
  92. /**
  93. * Change the ref, the index and the workdir
  94. */
  95. HARD,
  96. /**
  97. * Resets the index and updates the files in the working tree that are
  98. * different between respective commit and HEAD, but keeps those which
  99. * are different between the index and working tree
  100. */
  101. MERGE, // TODO not implemented yet
  102. /**
  103. * Change the ref, the index and the workdir that are different between
  104. * respective commit and HEAD
  105. */
  106. KEEP // TODO not implemented yet
  107. }
  108. private String ref = Constants.HEAD;
  109. private ResetType mode;
  110. private Collection<String> filepaths = new LinkedList<String>();
  111. /**
  112. *
  113. * @param repo
  114. */
  115. public ResetCommand(Repository repo) {
  116. super(repo);
  117. }
  118. /**
  119. * Executes the {@code Reset} command. Each instance of this class should
  120. * only be used for one invocation of the command. Don't call this method
  121. * twice on an instance.
  122. *
  123. * @return the Ref after reset
  124. * @throws GitAPIException
  125. */
  126. public Ref call() throws GitAPIException, CheckoutConflictException {
  127. checkCallable();
  128. Ref r;
  129. RevCommit commit;
  130. try {
  131. RepositoryState state = repo.getRepositoryState();
  132. final boolean merging = state.equals(RepositoryState.MERGING)
  133. || state.equals(RepositoryState.MERGING_RESOLVED);
  134. final boolean cherryPicking = state
  135. .equals(RepositoryState.CHERRY_PICKING)
  136. || state.equals(RepositoryState.CHERRY_PICKING_RESOLVED);
  137. // resolve the ref to a commit
  138. final ObjectId commitId;
  139. try {
  140. commitId = repo.resolve(ref + "^{commit}"); //$NON-NLS-1$
  141. if (commitId == null) {
  142. // @TODO throw an InvalidRefNameException. We can't do that
  143. // now because this would break the API
  144. throw new JGitInternalException("Invalid ref " + ref
  145. + " specified");
  146. }
  147. } catch (IOException e) {
  148. throw new JGitInternalException(
  149. MessageFormat.format(JGitText.get().cannotRead, ref),
  150. e);
  151. }
  152. RevWalk rw = new RevWalk(repo);
  153. try {
  154. commit = rw.parseCommit(commitId);
  155. } catch (IOException e) {
  156. throw new JGitInternalException(
  157. MessageFormat.format(
  158. JGitText.get().cannotReadCommit, commitId.toString()),
  159. e);
  160. } finally {
  161. rw.release();
  162. }
  163. if (!filepaths.isEmpty()) {
  164. // reset [commit] -- paths
  165. resetIndexForPaths(commit);
  166. setCallable(false);
  167. return repo.getRef(Constants.HEAD);
  168. }
  169. // write the ref
  170. final RefUpdate ru = repo.updateRef(Constants.HEAD);
  171. ru.setNewObjectId(commitId);
  172. String refName = Repository.shortenRefName(ref);
  173. String message = refName + ": updating " + Constants.HEAD; //$NON-NLS-1$
  174. ru.setRefLogMessage(message, false);
  175. if (ru.forceUpdate() == RefUpdate.Result.LOCK_FAILURE)
  176. throw new JGitInternalException(MessageFormat.format(
  177. JGitText.get().cannotLock, ru.getName()));
  178. ObjectId origHead = ru.getOldObjectId();
  179. if (origHead != null)
  180. repo.writeOrigHead(origHead);
  181. switch (mode) {
  182. case HARD:
  183. checkoutIndex(commit);
  184. break;
  185. case MIXED:
  186. resetIndex(commit);
  187. break;
  188. case SOFT: // do nothing, only the ref was changed
  189. break;
  190. case KEEP: // TODO
  191. case MERGE: // TODO
  192. throw new UnsupportedOperationException();
  193. }
  194. if (mode != ResetType.SOFT) {
  195. if (merging)
  196. resetMerge();
  197. else if (cherryPicking)
  198. resetCherryPick();
  199. else if (repo.readSquashCommitMsg() != null)
  200. repo.writeSquashCommitMsg(null /* delete */);
  201. }
  202. setCallable(false);
  203. r = ru.getRef();
  204. } catch (IOException e) {
  205. throw new JGitInternalException(
  206. JGitText.get().exceptionCaughtDuringExecutionOfResetCommand,
  207. e);
  208. }
  209. return r;
  210. }
  211. /**
  212. * @param ref
  213. * the ref to reset to
  214. * @return this instance
  215. */
  216. public ResetCommand setRef(String ref) {
  217. this.ref = ref;
  218. return this;
  219. }
  220. /**
  221. * @param mode
  222. * the mode of the reset command
  223. * @return this instance
  224. */
  225. public ResetCommand setMode(ResetType mode) {
  226. if (!filepaths.isEmpty())
  227. throw new JGitInternalException(MessageFormat.format(
  228. JGitText.get().illegalCombinationOfArguments,
  229. "[--mixed | --soft | --hard]", "<paths>...")); //$NON-NLS-1$
  230. this.mode = mode;
  231. return this;
  232. }
  233. /**
  234. * @param file
  235. * the file to add
  236. * @return this instance
  237. */
  238. public ResetCommand addPath(String file) {
  239. if (mode != null)
  240. throw new JGitInternalException(MessageFormat.format(
  241. JGitText.get().illegalCombinationOfArguments, "<paths>...",
  242. "[--mixed | --soft | --hard]")); //$NON-NLS-1$
  243. filepaths.add(file);
  244. return this;
  245. }
  246. private void resetIndexForPaths(RevCommit commit) {
  247. DirCache dc = null;
  248. try {
  249. dc = repo.lockDirCache();
  250. DirCacheBuilder builder = dc.builder();
  251. final TreeWalk tw = new TreeWalk(repo);
  252. tw.addTree(new DirCacheBuildIterator(builder));
  253. tw.addTree(commit.getTree());
  254. tw.setFilter(PathFilterGroup.createFromStrings(filepaths));
  255. tw.setRecursive(true);
  256. while (tw.next()) {
  257. final CanonicalTreeParser tree = tw.getTree(1,
  258. CanonicalTreeParser.class);
  259. // only keep file in index if it's in the commit
  260. if (tree != null) {
  261. // revert index to commit
  262. DirCacheEntry entry = new DirCacheEntry(tw.getRawPath());
  263. entry.setFileMode(tree.getEntryFileMode());
  264. entry.setObjectId(tree.getEntryObjectId());
  265. builder.add(entry);
  266. }
  267. }
  268. builder.commit();
  269. } catch (IOException e) {
  270. throw new RuntimeException(e);
  271. } finally {
  272. if (dc != null)
  273. dc.unlock();
  274. }
  275. }
  276. private void resetIndex(RevCommit commit) throws IOException {
  277. DirCache dc = repo.lockDirCache();
  278. TreeWalk walk = null;
  279. try {
  280. DirCacheBuilder builder = dc.builder();
  281. walk = new TreeWalk(repo);
  282. walk.addTree(commit.getTree());
  283. walk.addTree(new DirCacheIterator(dc));
  284. walk.setRecursive(true);
  285. while (walk.next()) {
  286. AbstractTreeIterator cIter = walk.getTree(0,
  287. AbstractTreeIterator.class);
  288. if (cIter == null) {
  289. // Not in commit, don't add to new index
  290. continue;
  291. }
  292. final DirCacheEntry entry = new DirCacheEntry(walk.getRawPath());
  293. entry.setFileMode(cIter.getEntryFileMode());
  294. entry.setObjectIdFromRaw(cIter.idBuffer(), cIter.idOffset());
  295. DirCacheIterator dcIter = walk.getTree(1,
  296. DirCacheIterator.class);
  297. if (dcIter != null && dcIter.idEqual(cIter)) {
  298. DirCacheEntry indexEntry = dcIter.getDirCacheEntry();
  299. entry.setLastModified(indexEntry.getLastModified());
  300. entry.setLength(indexEntry.getLength());
  301. }
  302. builder.add(entry);
  303. }
  304. builder.commit();
  305. } finally {
  306. dc.unlock();
  307. if (walk != null)
  308. walk.release();
  309. }
  310. }
  311. private void checkoutIndex(RevCommit commit) throws IOException,
  312. GitAPIException {
  313. DirCache dc = repo.lockDirCache();
  314. try {
  315. DirCacheCheckout checkout = new DirCacheCheckout(repo, dc,
  316. commit.getTree());
  317. checkout.setFailOnConflict(false);
  318. try {
  319. checkout.checkout();
  320. } catch (org.eclipse.jgit.errors.CheckoutConflictException cce) {
  321. throw new CheckoutConflictException(checkout.getConflicts(),
  322. cce);
  323. }
  324. } finally {
  325. dc.unlock();
  326. }
  327. }
  328. private void resetMerge() throws IOException {
  329. repo.writeMergeHeads(null);
  330. repo.writeMergeCommitMsg(null);
  331. }
  332. private void resetCherryPick() throws IOException {
  333. repo.writeCherryPickHead(null);
  334. repo.writeMergeCommitMsg(null);
  335. }
  336. }