summaryrefslogtreecommitdiffstatsabout
diff options
context:
space:
mode:
authorMathias Kinzler2010-12-01 09:10:13 (EST)
committer Mathias Kinzler2010-12-01 09:10:13 (EST)
commit59e62ba7e10188c6170bd97ffbd9c8768d9745ea (patch)
treed422855d75599ed6fe146f0c93949dd8c16928bd
parent7aa1b85821e007c0243772273960069497284290 (diff)
downloadjgit-59e62ba7e10188c6170bd97ffbd9c8768d9745ea.zip
jgit-59e62ba7e10188c6170bd97ffbd9c8768d9745ea.tar.gz
jgit-59e62ba7e10188c6170bd97ffbd9c8768d9745ea.tar.bz2
Rebase Interoperability second part: fix "pop steps"refs/changes/85/1985/1
If the CLI stops a rebase upon conflict, the current step is already popped from the git-rebase-todo and appended to the "done" file. The current implementation wrongly pops the step only after successful cherry-pick. Change-Id: I8640dda0cbb2a5271ecf75fcbad69410122eeab6 Signed-off-by: Mathias Kinzler <mathias.kinzler@sap.com>
-rw-r--r--org.eclipse.jgit.test/tst/org/eclipse/jgit/api/RebaseCommandTest.java4
-rw-r--r--org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java46
2 files changed, 33 insertions, 17 deletions
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/RebaseCommandTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/RebaseCommandTest.java
index d1d3480..bddb9ed 100644
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/RebaseCommandTest.java
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/RebaseCommandTest.java
@@ -327,7 +327,7 @@ public class RebaseCommandTest extends RepositoryTestCase {
assertTrue(new File(db.getDirectory(), "rebase-merge").exists());
// the first one should be included, so we should have left two picks in
// the file
- assertEquals(2, countPicks());
+ assertEquals(1, countPicks());
// rebase should not succeed in this state
try {
@@ -416,7 +416,7 @@ public class RebaseCommandTest extends RepositoryTestCase {
assertTrue(new File(db.getDirectory(), "rebase-merge").exists());
// the first one should be included, so we should have left two picks in
// the file
- assertEquals(1, countPicks());
+ assertEquals(0, countPicks());
assertFalse(file2.exists());
assertFalse(file3.exists());
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java
index 45c66e5..fbe7deb 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java
@@ -185,6 +185,7 @@ public class RebaseCommand extends GitCommand<RebaseResult> {
for (Step step : steps) {
if (step.action != Action.PICK)
continue;
+ popSteps(1);
Collection<ObjectId> ids = or.resolve(step.commit);
if (ids.size() != 1)
throw new JGitInternalException(
@@ -203,7 +204,6 @@ public class RebaseCommand extends GitCommand<RebaseResult> {
.call();
monitor.endTask();
if (newHead == null) {
- popSteps(stepsToPop);
return new RebaseResult(commitToPick);
}
stepsToPop++;
@@ -238,14 +238,15 @@ public class RebaseCommand extends GitCommand<RebaseResult> {
private void popSteps(int numSteps) throws IOException {
if (numSteps == 0)
return;
- List<String> lines = new ArrayList<String>();
- File file = new File(rebaseDir, "git-rebase-todo");
+ List<String> todoLines = new ArrayList<String>();
+ List<String> poppedLines = new ArrayList<String>();
+ File todoFile = new File(rebaseDir, "git-rebase-todo");
+ File doneFile = new File(rebaseDir, "done");
BufferedReader br = new BufferedReader(new InputStreamReader(
- new FileInputStream(file), "UTF-8"));
- int popped = 0;
+ new FileInputStream(todoFile), "UTF-8"));
try {
// check if the line starts with a action tag (pick, skip...)
- while (popped < numSteps) {
+ while (poppedLines.size() < numSteps) {
String popCandidate = br.readLine();
if (popCandidate == null)
break;
@@ -256,28 +257,43 @@ public class RebaseCommand extends GitCommand<RebaseResult> {
pop = Action.parse(actionToken) != null;
}
if (pop)
- popped++;
+ poppedLines.add(popCandidate);
else
- lines.add(popCandidate);
+ todoLines.add(popCandidate);
}
String readLine = br.readLine();
while (readLine != null) {
- lines.add(readLine);
+ todoLines.add(readLine);
readLine = br.readLine();
}
} finally {
br.close();
}
- BufferedWriter bw = new BufferedWriter(new OutputStreamWriter(
- new FileOutputStream(file), "UTF-8"));
+ BufferedWriter todoWriter = new BufferedWriter(new OutputStreamWriter(
+ new FileOutputStream(todoFile), "UTF-8"));
try {
- for (String writeLine : lines) {
- bw.write(writeLine);
- bw.newLine();
+ for (String writeLine : todoLines) {
+ todoWriter.write(writeLine);
+ todoWriter.newLine();
}
} finally {
- bw.close();
+ todoWriter.close();
+ }
+
+ if (poppedLines.size() > 0) {
+ // append here
+ BufferedWriter doneWriter = new BufferedWriter(
+ new OutputStreamWriter(
+ new FileOutputStream(doneFile, true), "UTF-8"));
+ try {
+ for (String writeLine : poppedLines) {
+ doneWriter.write(writeLine);
+ doneWriter.newLine();
+ }
+ } finally {
+ doneWriter.close();
+ }
}
}