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.

PullCommand.java 12KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366
  1. /*
  2. * Copyright (C) 2010, Christian Halstrick <christian.halstrick@sap.com>
  3. * Copyright (C) 2010, Mathias Kinzler <mathias.kinzler@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 org.eclipse.jgit.api.RebaseCommand.Operation;
  48. import org.eclipse.jgit.api.errors.CanceledException;
  49. import org.eclipse.jgit.api.errors.DetachedHeadException;
  50. import org.eclipse.jgit.api.errors.GitAPIException;
  51. import org.eclipse.jgit.api.errors.InvalidConfigurationException;
  52. import org.eclipse.jgit.api.errors.InvalidRemoteException;
  53. import org.eclipse.jgit.api.errors.JGitInternalException;
  54. import org.eclipse.jgit.api.errors.NoHeadException;
  55. import org.eclipse.jgit.api.errors.RefNotFoundException;
  56. import org.eclipse.jgit.api.errors.WrongRepositoryStateException;
  57. import org.eclipse.jgit.internal.JGitText;
  58. import org.eclipse.jgit.lib.AnyObjectId;
  59. import org.eclipse.jgit.lib.Config;
  60. import org.eclipse.jgit.lib.ConfigConstants;
  61. import org.eclipse.jgit.lib.Constants;
  62. import org.eclipse.jgit.lib.NullProgressMonitor;
  63. import org.eclipse.jgit.lib.ProgressMonitor;
  64. import org.eclipse.jgit.lib.Ref;
  65. import org.eclipse.jgit.lib.Repository;
  66. import org.eclipse.jgit.lib.RepositoryState;
  67. import org.eclipse.jgit.transport.FetchResult;
  68. /**
  69. * The Pull command
  70. *
  71. * @see <a href="http://www.kernel.org/pub/software/scm/git/docs/git-pull.html"
  72. * >Git documentation about Pull</a>
  73. */
  74. public class PullCommand extends TransportCommand<PullCommand, PullResult> {
  75. private final static String DOT = "."; //$NON-NLS-1$
  76. private ProgressMonitor monitor = NullProgressMonitor.INSTANCE;
  77. private PullRebaseMode pullRebaseMode = PullRebaseMode.USE_CONFIG;
  78. private String remote;
  79. private String remoteBranchName;
  80. private enum PullRebaseMode {
  81. USE_CONFIG,
  82. REBASE,
  83. NO_REBASE
  84. }
  85. /**
  86. * @param repo
  87. */
  88. protected PullCommand(Repository repo) {
  89. super(repo);
  90. }
  91. /**
  92. * @param monitor
  93. * a progress monitor
  94. * @return this instance
  95. */
  96. public PullCommand setProgressMonitor(ProgressMonitor monitor) {
  97. this.monitor = monitor;
  98. return this;
  99. }
  100. /**
  101. * Set if rebase should be used after fetching. If set to true, rebase is
  102. * used instead of merge. This is equivalent to --rebase on the command
  103. * line.
  104. * <p>
  105. * If set to false, merge is used after fetching, overriding the
  106. * configuration file. This is equivalent to --no-rebase on the command
  107. * line.
  108. * <p>
  109. * This setting overrides the settings in the configuration file. By
  110. * default, the setting in the repository configuration file is used.
  111. * <p>
  112. * A branch can be configured to use rebase by default. See
  113. * branch.[name].rebase and branch.autosetuprebase.
  114. *
  115. * @param useRebase
  116. * @return {@code this}
  117. */
  118. public PullCommand setRebase(boolean useRebase) {
  119. checkCallable();
  120. pullRebaseMode = useRebase ? PullRebaseMode.REBASE : PullRebaseMode.NO_REBASE;
  121. return this;
  122. }
  123. /**
  124. * Executes the {@code Pull} command with all the options and parameters
  125. * collected by the setter methods (e.g.
  126. * {@link #setProgressMonitor(ProgressMonitor)}) of this class. Each
  127. * instance of this class should only be used for one invocation of the
  128. * command. Don't call this method twice on an instance.
  129. *
  130. * @return the result of the pull
  131. * @throws WrongRepositoryStateException
  132. * @throws InvalidConfigurationException
  133. * @throws DetachedHeadException
  134. * @throws InvalidRemoteException
  135. * @throws CanceledException
  136. * @throws RefNotFoundException
  137. * @throws NoHeadException
  138. * @throws org.eclipse.jgit.api.errors.TransportException
  139. * @throws GitAPIException
  140. */
  141. public PullResult call() throws GitAPIException,
  142. WrongRepositoryStateException, InvalidConfigurationException,
  143. DetachedHeadException, InvalidRemoteException, CanceledException,
  144. RefNotFoundException, NoHeadException,
  145. org.eclipse.jgit.api.errors.TransportException {
  146. checkCallable();
  147. monitor.beginTask(JGitText.get().pullTaskName, 2);
  148. String branchName;
  149. try {
  150. String fullBranch = repo.getFullBranch();
  151. if (fullBranch == null)
  152. throw new NoHeadException(
  153. JGitText.get().pullOnRepoWithoutHEADCurrentlyNotSupported);
  154. if (!fullBranch.startsWith(Constants.R_HEADS)) {
  155. // we can not pull if HEAD is detached and branch is not
  156. // specified explicitly
  157. throw new DetachedHeadException();
  158. }
  159. branchName = fullBranch.substring(Constants.R_HEADS.length());
  160. } catch (IOException e) {
  161. throw new JGitInternalException(
  162. JGitText.get().exceptionCaughtDuringExecutionOfPullCommand,
  163. e);
  164. }
  165. if (!repo.getRepositoryState().equals(RepositoryState.SAFE))
  166. throw new WrongRepositoryStateException(MessageFormat.format(
  167. JGitText.get().cannotPullOnARepoWithState, repo
  168. .getRepositoryState().name()));
  169. Config repoConfig = repo.getConfig();
  170. if (remote == null) {
  171. // get the configured remote for the currently checked out branch
  172. // stored in configuration key branch.<branch name>.remote
  173. remote = repoConfig.getString(
  174. ConfigConstants.CONFIG_BRANCH_SECTION, branchName,
  175. ConfigConstants.CONFIG_KEY_REMOTE);
  176. }
  177. if (remote == null)
  178. // fall back to default remote
  179. remote = Constants.DEFAULT_REMOTE_NAME;
  180. if (remoteBranchName == null)
  181. // get the name of the branch in the remote repository
  182. // stored in configuration key branch.<branch name>.merge
  183. remoteBranchName = repoConfig.getString(
  184. ConfigConstants.CONFIG_BRANCH_SECTION, branchName,
  185. ConfigConstants.CONFIG_KEY_MERGE);
  186. // determines whether rebase should be used after fetching
  187. boolean doRebase = false;
  188. switch (pullRebaseMode) {
  189. case REBASE:
  190. doRebase = true;
  191. break;
  192. case NO_REBASE:
  193. doRebase = false;
  194. break;
  195. case USE_CONFIG:
  196. default:
  197. // check if the branch is configured for pull-rebase
  198. doRebase = repoConfig.getBoolean(
  199. ConfigConstants.CONFIG_BRANCH_SECTION, branchName,
  200. ConfigConstants.CONFIG_KEY_REBASE, false);
  201. break;
  202. }
  203. if (remoteBranchName == null)
  204. remoteBranchName = branchName;
  205. final boolean isRemote = !remote.equals("."); //$NON-NLS-1$
  206. String remoteUri;
  207. FetchResult fetchRes;
  208. if (isRemote) {
  209. remoteUri = repoConfig.getString(
  210. ConfigConstants.CONFIG_REMOTE_SECTION, remote,
  211. ConfigConstants.CONFIG_KEY_URL);
  212. if (remoteUri == null) {
  213. String missingKey = ConfigConstants.CONFIG_REMOTE_SECTION + DOT
  214. + remote + DOT + ConfigConstants.CONFIG_KEY_URL;
  215. throw new InvalidConfigurationException(MessageFormat.format(
  216. JGitText.get().missingConfigurationForKey, missingKey));
  217. }
  218. if (monitor.isCancelled())
  219. throw new CanceledException(MessageFormat.format(
  220. JGitText.get().operationCanceled,
  221. JGitText.get().pullTaskName));
  222. FetchCommand fetch = new FetchCommand(repo);
  223. fetch.setRemote(remote);
  224. fetch.setProgressMonitor(monitor);
  225. configure(fetch);
  226. fetchRes = fetch.call();
  227. } else {
  228. // we can skip the fetch altogether
  229. remoteUri = "local repository";
  230. fetchRes = null;
  231. }
  232. monitor.update(1);
  233. if (monitor.isCancelled())
  234. throw new CanceledException(MessageFormat.format(
  235. JGitText.get().operationCanceled,
  236. JGitText.get().pullTaskName));
  237. // we check the updates to see which of the updated branches
  238. // corresponds
  239. // to the remote branch name
  240. AnyObjectId commitToMerge;
  241. if (isRemote) {
  242. Ref r = null;
  243. if (fetchRes != null) {
  244. r = fetchRes.getAdvertisedRef(remoteBranchName);
  245. if (r == null)
  246. r = fetchRes.getAdvertisedRef(Constants.R_HEADS
  247. + remoteBranchName);
  248. }
  249. if (r == null)
  250. throw new JGitInternalException(MessageFormat.format(JGitText
  251. .get().couldNotGetAdvertisedRef, remoteBranchName));
  252. else
  253. commitToMerge = r.getObjectId();
  254. } else {
  255. try {
  256. commitToMerge = repo.resolve(remoteBranchName);
  257. if (commitToMerge == null)
  258. throw new RefNotFoundException(MessageFormat.format(
  259. JGitText.get().refNotResolved, remoteBranchName));
  260. } catch (IOException e) {
  261. throw new JGitInternalException(
  262. JGitText.get().exceptionCaughtDuringExecutionOfPullCommand,
  263. e);
  264. }
  265. }
  266. String upstreamName = "branch \'"
  267. + Repository.shortenRefName(remoteBranchName) + "\' of "
  268. + remoteUri;
  269. PullResult result;
  270. if (doRebase) {
  271. RebaseCommand rebase = new RebaseCommand(repo);
  272. RebaseResult rebaseRes = rebase.setUpstream(commitToMerge)
  273. .setUpstreamName(upstreamName)
  274. .setProgressMonitor(monitor).setOperation(Operation.BEGIN)
  275. .call();
  276. result = new PullResult(fetchRes, remote, rebaseRes);
  277. } else {
  278. MergeCommand merge = new MergeCommand(repo);
  279. merge.include(upstreamName, commitToMerge);
  280. MergeResult mergeRes = merge.call();
  281. monitor.update(1);
  282. result = new PullResult(fetchRes, remote, mergeRes);
  283. }
  284. monitor.endTask();
  285. return result;
  286. }
  287. /**
  288. * The remote (uri or name) to be used for the pull operation. If no remote
  289. * is set, the branch's configuration will be used. If the branch
  290. * configuration is missing the default value of
  291. * <code>Constants.DEFAULT_REMOTE_NAME</code> will be used.
  292. *
  293. * @see Constants#DEFAULT_REMOTE_NAME
  294. * @param remote
  295. * @return {@code this}
  296. * @since 3.3
  297. */
  298. public PullCommand setRemote(String remote) {
  299. checkCallable();
  300. this.remote = remote;
  301. return this;
  302. }
  303. /**
  304. * The remote branch name to be used for the pull operation. If no
  305. * remoteBranchName is set, the branch's configuration will be used. If the
  306. * branch configuration is missing the remote branch with the same name as
  307. * the current branch is used.
  308. *
  309. * @param remoteBranchName
  310. * @return {@code this}
  311. * @since 3.3
  312. */
  313. public PullCommand setRemoteBranchName(String remoteBranchName) {
  314. checkCallable();
  315. this.remoteBranchName = remoteBranchName;
  316. return this;
  317. }
  318. /**
  319. * @return the remote used for the pull operation if it was set explicitly
  320. * @since 3.3
  321. */
  322. public String getRemote() {
  323. return remote;
  324. }
  325. /**
  326. * @return the remote branch name used for the pull operation if it was set
  327. * explicitly
  328. * @since 3.3
  329. */
  330. public String getRemoteBranchName() {
  331. return remoteBranchName;
  332. }
  333. }