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

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386
  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.JGitInternalException;
  49. import org.eclipse.jgit.dircache.DirCache;
  50. import org.eclipse.jgit.dircache.DirCacheCheckout;
  51. import org.eclipse.jgit.dircache.DirCacheEditor;
  52. import org.eclipse.jgit.dircache.DirCacheEditor.DeletePath;
  53. import org.eclipse.jgit.dircache.DirCacheEditor.PathEdit;
  54. import org.eclipse.jgit.dircache.DirCacheEntry;
  55. import org.eclipse.jgit.dircache.DirCacheIterator;
  56. import org.eclipse.jgit.internal.JGitText;
  57. import org.eclipse.jgit.lib.Constants;
  58. import org.eclipse.jgit.lib.FileMode;
  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. */
  125. public Ref call() throws IOException {
  126. checkCallable();
  127. Ref r;
  128. RevCommit commit;
  129. try {
  130. RepositoryState state = repo.getRepositoryState();
  131. final boolean merging = state.equals(RepositoryState.MERGING)
  132. || state.equals(RepositoryState.MERGING_RESOLVED);
  133. final boolean cherryPicking = state
  134. .equals(RepositoryState.CHERRY_PICKING)
  135. || state.equals(RepositoryState.CHERRY_PICKING_RESOLVED);
  136. // resolve the ref to a commit
  137. final ObjectId commitId;
  138. try {
  139. commitId = repo.resolve(ref + "^{commit}");
  140. if (commitId == null) {
  141. // @TODO throw an InvalidRefNameException. We can't do that
  142. // now because this would break the API
  143. throw new JGitInternalException("Invalid ref " + ref
  144. + " specified");
  145. }
  146. } catch (IOException e) {
  147. throw new JGitInternalException(
  148. MessageFormat.format(JGitText.get().cannotRead, ref),
  149. e);
  150. }
  151. RevWalk rw = new RevWalk(repo);
  152. try {
  153. commit = rw.parseCommit(commitId);
  154. } catch (IOException e) {
  155. throw new JGitInternalException(
  156. MessageFormat.format(
  157. JGitText.get().cannotReadCommit, commitId.toString()),
  158. e);
  159. } finally {
  160. rw.release();
  161. }
  162. if (!filepaths.isEmpty()) {
  163. // reset [commit] -- paths
  164. resetIndexForPaths(commit);
  165. setCallable(false);
  166. return repo.getRef(Constants.HEAD);
  167. }
  168. // write the ref
  169. final RefUpdate ru = repo.updateRef(Constants.HEAD);
  170. ru.setNewObjectId(commitId);
  171. String refName = Repository.shortenRefName(ref);
  172. String message = refName + ": updating " + Constants.HEAD; //$NON-NLS-1$
  173. ru.setRefLogMessage(message, false);
  174. if (ru.forceUpdate() == RefUpdate.Result.LOCK_FAILURE)
  175. throw new JGitInternalException(MessageFormat.format(
  176. JGitText.get().cannotLock, ru.getName()));
  177. switch (mode) {
  178. case HARD:
  179. checkoutIndex(commit);
  180. break;
  181. case MIXED:
  182. resetIndex(commit);
  183. break;
  184. case SOFT: // do nothing, only the ref was changed
  185. break;
  186. case KEEP: // TODO
  187. case MERGE: // TODO
  188. throw new UnsupportedOperationException();
  189. }
  190. if (mode != ResetType.SOFT) {
  191. if (merging)
  192. resetMerge();
  193. else if (cherryPicking)
  194. resetCherryPick();
  195. }
  196. setCallable(false);
  197. r = ru.getRef();
  198. } catch (IOException e) {
  199. throw new JGitInternalException(
  200. JGitText.get().exceptionCaughtDuringExecutionOfResetCommand,
  201. e);
  202. }
  203. return r;
  204. }
  205. /**
  206. * @param ref
  207. * the ref to reset to
  208. * @return this instance
  209. */
  210. public ResetCommand setRef(String ref) {
  211. this.ref = ref;
  212. return this;
  213. }
  214. /**
  215. * @param mode
  216. * the mode of the reset command
  217. * @return this instance
  218. */
  219. public ResetCommand setMode(ResetType mode) {
  220. if (!filepaths.isEmpty())
  221. throw new JGitInternalException(MessageFormat.format(
  222. JGitText.get().illegalCombinationOfArguments,
  223. "[--mixed | --soft | --hard]", "<paths>..."));
  224. this.mode = mode;
  225. return this;
  226. }
  227. /**
  228. * @param file
  229. * the file to add
  230. * @return this instance
  231. */
  232. public ResetCommand addPath(String file) {
  233. if (mode != null)
  234. throw new JGitInternalException(MessageFormat.format(
  235. JGitText.get().illegalCombinationOfArguments, "<paths>...",
  236. "[--mixed | --soft | --hard]"));
  237. filepaths.add(file);
  238. return this;
  239. }
  240. private void resetIndexForPaths(RevCommit commit) {
  241. DirCache dc = null;
  242. final DirCacheEditor edit;
  243. try {
  244. dc = repo.lockDirCache();
  245. edit = dc.editor();
  246. final TreeWalk tw = new TreeWalk(repo);
  247. tw.addTree(new DirCacheIterator(dc));
  248. tw.addTree(commit.getTree());
  249. tw.setFilter(PathFilterGroup.createFromStrings(filepaths));
  250. tw.setRecursive(true);
  251. while (tw.next()) {
  252. final String path = tw.getPathString();
  253. // DirCacheIterator dci = tw.getTree(0, DirCacheIterator.class);
  254. final CanonicalTreeParser tree = tw.getTree(1,
  255. CanonicalTreeParser.class);
  256. if (tree == null)
  257. // file is not in the commit, remove from index
  258. edit.add(new DirCacheEditor.DeletePath(path));
  259. else { // revert index to commit
  260. // it seams that there is concurrent access to tree
  261. // variable, therefore we need to keep references to
  262. // entryFileMode and entryObjectId in local
  263. // variables
  264. final FileMode entryFileMode = tree.getEntryFileMode();
  265. final ObjectId entryObjectId = tree.getEntryObjectId();
  266. edit.add(new DirCacheEditor.PathEdit(path) {
  267. @Override
  268. public void apply(DirCacheEntry ent) {
  269. ent.setFileMode(entryFileMode);
  270. ent.setObjectId(entryObjectId);
  271. ent.setLastModified(0);
  272. }
  273. });
  274. }
  275. }
  276. edit.commit();
  277. } catch (IOException e) {
  278. throw new RuntimeException(e);
  279. } finally {
  280. if (dc != null)
  281. dc.unlock();
  282. }
  283. }
  284. private void resetIndex(RevCommit commit) throws IOException {
  285. DirCache dc = repo.lockDirCache();
  286. TreeWalk walk = null;
  287. try {
  288. DirCacheEditor editor = dc.editor();
  289. walk = new TreeWalk(repo);
  290. walk.addTree(commit.getTree());
  291. walk.addTree(new DirCacheIterator(dc));
  292. walk.setRecursive(true);
  293. while (walk.next()) {
  294. AbstractTreeIterator cIter = walk.getTree(0,
  295. AbstractTreeIterator.class);
  296. if (cIter == null) {
  297. editor.add(new DeletePath(walk.getPathString()));
  298. continue;
  299. }
  300. final DirCacheEntry entry = new DirCacheEntry(walk.getRawPath());
  301. entry.setFileMode(cIter.getEntryFileMode());
  302. entry.setObjectIdFromRaw(cIter.idBuffer(), cIter.idOffset());
  303. DirCacheIterator dcIter = walk.getTree(1,
  304. DirCacheIterator.class);
  305. if (dcIter != null && dcIter.idEqual(cIter)) {
  306. DirCacheEntry indexEntry = dcIter.getDirCacheEntry();
  307. entry.setLastModified(indexEntry.getLastModified());
  308. entry.setLength(indexEntry.getLength());
  309. }
  310. editor.add(new PathEdit(entry) {
  311. @Override
  312. public void apply(DirCacheEntry ent) {
  313. ent.copyMetaData(entry);
  314. }
  315. });
  316. }
  317. editor.commit();
  318. } finally {
  319. dc.unlock();
  320. if (walk != null)
  321. walk.release();
  322. }
  323. }
  324. private void checkoutIndex(RevCommit commit) throws IOException {
  325. DirCache dc = repo.lockDirCache();
  326. try {
  327. DirCacheCheckout checkout = new DirCacheCheckout(repo, dc,
  328. commit.getTree());
  329. checkout.setFailOnConflict(false);
  330. checkout.checkout();
  331. } finally {
  332. dc.unlock();
  333. }
  334. }
  335. private void resetMerge() throws IOException {
  336. repo.writeMergeHeads(null);
  337. repo.writeMergeCommitMsg(null);
  338. }
  339. private void resetCherryPick() throws IOException {
  340. repo.writeCherryPickHead(null);
  341. repo.writeMergeCommitMsg(null);
  342. }
  343. }