();
+ for ( Object line: delta.getOriginal().getLines() ) {
+ buffer.add( "-" + line );
+ }
+ for ( Object line: delta.getRevised().getLines() ) {
+ buffer.add( "+" + line );
+ }
+ return buffer;
+ }
}
--- one_delta_test_original.txt
+++ one_delta_test_revised.txt
@@ -1,54 +1,11 @@
-Esta é uma obra Online.
-
-Este texto é negrito
-Este texto é itálico
-Este texto está sublinhado
-Este texto está riscado
-Este texto está centralizado
-Este texto está alinhado a direita
-
-- Este texto está em uma lista numérica
-- Este texto está identado
-
-
-Este
-aqui é um link
-
-
-
,
-
-Página 1
-
-
-
-
-
-
-
-
-
-
-
-
-Página 2
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Página 3
-
+Revisão 3
Esta é uma obra
+Online.
Este texto é
+negrit
Este texto é itálico/p>
Este texto está
+sublinhado
Este texto está riscado agora não
+está mais
p style="text-align: left;">Este texto está
+centralizado nem esteEste texto
+está alinhado a direita
- Este texto está em uma
+lista numérica
Este aqui é um
+link
[INFO] Tests run: 9, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.029 s - in com.github.difflib.GenerateUnifiedDiffTest
[INFO] Running com.github.difflib.text.DiffRowGeneratorTest
[[CHANGE,Ich möchte nicht **mehr **mit ~einem~**dir** ~Bot ~sprechen.** Leite mich weiter.**,Ich möchte nicht mehr mit dir sprechen. Leite mich weiter.], [CHANGE,~Ich~**Kannst** ~soll~**du** ~das~**mich** ~schon~**zum** ~wieder~**Kundendienst** ~wiederholen?~**weiterleiten?**,Kannst du mich zum Kundendienst weiterleiten?]]
This is a test ~senctence~**for diffutils**.
|original|new|
|--------|---|
|This is a test ~senctence~.|This is a test **for diffutils**.|
|This is the second line.|This is the second line.|
|~And here is the finish.~||
[CHANGE,anything ,anything]
[CHANGE, ,]
[EQUAL,other,other]
[test, , ,, , test2]
[test, ,, test2, ,]
[CHANGE,Testester,ester]
[CHANGE,Testester
feature best,ester feature best]
[[CHANGE,Ich möchte nicht mit ~e~i~nem~ ~Bot ~sprechen.,Ich möchte nicht m**ehr m**it **d**i**r** sprechen.** Leite mi**ch **weiter.**], [CHANGE,~I~ch s~oll~ d~as~ ~s~ch~on~ ~wi~ede~r~ wie~de~r~ho~len?,**Kann**s**t** d**u** **mi**ch **zum Kund**e**n**d**i**e**nst** w**e**i**t**erle**ite**n?]]
[CHANGE,Tester,ester]
[CHANGE,test,anything]
[CHANGE,anything ,]
[CHANGE, ,]
[EQUAL,other,other]
[INSERT,test,test]
[INSERT,test2,test2]
[CHANGE,anything ,anything]
[CHANGE, ,]
[EQUAL,other,other]
[CHANGE,anything ,anything]
[CHANGE, ,]
[EQUAL,other,other]
[EQUAL,anything ,anything ]
[EQUAL, , ]
[EQUAL,other,other]
[CHANGE,more lines,some more lines]
[[CHANGE,American bobtail jaguar. American bobtail bombay but turkish angora and tomcat.,bobtail jaguar. American bobtail turkish angora and tomcat.], [CHANGE,Russian blue leopard. Lion. Tabby scottish fold for russian blue, so savannah yet lynx. Tomcat singa
pura, cheetah.,Russian blue leopard. Lion. Tabby scottish folded for russian blu
e, so savannah yettie? lynx. Tomcat singapura, cheetah.], [CHANGE,Bengal tiger panther but singapura but bombay munchkin for cougar.,Bengal tiger panther but singapura but bombay munchkin for cougar. And m
ore.]]
[EQUAL,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,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]
[CHANGE,2020-04-~04T08:00:00~.000Z,S,HHD_MAY20,Open,,,,,,,,,,,,,,,,,,,,,,,,,2020-04-**02T08:00:00**.000Z,S,HHD_MAY20,Open,,,,,,,,,,,,,,,,,,,,,,,,]
[CHANGE,2020-04-~04T08:00:00~.000Z,S,FHK_C23.5_MAY20,Open,,,,,,,,,,,,,,,,,,,,,,,,,2020-04-**02T08:00:00**.000Z,S,FHK_C23.5_MAY20,Open,,,,,,,,,,,,,,,,,,,,,,,,]
[EQUAL,2020-04-04T13:49:11.522Z,Q,HHD_MAY20,,,,,,2.6,10,2.6,10,,,,,,,,,,,,,,,,,2020-04-04T13:49:11.522Z,Q,HHD_MAY20,,,,,,2.6,10,2.6,10,,,,,,,,,,,,,,,,]
[CHANGE,2020-04-04T13:49:18.210Z,T,HHD_MAY20,,2.6,~1~,Screen,0,,,,,,,,,,,,,,,,,,,,,2020-**04xs-04T17dw:00:00.000Z,Sdwdw,HHD_MAY20dwdw,Closdwde,,,,,,,,,,,,,,,,,,,,,,,,**]
[CHANGE,,**2020-**04-04T13:49:18.210Z,T,HHD_MAY20,,2.6,**2**,Screen,0,,,,,,,,,,,,,,,,,,,,]
[EQUAL,2020-04-04T17:00:00.000Z,S,HHD_MAY20,Close,,,,,,,,,,,,,,,,,,,,,,,,,2020-04-04T17:00:00.000Z,S,HHD_MAY20,Close,,,,,,,,,,,,,,,,,,,,,,,,]
[EQUAL,2020-04-04T17:00:00.000Z,S,FHK_C23.5_MAY20,Close,,,,,,,,,,,,,,,,,,,,,,,,,2020-04-04T17:00:00.000Z,S,FHK_C23.5_MAY20,Close,,,,,,,,,,,,,,,,,,,,,,,,]
~J. G. Feldstein~**T. P. Pastor**, Chair
|TABLE_NAME, COLUMN_NAME, DATA_TYPE, DATA_LENGTH, DATA_PRECISION, NULLABLE,| TABLE_NAME, COLUMN_NAME, DATA_TYPE, DATA_LENGTH, DATA_PRECISION, NULLABLE, |
|~ACTIONS_C17005~, ID, NUMBER, 22, 19, N,| **ACTIONS_C16913**, ID, NUMBER, 22, 19, N, |
|~ACTIONS_C17005~, ISSUEID, NUMBER, 22, 19, Y,| **ACTIONS_C16913**, ISSUEID, NUMBER, 22, 19, Y, |
|~ACTIONS_C17005~, MODIFIED, NUMBER, 22, 10, Y,| **ACTIONS_C16913**, MODIFIED, NUMBER, 22, 10, Y, |
|~ACTIONS_C17005~, ~TABLE~, ~VARCHAR2~, ~1020~, ~null~, Y,| **ACTIONS_C16913**, **VRS**, **NUMBER**, **22**, **1**, Y, |
|~ACTIONS_C17005~, ~S_NAME~, ~CLOB~, ~4000~, null, Y,| **ACTIONS_C16913**, **ZTABS**, **VARCHAR2**, **255**, null, Y, |
|~ACTIONS_C17008~, ~ID~, ~NUMBER~, ~22~, ~19~, ~N~,| **ACTIONS_C16913**, **ZTABS_S**, **VARCHAR2**, **255**, **null**, **Y**, |
|~ACTIONS_C17008~, ~ISSUEID~, ~NUMBER~, ~22~, ~19~, Y,| **ACTIONS_C16913**, **TASK**, **VARCHAR2**, **255**, **null**, Y, |
|~ACTIONS_C17008~, ~MODIFIED~, ~NUMBER~, ~22~, ~10~, Y,| **ACTIONS_C16913**, **HOURS_SPENT**, **VARCHAR2**, **255**, **null**, Y, |
|original|new|
|--------|---|
|This is a test ~senctence~.|This is a test **for diffutils**.|
||**This is the second line.**|
[CHANGE,Ich möchte nicht m**ehr m**it ~e~**d**i~nem~**r** ~Bot ~sprechen.~ I~** Leite mi**ch **weiter.**,Ich möchte nicht mehr mit dir sprechen. Leite mich weiter.]
[CHANGE,**Kann**s~oll~**t** d~as~**u** ~s~**mi**ch~on~ ~wi~**zum Kund**e**n**d**i**e~r~**nst** w**e**i**t**e~de~r~ho~le**ite**n?,Kannst du mich zum Kundendienst weiterleiten?]
[CHANGE,anyth
ing ,anyth
ing]
[CHANGE, ,]
[EQUAL,other,other]
[[CHANGE,Ich möchte nicht mit einem Bot sprechen.,Ich möchte nicht mehr mit dir sprechen. Leite mich weiter.], [CHANGE,Ich soll das schon wieder wiederholen?,Kannst du mich zum Kundendienst weiterleiten?]]
[CHANGE,anything ,anything]
[CHANGE, ,]
[EQUAL,other,other]
[CHANGE,anything ,anything]
[CHANGE, ,]
[EQUAL,other,other]
[INFO] Tests run: 35, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.061 s - in com.github.difflib.text.DiffRowGeneratorTest
[INFO] Running com.github.difflib.text.StringUtilsTest
[INFO] Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.004 s - in com.github.difflib.text.StringUtilsTest
[INFO] Running com.github.difflib.unifieddiff.UnifiedDiffReaderTest
com.github.difflib.unifieddiff.UnifiedDiff@2cdd0d4b
com.github.difflib.unifieddiff.UnifiedDiff@55b53d44
com.github.difflib.unifieddiff.UnifiedDiff@4cc8eb05
com.github.difflib.unifieddiff.UnifiedDiff@51f116b8
[INFO] Tests run: 15, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.051 s - in com.github.difflib.unifieddiff.UnifiedDiffReaderTest
[INFO] Running com.github.difflib.unifieddiff.UnifiedDiffWriterTest
From 3209a16c55c1976d5b772c607fd4b9d5fb9f9483 Mon Sep 17 00:00:00 2001
From: wumpz
Date: Tue, 19 Feb 2019 01:35:14 +0100
Subject: [PATCH] fixes #753
---
src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt | 5 +++--
.../net/sf/jsqlparser/statement/select/SelectTest.java | 7 +++++++
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt b/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt
index cd9bcd1..5f4b2b7 100644
--- src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt
+++ src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt
@@ -184,6 +184,7 @@
-|
-|
-|
-|
-|
-|
+|
+|
+|
+|
+|
+|
+|
@@ -1034,7 +1035,7 @@
- | tk= | tk= | tk= | tk=
- | tk=
- | tk= | tk= | tk= | tk=
- | tk= | tk= | tk=
-/* | tk= | tk= | tk= | tk= */
- )
-
+ | tk= | tk= | tk= | tk=
+ | tk=
+ | tk= | tk= | tk= | tk=
+ | tk= | tk= | tk= | tk=
+/* | tk= | tk= | tk= | tk= */
+ )
+
@@ -3113,7 +3114,7 @@
- Expression expr1 = null;
-}
-{
- ["{fn" { retval.setEscaped(true); } ]
-
- funcName=RelObjectNameExt()
-
+ Expression expr1 = null;
+}
+{
+ ["{" { retval.setEscaped(true); } ]
+
+ funcName=RelObjectNameExt()
+
diff --git a/src/test/java/net/sf/jsqlparser/statement/select/SelectTest.java b/src/test/java/net/sf/jsqlparser/statement/select/SelectTest.java
index 7ee9b38..d39bfd3 100644
--- src/test/java/net/sf/jsqlparser/statement/select/SelectTest.java
+++ src/test/java/net/sf/jsqlparser/statement/select/SelectTest.java
@@ -1058,6 +1058,13 @@
- assertSqlCanBeParsedAndDeparsed("SELECT {fn concat(a, b)} AS COL");
- }
-
- @Test
- public void testNamedParametersPR702() throws JSQLParserException {
- assertSqlCanBeParsedAndDeparsed("SELECT substring(id, 2, 3), substring(id from 2 for 3), substring(id from 2), trim(BOTH ' ' from 'foo bar '), trim(LEADING ' ' from 'foo bar '), trim(TRAILING ' ' from 'foo bar '), trim(' ' from 'foo bar '), position('foo' in 'bar'), overlay('foo' placing 'bar' from 1), overlay('foo' placing 'bar' from 1 for 2) FROM my table");
+ assertSqlCanBeParsedAndDeparsed("SELECT {fn concat(a, b)} AS COL");
+ }
+
+ @Test
+ public void testEscapedFunctionsIssue753() throws JSQLParserException {
+ Statement stmt = CCJSqlParserUtil.parse("SELECT { fn test(0)} AS COL");
+ assertEquals("SELECT {fn test(0)} AS COL", stmt.toString());
+ assertSqlCanBeParsedAndDeparsed("SELECT fn FROM fn");
+ }
+
+ @Test
+ public void testNamedParametersPR702() throws JSQLParserException {
+ assertSqlCanBeParsedAndDeparsed("SELECT substring(id, 2, 3), substring(id from 2 for 3), substring(id from 2), trim(BOTH ' ' from 'foo bar '), trim(LEADING ' ' from 'foo bar '), trim(TRAILING ' ' from 'foo bar '), trim(' ' from 'foo bar '), position('foo' in 'bar'), overlay('foo' placing 'bar' from 1), overlay('foo' placing 'bar' from 1 for 2) FROM my table");
--
2.17.1.windows.2
--- /dev/null
+++ revised
@@ -0,0 +1,2 @@
+line1
+line2
[INFO] Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.007 s - in com.github.difflib.unifieddiff.UnifiedDiffWriterTest
[INFO] Running com.github.difflib.unifieddiff.UnifiedDiffRoundTripTest
header
--
tail
header
--- original
+++ revised
@@ -1,4 +1,5 @@
test line1
test line2
+@@ -2,6 +2,7 @@
test line 4
test line 5
--
tail
header
--- 5A.txt
+++ 5B.txt
@@ -106,20 +106,28 @@
+++ b/x
@@ -1,6 +1,6 @@
-whitespace at beginning
+ whitespace at beginning
whitespace change
-whitespace in the middle
+white space in the middle
whitespace at end
unchanged line
CR at endQ
+git diff -b --ignore-space-at-eol > out
+test_expect_failure 'another test, with -b --ignore-space-at-eol' 'test_cmp expect out'
+
+tr 'Q' '\015' << EOF > expect
+diff --git a/x b/x
+index d99af23..8b32fb5 100644
+--- a/x
++++ b/x
EOF
git diff -b > out
test_expect_success 'another test, with -b' 'test_cmp expect out'
test_expect_success 'check mixed spaces and tabs in indent' '
# This is indented with SP HT SP.
echo " foo();" > x &&
git diff --check | grep "space before tab in indent"
@@ -363,10 +371,11 @@
git config core.autocrlf true &&
test_must_fail git merge master &&
git diff | sed -e "1,/^@@@/d" >actual &&
! grep "^-" actual
'
test_done
+
--
tail
header
--- original.txt
+++ revised.txt
@@ -1,27 +1,27 @@
/*
Copyright 2009 Dmitry Naumenko (dm.naumenko@gmail.com)
- This file is part of Java Diff Utills Library.
+ This file is part of Java Diff Utils Library.
- Java Diff Utills Library is free software: you can redistribute it and/or modify
+ Java Diff Utils Library is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
- Java Diff Utills Library is distributed in the hope that it will be useful,
+ Java Diff Utils Library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with Java Diff Utills Library. If not, see .
+ along with Java Diff Utils Library. If not, see .
*/
package difflib;
import java.util.*;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import difflib.myers.*;
/**
@@ -71,21 +71,21 @@
}
/**
* Unpatch the revised text for a given patch
*
* @param revised the revised text
* @param patch the given patch
* @return the original text
*/
public static List unpatch(List revised, Patch patch) {
- return patch.restore(revised);
+ return patch.restore(revised); // bla-bla-bla
}
/**
* Parse the given text in unified format and creates the list of deltas for it.
*
* @param diff the text in unified format
* @return the patch with deltas.
*/
public static Patch parseUnifiedDiff(List diff) {
boolean inPrelude = true;
@@ -145,30 +145,164 @@
}
}
}
}
// Process the lines in the last chunk
if (rawChunk.size() != 0) {
List oldChunkLines = new ArrayList();
List newChunkLines = new ArrayList();
- for (Object[] raw_line: rawChunk) {
+ for (Object[] raw_line: rawChunk)
+ {
tag = (String)raw_line[0];
rest = (String)raw_line[1];
- if (tag.equals(" ") || tag.equals("-")) {
+ if (tag.equals(" ") || tag.equals("-"))
+ {
oldChunkLines.add(rest);
}
- if (tag.equals(" ") || tag.equals("+")) {
+ if (tag.equals(" ") || tag.equals("+"))
+ {
newChunkLines.add(rest);
}
}
patch.addDelta(new ChangeDelta(new Chunk(old_ln - 1, old_n, oldChunkLines),
new Chunk(new_ln - 1, new_n, newChunkLines)));
rawChunk.clear();
}
return patch;
}
+
+ /**
+ * generateUnifiedDiff takes a Patch and some other arguments, returning the Unified Diff format text representing the Patch.
+ * @author Bill James (tankerbay@gmail.com)
+ *
+ * @param fname1 - Filename of the original (unrevised file)
+ * @param fname2 - Filename of the revised file
+ * @param originalLines - Lines of the original file
+ * @param patch - Patch created by the diff() function
+ * @param contextSize - number of lines of context output around each difference in the file.
+ * @return List of strings representing the Unified Diff representation of the Patch argument.
+ */
+ public static List generateUnifiedDiff(String fname1, String fname2, List originalLines, Patch patch, int contextSize ) {
+ List ret = new ArrayList();
+ ret.add( "--- " + fname1 );
+ ret.add( "+++ " + fname2 );
+
+ List cur = new ArrayList(); // current list of Delta's to process
+ int deltact = patch.getDeltas().size();
+ // if there's more than 1 Delta, we may need to output them together
+ if ( deltact > 1 ) {
+ Delta curDelta = patch.getDelta(0);
+ cur.add( curDelta ); // add the first Delta to the current set
+ for ( int i = 1; i < deltact; i++ ) {
+ int curpos = curDelta.getOriginal().getPosition(); // store the current position of the first Delta
+ Delta nextDelta = patch.getDelta(i); // Check if the next Delta is too close to the current position
+ if ( (curpos + curDelta.getOriginal().getSize() + contextSize) >= ( nextDelta.getOriginal().getPosition()-contextSize ) ) {
+ cur.add( nextDelta ); // if it is, add it to the current set
+ } else {
+ List curBlock = processDeltas( originalLines, cur, contextSize );
+ ret.addAll( curBlock ); // if it isn't, output the current set, then create a new
+ cur.clear(); // set and add the current Delta to it.
+ cur.add( nextDelta );
+ }
+ curDelta = nextDelta;
+ }
+ List curBlock = processDeltas( originalLines, cur, contextSize ); // don't forget to process the last set of Deltas
+ ret.addAll( curBlock );
+ }
+
+ return ret;
+ }
+
+ /**
+ * processDeltas takes a list of Deltas and outputs them together in a single block of Unified-Diff-format text.
+ * @author Bill James (tankerbay@gmail.com)
+ *
+ * @param origLines - the lines of the original file
+ * @param deltas - the Deltas to be output as a single block
+ * @param contextSize - the number of lines of context to place around block
+ * @return
+ */
+ private static List processDeltas( List origLines, List deltas, int contextSize ) {
+ List buffer = new ArrayList();
+ int origTotal = 0; // counter for total lines output from Original
+ int revTotal = 0; // counter for total lines output from Original
+ int line;
+
+ Delta curDelta = deltas.get(0); // start with the first Delta
+ int origStart = curDelta.getOriginal().getPosition()+1 - contextSize; // note the +1 to overcome the 0-offset Position
+ if ( origStart < 1 ) origStart = 1; // clamp to the start of the file
+ int revStart = curDelta.getRevised().getPosition()+1 - contextSize; // note the +1 to overcome the 0-offset Position
+ if ( revStart < 1 ) revStart = 1; // clamp to the start of the file
+ int contextStart = curDelta.getOriginal().getPosition() - contextSize; // find the start of the wrapper context code
+ if ( contextStart < 0 ) contextStart = 0; // clamp to the start of the file
+ for ( line = contextStart; line < curDelta.getOriginal().getPosition(); line++ ) { // output the context before the first Delta
+ buffer.add( " " + origLines.get( line ) );
+ origTotal++;
+ revTotal++;
+ }
+ buffer.addAll( getDeltaText( curDelta ) ); // output the first Delta
+ origTotal += curDelta.getOriginal().getLines().size();
+ revTotal += curDelta.getRevised().getLines().size();
+
+ int deltaIndex = 1;
+ while ( deltaIndex < deltas.size() ) { // for each of the other Deltas
+ Delta nextDelta = deltas.get( deltaIndex );
+ int intermediateStart = curDelta.getOriginal().getPosition() + curDelta.getOriginal().getLines().size();
+ for ( line = intermediateStart; line < nextDelta.getOriginal().getPosition(); line++ ) {
+ buffer.add( " " + origLines.get( line ) ); // output the code between the last Delta and this one
+ origTotal++;
+ revTotal++;
+ }
+ buffer.addAll( getDeltaText( nextDelta ) ); // output the Delta
+ origTotal += nextDelta.getOriginal().getLines().size();
+ revTotal += nextDelta.getRevised().getLines().size();
+ curDelta = nextDelta;
+ deltaIndex++; // increment the iterator
+ }
+
+ // Now output the post-Delta context code, clamping the end of the file
+ contextStart = curDelta.getOriginal().getPosition() + curDelta.getOriginal().getLines().size();
+ for ( line = contextStart; ( line < (contextStart + contextSize )) && ( line < origLines.size() ); line++ ) {
+ buffer.add( " " + origLines.get( line ) );
+ origTotal++;
+ revTotal++;
+ }
+
+ // Create and insert the block header, conforming to the Unified Diff standard
+ StringBuffer header = new StringBuffer();
+ header.append( "@@ -" );
+ header.append( origStart );
+ header.append( "," );
+ header.append( origTotal );
+ header.append( " +" );
+ header.append( revStart );
+ header.append( "," );
+ header.append( revTotal );
+ header.append( " @@" );
+ buffer.add( 0, header.toString() );
+
+ return buffer;
+ }
+
+ /**
+ * getDeltaText returns the lines to be added to the Unified Diff text from the Delta parameter
+ * @author Bill James (tankerbay@gmail.com)
+ *
+ * @param delta - the Delta to output
+ * @return list of String lines of code.
+ */
+ private static List getDeltaText( Delta delta ) {
+ List buffer = new ArrayList();
+ for ( Object line: delta.getOriginal().getLines() ) {
+ buffer.add( "-" + line );
+ }
+ for ( Object line: delta.getRevised().getLines() ) {
+ buffer.add( "+" + line );
+ }
+ return buffer;
+ }
}
--
tail
header
--- one_delta_test_original.txt
+++ one_delta_test_revised.txt
@@ -1,54 +1,11 @@
-Esta é uma obra Online.
-
-Este texto é negrito
-Este texto é itálico
-Este texto está sublinhado
-Este texto está riscado
-Este texto está centralizado
-Este texto está alinhado a direita
-
-- Este texto está em uma lista numérica
-- Este texto está identado
-
-
-Este
-aqui é um link
-
-
-
,
-
-Página 1
-
-
-
-
-
-
-
-
-
-
-
-
-Página 2
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Página 3
-
+Revisão 3
Esta é uma obra
+Online.
Este texto é
+negrit
Este texto é itálico/p>
Este texto está
+sublinhado
Este texto está riscado agora não
+está mais
p style="text-align: left;">Este texto está
+centralizado nem esteEste texto
+está alinhado a direita
- Este texto está em uma
+lista numérica
Este aqui é um
+link
--
tail
[WARNING] Tests run: 7, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0.023 s - in com.github.difflib.unifieddiff.UnifiedDiffRoundTripTest
[INFO]
[INFO] Results:
[INFO]
[WARNING] Tests run: 92, Failures: 0, Errors: 0, Skipped: 2
[INFO]
[INFO]
[INFO] --- maven-jar-plugin:3.2.0:jar (default-jar) @ java-diff-utils ---
[INFO] Building jar: /usr/src/RPM/BUILD/java-diff-utils-java-diff-utils-parent-4.9/java-diff-utils/target/java-diff-utils-4.9.jar
[INFO]
[INFO] -----------< io.github.java-diff-utils:java-diff-utils-jgit >-----------
[INFO] Building java-diff-utils-jgit 4.9 [3/3]
[INFO] --------------------------------[ jar ]---------------------------------
[INFO]
[INFO] --- maven-resources-plugin:3.2.0:resources (default-resources) @ java-diff-utils-jgit ---
[INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] Using 'UTF-8' encoding to copy filtered properties files.
[INFO] skip non existing resourceDirectory /usr/src/RPM/BUILD/java-diff-utils-java-diff-utils-parent-4.9/java-diff-utils-jgit/src/main/resources
[INFO]
[INFO] --- maven-compiler-plugin:3.8.1:compile (default-compile) @ java-diff-utils-jgit ---
[INFO] Changes detected - recompiling the module!
[INFO] Compiling 1 source file to /usr/src/RPM/BUILD/java-diff-utils-java-diff-utils-parent-4.9/java-diff-utils-jgit/target/classes
[INFO]
[INFO] --- maven-bundle-plugin:4.2.1:manifest (bundle-manifest) @ java-diff-utils-jgit ---
[INFO]
[INFO] --- maven-resources-plugin:3.2.0:testResources (default-testResources) @ java-diff-utils-jgit ---
[INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] Using 'UTF-8' encoding to copy filtered properties files.
[INFO] Copying 1 resource
[INFO]
[INFO] --- maven-compiler-plugin:3.8.1:testCompile (default-testCompile) @ java-diff-utils-jgit ---
[INFO] Changes detected - recompiling the module!
[INFO] Compiling 2 source files to /usr/src/RPM/BUILD/java-diff-utils-java-diff-utils-parent-4.9/java-diff-utils-jgit/target/test-classes
[INFO]
[INFO] --- maven-surefire-plugin:3.0.0-M4:test (default-test) @ java-diff-utils-jgit ---
[INFO]
[INFO] -------------------------------------------------------
[INFO] T E S T S
[INFO] -------------------------------------------------------
[INFO] Running com.github.difflib.algorithm.jgit.HistogramDiffTest
Patch{deltas=[[DeleteDelta, position: 0, lines: [A, B]], [DeleteDelta, position: 3, lines: [A, B]], [InsertDelta, position: 7, lines: [B, A, C]]]}
[start, 0 - 13, 11 - 13, 9 - 14, 9 - 14, 5 - 14, 3 - 14, 2 - 13, 7 - 13, 9 - 14, 9 - 14, 5 - 13, 8 - 13, 7 - 13, 5 - 13, 10 - 13, 8 - 14, 2 - 14, end]
Patch{deltas=[[DeleteDelta, position: 0, lines: [A, B]], [DeleteDelta, position: 3, lines: [A, B]], [InsertDelta, position: 7, lines: [B, A, C]]]}
[INFO] Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.064 s - in com.github.difflib.algorithm.jgit.HistogramDiffTest
[INFO]
[INFO] Results:
[INFO]
[INFO] Tests run: 2, Failures: 0, Errors: 0, Skipped: 0
[INFO]
[INFO]
[INFO] --- maven-jar-plugin:3.2.0:jar (default-jar) @ java-diff-utils-jgit ---
[INFO] Building jar: /usr/src/RPM/BUILD/java-diff-utils-java-diff-utils-parent-4.9/java-diff-utils-jgit/target/java-diff-utils-jgit-4.9.jar
[INFO]
[INFO] ----------< io.github.java-diff-utils:java-diff-utils-parent >----------
[INFO] Building java-diff-utils-parent 4.9 [4/3]
[INFO] --------------------------------[ pom ]---------------------------------
[INFO]
[INFO] --- xmvn-mojo:3.1.0:install (default-cli) @ java-diff-utils-parent ---
[INFO]
[INFO] --- xmvn-mojo:3.1.0:javadoc (default-cli) @ java-diff-utils-parent ---
[INFO]
[INFO] --- xmvn-mojo:3.1.0:builddep (default-cli) @ java-diff-utils-parent ---
[INFO] ------------------------------------------------------------------------
[INFO] Reactor Summary for java-diff-utils-parent 4.9:
[INFO]
[INFO] java-diff-utils-parent ............................. SUCCESS [ 2.657 s]
[INFO] java-diff-utils .................................... SUCCESS [ 13.227 s]
[INFO] java-diff-utils-jgit ............................... SUCCESS [ 10.570 s]
[INFO] ------------------------------------------------------------------------
[INFO] BUILD SUCCESS
[INFO] ------------------------------------------------------------------------
[INFO] Total time: 27.429 s
[INFO] Finished at: 2021-06-19T05:58:50Z
[INFO] ------------------------------------------------------------------------
-----BEGIN MAVEN BUILD DEPENDENCIES-----
H4sIAAAAAAACA6WRu27DMAxF93wF6112uzsO2kweOgUFuioSo9JQKEEPI/n7yn26KKAlC4F77wHO
wH53OVuYMURyvG0e2vsGkJXTxGbbvBzE42E/js1u2PR3QsBTJqtBo0fWBSOMYJAxyIQajld4fZ4Z
hCj0mhk2AL/FdYmlMMFlP+rBBdNKL9Ubtie0dOm77+WTkyHRSapUirOckcUxs7YovM2GuO9W++Lp
/orq3ikzpXI9JQwV8QcnfrhblDJGDGmqyL4IoVzA21yoLPmI7WQoVYT/0Zp0lZbfvgNJ+WkOQgIA
AA==
-----END MAVEN BUILD DEPENDENCIES-----
+ exit 0
Executing(%install): /bin/sh -e /usr/src/tmp/rpm-tmp.84181
+ umask 022
+ /bin/mkdir -p /usr/src/RPM/BUILD
+ cd /usr/src/RPM/BUILD
+ /bin/chmod -Rf u+rwX -- /usr/src/tmp/java-diff-utils-buildroot
+ :
+ /bin/rm -rf -- /usr/src/tmp/java-diff-utils-buildroot
+ PATH=/usr/libexec/rpm-build:/usr/src/bin:/bin:/usr/bin:/usr/X11R6/bin:/usr/games
+ cd java-diff-utils-java-diff-utils-parent-4.9
+ xmvn-install -R .xmvn-reactor -n java-diff-utils -d /usr/src/tmp/java-diff-utils-buildroot
[INFO] Installing artifact io.github.java-diff-utils:java-diff-utils-parent:pom:4.9
[INFO] Installing artifact io.github.java-diff-utils:java-diff-utils:jar:4.9
[INFO] Installing artifact io.github.java-diff-utils:java-diff-utils:pom:4.9
[INFO] Installing artifact io.github.java-diff-utils:java-diff-utils-jgit:jar:4.9
[INFO] Installing artifact io.github.java-diff-utils:java-diff-utils-jgit:pom:4.9
[INFO] Installation successful
+ jdir=target/site/apidocs
+ '[' -d .xmvn/apidocs ']'
+ jdir=.xmvn/apidocs
+ /bin/mkdir -p /usr/src/tmp/java-diff-utils-buildroot/usr/share/license
+ '[' -d .xmvn/apidocs ']'
+ install -dm755 /usr/src/tmp/java-diff-utils-buildroot/usr/share/javadoc/java-diff-utils
+ cp -pr .xmvn/apidocs/allclasses-index.html .xmvn/apidocs/allclasses.html .xmvn/apidocs/allpackages-index.html .xmvn/apidocs/args .xmvn/apidocs/com .xmvn/apidocs/constant-values.html .xmvn/apidocs/deprecated-list.html .xmvn/apidocs/element-list .xmvn/apidocs/help-doc.html .xmvn/apidocs/index-all.html .xmvn/apidocs/index.html .xmvn/apidocs/jquery .xmvn/apidocs/member-search-index.js .xmvn/apidocs/member-search-index.zip .xmvn/apidocs/overview-summary.html .xmvn/apidocs/overview-tree.html .xmvn/apidocs/package-search-index.js .xmvn/apidocs/package-search-index.zip .xmvn/apidocs/resources .xmvn/apidocs/script.js .xmvn/apidocs/search.js .xmvn/apidocs/serialized-form.html .xmvn/apidocs/stylesheet.css .xmvn/apidocs/type-search-index.js .xmvn/apidocs/type-search-index.zip /usr/src/tmp/java-diff-utils-buildroot/usr/share/javadoc/java-diff-utils
+ echo /usr/share/javadoc/java-diff-utils
+ /usr/lib/rpm/brp-alt
Cleaning files in /usr/src/tmp/java-diff-utils-buildroot (auto)
Verifying and fixing files in /usr/src/tmp/java-diff-utils-buildroot (binconfig,pkgconfig,libtool,desktop,gnuconfig)
Checking contents of files in /usr/src/tmp/java-diff-utils-buildroot/ (default)
Compressing files in /usr/src/tmp/java-diff-utils-buildroot (auto)
Verifying ELF objects in /usr/src/tmp/java-diff-utils-buildroot (arch=normal,fhs=normal,lfs=relaxed,lint=relaxed,rpath=normal,stack=normal,textrel=normal,unresolved=normal)
Processing files: java-diff-utils-4.9-alt1_2jpp11
Executing(%doc): /bin/sh -e /usr/src/tmp/rpm-tmp.88364
+ umask 022
+ /bin/mkdir -p /usr/src/RPM/BUILD
+ cd /usr/src/RPM/BUILD
+ cd java-diff-utils-java-diff-utils-parent-4.9
+ DOCDIR=/usr/src/tmp/java-diff-utils-buildroot/usr/share/doc/java-diff-utils-4.9
+ export DOCDIR
+ rm -rf /usr/src/tmp/java-diff-utils-buildroot/usr/share/doc/java-diff-utils-4.9
+ /bin/mkdir -p /usr/src/tmp/java-diff-utils-buildroot/usr/share/doc/java-diff-utils-4.9
+ cp -prL --no-dereference LICENSE /usr/src/tmp/java-diff-utils-buildroot/usr/share/doc/java-diff-utils-4.9
+ chmod -R go-w /usr/src/tmp/java-diff-utils-buildroot/usr/share/doc/java-diff-utils-4.9
+ chmod -R a+rX /usr/src/tmp/java-diff-utils-buildroot/usr/share/doc/java-diff-utils-4.9
+ exit 0
Finding Provides (using /usr/lib/rpm/find-provides)
Executing: /bin/sh -e /usr/src/tmp/rpm-tmp.Biv1U9
find-provides: running scripts (alternatives,debuginfo,lib,maven,osgi-fc,pam,perl,pkgconfig,python,python3,shell)
[INFO maven.prov] input: ['/usr/src/tmp/java-diff-utils-buildroot/usr/share/maven-metadata/java-diff-utils-java-diff-utils.xml']
[INFO maven.prov] mvn(io.github.java-diff-utils:java-diff-utils) = 4.9, mvn(io.github.java-diff-utils:java-diff-utils:pom:) = 4.9
[INFO osgi.prov] input: ['/usr/src/tmp/java-diff-utils-buildroot/usr/share/java/java-diff-utils/java-diff-utils.jar']
[INFO osgi.prov] osgi(io.github.java-diff-utils) = 4.9.0
Finding Requires (using /usr/lib/rpm/find-requires)
Executing: /bin/sh -e /usr/src/tmp/rpm-tmp.Vn6HG7
find-requires: running scripts (cpp,debuginfo,files,javadoc,lib,maven,osgi-fc,pam,perl,pkgconfig,pkgconfiglib,python,python3,rpmlib,shebang,shell,static,symlinks,systemd-services)
[INFO maven.req] input: ['/usr/src/tmp/java-diff-utils-buildroot/usr/share/maven-metadata/java-diff-utils-java-diff-utils.xml']
[INFO maven.req] javapackages-filesystem
[INFO osgi.req] input: ['/usr/src/tmp/java-diff-utils-buildroot/usr/share/java/java-diff-utils/java-diff-utils.jar']
Provides: mvn(io.github.java-diff-utils:java-diff-utils) = 4.9, mvn(io.github.java-diff-utils:java-diff-utils:pom:) = 4.9, osgi(io.github.java-diff-utils) = 4.9.0
Requires: javapackages-filesystem
Processing files: java-diff-utils-parent-4.9-alt1_2jpp11
Executing(%doc): /bin/sh -e /usr/src/tmp/rpm-tmp.65090
+ umask 022
+ /bin/mkdir -p /usr/src/RPM/BUILD
+ cd /usr/src/RPM/BUILD
+ cd java-diff-utils-java-diff-utils-parent-4.9
+ DOCDIR=/usr/src/tmp/java-diff-utils-buildroot/usr/share/doc/java-diff-utils-parent-4.9
+ export DOCDIR
+ rm -rf /usr/src/tmp/java-diff-utils-buildroot/usr/share/doc/java-diff-utils-parent-4.9
+ /bin/mkdir -p /usr/src/tmp/java-diff-utils-buildroot/usr/share/doc/java-diff-utils-parent-4.9
+ cp -prL --no-dereference LICENSE /usr/src/tmp/java-diff-utils-buildroot/usr/share/doc/java-diff-utils-parent-4.9
+ chmod -R go-w /usr/src/tmp/java-diff-utils-buildroot/usr/share/doc/java-diff-utils-parent-4.9
+ chmod -R a+rX /usr/src/tmp/java-diff-utils-buildroot/usr/share/doc/java-diff-utils-parent-4.9
+ exit 0
Finding Provides (using /usr/lib/rpm/find-provides)
Executing: /bin/sh -e /usr/src/tmp/rpm-tmp.MM6YS7
find-provides: running scripts (alternatives,debuginfo,lib,maven,osgi-fc,pam,perl,pkgconfig,python,python3,shell)
[INFO maven.prov] input: ['/usr/src/tmp/java-diff-utils-buildroot/usr/share/maven-metadata/java-diff-utils-java-diff-utils-parent.xml']
[INFO maven.prov] mvn(io.github.java-diff-utils:java-diff-utils-parent:pom:) = 4.9
Finding Requires (using /usr/lib/rpm/find-requires)
Executing: /bin/sh -e /usr/src/tmp/rpm-tmp.P4Y0Z7
find-requires: running scripts (cpp,debuginfo,files,javadoc,lib,maven,osgi-fc,pam,perl,pkgconfig,pkgconfiglib,python,python3,rpmlib,shebang,shell,static,symlinks,systemd-services)
[INFO maven.req] input: ['/usr/src/tmp/java-diff-utils-buildroot/usr/share/maven-metadata/java-diff-utils-java-diff-utils-parent.xml']
[INFO maven.req] javapackages-filesystem
[INFO maven.req] from POM(s): mvn(org.apache.felix:maven-bundle-plugin), mvn(org.apache.maven.plugins:maven-surefire-plugin)
Provides: mvn(io.github.java-diff-utils:java-diff-utils-parent:pom:) = 4.9
Requires: javapackages-filesystem, mvn(org.apache.felix:maven-bundle-plugin), mvn(org.apache.maven.plugins:maven-surefire-plugin)
Processing files: java-diff-utils-jgit-4.9-alt1_2jpp11
Finding Provides (using /usr/lib/rpm/find-provides)
Executing: /bin/sh -e /usr/src/tmp/rpm-tmp.SibAma
find-provides: running scripts (alternatives,debuginfo,lib,maven,osgi-fc,pam,perl,pkgconfig,python,python3,shell)
[INFO maven.prov] input: ['/usr/src/tmp/java-diff-utils-buildroot/usr/share/maven-metadata/java-diff-utils-java-diff-utils-jgit.xml']
[INFO maven.prov] mvn(io.github.java-diff-utils:java-diff-utils-jgit:pom:) = 4.9, mvn(io.github.java-diff-utils:java-diff-utils-jgit) = 4.9
[INFO osgi.prov] input: ['/usr/src/tmp/java-diff-utils-buildroot/usr/share/java/java-diff-utils/java-diff-utils-jgit.jar']
Finding Requires (using /usr/lib/rpm/find-requires)
Executing: /bin/sh -e /usr/src/tmp/rpm-tmp.HAP5e6
find-requires: running scripts (cpp,debuginfo,files,javadoc,lib,maven,osgi-fc,pam,perl,pkgconfig,pkgconfiglib,python,python3,rpmlib,shebang,shell,static,symlinks,systemd-services)
[INFO maven.req] input: ['/usr/src/tmp/java-diff-utils-buildroot/usr/share/maven-metadata/java-diff-utils-java-diff-utils-jgit.xml']
[INFO maven.req] javapackages-filesystem, mvn(org.eclipse.jgit:org.eclipse.jgit), mvn(io.github.java-diff-utils:java-diff-utils) = 4.9
[INFO osgi.req] input: ['/usr/src/tmp/java-diff-utils-buildroot/usr/share/java/java-diff-utils/java-diff-utils-jgit.jar']
Provides: mvn(io.github.java-diff-utils:java-diff-utils-jgit) = 4.9, mvn(io.github.java-diff-utils:java-diff-utils-jgit:pom:) = 4.9
Requires: java-diff-utils = 4.9-alt1_2jpp11, javapackages-filesystem, mvn(io.github.java-diff-utils:java-diff-utils) = 4.9, mvn(org.eclipse.jgit:org.eclipse.jgit)
Processing files: java-diff-utils-javadoc-4.9-alt1_2jpp11
Finding Provides (using /usr/lib/rpm/find-provides)
Executing: /bin/sh -e /usr/src/tmp/rpm-tmp.raJ9L7
find-provides: running scripts (alternatives,debuginfo,lib,maven,osgi-fc,pam,perl,pkgconfig,python,python3,shell)
Finding Requires (using /usr/lib/rpm/find-requires)
Executing: /bin/sh -e /usr/src/tmp/rpm-tmp.olsYi6
find-requires: running scripts (cpp,debuginfo,files,javadoc,lib,maven,osgi-fc,pam,perl,pkgconfig,pkgconfiglib,python,python3,rpmlib,shebang,shell,static,symlinks,systemd-services)
Requires: javapackages-filesystem
Adding to java-diff-utils-jgit a strict dependency on java-diff-utils
Removing 1 extra deps from java-diff-utils-jgit due to dependency on java-diff-utils
Removing 1 extra deps from java-diff-utils-jgit due to repentancy on java-diff-utils
Wrote: /usr/src/RPM/RPMS/noarch/java-diff-utils-4.9-alt1_2jpp11.noarch.rpm (w2.lzdio)
Wrote: /usr/src/RPM/RPMS/noarch/java-diff-utils-parent-4.9-alt1_2jpp11.noarch.rpm (w2.lzdio)
Wrote: /usr/src/RPM/RPMS/noarch/java-diff-utils-jgit-4.9-alt1_2jpp11.noarch.rpm (w2.lzdio)
Wrote: /usr/src/RPM/RPMS/noarch/java-diff-utils-javadoc-4.9-alt1_2jpp11.noarch.rpm (w2.lzdio)
40.45user 1.58system 0:38.97elapsed 107%CPU (0avgtext+0avgdata 657656maxresident)k
0inputs+0outputs (0major+406974minor)pagefaults 0swaps
/.out/java-diff-utils-4.9-alt1_2jpp11.noarch.rpm: license not found in '/usr/share/license' directory: ASL
/.out/java-diff-utils-4.9-alt1_2jpp11.noarch.rpm: license not found in '/usr/share/license' directory: 2.0
/.out/java-diff-utils-parent-4.9-alt1_2jpp11.noarch.rpm: license not found in '/usr/share/license' directory: ASL
/.out/java-diff-utils-parent-4.9-alt1_2jpp11.noarch.rpm: license not found in '/usr/share/license' directory: 2.0
/.out/java-diff-utils-jgit-4.9-alt1_2jpp11.noarch.rpm: license not found in '/usr/share/license' directory: ASL
/.out/java-diff-utils-jgit-4.9-alt1_2jpp11.noarch.rpm: license not found in '/usr/share/license' directory: 2.0
/.out/java-diff-utils-javadoc-4.9-alt1_2jpp11.noarch.rpm: license not found in '/usr/share/license' directory: ASL
/.out/java-diff-utils-javadoc-4.9-alt1_2jpp11.noarch.rpm: license not found in '/usr/share/license' directory: 2.0
64.58user 6.60system 1:09.70elapsed 102%CPU (0avgtext+0avgdata 657656maxresident)k
0inputs+0outputs (0major+1333160minor)pagefaults 0swaps