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 20KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419420421422423424425426427428429430431432433434435436437438439440441442443444445446447448449450451452453454455456457458459460461462463464465466467468469470471472473474475476477478479480481482483484485486487488489490491492493494495496497498499500501502503504505506507508509510511512513514515516517518519520521522523524525526527528529530531532533534535536537538539540541542543544545546547548549550551552553554555556557558559560561562563564565566567568569570571572573574575576577578579580581582583584585586587588589590591592593594595596597598599600601602603604605606607608609610611612613614615616617618619620621622623624625626627628629630631632633634635636637638639640641642643644645646647648649650651652653654655656657658659660661662663664665666667668669670671672673674675676677678679680681
  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.IOException;
  46. import java.text.MessageFormat;
  47. import java.util.ArrayList;
  48. import java.util.EnumSet;
  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. /**
  82. * Checkout a branch to the working tree.
  83. * <p>
  84. * Examples (<code>git</code> is a {@link Git} instance):
  85. * <p>
  86. * Check out an existing branch:
  87. *
  88. * <pre>
  89. * git.checkout().setName(&quot;feature&quot;).call();
  90. * </pre>
  91. * <p>
  92. * Check out paths from the index:
  93. *
  94. * <pre>
  95. * git.checkout().addPath(&quot;file1.txt&quot;).addPath(&quot;file2.txt&quot;).call();
  96. * </pre>
  97. * <p>
  98. * Check out a path from a commit:
  99. *
  100. * <pre>
  101. * git.checkout().setStartPoint(&quot;HEAD&circ;&quot;).addPath(&quot;file1.txt&quot;).call();
  102. * </pre>
  103. *
  104. * <p>
  105. * Create a new branch and check it out:
  106. *
  107. * <pre>
  108. * git.checkout().setCreateBranch(true).setName(&quot;newbranch&quot;).call();
  109. * </pre>
  110. * <p>
  111. * Create a new tracking branch for a remote branch and check it out:
  112. *
  113. * <pre>
  114. * git.checkout().setCreateBranch(true).setName(&quot;stable&quot;)
  115. * .setUpstreamMode(SetupUpstreamMode.SET_UPSTREAM)
  116. * .setStartPoint(&quot;origin/stable&quot;).call();
  117. * </pre>
  118. *
  119. * @see <a
  120. * href="http://www.kernel.org/pub/software/scm/git/docs/git-checkout.html"
  121. * >Git documentation about Checkout</a>
  122. */
  123. public class CheckoutCommand extends GitCommand<Ref> {
  124. /**
  125. * Stage to check out, see {@link CheckoutCommand#setStage(Stage)}.
  126. */
  127. public static enum Stage {
  128. /**
  129. * Base stage (#1)
  130. */
  131. BASE(DirCacheEntry.STAGE_1),
  132. /**
  133. * Ours stage (#2)
  134. */
  135. OURS(DirCacheEntry.STAGE_2),
  136. /**
  137. * Theirs stage (#3)
  138. */
  139. THEIRS(DirCacheEntry.STAGE_3);
  140. private final int number;
  141. private Stage(int number) {
  142. this.number = number;
  143. }
  144. }
  145. private String name;
  146. private boolean force = false;
  147. private boolean createBranch = false;
  148. private boolean orphan = 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. try {
  181. processOptions();
  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. if (startCommit != null)
  193. command.setStartPoint(startCommit);
  194. else
  195. command.setStartPoint(startPoint);
  196. if (upstreamMode != null)
  197. command.setUpstreamMode(upstreamMode);
  198. command.call();
  199. }
  200. Ref headRef = repo.getRef(Constants.HEAD);
  201. String shortHeadRef = getShortBranchName(headRef);
  202. String refLogMessage = "checkout: moving from " + shortHeadRef; //$NON-NLS-1$
  203. ObjectId branch;
  204. if (orphan) {
  205. if (startPoint == null && startCommit == null) {
  206. Result r = repo.updateRef(Constants.HEAD).link(
  207. getBranchName());
  208. if (!EnumSet.of(Result.NEW, Result.FORCED).contains(r))
  209. throw new JGitInternalException(MessageFormat.format(
  210. JGitText.get().checkoutUnexpectedResult,
  211. r.name()));
  212. this.status = CheckoutResult.NOT_TRIED_RESULT;
  213. return repo.getRef(Constants.HEAD);
  214. }
  215. branch = getStartPointObjectId();
  216. } else {
  217. branch = repo.resolve(name);
  218. if (branch == null)
  219. throw new RefNotFoundException(MessageFormat.format(
  220. JGitText.get().refNotResolved, name));
  221. }
  222. RevWalk revWalk = new RevWalk(repo);
  223. AnyObjectId headId = headRef.getObjectId();
  224. RevCommit headCommit = headId == null ? null : revWalk
  225. .parseCommit(headId);
  226. RevCommit newCommit = revWalk.parseCommit(branch);
  227. RevTree headTree = headCommit == null ? null : headCommit.getTree();
  228. DirCacheCheckout dco;
  229. DirCache dc = repo.lockDirCache();
  230. try {
  231. dco = new DirCacheCheckout(repo, headTree, dc,
  232. newCommit.getTree());
  233. dco.setFailOnConflict(true);
  234. try {
  235. dco.checkout();
  236. } catch (org.eclipse.jgit.errors.CheckoutConflictException e) {
  237. status = new CheckoutResult(Status.CONFLICTS,
  238. dco.getConflicts());
  239. throw new CheckoutConflictException(dco.getConflicts(), e);
  240. }
  241. } finally {
  242. dc.unlock();
  243. }
  244. Ref ref = repo.getRef(name);
  245. if (ref != null && !ref.getName().startsWith(Constants.R_HEADS))
  246. ref = null;
  247. String toName = Repository.shortenRefName(name);
  248. RefUpdate refUpdate = repo.updateRef(Constants.HEAD, ref == null);
  249. refUpdate.setForceUpdate(force);
  250. refUpdate.setRefLogMessage(refLogMessage + " to " + toName, false); //$NON-NLS-1$
  251. Result updateResult;
  252. if (ref != null)
  253. updateResult = refUpdate.link(ref.getName());
  254. else if (orphan) {
  255. updateResult = refUpdate.link(getBranchName());
  256. ref = repo.getRef(Constants.HEAD);
  257. } else {
  258. refUpdate.setNewObjectId(newCommit);
  259. updateResult = refUpdate.forceUpdate();
  260. }
  261. setCallable(false);
  262. boolean ok = false;
  263. switch (updateResult) {
  264. case NEW:
  265. ok = true;
  266. break;
  267. case NO_CHANGE:
  268. case FAST_FORWARD:
  269. case FORCED:
  270. ok = true;
  271. break;
  272. default:
  273. break;
  274. }
  275. if (!ok)
  276. throw new JGitInternalException(MessageFormat.format(JGitText
  277. .get().checkoutUnexpectedResult, updateResult.name()));
  278. if (!dco.getToBeDeleted().isEmpty()) {
  279. status = new CheckoutResult(Status.NONDELETED,
  280. dco.getToBeDeleted());
  281. } else
  282. status = new CheckoutResult(new ArrayList<String>(dco
  283. .getUpdated().keySet()), dco.getRemoved());
  284. return ref;
  285. } catch (IOException ioe) {
  286. throw new JGitInternalException(ioe.getMessage(), ioe);
  287. } finally {
  288. if (status == null)
  289. status = CheckoutResult.ERROR_RESULT;
  290. }
  291. }
  292. private String getShortBranchName(Ref headRef) {
  293. if (headRef.getTarget().getName().equals(headRef.getName()))
  294. return headRef.getTarget().getObjectId().getName();
  295. return Repository.shortenRefName(headRef.getTarget().getName());
  296. }
  297. /**
  298. * Add a single slash-separated path to the list of paths to check out. To
  299. * check out all paths, use {@link #setAllPaths(boolean)}.
  300. * <p>
  301. * If this option is set, neither the {@link #setCreateBranch(boolean)} nor
  302. * {@link #setName(String)} option is considered. In other words, these
  303. * options are exclusive.
  304. *
  305. * @param path
  306. * path to update in the working tree and index (with
  307. * <code>/</code> as separator)
  308. * @return {@code this}
  309. */
  310. public CheckoutCommand addPath(String path) {
  311. checkCallable();
  312. this.paths.add(path);
  313. return this;
  314. }
  315. /**
  316. * Set whether to checkout all paths.
  317. * <p>
  318. * This options should be used when you want to do a path checkout on the
  319. * entire repository and so calling {@link #addPath(String)} is not possible
  320. * since empty paths are not allowed.
  321. * <p>
  322. * If this option is set, neither the {@link #setCreateBranch(boolean)} nor
  323. * {@link #setName(String)} option is considered. In other words, these
  324. * options are exclusive.
  325. *
  326. * @param all
  327. * <code>true</code> to checkout all paths, <code>false</code>
  328. * otherwise
  329. * @return {@code this}
  330. * @since 2.0
  331. */
  332. public CheckoutCommand setAllPaths(boolean all) {
  333. checkoutAllPaths = all;
  334. return this;
  335. }
  336. /**
  337. * Checkout paths into index and working directory
  338. *
  339. * @return this instance
  340. * @throws IOException
  341. * @throws RefNotFoundException
  342. */
  343. protected CheckoutCommand checkoutPaths() throws IOException,
  344. RefNotFoundException {
  345. RevWalk revWalk = new RevWalk(repo);
  346. DirCache dc = repo.lockDirCache();
  347. try {
  348. TreeWalk treeWalk = new TreeWalk(revWalk.getObjectReader());
  349. treeWalk.setRecursive(true);
  350. if (!checkoutAllPaths)
  351. treeWalk.setFilter(PathFilterGroup.createFromStrings(paths));
  352. try {
  353. if (isCheckoutIndex())
  354. checkoutPathsFromIndex(treeWalk, dc);
  355. else {
  356. RevCommit commit = revWalk.parseCommit(getStartPointObjectId());
  357. checkoutPathsFromCommit(treeWalk, dc, commit);
  358. }
  359. } finally {
  360. treeWalk.release();
  361. }
  362. } finally {
  363. dc.unlock();
  364. revWalk.release();
  365. }
  366. return this;
  367. }
  368. private void checkoutPathsFromIndex(TreeWalk treeWalk, DirCache dc)
  369. throws IOException {
  370. DirCacheIterator dci = new DirCacheIterator(dc);
  371. treeWalk.addTree(dci);
  372. String previousPath = null;
  373. final ObjectReader r = treeWalk.getObjectReader();
  374. DirCacheEditor editor = dc.editor();
  375. while (treeWalk.next()) {
  376. String path = treeWalk.getPathString();
  377. // Only add one edit per path
  378. if (path.equals(previousPath))
  379. continue;
  380. editor.add(new PathEdit(path) {
  381. public void apply(DirCacheEntry ent) {
  382. int stage = ent.getStage();
  383. if (stage > DirCacheEntry.STAGE_0) {
  384. if (checkoutStage != null) {
  385. if (stage == checkoutStage.number)
  386. checkoutPath(ent, r);
  387. } else {
  388. UnmergedPathException e = new UnmergedPathException(
  389. ent);
  390. throw new JGitInternalException(e.getMessage(), e);
  391. }
  392. } else {
  393. checkoutPath(ent, r);
  394. }
  395. }
  396. });
  397. previousPath = path;
  398. }
  399. editor.commit();
  400. }
  401. private void checkoutPathsFromCommit(TreeWalk treeWalk, DirCache dc,
  402. RevCommit commit) throws IOException {
  403. treeWalk.addTree(commit.getTree());
  404. final ObjectReader r = treeWalk.getObjectReader();
  405. DirCacheEditor editor = dc.editor();
  406. while (treeWalk.next()) {
  407. final ObjectId blobId = treeWalk.getObjectId(0);
  408. final FileMode mode = treeWalk.getFileMode(0);
  409. editor.add(new PathEdit(treeWalk.getPathString()) {
  410. public void apply(DirCacheEntry ent) {
  411. ent.setObjectId(blobId);
  412. ent.setFileMode(mode);
  413. checkoutPath(ent, r);
  414. }
  415. });
  416. }
  417. editor.commit();
  418. }
  419. private void checkoutPath(DirCacheEntry entry, ObjectReader reader) {
  420. try {
  421. DirCacheCheckout.checkoutEntry(repo, entry, reader);
  422. } catch (IOException e) {
  423. throw new JGitInternalException(MessageFormat.format(
  424. JGitText.get().checkoutConflictWithFile,
  425. entry.getPathString()), e);
  426. }
  427. }
  428. private boolean isCheckoutIndex() {
  429. return startCommit == null && startPoint == null;
  430. }
  431. private ObjectId getStartPointObjectId() throws AmbiguousObjectException,
  432. RefNotFoundException, IOException {
  433. if (startCommit != null)
  434. return startCommit.getId();
  435. String startPointOrHead = (startPoint != null) ? startPoint
  436. : Constants.HEAD;
  437. ObjectId result = repo.resolve(startPointOrHead);
  438. if (result == null)
  439. throw new RefNotFoundException(MessageFormat.format(
  440. JGitText.get().refNotResolved, startPointOrHead));
  441. return result;
  442. }
  443. private void processOptions() throws InvalidRefNameException,
  444. RefAlreadyExistsException, IOException {
  445. if (((!checkoutAllPaths && paths.isEmpty()) || orphan)
  446. && (name == null || !Repository
  447. .isValidRefName(Constants.R_HEADS + name)))
  448. throw new InvalidRefNameException(MessageFormat.format(JGitText
  449. .get().branchNameInvalid, name == null ? "<null>" : name)); //$NON-NLS-1$
  450. if (orphan) {
  451. Ref refToCheck = repo.getRef(getBranchName());
  452. if (refToCheck != null)
  453. throw new RefAlreadyExistsException(MessageFormat.format(
  454. JGitText.get().refAlreadyExists, name));
  455. }
  456. }
  457. private String getBranchName() {
  458. if (name.startsWith(Constants.R_REFS))
  459. return name;
  460. return Constants.R_HEADS + name;
  461. }
  462. /**
  463. * Specify the name of the branch or commit to check out, or the new branch
  464. * name.
  465. * <p>
  466. * When only checking out paths and not switching branches, use
  467. * {@link #setStartPoint(String)} or {@link #setStartPoint(RevCommit)} to
  468. * specify from which branch or commit to check out files.
  469. * <p>
  470. * When {@link #setCreateBranch(boolean)} is set to <code>true</code>, use
  471. * this method to set the name of the new branch to create and
  472. * {@link #setStartPoint(String)} or {@link #setStartPoint(RevCommit)} to
  473. * specify the start point of the branch.
  474. *
  475. * @param name
  476. * the name of the branch or commit
  477. * @return this instance
  478. */
  479. public CheckoutCommand setName(String name) {
  480. checkCallable();
  481. this.name = name;
  482. return this;
  483. }
  484. /**
  485. * Specify whether to create a new branch.
  486. * <p>
  487. * If <code>true</code> is used, the name of the new branch must be set
  488. * using {@link #setName(String)}. The commit at which to start the new
  489. * branch can be set using {@link #setStartPoint(String)} or
  490. * {@link #setStartPoint(RevCommit)}; if not specified, HEAD is used. Also
  491. * see {@link #setUpstreamMode} for setting up branch tracking.
  492. *
  493. * @param createBranch
  494. * if <code>true</code> a branch will be created as part of the
  495. * checkout and set to the specified start point
  496. * @return this instance
  497. */
  498. public CheckoutCommand setCreateBranch(boolean createBranch) {
  499. checkCallable();
  500. this.createBranch = createBranch;
  501. return this;
  502. }
  503. /**
  504. * Specify whether to create a new orphan branch.
  505. * <p>
  506. * If <code>true</code> is used, the name of the new orphan branch must be
  507. * set using {@link #setName(String)}. The commit at which to start the new
  508. * orphan branch can be set using {@link #setStartPoint(String)} or
  509. * {@link #setStartPoint(RevCommit)}; if not specified, HEAD is used.
  510. *
  511. * @param orphan
  512. * if <code>true</code> a orphan branch will be created as part
  513. * of the checkout to the specified start point
  514. * @return this instance
  515. * @since 3.3
  516. */
  517. public CheckoutCommand setOrphan(boolean orphan) {
  518. checkCallable();
  519. this.orphan = orphan;
  520. return this;
  521. }
  522. /**
  523. * Specify to force the ref update in case of a branch switch.
  524. *
  525. * @param force
  526. * if <code>true</code> and the branch with the given name
  527. * already exists, the start-point of an existing branch will be
  528. * set to a new start-point; if false, the existing branch will
  529. * not be changed
  530. * @return this instance
  531. */
  532. public CheckoutCommand setForce(boolean force) {
  533. checkCallable();
  534. this.force = force;
  535. return this;
  536. }
  537. /**
  538. * Set the name of the commit that should be checked out.
  539. * <p>
  540. * When checking out files and this is not specified or <code>null</code>,
  541. * the index is used.
  542. * <p>
  543. * When creating a new branch, this will be used as the start point. If not
  544. * specified or <code>null</code>, the current HEAD is used.
  545. *
  546. * @param startPoint
  547. * commit name to check out
  548. * @return this instance
  549. */
  550. public CheckoutCommand setStartPoint(String startPoint) {
  551. checkCallable();
  552. this.startPoint = startPoint;
  553. this.startCommit = null;
  554. checkOptions();
  555. return this;
  556. }
  557. /**
  558. * Set the commit that should be checked out.
  559. * <p>
  560. * When creating a new branch, this will be used as the start point. If not
  561. * specified or <code>null</code>, the current HEAD is used.
  562. * <p>
  563. * When checking out files and this is not specified or <code>null</code>,
  564. * the index is used.
  565. *
  566. * @param startCommit
  567. * commit to check out
  568. * @return this instance
  569. */
  570. public CheckoutCommand setStartPoint(RevCommit startCommit) {
  571. checkCallable();
  572. this.startCommit = startCommit;
  573. this.startPoint = null;
  574. checkOptions();
  575. return this;
  576. }
  577. /**
  578. * When creating a branch with {@link #setCreateBranch(boolean)}, this can
  579. * be used to configure branch tracking.
  580. *
  581. * @param mode
  582. * corresponds to the --track/--no-track options; may be
  583. * <code>null</code>
  584. * @return this instance
  585. */
  586. public CheckoutCommand setUpstreamMode(
  587. CreateBranchCommand.SetupUpstreamMode mode) {
  588. checkCallable();
  589. this.upstreamMode = mode;
  590. return this;
  591. }
  592. /**
  593. * When checking out the index, check out the specified stage (ours or
  594. * theirs) for unmerged paths.
  595. * <p>
  596. * This can not be used when checking out a branch, only when checking out
  597. * the index.
  598. *
  599. * @param stage
  600. * the stage to check out
  601. * @return this
  602. */
  603. public CheckoutCommand setStage(Stage stage) {
  604. checkCallable();
  605. this.checkoutStage = stage;
  606. checkOptions();
  607. return this;
  608. }
  609. /**
  610. * @return the result, never <code>null</code>
  611. */
  612. public CheckoutResult getResult() {
  613. if (status == null)
  614. return CheckoutResult.NOT_TRIED_RESULT;
  615. return status;
  616. }
  617. private void checkOptions() {
  618. if (checkoutStage != null && !isCheckoutIndex())
  619. throw new IllegalStateException(
  620. "Checking out ours/theirs is only possible when checking out index, "
  621. + "not when switching branches.");
  622. }
  623. }