Mercurial > repos > artbio > justdiff
changeset 1:294d9452c0d4 draft default tip
planemo upload for repository https://github.com/ARTbio/tools-artbio/tree/main/tools/justdiff commit 97f29bbbd0f37d148e653bfcabe3efce1718c37e
| author | artbio |
|---|---|
| date | Mon, 11 Dec 2023 00:01:55 +0000 |
| parents | 9299a59defda |
| children | |
| files | diff.xml test-data/diff.txt |
| diffstat | 2 files changed, 11 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/diff.xml Wed Sep 27 11:27:47 2017 -0400 +++ b/diff.xml Mon Dec 11 00:01:55 2023 +0000 @@ -1,10 +1,15 @@ -<tool id="justdiff" name="Differences between two files" version="0.6.0"> +<tool id="justdiff" name="Differences between two files" version="3.10+galaxy0"> <description></description> + <requirements> + <requirement type="package" version="3.10">diffutils</requirement> + </requirements> + + <stdio> <exit_code range="1:" level="fatal" description="Tool exception" /> </stdio> <command detect_errors="exit_code"><![CDATA[ - diff '${input1}' '${input2}' | cat > '$output' + diff --side-by-side --suppress-common-lines '${input1}' '${input2}' | cat > '$output' ]]></command> <inputs> <param format="txt" name="input1" type="data" label="first file" help="first file" /> @@ -26,7 +31,8 @@ **What it does** -Just returns the Unix-style **diff** between two files ! +Just returns the Unix-style **diff** between two files, +using options --side-by-side and --suppress-common-lines, to make easier difference search. </help> </tool>
--- a/test-data/diff.txt Wed Sep 27 11:27:47 2017 -0400 +++ b/test-data/diff.txt Mon Dec 11 00:01:55 2023 +0000 @@ -1,6 +1,2 @@ -1c1 -< Je fais souvent ce reve etrange et penetrant ---- -> Il fait souvent ce reve etrange et penetrant -5d4 -< +Je fais souvent ce reve etrange et penetrant | Il fait souvent ce reve etrange et penetrant + <