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.

CheckoutCommand.java 19KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419420421422423424425426427428429430431432433434435436437438439440441442443444445446447448449450451452453454455456457458459460461462463464465466467468469470471472473474475476477478479480481482483484485486487488489490491492493494495496497498499500501502503504505506507508509510511512513514515516517518519520521522523524525526527528529530531532533534535536537538539540541542543544545546547548549550551552553554555556557558559560561562563564565566567568569570571572573574575576577578579580581582583584585586587588589590591592593594595596597598599600601602603604605606607608609610611612613614615616617618619620621622623624625
  1. /*
  2. * Copyright (C) 2010, Chris Aniszczyk <caniszczyk@gmail.com>
  3. * Copyright (C) 2011, Matthias Sohn <matthias.sohn@sap.com>
  4. * and other copyright owners as documented in the project's IP log.
  5. *
  6. * This program and the accompanying materials are made available
  7. * under the terms of the Eclipse Distribution License v1.0 which
  8. * accompanies this distribution, is reproduced below, and is
  9. * available at http://www.eclipse.org/org/documents/edl-v10.php
  10. *
  11. * All rights reserved.
  12. *
  13. * Redistribution and use in source and binary forms, with or
  14. * without modification, are permitted provided that the following
  15. * conditions are met:
  16. *
  17. * - Redistributions of source code must retain the above copyright
  18. * notice, this list of conditions and the following disclaimer.
  19. *
  20. * - Redistributions in binary form must reproduce the above
  21. * copyright notice, this list of conditions and the following
  22. * disclaimer in the documentation and/or other materials provided
  23. * with the distribution.
  24. *
  25. * - Neither the name of the Eclipse Foundation, Inc. nor the
  26. * names of its contributors may be used to endorse or promote
  27. * products derived from this software without specific prior
  28. * written permission.
  29. *
  30. * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
  31. * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
  32. * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  33. * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  34. * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
  35. * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  36. * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  37. * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  38. * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
  39. * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
  40. * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  41. * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  42. * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  43. */
  44. package org.eclipse.jgit.api;
  45. import java.io.File;
  46. import java.io.IOException;
  47. import java.text.MessageFormat;
  48. import java.util.ArrayList;
  49. import java.util.LinkedList;
  50. import java.util.List;
  51. import org.eclipse.jgit.api.CheckoutResult.Status;
  52. import org.eclipse.jgit.api.errors.CheckoutConflictException;
  53. import org.eclipse.jgit.api.errors.GitAPIException;
  54. import org.eclipse.jgit.api.errors.InvalidRefNameException;
  55. import org.eclipse.jgit.api.errors.JGitInternalException;
  56. import org.eclipse.jgit.api.errors.RefAlreadyExistsException;
  57. import org.eclipse.jgit.api.errors.RefNotFoundException;
  58. import org.eclipse.jgit.dircache.DirCache;
  59. import org.eclipse.jgit.dircache.DirCacheCheckout;
  60. import org.eclipse.jgit.dircache.DirCacheEditor;
  61. import org.eclipse.jgit.dircache.DirCacheEditor.PathEdit;
  62. import org.eclipse.jgit.dircache.DirCacheEntry;
  63. import org.eclipse.jgit.dircache.DirCacheIterator;
  64. import org.eclipse.jgit.errors.AmbiguousObjectException;
  65. import org.eclipse.jgit.errors.UnmergedPathException;
  66. import org.eclipse.jgit.internal.JGitText;
  67. import org.eclipse.jgit.lib.AnyObjectId;
  68. import org.eclipse.jgit.lib.Constants;
  69. import org.eclipse.jgit.lib.FileMode;
  70. import org.eclipse.jgit.lib.ObjectId;
  71. import org.eclipse.jgit.lib.ObjectReader;
  72. import org.eclipse.jgit.lib.Ref;
  73. import org.eclipse.jgit.lib.RefUpdate;
  74. import org.eclipse.jgit.lib.RefUpdate.Result;
  75. import org.eclipse.jgit.lib.Repository;
  76. import org.eclipse.jgit.revwalk.RevCommit;
  77. import org.eclipse.jgit.revwalk.RevTree;
  78. import org.eclipse.jgit.revwalk.RevWalk;
  79. import org.eclipse.jgit.treewalk.TreeWalk;
  80. import org.eclipse.jgit.treewalk.filter.PathFilterGroup;
  81. import org.eclipse.jgit.util.FileUtils;
  82. /**
  83. * Checkout a branch to the working tree.
  84. * <p>
  85. * Examples (<code>git</code> is a {@link Git} instance):
  86. * <p>
  87. * Check out an existing branch:
  88. *
  89. * <pre>
  90. * git.checkout().setName(&quot;feature&quot;).call();
  91. * </pre>
  92. * <p>
  93. * Check out paths from the index:
  94. *
  95. * <pre>
  96. * git.checkout().addPath(&quot;file1.txt&quot;).addPath(&quot;file2.txt&quot;).call();
  97. * </pre>
  98. * <p>
  99. * Check out a path from a commit:
  100. *
  101. * <pre>
  102. * git.checkout().setStartPoint(&quot;HEAD&circ;&quot;).addPath(&quot;file1.txt&quot;).call();
  103. * </pre>
  104. *
  105. * <p>
  106. * Create a new branch and check it out:
  107. *
  108. * <pre>
  109. * git.checkout().setCreateBranch(true).setName(&quot;newbranch&quot;).call();
  110. * </pre>
  111. * <p>
  112. * Create a new tracking branch for a remote branch and check it out:
  113. *
  114. * <pre>
  115. * git.checkout().setCreateBranch(true).setName(&quot;stable&quot;)
  116. * .setUpstreamMode(SetupUpstreamMode.SET_UPSTREAM)
  117. * .setStartPoint(&quot;origin/stable&quot;).call();
  118. * </pre>
  119. *
  120. * @see <a
  121. * href="http://www.kernel.org/pub/software/scm/git/docs/git-checkout.html"
  122. * >Git documentation about Checkout</a>
  123. */
  124. public class CheckoutCommand extends GitCommand<Ref> {
  125. /**
  126. * Stage to check out, see {@link CheckoutCommand#setStage(Stage)}.
  127. */
  128. public static enum Stage {
  129. /**
  130. * Base stage (#1)
  131. */
  132. BASE(DirCacheEntry.STAGE_1),
  133. /**
  134. * Ours stage (#2)
  135. */
  136. OURS(DirCacheEntry.STAGE_2),
  137. /**
  138. * Theirs stage (#3)
  139. */
  140. THEIRS(DirCacheEntry.STAGE_3);
  141. private final int number;
  142. private Stage(int number) {
  143. this.number = number;
  144. }
  145. }
  146. private String name;
  147. private boolean force = false;
  148. private boolean createBranch = false;
  149. private CreateBranchCommand.SetupUpstreamMode upstreamMode;
  150. private String startPoint = null;
  151. private RevCommit startCommit;
  152. private Stage checkoutStage = null;
  153. private CheckoutResult status;
  154. private List<String> paths;
  155. private boolean checkoutAllPaths;
  156. /**
  157. * @param repo
  158. */
  159. protected CheckoutCommand(Repository repo) {
  160. super(repo);
  161. this.paths = new LinkedList<String>();
  162. }
  163. /**
  164. * @throws RefAlreadyExistsException
  165. * when trying to create (without force) a branch with a name
  166. * that already exists
  167. * @throws RefNotFoundException
  168. * if the start point or branch can not be found
  169. * @throws InvalidRefNameException
  170. * if the provided name is <code>null</code> or otherwise
  171. * invalid
  172. * @throws CheckoutConflictException
  173. * if the checkout results in a conflict
  174. * @return the newly created branch
  175. */
  176. public Ref call() throws GitAPIException, RefAlreadyExistsException,
  177. RefNotFoundException, InvalidRefNameException,
  178. CheckoutConflictException {
  179. checkCallable();
  180. processOptions();
  181. try {
  182. if (checkoutAllPaths || !paths.isEmpty()) {
  183. checkoutPaths();
  184. status = new CheckoutResult(Status.OK, paths);
  185. setCallable(false);
  186. return null;
  187. }
  188. if (createBranch) {
  189. Git git = new Git(repo);
  190. CreateBranchCommand command = git.branchCreate();
  191. command.setName(name);
  192. command.setStartPoint(getStartPoint().name());
  193. if (upstreamMode != null)
  194. command.setUpstreamMode(upstreamMode);
  195. command.call();
  196. }
  197. Ref headRef = repo.getRef(Constants.HEAD);
  198. String shortHeadRef = getShortBranchName(headRef);
  199. String refLogMessage = "checkout: moving from " + shortHeadRef; //$NON-NLS-1$
  200. ObjectId branch = repo.resolve(name);
  201. if (branch == null)
  202. throw new RefNotFoundException(MessageFormat.format(JGitText
  203. .get().refNotResolved, name));
  204. RevWalk revWalk = new RevWalk(repo);
  205. AnyObjectId headId = headRef.getObjectId();
  206. RevCommit headCommit = headId == null ? null : revWalk
  207. .parseCommit(headId);
  208. RevCommit newCommit = revWalk.parseCommit(branch);
  209. RevTree headTree = headCommit == null ? null : headCommit.getTree();
  210. DirCacheCheckout dco;
  211. DirCache dc = repo.lockDirCache();
  212. try {
  213. dco = new DirCacheCheckout(repo, headTree, dc,
  214. newCommit.getTree());
  215. dco.setFailOnConflict(true);
  216. try {
  217. dco.checkout();
  218. } catch (org.eclipse.jgit.errors.CheckoutConflictException e) {
  219. status = new CheckoutResult(Status.CONFLICTS,
  220. dco.getConflicts());
  221. throw new CheckoutConflictException(dco.getConflicts(), e);
  222. }
  223. } finally {
  224. dc.unlock();
  225. }
  226. Ref ref = repo.getRef(name);
  227. if (ref != null && !ref.getName().startsWith(Constants.R_HEADS))
  228. ref = null;
  229. String toName = Repository.shortenRefName(name);
  230. RefUpdate refUpdate = repo.updateRef(Constants.HEAD, ref == null);
  231. refUpdate.setForceUpdate(force);
  232. refUpdate.setRefLogMessage(refLogMessage + " to " + toName, false); //$NON-NLS-1$
  233. Result updateResult;
  234. if (ref != null)
  235. updateResult = refUpdate.link(ref.getName());
  236. else {
  237. refUpdate.setNewObjectId(newCommit);
  238. updateResult = refUpdate.forceUpdate();
  239. }
  240. setCallable(false);
  241. boolean ok = false;
  242. switch (updateResult) {
  243. case NEW:
  244. ok = true;
  245. break;
  246. case NO_CHANGE:
  247. case FAST_FORWARD:
  248. case FORCED:
  249. ok = true;
  250. break;
  251. default:
  252. break;
  253. }
  254. if (!ok)
  255. throw new JGitInternalException(MessageFormat.format(JGitText
  256. .get().checkoutUnexpectedResult, updateResult.name()));
  257. if (!dco.getToBeDeleted().isEmpty()) {
  258. status = new CheckoutResult(Status.NONDELETED,
  259. dco.getToBeDeleted());
  260. } else
  261. status = new CheckoutResult(new ArrayList<String>(dco
  262. .getUpdated().keySet()), dco.getRemoved());
  263. return ref;
  264. } catch (IOException ioe) {
  265. throw new JGitInternalException(ioe.getMessage(), ioe);
  266. } finally {
  267. if (status == null)
  268. status = CheckoutResult.ERROR_RESULT;
  269. }
  270. }
  271. private String getShortBranchName(Ref headRef) {
  272. if (headRef.getTarget().getName().equals(headRef.getName()))
  273. return headRef.getTarget().getObjectId().getName();
  274. return Repository.shortenRefName(headRef.getTarget().getName());
  275. }
  276. /**
  277. * Add a single path to the list of paths to check out. To check out all
  278. * paths, use {@link #setAllPaths(boolean)}.
  279. * <p>
  280. * If this option is set, neither the {@link #setCreateBranch(boolean)} nor
  281. * {@link #setName(String)} option is considered. In other words, these
  282. * options are exclusive.
  283. *
  284. * @param path
  285. * path to update in the working tree and index
  286. * @return {@code this}
  287. */
  288. public CheckoutCommand addPath(String path) {
  289. checkCallable();
  290. this.paths.add(path);
  291. return this;
  292. }
  293. /**
  294. * Set whether to checkout all paths.
  295. * <p>
  296. * This options should be used when you want to do a path checkout on the
  297. * entire repository and so calling {@link #addPath(String)} is not possible
  298. * since empty paths are not allowed.
  299. * <p>
  300. * If this option is set, neither the {@link #setCreateBranch(boolean)} nor
  301. * {@link #setName(String)} option is considered. In other words, these
  302. * options are exclusive.
  303. *
  304. * @param all
  305. * <code>true</code> to checkout all paths, <code>false</code>
  306. * otherwise
  307. * @return {@code this}
  308. * @since 2.0
  309. */
  310. public CheckoutCommand setAllPaths(boolean all) {
  311. checkoutAllPaths = all;
  312. return this;
  313. }
  314. /**
  315. * Checkout paths into index and working directory
  316. *
  317. * @return this instance
  318. * @throws IOException
  319. * @throws RefNotFoundException
  320. */
  321. protected CheckoutCommand checkoutPaths() throws IOException,
  322. RefNotFoundException {
  323. RevWalk revWalk = new RevWalk(repo);
  324. DirCache dc = repo.lockDirCache();
  325. try {
  326. TreeWalk treeWalk = new TreeWalk(revWalk.getObjectReader());
  327. treeWalk.setRecursive(true);
  328. if (!checkoutAllPaths)
  329. treeWalk.setFilter(PathFilterGroup.createFromStrings(paths));
  330. try {
  331. if (isCheckoutIndex())
  332. checkoutPathsFromIndex(treeWalk, dc);
  333. else {
  334. RevCommit commit = revWalk.parseCommit(getStartPoint());
  335. checkoutPathsFromCommit(treeWalk, dc, commit);
  336. }
  337. } finally {
  338. treeWalk.release();
  339. }
  340. } finally {
  341. dc.unlock();
  342. revWalk.release();
  343. }
  344. return this;
  345. }
  346. private void checkoutPathsFromIndex(TreeWalk treeWalk, DirCache dc)
  347. throws IOException {
  348. DirCacheIterator dci = new DirCacheIterator(dc);
  349. treeWalk.addTree(dci);
  350. final ObjectReader r = treeWalk.getObjectReader();
  351. DirCacheEditor editor = dc.editor();
  352. while (treeWalk.next()) {
  353. DirCacheEntry entry = dci.getDirCacheEntry();
  354. // Only add one edit per path
  355. if (entry != null && entry.getStage() > DirCacheEntry.STAGE_1)
  356. continue;
  357. editor.add(new PathEdit(treeWalk.getPathString()) {
  358. public void apply(DirCacheEntry ent) {
  359. int stage = ent.getStage();
  360. if (stage > DirCacheEntry.STAGE_0) {
  361. if (checkoutStage != null) {
  362. if (stage == checkoutStage.number)
  363. checkoutPath(ent, r);
  364. } else {
  365. UnmergedPathException e = new UnmergedPathException(
  366. ent);
  367. throw new JGitInternalException(e.getMessage(), e);
  368. }
  369. } else {
  370. checkoutPath(ent, r);
  371. }
  372. }
  373. });
  374. }
  375. editor.commit();
  376. }
  377. private void checkoutPathsFromCommit(TreeWalk treeWalk, DirCache dc,
  378. RevCommit commit) throws IOException {
  379. treeWalk.addTree(commit.getTree());
  380. final ObjectReader r = treeWalk.getObjectReader();
  381. DirCacheEditor editor = dc.editor();
  382. while (treeWalk.next()) {
  383. final ObjectId blobId = treeWalk.getObjectId(0);
  384. final FileMode mode = treeWalk.getFileMode(0);
  385. editor.add(new PathEdit(treeWalk.getPathString()) {
  386. public void apply(DirCacheEntry ent) {
  387. ent.setObjectId(blobId);
  388. ent.setFileMode(mode);
  389. checkoutPath(ent, r);
  390. }
  391. });
  392. }
  393. editor.commit();
  394. }
  395. private void checkoutPath(DirCacheEntry entry, ObjectReader reader) {
  396. File file = new File(repo.getWorkTree(), entry.getPathString());
  397. File parentDir = file.getParentFile();
  398. try {
  399. FileUtils.mkdirs(parentDir, true);
  400. DirCacheCheckout.checkoutEntry(repo, file, entry, reader);
  401. } catch (IOException e) {
  402. throw new JGitInternalException(MessageFormat.format(
  403. JGitText.get().checkoutConflictWithFile,
  404. entry.getPathString()), e);
  405. }
  406. }
  407. private boolean isCheckoutIndex() {
  408. return startCommit == null && startPoint == null;
  409. }
  410. private ObjectId getStartPoint() throws AmbiguousObjectException,
  411. RefNotFoundException, IOException {
  412. if (startCommit != null)
  413. return startCommit.getId();
  414. ObjectId result = null;
  415. try {
  416. result = repo.resolve((startPoint == null) ? Constants.HEAD
  417. : startPoint);
  418. } catch (AmbiguousObjectException e) {
  419. throw e;
  420. }
  421. if (result == null)
  422. throw new RefNotFoundException(MessageFormat.format(
  423. JGitText.get().refNotResolved,
  424. startPoint != null ? startPoint : Constants.HEAD));
  425. return result;
  426. }
  427. private void processOptions() throws InvalidRefNameException {
  428. if ((!checkoutAllPaths && paths.isEmpty())
  429. && (name == null || !Repository
  430. .isValidRefName(Constants.R_HEADS + name)))
  431. throw new InvalidRefNameException(MessageFormat.format(JGitText
  432. .get().branchNameInvalid, name == null ? "<null>" : name)); //$NON-NLS-1$
  433. }
  434. /**
  435. * Specify the name of the branch or commit to check out, or the new branch
  436. * name.
  437. * <p>
  438. * When only checking out paths and not switching branches, use
  439. * {@link #setStartPoint(String)} or {@link #setStartPoint(RevCommit)} to
  440. * specify from which branch or commit to check out files.
  441. * <p>
  442. * When {@link #setCreateBranch(boolean)} is set to <code>true</code>, use
  443. * this method to set the name of the new branch to create and
  444. * {@link #setStartPoint(String)} or {@link #setStartPoint(RevCommit)} to
  445. * specify the start point of the branch.
  446. *
  447. * @param name
  448. * the name of the branch or commit
  449. * @return this instance
  450. */
  451. public CheckoutCommand setName(String name) {
  452. checkCallable();
  453. this.name = name;
  454. return this;
  455. }
  456. /**
  457. * Specify whether to create a new branch.
  458. * <p>
  459. * If <code>true</code> is used, the name of the new branch must be set
  460. * using {@link #setName(String)}. The commit at which to start the new
  461. * branch can be set using {@link #setStartPoint(String)} or
  462. * {@link #setStartPoint(RevCommit)}; if not specified, HEAD is used. Also
  463. * see {@link #setUpstreamMode} for setting up branch tracking.
  464. *
  465. * @param createBranch
  466. * if <code>true</code> a branch will be created as part of the
  467. * checkout and set to the specified start point
  468. * @return this instance
  469. */
  470. public CheckoutCommand setCreateBranch(boolean createBranch) {
  471. checkCallable();
  472. this.createBranch = createBranch;
  473. return this;
  474. }
  475. /**
  476. * Specify to force the ref update in case of a branch switch.
  477. *
  478. * @param force
  479. * if <code>true</code> and the branch with the given name
  480. * already exists, the start-point of an existing branch will be
  481. * set to a new start-point; if false, the existing branch will
  482. * not be changed
  483. * @return this instance
  484. */
  485. public CheckoutCommand setForce(boolean force) {
  486. checkCallable();
  487. this.force = force;
  488. return this;
  489. }
  490. /**
  491. * Set the name of the commit that should be checked out.
  492. * <p>
  493. * When checking out files and this is not specified or <code>null</code>,
  494. * the index is used.
  495. * <p>
  496. * When creating a new branch, this will be used as the start point. If not
  497. * specified or <code>null</code>, the current HEAD is used.
  498. *
  499. * @param startPoint
  500. * commit name to check out
  501. * @return this instance
  502. */
  503. public CheckoutCommand setStartPoint(String startPoint) {
  504. checkCallable();
  505. this.startPoint = startPoint;
  506. this.startCommit = null;
  507. checkOptions();
  508. return this;
  509. }
  510. /**
  511. * Set the commit that should be checked out.
  512. * <p>
  513. * When creating a new branch, this will be used as the start point. If not
  514. * specified or <code>null</code>, the current HEAD is used.
  515. * <p>
  516. * When checking out files and this is not specified or <code>null</code>,
  517. * the index is used.
  518. *
  519. * @param startCommit
  520. * commit to check out
  521. * @return this instance
  522. */
  523. public CheckoutCommand setStartPoint(RevCommit startCommit) {
  524. checkCallable();
  525. this.startCommit = startCommit;
  526. this.startPoint = null;
  527. checkOptions();
  528. return this;
  529. }
  530. /**
  531. * When creating a branch with {@link #setCreateBranch(boolean)}, this can
  532. * be used to configure branch tracking.
  533. *
  534. * @param mode
  535. * corresponds to the --track/--no-track options; may be
  536. * <code>null</code>
  537. * @return this instance
  538. */
  539. public CheckoutCommand setUpstreamMode(
  540. CreateBranchCommand.SetupUpstreamMode mode) {
  541. checkCallable();
  542. this.upstreamMode = mode;
  543. return this;
  544. }
  545. /**
  546. * When checking out the index, check out the specified stage (ours or
  547. * theirs) for unmerged paths.
  548. * <p>
  549. * This can not be used when checking out a branch, only when checking out
  550. * the index.
  551. *
  552. * @param stage
  553. * the stage to check out
  554. * @return this
  555. */
  556. public CheckoutCommand setStage(Stage stage) {
  557. checkCallable();
  558. this.checkoutStage = stage;
  559. checkOptions();
  560. return this;
  561. }
  562. /**
  563. * @return the result, never <code>null</code>
  564. */
  565. public CheckoutResult getResult() {
  566. if (status == null)
  567. return CheckoutResult.NOT_TRIED_RESULT;
  568. return status;
  569. }
  570. private void checkOptions() {
  571. if (checkoutStage != null && !isCheckoutIndex())
  572. throw new IllegalStateException(
  573. "Checking out ours/theirs is only possible when checking out index, "
  574. + "not when switching branches.");
  575. }
  576. }