GV

GeezerVison

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

Home|About|Gaming cabinet|Archives|How it works|Starter sites

On this site

  • Sign in
  • ActionsCI/CD and automation
  • CodespacesCloud development environments
  • All Features
  • Documentation
  • Training
  • Certifications
  • Build with Copilot
  • Customize Copilot
  • Integrations
  • Trending repos
  • GitHub Sponsors
  • Developer articles
  • Enterprises

This view

  • Original page
  • New address

GeezerVison is showing github.com — changes jgit version · senwa/java-diff-utils@85c3199

File tree

Expand file treeCollapse file tree
Open diff view settings
Filter options
  • java-diff-utils-jgit
    • pom.xml
    • src/test/java/com/github/difflib/algorithm/jgit
      • HistogramDiffTest.java
  • java-diff-utils/src/test
    • java/com/github/difflib/text
      • DiffRowGeneratorTest.java
    • resources/com/github/difflib/text
      • issue_86_original.txt
      • issue_86_revised.txt
Expand file treeCollapse file tree
Open diff view settings
Collapse file

‎java-diff-utils-jgit/pom.xml‎

Copy file name to clipboardExpand all lines: java-diff-utils-jgit/pom.xml
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<dependency>
2121
<groupId>org.eclipse.jgit</groupId>
2222
<artifactId>org.eclipse.jgit</artifactId>
23-
<version>4.4.1.201607150455-r</version>
23+
<version>5.8.1.202007141445-r</version>
2424
<exclusions>
2525
<exclusion>
2626
<groupId>com.googlecode.javaewah</groupId>
Collapse file

‎java-diff-utils-jgit/src/test/java/com/github/difflib/algorithm/jgit/HistogramDiffTest.java‎

Copy file name to clipboardExpand all lines: java-diff-utils-jgit/src/test/java/com/github/difflib/algorithm/jgit/HistogramDiffTest.java
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,6 @@ public void diffEnd() {
8282
assertEquals(revList, patched);
8383

8484
System.out.println(logdata);
85-
assertEquals(17, logdata.size());
85+
assertEquals(19, logdata.size());
8686
}
8787
}
Collapse file

‎java-diff-utils/src/test/java/com/github/difflib/text/DiffRowGeneratorTest.java‎

Copy file name to clipboardExpand all lines: java-diff-utils/src/test/java/com/github/difflib/text/DiffRowGeneratorTest.java
+23Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,12 @@
33
import java.io.File;
44
import java.io.IOException;
55
import java.nio.file.Files;
6+
import java.nio.file.Paths;
67
import java.util.Arrays;
78
import java.util.Collections;
89
import java.util.List;
910
import java.util.regex.Pattern;
11+
import static java.util.stream.Collectors.joining;
1012
import static java.util.stream.Collectors.toList;
1113
import static org.assertj.core.api.Assertions.assertThat;
1214
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -598,4 +600,25 @@ public void testLinefeedInStandardTagsWithLineWidthIssue81() {
598600

599601
System.out.println(deltas);
600602
}
603+
604+
@Test
605+
public void testIssue86WrongInlineDiff() throws IOException {
606+
String original = Files.lines(Paths.get("target/test-classes/com/github/difflib/text/issue_86_original.txt")).collect(joining("\n"));
607+
String revised = Files.lines(Paths.get("target/test-classes/com/github/difflib/text/issue_86_revised.txt")).collect(joining("\n"));
608+
609+
DiffRowGenerator generator = DiffRowGenerator.create()
610+
.showInlineDiffs(true)
611+
.mergeOriginalRevised(false)
612+
.inlineDiffByWord(true)
613+
.oldTag( f -> "~" )
614+
.newTag( f -> "**" )
615+
.build();
616+
List<DiffRow> rows = generator.generateDiffRows(
617+
Arrays.asList(original.split("\n")),
618+
Arrays.asList(revised.split("\n")));
619+
620+
for (DiffRow diff : rows) {
621+
System.out.println(diff);
622+
}
623+
}
601624
}
Collapse file

‎java-diff-utils/src/test/resources/com/github/difflib/text/issue_86_original.txt‎

Copy file name to clipboard
+7Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
MessageTime,MessageType,Instrument,InstrumentState,TradePrice,TradeVolume,TradeCond,TradeId,AskPrice1,AskVol1,BidPrice1,BidVol1,AskPrice2,AskVol2,BidPrice2,BidVol2,AskPrice3,AskVol3,BidPrice3,BidVol3,AskPrice4,AskVol4,BidPrice4,BidVol4,AskPrice5,AskVol5,BidPrice5,BidVol5
2+
2020-04-04T08:00:00.000Z,S,HHD_MAY20,Open,,,,,,,,,,,,,,,,,,,,,,,,
3+
2020-04-04T08:00:00.000Z,S,FHK_C23.5_MAY20,Open,,,,,,,,,,,,,,,,,,,,,,,,
4+
2020-04-04T13:49:11.522Z,Q,HHD_MAY20,,,,,,2.6,10,2.6,10,,,,,,,,,,,,,,,,
5+
2020-04-04T13:49:18.210Z,T,HHD_MAY20,,2.6,1,Screen,0,,,,,,,,,,,,,,,,,,,,
6+
2020-04-04T17:00:00.000Z,S,HHD_MAY20,Close,,,,,,,,,,,,,,,,,,,,,,,,
7+
2020-04-04T17:00:00.000Z,S,FHK_C23.5_MAY20,Close,,,,,,,,,,,,,,,,,,,,,,,,
Collapse file

‎java-diff-utils/src/test/resources/com/github/difflib/text/issue_86_revised.txt‎

Copy file name to clipboard
+8Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
MessageTime,MessageType,Instrument,InstrumentState,TradePrice,TradeVolume,TradeCond,TradeId,AskPrice1,AskVol1,BidPrice1,BidVol1,AskPrice2,AskVol2,BidPrice2,BidVol2,AskPrice3,AskVol3,BidPrice3,BidVol3,AskPrice4,AskVol4,BidPrice4,BidVol4,AskPrice5,AskVol5,BidPrice5,BidVol5
2+
2020-04-02T08:00:00.000Z,S,HHD_MAY20,Open,,,,,,,,,,,,,,,,,,,,,,,,
3+
2020-04-02T08:00:00.000Z,S,FHK_C23.5_MAY20,Open,,,,,,,,,,,,,,,,,,,,,,,,
4+
2020-04-04T13:49:11.522Z,Q,HHD_MAY20,,,,,,2.6,10,2.6,10,,,,,,,,,,,,,,,,
5+
2020-04xs-04T17dw:00:00.000Z,Sdwdw,HHD_MAY20dwdw,Closdwde,,,,,,,,,,,,,,,,,,,,,,,,
6+
2020-04-04T13:49:18.210Z,T,HHD_MAY20,,2.6,2,Screen,0,,,,,,,,,,,,,,,,,,,,
7+
2020-04-04T17:00:00.000Z,S,HHD_MAY20,Close,,,,,,,,,,,,,,,,,,,,,,,,
8+
2020-04-04T17:00:00.000Z,S,FHK_C23.5_MAY20,Close,,,,,,,,,,,,,,,,,,,,,,,,

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.