motiejus
/
jgit
1
Fork 0
Code Releases Activity

Merge "Rebase Interoperability second part: fix "pop steps""

This commit is contained in:
Chris Aniszczyk 2010-12-07 09:19:35 -05:00 committed by Code Review
parent 6462be8350 59e62ba7e1
commit a51f44edb0
2 changed files with 33 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
org.eclipse.jgit.test/tst/org/eclipse/jgit/api/RebaseCommandTest.java
View File

@ -327,7 +327,7 @@ public void testAbortOnConflict() throws Exception {
assertTrue(new File(db.getDirectory(), "rebase-merge").exists()); assertTrue(new File(db.getDirectory(), "rebase-merge").exists());
// the first one should be included, so we should have left two picks in // the first one should be included, so we should have left two picks in
// the file // the file
assertEquals(2, countPicks()); assertEquals(1, countPicks());
// rebase should not succeed in this state // rebase should not succeed in this state
try { try {
@ -416,7 +416,7 @@ public void testAbortOnConflictFileCreationAndDeletion() throws Exception {
assertTrue(new File(db.getDirectory(), "rebase-merge").exists()); assertTrue(new File(db.getDirectory(), "rebase-merge").exists());
// the first one should be included, so we should have left two picks in // the first one should be included, so we should have left two picks in
// the file // the file
assertEquals(1, countPicks()); assertEquals(0, countPicks());
assertFalse(file2.exists()); assertFalse(file2.exists());
assertFalse(file3.exists()); assertFalse(file3.exists());

46
org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java
View File

@ -185,6 +185,7 @@ public RebaseResult call() throws NoHeadException, RefNotFoundException,
for (Step step : steps) { for (Step step : steps) {
if (step.action != Action.PICK) if (step.action != Action.PICK)
continue; continue;
popSteps(1);
Collection<ObjectId> ids = or.resolve(step.commit); Collection<ObjectId> ids = or.resolve(step.commit);
if (ids.size() != 1) if (ids.size() != 1)
throw new JGitInternalException( throw new JGitInternalException(
@ -203,7 +204,6 @@ public RebaseResult call() throws NoHeadException, RefNotFoundException,
.call(); .call();
monitor.endTask(); monitor.endTask();
if (newHead == null) { if (newHead == null) {
popSteps(stepsToPop);
return new RebaseResult(commitToPick); return new RebaseResult(commitToPick);
} }
stepsToPop++; stepsToPop++;
@ -238,14 +238,15 @@ public RebaseResult call() throws NoHeadException, RefNotFoundException,
private void popSteps(int numSteps) throws IOException { private void popSteps(int numSteps) throws IOException {
if (numSteps == 0) if (numSteps == 0)
return; return;
List<String> lines = new ArrayList<String>(); List<String> todoLines = new ArrayList<String>();
File file = new File(rebaseDir, "git-rebase-todo"); 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( BufferedReader br = new BufferedReader(new InputStreamReader(
new FileInputStream(file), "UTF-8")); new FileInputStream(todoFile), "UTF-8"));
int popped = 0;
try { try {
// check if the line starts with a action tag (pick, skip...) // check if the line starts with a action tag (pick, skip...)
while (popped < numSteps) { while (poppedLines.size() < numSteps) {
String popCandidate = br.readLine(); String popCandidate = br.readLine();
if (popCandidate == null) if (popCandidate == null)
break; break;
@ -256,28 +257,43 @@ private void popSteps(int numSteps) throws IOException {
pop = Action.parse(actionToken) != null; pop = Action.parse(actionToken) != null;
} }
if (pop) if (pop)
popped++; poppedLines.add(popCandidate);
else else
lines.add(popCandidate); todoLines.add(popCandidate);
} }
String readLine = br.readLine(); String readLine = br.readLine();
while (readLine != null) { while (readLine != null) {
lines.add(readLine); todoLines.add(readLine);
readLine = br.readLine(); readLine = br.readLine();
} }
} finally { } finally {
br.close(); br.close();
} }
BufferedWriter bw = new BufferedWriter(new OutputStreamWriter( BufferedWriter todoWriter = new BufferedWriter(new OutputStreamWriter(
new FileOutputStream(file), "UTF-8")); new FileOutputStream(todoFile), "UTF-8"));
try { try {
for (String writeLine : lines) { for (String writeLine : todoLines) {
bw.write(writeLine); todoWriter.write(writeLine);
bw.newLine(); todoWriter.newLine();
} }
} finally { } 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();
}
} }
} }