GeezerVison

The World Wide Web, restored to 800 pixels of glory.

GeezerVison is showing github.com — introduced conflict processing · zaslight/java-diff-utils@8880ec5

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

java-diff-utils/src
- main/java/com/github/difflib/patch
  - ConflictOutput.java
  - Patch.java
- test/java/com/github/difflib
  - GenerateUnifiedDiffTest.java

Expand file treeCollapse file tree

Open diff view settings

Collapse file

`‎java-diff-utils/src/main/java/com/github/difflib/patch/ConflictOutput.java‎`

Copy file name to clipboardExpand all lines: java-diff-utils/src/main/java/com/github/difflib/patch/ConflictOutput.java

+2-1Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -19,14 +19,15 @@`
`19`	`19`	`*/`
`20`	`20`	`package com.github.difflib.patch;`
`21`	`21`
	`22`	`+import java.io.Serializable;`
`22`	`23`	`import java.util.List;`
`23`	`24`
`24`	`25`	`/**`
`25`	`26`	`*`
`26`	`27`	`* @author tw`
`27`	`28`	`*/`
`28`	`29`	`@FunctionalInterface`
`29`		`-public interface ConflictOutput<T> {`
	`30`	`+public interface ConflictOutput<T> extends Serializable {`
`30`	`31`
`31`	`32`	`public void processConflict(VerifyChunk verifyChunk, AbstractDelta<T> delta, List<T> result) throws PatchFailedException;`
`32`	`33`	`}`

Collapse file

`‎java-diff-utils/src/main/java/com/github/difflib/patch/Patch.java‎`

Copy file name to clipboardExpand all lines: java-diff-utils/src/main/java/com/github/difflib/patch/Patch.java

+11-5Lines changed: 11 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -60,18 +60,24 @@ public List<T> applyTo(List<T> target) throws PatchFailedException {`
`60`	`60`	`AbstractDelta<T> delta = it.previous();`
`61`	`61`	`VerifyChunk valid = delta.verifyAntApplyTo(result);`
`62`	`62`	`if (valid != VerifyChunk.OK) {`
`63`		`-`
	`63`	`+ conflictOutput.processConflict(valid, delta, result);`
`64`	`64`	`}`
`65`	`65`	`}`
`66`	`66`	`return result;`
`67`	`67`	`}`
`68`		`-`
`69`		`- private ConflictOutput<T> conflictOutput = (VerifyChunk verifyChunk, AbstractDelta<T> delta, List<T> result) -> {`
	`68`	`+`
	`69`	`+ /**`
	`70`	`+ * Standard Patch behaviour to throw an exception for pathching conflicts.`
	`71`	`+ */`
	`72`	`+ public final ConflictOutput<T> CONFLICT_PRODUCES_EXCEPTION = (VerifyChunk verifyChunk, AbstractDelta<T> delta, List<T> result) -> {`
`70`	`73`	`throw new PatchFailedException("could not apply patch due to " + verifyChunk.toString());`
`71`	`74`	`};`
`72`		`-`
	`75`	`+`
	`76`	`+ private ConflictOutput<T> conflictOutput = CONFLICT_PRODUCES_EXCEPTION;`
	`77`	`+`
`73`	`78`	`/**`
`74`		`- * Alter normal conflict output behaviour to e.g. inclide some conflict statements in the result, like git does it.`
	`79`	`+ * Alter normal conflict output behaviour to e.g. inclide some conflict`
	`80`	`+ * statements in the result, like git does it.`
`75`	`81`	`*/`
`76`	`82`	`public Patch withConflictOutput(ConflictOutput<T> conflictOutput) {`
`77`	`83`	`this.conflictOutput = conflictOutput;`

Collapse file

`‎java-diff-utils/src/test/java/com/github/difflib/GenerateUnifiedDiffTest.java‎`

Copy file name to clipboardExpand all lines: java-diff-utils/src/test/java/com/github/difflib/GenerateUnifiedDiffTest.java

+18-1Lines changed: 18 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@`
`13`	`13`	`import java.util.List;`
`14`	`14`	`import static java.util.stream.Collectors.joining;`
`15`	`15`	`import static org.junit.jupiter.api.Assertions.assertEquals;`
	`16`	`+import static org.junit.jupiter.api.Assertions.assertThrows;`
`16`	`17`	`import static org.junit.jupiter.api.Assertions.assertTrue;`
`17`	`18`	`import static org.junit.jupiter.api.Assertions.fail;`
`18`	`19`	`import org.junit.jupiter.api.Test;`
`@@ -133,7 +134,7 @@ public void testNewFileCreation() {`
`133`	`134`	`* Issue 89`
`134`	`135`	`*/`
`135`	`136`	`@Test`
`136`		`- public void testChagngePosition() throws IOException {`
	`137`	`+ public void testChangePosition() throws IOException {`
`137`	`138`	`final List<String> patchLines = fileToLines(TestConstants.MOCK_FOLDER + "issue89_patch.txt");`
`138`	`139`	`final Patch<String> patch = UnifiedDiffUtils.parseUnifiedDiff(patchLines);`
`139`	`140`	`List<Integer> realRemoveListOne = Collections.singletonList(3);`
`@@ -191,4 +192,20 @@ private void verify(List<String> origLines, List<String> revLines,`
`191`	`192`	`fail(e.getMessage());`
`192`	`193`	`}`
`193`	`194`	`}`
	`195`	`+`
	`196`	`+`
	`197`	`+ @Test`
	`198`	`+ public void testFailingPatchByException() throws IOException {`
	`199`	`+ final List<String> baseLines = fileToLines(TestConstants.MOCK_FOLDER + "issue10_base.txt");`
	`200`	`+ final List<String> patchLines = fileToLines(TestConstants.MOCK_FOLDER + "issue10_patch.txt");`
	`201`	`+ final Patch<String> p = UnifiedDiffUtils.parseUnifiedDiff(patchLines);`
	`202`	`+`
	`203`	`+ //make original not fitting`
	`204`	`+ baseLines.set(40, baseLines.get(40) + " corrupted ");`
	`205`	`+`
	`206`	`+ assertThrows(PatchFailedException.class, () -> DiffUtils.patch(baseLines, p));`
	`207`	`+`
	`208`	`+`
	`209`	`+`
	`210`	`+ }`
`194`	`211`	`}`

0 commit comments

Comments

0 (0)

You are visitor 01402520 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.