Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-10 15:35:49 +01:00
Code Issues Packages Projects Releases Activity

Ignore '\ No newline at end of file' in diff

Browse Source
This commit is contained in:
René Pfeuffer
2019-09-23 17:25:01 +02:00
parent eb1812dea6
commit 1c922d637e
2 changed files with 35 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitHunkParser.java
View File

@@ -79,9 +79,11 @@ final class GitHunkParser {
++oldLineCounter;
break;
default:
if (!line.equals("\\ No newline at end of file")) {
throw new IllegalStateException("cannot handle diff line: " + line);
}
}
}
private static class AddedGitDiffLine implements DiffLine {
private final int newLineNumber;

32
scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitHunkParserTest.java
View File

@@ -68,6 +68,17 @@ class GitHunkParserTest {
" a\n" +
"~illegal line\n";
private static final String NO_NEWLINE_DIFF = "diff --git a/.editorconfig b/.editorconfig\n" +
"index ea2a3ba..2f02f32 100644\n" +
"--- a/.editorconfig\n" +
"+++ b/.editorconfig\n" +
"@@ -10,3 +10,4 @@\n" +
" indent_style = space\n" +
" indent_size = 2\n" +
" charset = utf-8\n" +
"+added line\n" +
"\\ No newline at end of file\n";
@Test
void shouldParseHunks() {
List<Hunk> hunks = new GitHunkParser().parse(DIFF_001);
@@ -127,6 +138,27 @@ class GitHunkParserTest {
assertThrows(IllegalStateException.class, () -> new GitHunkParser().parse(ILLEGAL_DIFF));
}
@Test
void shouldIgnoreNoNewlineLine() {
List<Hunk> hunks = new GitHunkParser().parse(NO_NEWLINE_DIFF);
Hunk hunk = hunks.get(0);
Iterator<DiffLine> lines = hunk.iterator();
DiffLine line1 = lines.next();
assertThat(line1.getOldLineNumber()).hasValue(10);
assertThat(line1.getNewLineNumber()).hasValue(10);
assertThat(line1.getContent()).isEqualTo("indent_style = space");
lines.next();
lines.next();
DiffLine lastLine = lines.next();
assertThat(lastLine.getOldLineNumber()).isEmpty();
assertThat(lastLine.getNewLineNumber()).hasValue(13);
assertThat(lastLine.getContent()).isEqualTo("added line");
}
private void assertHunk(Hunk hunk, int oldStart, int oldLineCount, int newStart, int newLineCount) {
assertThat(hunk.getOldStart()).isEqualTo(oldStart);
assertThat(hunk.getOldLineCount()).isEqualTo(oldLineCount);