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

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