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

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266
  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 = ".";
  76. private ProgressMonitor monitor = NullProgressMonitor.INSTANCE;
  77. /**
  78. * @param repo
  79. */
  80. protected PullCommand(Repository repo) {
  81. super(repo);
  82. }
  83. /**
  84. * @param monitor
  85. * a progress monitor
  86. * @return this instance
  87. */
  88. public PullCommand setProgressMonitor(ProgressMonitor monitor) {
  89. this.monitor = monitor;
  90. return this;
  91. }
  92. /**
  93. * Executes the {@code Pull} command with all the options and parameters
  94. * collected by the setter methods (e.g.
  95. * {@link #setProgressMonitor(ProgressMonitor)}) of this class. Each
  96. * instance of this class should only be used for one invocation of the
  97. * command. Don't call this method twice on an instance.
  98. *
  99. * @return the result of the pull
  100. * @throws WrongRepositoryStateException
  101. * @throws InvalidConfigurationException
  102. * @throws DetachedHeadException
  103. * @throws InvalidRemoteException
  104. * @throws CanceledException
  105. * @throws RefNotFoundException
  106. * @throws NoHeadException
  107. * @throws org.eclipse.jgit.api.errors.TransportException
  108. * @throws GitAPIException
  109. */
  110. public PullResult call() throws GitAPIException,
  111. WrongRepositoryStateException, InvalidConfigurationException,
  112. DetachedHeadException, InvalidRemoteException, CanceledException,
  113. RefNotFoundException, NoHeadException,
  114. org.eclipse.jgit.api.errors.TransportException {
  115. checkCallable();
  116. monitor.beginTask(JGitText.get().pullTaskName, 2);
  117. String branchName;
  118. try {
  119. String fullBranch = repo.getFullBranch();
  120. if (fullBranch == null)
  121. throw new NoHeadException(
  122. JGitText.get().pullOnRepoWithoutHEADCurrentlyNotSupported);
  123. if (!fullBranch.startsWith(Constants.R_HEADS)) {
  124. // we can not pull if HEAD is detached and branch is not
  125. // specified explicitly
  126. throw new DetachedHeadException();
  127. }
  128. branchName = fullBranch.substring(Constants.R_HEADS.length());
  129. } catch (IOException e) {
  130. throw new JGitInternalException(
  131. JGitText.get().exceptionCaughtDuringExecutionOfPullCommand,
  132. e);
  133. }
  134. if (!repo.getRepositoryState().equals(RepositoryState.SAFE))
  135. throw new WrongRepositoryStateException(MessageFormat.format(
  136. JGitText.get().cannotPullOnARepoWithState, repo
  137. .getRepositoryState().name()));
  138. // get the configured remote for the currently checked out branch
  139. // stored in configuration key branch.<branch name>.remote
  140. Config repoConfig = repo.getConfig();
  141. String remote = repoConfig.getString(
  142. ConfigConstants.CONFIG_BRANCH_SECTION, branchName,
  143. ConfigConstants.CONFIG_KEY_REMOTE);
  144. if (remote == null)
  145. // fall back to default remote
  146. remote = Constants.DEFAULT_REMOTE_NAME;
  147. // get the name of the branch in the remote repository
  148. // stored in configuration key branch.<branch name>.merge
  149. String remoteBranchName = repoConfig.getString(
  150. ConfigConstants.CONFIG_BRANCH_SECTION, branchName,
  151. ConfigConstants.CONFIG_KEY_MERGE);
  152. // check if the branch is configured for pull-rebase
  153. boolean doRebase = repoConfig.getBoolean(
  154. ConfigConstants.CONFIG_BRANCH_SECTION, branchName,
  155. ConfigConstants.CONFIG_KEY_REBASE, false);
  156. if (remoteBranchName == null) {
  157. String missingKey = ConfigConstants.CONFIG_BRANCH_SECTION + DOT
  158. + branchName + DOT + ConfigConstants.CONFIG_KEY_MERGE;
  159. throw new InvalidConfigurationException(MessageFormat.format(
  160. JGitText.get().missingConfigurationForKey, missingKey));
  161. }
  162. final boolean isRemote = !remote.equals(".");
  163. String remoteUri;
  164. FetchResult fetchRes;
  165. if (isRemote) {
  166. remoteUri = repoConfig.getString(
  167. ConfigConstants.CONFIG_REMOTE_SECTION, remote,
  168. ConfigConstants.CONFIG_KEY_URL);
  169. if (remoteUri == null) {
  170. String missingKey = ConfigConstants.CONFIG_REMOTE_SECTION + DOT
  171. + remote + DOT + ConfigConstants.CONFIG_KEY_URL;
  172. throw new InvalidConfigurationException(MessageFormat.format(
  173. JGitText.get().missingConfigurationForKey, missingKey));
  174. }
  175. if (monitor.isCancelled())
  176. throw new CanceledException(MessageFormat.format(
  177. JGitText.get().operationCanceled,
  178. JGitText.get().pullTaskName));
  179. FetchCommand fetch = new FetchCommand(repo);
  180. fetch.setRemote(remote);
  181. fetch.setProgressMonitor(monitor);
  182. configure(fetch);
  183. fetchRes = fetch.call();
  184. } else {
  185. // we can skip the fetch altogether
  186. remoteUri = "local repository";
  187. fetchRes = null;
  188. }
  189. monitor.update(1);
  190. if (monitor.isCancelled())
  191. throw new CanceledException(MessageFormat.format(
  192. JGitText.get().operationCanceled,
  193. JGitText.get().pullTaskName));
  194. // we check the updates to see which of the updated branches
  195. // corresponds
  196. // to the remote branch name
  197. AnyObjectId commitToMerge;
  198. if (isRemote) {
  199. Ref r = null;
  200. if (fetchRes != null) {
  201. r = fetchRes.getAdvertisedRef(remoteBranchName);
  202. if (r == null)
  203. r = fetchRes.getAdvertisedRef(Constants.R_HEADS
  204. + remoteBranchName);
  205. }
  206. if (r == null)
  207. throw new JGitInternalException(MessageFormat.format(JGitText
  208. .get().couldNotGetAdvertisedRef, remoteBranchName));
  209. else
  210. commitToMerge = r.getObjectId();
  211. } else {
  212. try {
  213. commitToMerge = repo.resolve(remoteBranchName);
  214. if (commitToMerge == null)
  215. throw new RefNotFoundException(MessageFormat.format(
  216. JGitText.get().refNotResolved, remoteBranchName));
  217. } catch (IOException e) {
  218. throw new JGitInternalException(
  219. JGitText.get().exceptionCaughtDuringExecutionOfPullCommand,
  220. e);
  221. }
  222. }
  223. PullResult result;
  224. if (doRebase) {
  225. RebaseCommand rebase = new RebaseCommand(repo);
  226. RebaseResult rebaseRes = rebase.setUpstream(commitToMerge)
  227. .setProgressMonitor(monitor).setOperation(Operation.BEGIN)
  228. .call();
  229. result = new PullResult(fetchRes, remote, rebaseRes);
  230. } else {
  231. MergeCommand merge = new MergeCommand(repo);
  232. String name = "branch \'"
  233. + Repository.shortenRefName(remoteBranchName) + "\' of "
  234. + remoteUri;
  235. merge.include(name, commitToMerge);
  236. MergeResult mergeRes = merge.call();
  237. monitor.update(1);
  238. result = new PullResult(fetchRes, remote, mergeRes);
  239. }
  240. monitor.endTask();
  241. return result;
  242. }
  243. }