summaryrefslogtreecommitdiffstatsabout
diff options
context:
space:
mode:
authorMathias Kinzler2010-10-19 02:54:28 (EDT)
committer Shawn O. Pearce2010-10-28 12:18:02 (EDT)
commit7668a462829b12e4f6a192c43157152ef63ff305 (patch)
tree8d50007a8be9be62b217a5efbd717b5f202b1a41
parent0544c9af4159ede49a42119833f680b2435e78a7 (diff)
downloadjgit-7668a462829b12e4f6a192c43157152ef63ff305.zip
jgit-7668a462829b12e4f6a192c43157152ef63ff305.tar.gz
jgit-7668a462829b12e4f6a192c43157152ef63ff305.tar.bz2
PullCommand: support upstream configuration for local branchesrefs/changes/47/1747/4
When creating a local branch based on another local branch, the upstream configuration contains "." as origin and the source branch as "merge". The PullCommand should support this by skipping the fetch step altogether and use the base branch to merge with. Change-Id: I260a1771aeeffca5b0161d1494fd63c672ecc2a6 Signed-off-by: Mathias Kinzler <mathias.kinzler@sap.com>
-rw-r--r--org.eclipse.jgit.test/tst/org/eclipse/jgit/api/PullCommandTest.java42
-rw-r--r--org.eclipse.jgit/resources/org/eclipse/jgit/JGitText.properties1
-rw-r--r--org.eclipse.jgit/src/org/eclipse/jgit/JGitText.java1
-rw-r--r--org.eclipse.jgit/src/org/eclipse/jgit/api/PullCommand.java80
4 files changed, 91 insertions, 33 deletions
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/PullCommandTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/PullCommandTest.java
index de75fd5..48ede96 100644
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/PullCommandTest.java
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/PullCommandTest.java
@@ -48,7 +48,9 @@ import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
+import org.eclipse.jgit.api.CreateBranchCommand.SetupUpstreamMode;
import org.eclipse.jgit.api.MergeResult.MergeStatus;
+import org.eclipse.jgit.lib.Constants;
import org.eclipse.jgit.lib.RefUpdate;
import org.eclipse.jgit.lib.RepositoryTestCase;
import org.eclipse.jgit.lib.StoredConfig;
@@ -125,6 +127,46 @@ public class PullCommandTest extends RepositoryTestCase {
assertFileContentsEqual(targetFile, result);
}
+ public void testPullLocalConflict() throws Exception {
+ target.branchCreate().setName("basedOnMaster").setStartPoint(
+ "refs/heads/master").setUpstreamMode(SetupUpstreamMode.TRACK)
+ .call();
+ target.getRepository().updateRef(Constants.HEAD).link(
+ "refs/heads/basedOnMaster");
+ PullResult res = target.pull().call();
+ // nothing to update since we don't have different data yet
+ assertNull(res.getFetchResult());
+ assertTrue(res.getMergeResult().getMergeStatus().equals(
+ MergeStatus.ALREADY_UP_TO_DATE));
+
+ assertFileContentsEqual(targetFile, "Hello world");
+
+ // change the file in master
+ target.getRepository().updateRef(Constants.HEAD).link(
+ "refs/heads/master");
+ writeToFile(targetFile, "Master change");
+ target.add().addFilepattern("SomeFile.txt").call();
+ target.commit().setMessage("Source change in master").call();
+
+ // change the file in slave
+ target.getRepository().updateRef(Constants.HEAD).link(
+ "refs/heads/basedOnMaster");
+ writeToFile(targetFile, "Slave change");
+ target.add().addFilepattern("SomeFile.txt").call();
+ target.commit().setMessage("Source change in based on master").call();
+
+ res = target.pull().call();
+
+ String sourceChangeString = "Master change\n>>>>>>> branch 'refs/heads/master' of local repository";
+
+ assertNull(res.getFetchResult());
+ assertEquals(res.getMergeResult().getMergeStatus(),
+ MergeStatus.CONFLICTING);
+ String result = "<<<<<<< HEAD\nSlave change\n=======\n"
+ + sourceChangeString + "\n";
+ assertFileContentsEqual(targetFile, result);
+ }
+
@Override
protected void setUp() throws Exception {
super.setUp();
diff --git a/org.eclipse.jgit/resources/org/eclipse/jgit/JGitText.properties b/org.eclipse.jgit/resources/org/eclipse/jgit/JGitText.properties
index 409b434..8af6e31 100644
--- a/org.eclipse.jgit/resources/org/eclipse/jgit/JGitText.properties
+++ b/org.eclipse.jgit/resources/org/eclipse/jgit/JGitText.properties
@@ -113,6 +113,7 @@ corruptionDetectedReReadingAt=Corruption detected re-reading at {0}
couldNotCheckOutBecauseOfConflicts=Could not check out because of conflicts
couldNotDeleteLockFileShouldNotHappen=Could not delete lock file. Should not happen
couldNotDeleteTemporaryIndexFileShouldNotHappen=Could not delete temporary index file. Should not happen
+couldNotGetAdvertisedRef=Could not get advertised Ref for branch {0}
couldNotLockHEAD=Could not lock HEAD
couldNotReadIndexInOneGo=Could not read index in one go, only {0} out of {1} read
couldNotRenameDeleteOldIndex=Could not rename delete old index
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/JGitText.java b/org.eclipse.jgit/src/org/eclipse/jgit/JGitText.java
index d6c6018..6a75a9e 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/JGitText.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/JGitText.java
@@ -173,6 +173,7 @@ public class JGitText extends TranslationBundle {
/***/ public String couldNotCheckOutBecauseOfConflicts;
/***/ public String couldNotDeleteLockFileShouldNotHappen;
/***/ public String couldNotDeleteTemporaryIndexFileShouldNotHappen;
+ /***/ public String couldNotGetAdvertisedRef;
/***/ public String couldNotLockHEAD;
/***/ public String couldNotReadIndexInOneGo;
/***/ public String couldNotRenameDeleteOldIndex;
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/PullCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/PullCommand.java
index b7f09d9..acbf3f1 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/api/PullCommand.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/PullCommand.java
@@ -157,14 +157,6 @@ public class PullCommand extends GitCommand<PullResult> {
throw new InvalidConfigurationException(MessageFormat.format(
JGitText.get().missingConfigurationForKey, missingKey));
}
- final String remoteUri = repo.getConfig().getString("remote", remote,
- ConfigConstants.CONFIG_KEY_URL);
- if (remoteUri == null) {
- String missingKey = ConfigConstants.CONFIG_REMOTE_SECTION + DOT
- + remote + DOT + ConfigConstants.CONFIG_KEY_URL;
- throw new InvalidConfigurationException(MessageFormat.format(
- JGitText.get().missingConfigurationForKey, missingKey));
- }
// get the name of the branch in the remote repository
// stored in configuration key branch.<branch name>.merge
@@ -175,13 +167,14 @@ public class PullCommand extends GitCommand<PullResult> {
// check if the branch is configured for pull-rebase
remoteBranchName = repoConfig.getString(
ConfigConstants.CONFIG_BRANCH_SECTION, branchName,
- ConfigConstants.CONFIG_KEY_MERGE);
+ ConfigConstants.CONFIG_KEY_REBASE);
if (remoteBranchName != null) {
// TODO implement pull-rebase
throw new JGitInternalException(
"Pull with rebase is not yet supported");
}
}
+
if (remoteBranchName == null) {
String missingKey = ConfigConstants.CONFIG_BRANCH_SECTION + DOT
+ branchName + DOT + ConfigConstants.CONFIG_KEY_MERGE;
@@ -189,45 +182,66 @@ public class PullCommand extends GitCommand<PullResult> {
JGitText.get().missingConfigurationForKey, missingKey));
}
- if (monitor.isCancelled())
- throw new CanceledException(MessageFormat.format(
- JGitText.get().operationCanceled,
- JGitText.get().pullTaskName));
+ final boolean isRemote = !remote.equals(".");
+ String remoteUri;
+ FetchResult fetchRes;
+ if (isRemote) {
+ remoteUri = repo.getConfig().getString("remote", remote,
+ ConfigConstants.CONFIG_KEY_URL);
+ if (remoteUri == null) {
+ String missingKey = ConfigConstants.CONFIG_REMOTE_SECTION + DOT
+ + remote + DOT + ConfigConstants.CONFIG_KEY_URL;
+ throw new InvalidConfigurationException(MessageFormat.format(
+ JGitText.get().missingConfigurationForKey, missingKey));
+ }
- FetchCommand fetch = new FetchCommand(repo);
- fetch.setRemote(remote);
- if (monitor != null)
- fetch.setProgressMonitor(monitor);
- fetch.setTimeout(this.timeout);
+ if (monitor.isCancelled())
+ throw new CanceledException(MessageFormat.format(
+ JGitText.get().operationCanceled,
+ JGitText.get().pullTaskName));
- FetchResult fetchRes = fetch.call();
+ FetchCommand fetch = new FetchCommand(repo);
+ fetch.setRemote(remote);
+ if (monitor != null)
+ fetch.setProgressMonitor(monitor);
+ fetch.setTimeout(this.timeout);
+
+ fetchRes = fetch.call();
+ } else {
+ // we can skip the fetch altogether
+ remoteUri = "local repository";
+ fetchRes = null;
+ }
monitor.update(1);
// we check the updates to see which of the updated branches corresponds
// to the remote branch name
- AnyObjectId commitToMerge = null;
+ AnyObjectId commitToMerge;
- Ref r = fetchRes.getAdvertisedRef(remoteBranchName);
- if (r == null)
- r = fetchRes.getAdvertisedRef(Constants.R_HEADS + remoteBranchName);
- if (r == null) {
- // TODO: we should be able to get the mapping also if nothing was
- // updated by the fetch; for the time being, use the naming
- // convention as fall back
- String remoteTrackingBranch = Constants.R_REMOTES + remote + '/'
- + branchName;
+ if (isRemote) {
+ Ref r = null;
+ if (fetchRes != null) {
+ r = fetchRes.getAdvertisedRef(remoteBranchName);
+ if (r == null)
+ r = fetchRes.getAdvertisedRef(Constants.R_HEADS
+ + remoteBranchName);
+ }
+ if (r == null)
+ throw new JGitInternalException(MessageFormat.format(JGitText
+ .get().couldNotGetAdvertisedRef, remoteBranchName));
+ else
+ commitToMerge = r.getObjectId();
+ } else {
try {
- commitToMerge = repo.resolve(remoteTrackingBranch);
+ commitToMerge = repo.resolve(remoteBranchName);
} catch (IOException e) {
throw new JGitInternalException(
JGitText.get().exceptionCaughtDuringExecutionOfPullCommand,
e);
}
-
- } else
- commitToMerge = r.getObjectId();
+ }
if (monitor.isCancelled())
throw new CanceledException(MessageFormat.format(