Add a Rebase Operation

As a prerequisite for implementing the Rebase action in the UI,
this adds the underlying operation.

Change-Id: I9170ffd13b9554b0f19f539387f824e3bb44c018
Signed-off-by: Mathias Kinzler <mathias.kinzler@sap.com>

1 files changed, 238 insertions, 0 deletions

diff --git a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/RebaseOperationTest.java b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/RebaseOperationTest.java
new file mode 100644
index 0000000000..86fbb9c08d
--- /dev/null
+++ b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/RebaseOperationTest.java
@@ -0,0 +1,238 @@
+/*******************************************************************************
+ * Copyright (C) 2010, Mathias Kinzler <mathias.kinzler@sap.com>
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *******************************************************************************/
+package org.eclipse.egit.core.test.op;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.io.ByteArrayInputStream;
+import java.io.File;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.egit.core.op.RebaseOperation;
+import org.eclipse.egit.core.test.GitTestCase;
+import org.eclipse.egit.core.test.TestRepository;
+import org.eclipse.jgit.api.Git;
+import org.eclipse.jgit.api.RebaseResult;
+import org.eclipse.jgit.api.RebaseCommand.Operation;
+import org.eclipse.jgit.api.RebaseResult.Status;
+import org.eclipse.jgit.api.errors.WrongRepositoryStateException;
+import org.eclipse.jgit.lib.Constants;
+import org.eclipse.jgit.lib.Repository;
+import org.eclipse.jgit.revwalk.RevCommit;
+import org.eclipse.jgit.revwalk.RevWalk;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
+
+public class RebaseOperationTest extends GitTestCase {
+
+	private static final String TOPIC = Constants.R_HEADS + "topic";
+
+	private static final String MASTER = Constants.R_HEADS + "master";
+
+	TestRepository testRepository;
+
+	Repository repository;
+
+	Git git;
+
+	@Before
+	public void setUp() throws Exception {
+		super.setUp();
+		testRepository = new TestRepository(gitDir);
+		repository = testRepository.getRepository();
+		// create first commit containing a dummy file
+		testRepository
+				.createInitialCommit("testRebaseOperation\n\nfirst commit\n");
+		git = new Git(repository);
+	}
+
+	@Test
+	@Ignore
+	// currently not working as expected; see also TODO in RebaseCommand
+	public void testUpToDate() throws Exception {
+		IFile file = project.createFile("theFile.txt", "Hello, world"
+				.getBytes("UTF-8"));
+		// first commit in master: add theFile.txt
+		RevCommit first = testRepository.addAndCommit(project.project,
+				new File(file.getLocationURI()), "Adding theFile.txt");
+
+		testRepository.createBranch(MASTER, TOPIC);
+
+		// checkout topic
+		testRepository.checkoutBranch(TOPIC);
+
+		file = project.createFile("theSecondFile.txt", "Hello, world"
+				.getBytes("UTF-8"));
+		// topic commit: add second file
+		RevCommit topicCommit = testRepository.addAndCommit(project.project,
+				new File(file.getLocationURI()), "Adding theSecondFile.txt");
+
+		// parent of topic commit should be first master commit before rebase
+		assertEquals(first, topicCommit.getParent(0));
+
+		// rebase topic onto master
+		RebaseOperation op = new RebaseOperation(
+				testRepository.getRepository(), testRepository.getRepository()
+						.getRef(MASTER));
+		op.execute(null);
+
+		RebaseResult res = op.getResult();
+		assertEquals(RebaseResult.Status.UP_TO_DATE, res.getStatus());
+
+		RevCommit newTopic = new RevWalk(repository).parseCommit(repository
+				.resolve(TOPIC));
+		assertEquals(topicCommit, newTopic);
+		assertEquals(first, newTopic.getParent(0));
+	}
+
+	@Test
+	public void testNoConflict() throws Exception {
+		IFile file = project.createFile("theFile.txt", "Hello, world"
+				.getBytes("UTF-8"));
+		// first commit in master: add theFile.txt
+		RevCommit first = testRepository.addAndCommit(project.project,
+				new File(file.getLocationURI()), "Adding theFile.txt");
+
+		testRepository.createBranch(MASTER, TOPIC);
+
+		file.setContents(new ByteArrayInputStream("master".getBytes("UTF-8")),
+				0, null);
+		// second commit in master: modify theFile.txt
+		RevCommit second = git.commit().setAll(true).setMessage(
+				"Modify theFile.txt").call();
+		assertEquals(first, second.getParent(0));
+
+		// checkout topic
+		testRepository.checkoutBranch(TOPIC);
+
+		file = project.createFile("theSecondFile.txt", "Hello, world"
+				.getBytes("UTF-8"));
+		// topic commit: add second file
+		RevCommit topicCommit = testRepository.addAndCommit(project.project,
+				new File(file.getLocationURI()), "Adding theSecondFile.txt");
+
+		// parent of topic commit should be first master commit before rebase
+		assertEquals(first, topicCommit.getParent(0));
+
+		// rebase topic onto master
+		RebaseOperation op = new RebaseOperation(
+				testRepository.getRepository(), testRepository.getRepository()
+						.getRef(MASTER));
+		op.execute(null);
+
+		RebaseResult res = op.getResult();
+		assertEquals(RebaseResult.Status.OK, res.getStatus());
+
+		RevCommit newTopic = new RevWalk(repository).parseCommit(repository
+				.resolve(TOPIC));
+		assertEquals(second, newTopic.getParent(0));
+	}
+
+	@Test
+	public void testStopAndAbortOnConflict() throws Exception {
+		IFile file = project.createFile("theFile.txt", "Hello, world"
+				.getBytes("UTF-8"));
+		// first commit in master: add theFile.txt
+		RevCommit first = testRepository.addAndCommit(project.project,
+				new File(file.getLocationURI()), "Adding theFile.txt");
+
+		testRepository.createBranch(MASTER, TOPIC);
+
+		file.setContents(new ByteArrayInputStream("master".getBytes("UTF-8")),
+				0, null);
+		// second commit in master: modify theFile.txt
+		RevCommit second = git.commit().setAll(true).setMessage(
+				"Modify theFile.txt").call();
+		assertEquals(first, second.getParent(0));
+
+		// checkout topic
+		testRepository.checkoutBranch(TOPIC);
+
+		// set conflicting content in topic
+		file.setContents(new ByteArrayInputStream("topic".getBytes("UTF-8")),
+				0, null);
+		// topic commit: add second file
+		RevCommit topicCommit = testRepository.addAndCommit(project.project,
+				new File(file.getLocationURI()), "Changing theFile.txt again");
+
+		// parent of topic commit should be first master commit before rebase
+		assertEquals(first, topicCommit.getParent(0));
+
+		// rebase topic onto master
+		RebaseOperation op = new RebaseOperation(
+				testRepository.getRepository(), testRepository.getRepository()
+						.getRef(MASTER));
+		op.execute(null);
+
+		RebaseResult res = op.getResult();
+		assertEquals(RebaseResult.Status.STOPPED, res.getStatus());
+
+		// let's try to abort this here
+		RebaseOperation abort = new RebaseOperation(repository, Operation.ABORT);
+		abort.execute(null);
+		RebaseResult abortResult = abort.getResult();
+		assertEquals(Status.ABORTED, abortResult.getStatus());
+
+		assertEquals(topicCommit, repository.resolve(Constants.HEAD));
+	}
+
+	@Test
+	public void testExceptionWhenRestartingStoppedRebase() throws Exception {
+		IFile file = project.createFile("theFile.txt", "Hello, world"
+				.getBytes("UTF-8"));
+		// first commit in master: add theFile.txt
+		RevCommit first = testRepository.addAndCommit(project.project,
+				new File(file.getLocationURI()), "Adding theFile.txt");
+
+		testRepository.createBranch(MASTER, TOPIC);
+
+		file.setContents(new ByteArrayInputStream("master".getBytes("UTF-8")),
+				0, null);
+		// second commit in master: modify theFile.txt
+		RevCommit second = git.commit().setAll(true).setMessage(
+				"Modify theFile.txt").call();
+		assertEquals(first, second.getParent(0));
+
+		// checkout topic
+		testRepository.checkoutBranch(TOPIC);
+
+		// set conflicting content in topic
+		file.setContents(new ByteArrayInputStream("topic".getBytes("UTF-8")),
+				0, null);
+		// topic commit: add second file
+		RevCommit topicCommit = testRepository.addAndCommit(project.project,
+				new File(file.getLocationURI()), "Changing theFile.txt again");
+
+		// parent of topic commit should be first master commit before rebase
+		assertEquals(first, topicCommit.getParent(0));
+
+		// rebase topic onto master
+		RebaseOperation op = new RebaseOperation(repository, repository
+				.getRef(MASTER));
+		op.execute(null);
+
+		RebaseResult res = op.getResult();
+		assertEquals(RebaseResult.Status.STOPPED, res.getStatus());
+
+		try {
+			// let's try to start again, we should get a wrapped
+			// WrongRepositoryStateException
+			op = new RebaseOperation(repository, repository.getRef(MASTER));
+			op.execute(null);
+			fail("Expected Exception not thrown");
+		} catch (CoreException e) {
+			Throwable cause = e.getCause();
+			assertTrue(cause instanceof WrongRepositoryStateException);
+		}
+	}
+}