Previously the result of an application would have been \r\r\n in the case of windows line endings, as RawText does not touch the \r, and ApplyCommand adds "\r\n" if this is the ending of the first line in the target file. Only always adding \n should be ok, since \r\n would be the result if the file and the patch include windows line endings. Also add according test. Change-Id: Ibd4c4948d81bd1c511ecf5fd6c906444930d236etags/v2.3.0.201302130906
@@ -0,0 +1,10 @@ | |||
diff --git a/NL1 b/NL1 | |||
index 68abad7..b14088c 100644 | |||
--- a/NL1 | |||
+++ b/NL1 | |||
@@ -1,4 +1,4 @@ | |||
a | |||
-b | |||
+d | |||
c | |||
@@ -0,0 +1,4 @@ | |||
a | |||
d | |||
c | |||
@@ -0,0 +1,4 @@ | |||
a | |||
b | |||
c | |||
@@ -178,6 +178,16 @@ public class ApplyCommandTest extends RepositoryTestCase { | |||
b.getString(0, b.size(), false)); | |||
} | |||
@Test | |||
public void testModifyNL1() throws Exception { | |||
ApplyResult result = init("NL1"); | |||
assertEquals(1, result.getUpdatedFiles().size()); | |||
assertEquals(new File(db.getWorkTree(), "NL1"), result | |||
.getUpdatedFiles().get(0)); | |||
checkFile(new File(db.getWorkTree(), "NL1"), | |||
b.getString(0, b.size(), false)); | |||
} | |||
private static byte[] readFile(final String patchFile) throws IOException { | |||
final InputStream in = DiffFormatterReflowTest.class | |||
.getResourceAsStream(patchFile); |
@@ -238,13 +238,10 @@ public class ApplyCommand extends GitCommand<ApplyResult> { | |||
if (!isChanged(oldLines, newLines)) | |||
return; // don't touch the file | |||
StringBuilder sb = new StringBuilder(); | |||
final String eol = rt.size() == 0 | |||
|| (rt.size() == 1 && rt.isMissingNewlineAtEnd()) ? "\n" : rt //$NON-NLS-1$ | |||
.getLineDelimiter(); | |||
for (String l : newLines) { | |||
sb.append(l); | |||
if (eol != null) | |||
sb.append(eol); | |||
// don't bother handling line endings - if it was windows, the \r is | |||
// still there! | |||
sb.append(l).append('\n'); | |||
} | |||
sb.deleteCharAt(sb.length() - 1); | |||
FileWriter fw = new FileWriter(f); | |||
@@ -252,7 +249,7 @@ public class ApplyCommand extends GitCommand<ApplyResult> { | |||
fw.close(); | |||
} | |||
private boolean isChanged(List<String> ol, List<String> nl) { | |||
private static boolean isChanged(List<String> ol, List<String> nl) { | |||
if (ol.size() != nl.size()) | |||
return true; | |||
for (int i = 0; i < ol.size(); i++) |