annotate diff.xml @ 0:8a18547725cf draft

"planemo upload for repository https://github.com/bgruening/galaxytools/tree/master/tools/diff commit 9b11cc5751c0931172d00799b246fcbd63660311"
author bgruening
date Tue, 31 Mar 2020 16:36:28 -0400
parents
children 02dfbbf869d8
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
8a18547725cf "planemo upload for repository https://github.com/bgruening/galaxytools/tree/master/tools/diff commit 9b11cc5751c0931172d00799b246fcbd63660311"
bgruening
parents:
diff changeset
1 <tool id="diff" name="diff" version="3.6+galaxy0">
8a18547725cf "planemo upload for repository https://github.com/bgruening/galaxytools/tree/master/tools/diff commit 9b11cc5751c0931172d00799b246fcbd63660311"
bgruening
parents:
diff changeset
2
8a18547725cf "planemo upload for repository https://github.com/bgruening/galaxytools/tree/master/tools/diff commit 9b11cc5751c0931172d00799b246fcbd63660311"
bgruening
parents:
diff changeset
3 <description>analyzes two files and generates a text file with information about the lines that are different</description>
8a18547725cf "planemo upload for repository https://github.com/bgruening/galaxytools/tree/master/tools/diff commit 9b11cc5751c0931172d00799b246fcbd63660311"
bgruening
parents:
diff changeset
4
8a18547725cf "planemo upload for repository https://github.com/bgruening/galaxytools/tree/master/tools/diff commit 9b11cc5751c0931172d00799b246fcbd63660311"
bgruening
parents:
diff changeset
5 <requirements>
8a18547725cf "planemo upload for repository https://github.com/bgruening/galaxytools/tree/master/tools/diff commit 9b11cc5751c0931172d00799b246fcbd63660311"
bgruening
parents:
diff changeset
6 <requirement type="package" version="3.6">diffutils</requirement>
8a18547725cf "planemo upload for repository https://github.com/bgruening/galaxytools/tree/master/tools/diff commit 9b11cc5751c0931172d00799b246fcbd63660311"
bgruening
parents:
diff changeset
7 </requirements>
8a18547725cf "planemo upload for repository https://github.com/bgruening/galaxytools/tree/master/tools/diff commit 9b11cc5751c0931172d00799b246fcbd63660311"
bgruening
parents:
diff changeset
8
8a18547725cf "planemo upload for repository https://github.com/bgruening/galaxytools/tree/master/tools/diff commit 9b11cc5751c0931172d00799b246fcbd63660311"
bgruening
parents:
diff changeset
9 <stdio>
8a18547725cf "planemo upload for repository https://github.com/bgruening/galaxytools/tree/master/tools/diff commit 9b11cc5751c0931172d00799b246fcbd63660311"
bgruening
parents:
diff changeset
10 <exit_code range="2:" level="fatal" description="Something went wrong trying to check differences in files. Please check output log for more details." />
8a18547725cf "planemo upload for repository https://github.com/bgruening/galaxytools/tree/master/tools/diff commit 9b11cc5751c0931172d00799b246fcbd63660311"
bgruening
parents:
diff changeset
11 <regex match="diff: memory exhausted" source="stdout" level="fatal_oom" description="Out of memory error occurred" />
8a18547725cf "planemo upload for repository https://github.com/bgruening/galaxytools/tree/master/tools/diff commit 9b11cc5751c0931172d00799b246fcbd63660311"
bgruening
parents:
diff changeset
12 </stdio>
8a18547725cf "planemo upload for repository https://github.com/bgruening/galaxytools/tree/master/tools/diff commit 9b11cc5751c0931172d00799b246fcbd63660311"
bgruening
parents:
diff changeset
13
8a18547725cf "planemo upload for repository https://github.com/bgruening/galaxytools/tree/master/tools/diff commit 9b11cc5751c0931172d00799b246fcbd63660311"
bgruening
parents:
diff changeset
14 <command ><![CDATA[
8a18547725cf "planemo upload for repository https://github.com/bgruening/galaxytools/tree/master/tools/diff commit 9b11cc5751c0931172d00799b246fcbd63660311"
bgruening
parents:
diff changeset
15 diff -u '$input1' '$input2' > '$output1'
8a18547725cf "planemo upload for repository https://github.com/bgruening/galaxytools/tree/master/tools/diff commit 9b11cc5751c0931172d00799b246fcbd63660311"
bgruening
parents:
diff changeset
16 ]]>
8a18547725cf "planemo upload for repository https://github.com/bgruening/galaxytools/tree/master/tools/diff commit 9b11cc5751c0931172d00799b246fcbd63660311"
bgruening
parents:
diff changeset
17 </command>
8a18547725cf "planemo upload for repository https://github.com/bgruening/galaxytools/tree/master/tools/diff commit 9b11cc5751c0931172d00799b246fcbd63660311"
bgruening
parents:
diff changeset
18
8a18547725cf "planemo upload for repository https://github.com/bgruening/galaxytools/tree/master/tools/diff commit 9b11cc5751c0931172d00799b246fcbd63660311"
bgruening
parents:
diff changeset
19 <inputs>
8a18547725cf "planemo upload for repository https://github.com/bgruening/galaxytools/tree/master/tools/diff commit 9b11cc5751c0931172d00799b246fcbd63660311"
bgruening
parents:
diff changeset
20 <param name="input1" type="data" format="txt" label="First input file" />
8a18547725cf "planemo upload for repository https://github.com/bgruening/galaxytools/tree/master/tools/diff commit 9b11cc5751c0931172d00799b246fcbd63660311"
bgruening
parents:
diff changeset
21 <param name="input2" type="data" format="txt" label="Second input file" />
8a18547725cf "planemo upload for repository https://github.com/bgruening/galaxytools/tree/master/tools/diff commit 9b11cc5751c0931172d00799b246fcbd63660311"
bgruening
parents:
diff changeset
22 </inputs>
8a18547725cf "planemo upload for repository https://github.com/bgruening/galaxytools/tree/master/tools/diff commit 9b11cc5751c0931172d00799b246fcbd63660311"
bgruening
parents:
diff changeset
23
8a18547725cf "planemo upload for repository https://github.com/bgruening/galaxytools/tree/master/tools/diff commit 9b11cc5751c0931172d00799b246fcbd63660311"
bgruening
parents:
diff changeset
24 <outputs>
8a18547725cf "planemo upload for repository https://github.com/bgruening/galaxytools/tree/master/tools/diff commit 9b11cc5751c0931172d00799b246fcbd63660311"
bgruening
parents:
diff changeset
25 <data name="output1" format="txt" />
8a18547725cf "planemo upload for repository https://github.com/bgruening/galaxytools/tree/master/tools/diff commit 9b11cc5751c0931172d00799b246fcbd63660311"
bgruening
parents:
diff changeset
26 </outputs>
8a18547725cf "planemo upload for repository https://github.com/bgruening/galaxytools/tree/master/tools/diff commit 9b11cc5751c0931172d00799b246fcbd63660311"
bgruening
parents:
diff changeset
27
8a18547725cf "planemo upload for repository https://github.com/bgruening/galaxytools/tree/master/tools/diff commit 9b11cc5751c0931172d00799b246fcbd63660311"
bgruening
parents:
diff changeset
28 <tests>
8a18547725cf "planemo upload for repository https://github.com/bgruening/galaxytools/tree/master/tools/diff commit 9b11cc5751c0931172d00799b246fcbd63660311"
bgruening
parents:
diff changeset
29 <test expect_exit_code="0" expect_failure="false">
8a18547725cf "planemo upload for repository https://github.com/bgruening/galaxytools/tree/master/tools/diff commit 9b11cc5751c0931172d00799b246fcbd63660311"
bgruening
parents:
diff changeset
30 <param name="input1" value="file1.txt" />
8a18547725cf "planemo upload for repository https://github.com/bgruening/galaxytools/tree/master/tools/diff commit 9b11cc5751c0931172d00799b246fcbd63660311"
bgruening
parents:
diff changeset
31 <param name="input2" value="file1.txt" />
8a18547725cf "planemo upload for repository https://github.com/bgruening/galaxytools/tree/master/tools/diff commit 9b11cc5751c0931172d00799b246fcbd63660311"
bgruening
parents:
diff changeset
32 <output name="output1">
8a18547725cf "planemo upload for repository https://github.com/bgruening/galaxytools/tree/master/tools/diff commit 9b11cc5751c0931172d00799b246fcbd63660311"
bgruening
parents:
diff changeset
33 <assert_contents>
8a18547725cf "planemo upload for repository https://github.com/bgruening/galaxytools/tree/master/tools/diff commit 9b11cc5751c0931172d00799b246fcbd63660311"
bgruening
parents:
diff changeset
34 <has_n_lines n="0" />
8a18547725cf "planemo upload for repository https://github.com/bgruening/galaxytools/tree/master/tools/diff commit 9b11cc5751c0931172d00799b246fcbd63660311"
bgruening
parents:
diff changeset
35 </assert_contents>
8a18547725cf "planemo upload for repository https://github.com/bgruening/galaxytools/tree/master/tools/diff commit 9b11cc5751c0931172d00799b246fcbd63660311"
bgruening
parents:
diff changeset
36 </output>
8a18547725cf "planemo upload for repository https://github.com/bgruening/galaxytools/tree/master/tools/diff commit 9b11cc5751c0931172d00799b246fcbd63660311"
bgruening
parents:
diff changeset
37 </test>
8a18547725cf "planemo upload for repository https://github.com/bgruening/galaxytools/tree/master/tools/diff commit 9b11cc5751c0931172d00799b246fcbd63660311"
bgruening
parents:
diff changeset
38 <test expect_exit_code="1" expect_failure="false">
8a18547725cf "planemo upload for repository https://github.com/bgruening/galaxytools/tree/master/tools/diff commit 9b11cc5751c0931172d00799b246fcbd63660311"
bgruening
parents:
diff changeset
39 <param name="input1" value="file1.txt" />
8a18547725cf "planemo upload for repository https://github.com/bgruening/galaxytools/tree/master/tools/diff commit 9b11cc5751c0931172d00799b246fcbd63660311"
bgruening
parents:
diff changeset
40 <param name="input2" value="file2.txt" />
8a18547725cf "planemo upload for repository https://github.com/bgruening/galaxytools/tree/master/tools/diff commit 9b11cc5751c0931172d00799b246fcbd63660311"
bgruening
parents:
diff changeset
41 <output name="output1">
8a18547725cf "planemo upload for repository https://github.com/bgruening/galaxytools/tree/master/tools/diff commit 9b11cc5751c0931172d00799b246fcbd63660311"
bgruening
parents:
diff changeset
42 <assert_contents>
8a18547725cf "planemo upload for repository https://github.com/bgruening/galaxytools/tree/master/tools/diff commit 9b11cc5751c0931172d00799b246fcbd63660311"
bgruening
parents:
diff changeset
43 <has_n_lines n="5" />
8a18547725cf "planemo upload for repository https://github.com/bgruening/galaxytools/tree/master/tools/diff commit 9b11cc5751c0931172d00799b246fcbd63660311"
bgruening
parents:
diff changeset
44 <has_line line=" a" />
8a18547725cf "planemo upload for repository https://github.com/bgruening/galaxytools/tree/master/tools/diff commit 9b11cc5751c0931172d00799b246fcbd63660311"
bgruening
parents:
diff changeset
45 <has_line line="+b" />
8a18547725cf "planemo upload for repository https://github.com/bgruening/galaxytools/tree/master/tools/diff commit 9b11cc5751c0931172d00799b246fcbd63660311"
bgruening
parents:
diff changeset
46 </assert_contents>
8a18547725cf "planemo upload for repository https://github.com/bgruening/galaxytools/tree/master/tools/diff commit 9b11cc5751c0931172d00799b246fcbd63660311"
bgruening
parents:
diff changeset
47 </output>
8a18547725cf "planemo upload for repository https://github.com/bgruening/galaxytools/tree/master/tools/diff commit 9b11cc5751c0931172d00799b246fcbd63660311"
bgruening
parents:
diff changeset
48 </test>
8a18547725cf "planemo upload for repository https://github.com/bgruening/galaxytools/tree/master/tools/diff commit 9b11cc5751c0931172d00799b246fcbd63660311"
bgruening
parents:
diff changeset
49 </tests>
8a18547725cf "planemo upload for repository https://github.com/bgruening/galaxytools/tree/master/tools/diff commit 9b11cc5751c0931172d00799b246fcbd63660311"
bgruening
parents:
diff changeset
50
8a18547725cf "planemo upload for repository https://github.com/bgruening/galaxytools/tree/master/tools/diff commit 9b11cc5751c0931172d00799b246fcbd63660311"
bgruening
parents:
diff changeset
51 <help><![CDATA[
8a18547725cf "planemo upload for repository https://github.com/bgruening/galaxytools/tree/master/tools/diff commit 9b11cc5751c0931172d00799b246fcbd63660311"
bgruening
parents:
diff changeset
52 .. class:: infomark
8a18547725cf "planemo upload for repository https://github.com/bgruening/galaxytools/tree/master/tools/diff commit 9b11cc5751c0931172d00799b246fcbd63660311"
bgruening
parents:
diff changeset
53
8a18547725cf "planemo upload for repository https://github.com/bgruening/galaxytools/tree/master/tools/diff commit 9b11cc5751c0931172d00799b246fcbd63660311"
bgruening
parents:
diff changeset
54 **Purpose**
8a18547725cf "planemo upload for repository https://github.com/bgruening/galaxytools/tree/master/tools/diff commit 9b11cc5751c0931172d00799b246fcbd63660311"
bgruening
parents:
diff changeset
55
8a18547725cf "planemo upload for repository https://github.com/bgruening/galaxytools/tree/master/tools/diff commit 9b11cc5751c0931172d00799b246fcbd63660311"
bgruening
parents:
diff changeset
56 The **diff** utility is a data comparison tool that calculates and displays the differences between two files.
8a18547725cf "planemo upload for repository https://github.com/bgruening/galaxytools/tree/master/tools/diff commit 9b11cc5751c0931172d00799b246fcbd63660311"
bgruening
parents:
diff changeset
57
8a18547725cf "planemo upload for repository https://github.com/bgruening/galaxytools/tree/master/tools/diff commit 9b11cc5751c0931172d00799b246fcbd63660311"
bgruening
parents:
diff changeset
58 Unlike edit distance notions used for other purposes, diff is line-oriented rather than character-oriented, but it is like Levenshtein distance in that it tries to determine the smallest set of deletions and insertions to create one file from the other.
8a18547725cf "planemo upload for repository https://github.com/bgruening/galaxytools/tree/master/tools/diff commit 9b11cc5751c0931172d00799b246fcbd63660311"
bgruening
parents:
diff changeset
59
8a18547725cf "planemo upload for repository https://github.com/bgruening/galaxytools/tree/master/tools/diff commit 9b11cc5751c0931172d00799b246fcbd63660311"
bgruening
parents:
diff changeset
60 The diff command displays the changes made in a standard format, such that both humans and machines can understand the changes and apply them: given one file and the changes, the other file can be created.
8a18547725cf "planemo upload for repository https://github.com/bgruening/galaxytools/tree/master/tools/diff commit 9b11cc5751c0931172d00799b246fcbd63660311"
bgruening
parents:
diff changeset
61
8a18547725cf "planemo upload for repository https://github.com/bgruening/galaxytools/tree/master/tools/diff commit 9b11cc5751c0931172d00799b246fcbd63660311"
bgruening
parents:
diff changeset
62 .. class:: infomark
8a18547725cf "planemo upload for repository https://github.com/bgruening/galaxytools/tree/master/tools/diff commit 9b11cc5751c0931172d00799b246fcbd63660311"
bgruening
parents:
diff changeset
63
8a18547725cf "planemo upload for repository https://github.com/bgruening/galaxytools/tree/master/tools/diff commit 9b11cc5751c0931172d00799b246fcbd63660311"
bgruening
parents:
diff changeset
64 **Input**
8a18547725cf "planemo upload for repository https://github.com/bgruening/galaxytools/tree/master/tools/diff commit 9b11cc5751c0931172d00799b246fcbd63660311"
bgruening
parents:
diff changeset
65
8a18547725cf "planemo upload for repository https://github.com/bgruening/galaxytools/tree/master/tools/diff commit 9b11cc5751c0931172d00799b246fcbd63660311"
bgruening
parents:
diff changeset
66 Two text files to be checked for differences line by line.
8a18547725cf "planemo upload for repository https://github.com/bgruening/galaxytools/tree/master/tools/diff commit 9b11cc5751c0931172d00799b246fcbd63660311"
bgruening
parents:
diff changeset
67
8a18547725cf "planemo upload for repository https://github.com/bgruening/galaxytools/tree/master/tools/diff commit 9b11cc5751c0931172d00799b246fcbd63660311"
bgruening
parents:
diff changeset
68 .. class:: infomark
8a18547725cf "planemo upload for repository https://github.com/bgruening/galaxytools/tree/master/tools/diff commit 9b11cc5751c0931172d00799b246fcbd63660311"
bgruening
parents:
diff changeset
69
8a18547725cf "planemo upload for repository https://github.com/bgruening/galaxytools/tree/master/tools/diff commit 9b11cc5751c0931172d00799b246fcbd63660311"
bgruening
parents:
diff changeset
70 **Output**
8a18547725cf "planemo upload for repository https://github.com/bgruening/galaxytools/tree/master/tools/diff commit 9b11cc5751c0931172d00799b246fcbd63660311"
bgruening
parents:
diff changeset
71
8a18547725cf "planemo upload for repository https://github.com/bgruening/galaxytools/tree/master/tools/diff commit 9b11cc5751c0931172d00799b246fcbd63660311"
bgruening
parents:
diff changeset
72 A *single text file*, either:
8a18547725cf "planemo upload for repository https://github.com/bgruening/galaxytools/tree/master/tools/diff commit 9b11cc5751c0931172d00799b246fcbd63660311"
bgruening
parents:
diff changeset
73
8a18547725cf "planemo upload for repository https://github.com/bgruening/galaxytools/tree/master/tools/diff commit 9b11cc5751c0931172d00799b246fcbd63660311"
bgruening
parents:
diff changeset
74 - containing the lines differences in **unified format** (*unidiff*),
8a18547725cf "planemo upload for repository https://github.com/bgruening/galaxytools/tree/master/tools/diff commit 9b11cc5751c0931172d00799b246fcbd63660311"
bgruening
parents:
diff changeset
75
8a18547725cf "planemo upload for repository https://github.com/bgruening/galaxytools/tree/master/tools/diff commit 9b11cc5751c0931172d00799b246fcbd63660311"
bgruening
parents:
diff changeset
76 - or an **empty** file if the two input files are the same.
8a18547725cf "planemo upload for repository https://github.com/bgruening/galaxytools/tree/master/tools/diff commit 9b11cc5751c0931172d00799b246fcbd63660311"
bgruening
parents:
diff changeset
77 ]]>
8a18547725cf "planemo upload for repository https://github.com/bgruening/galaxytools/tree/master/tools/diff commit 9b11cc5751c0931172d00799b246fcbd63660311"
bgruening
parents:
diff changeset
78 </help>
8a18547725cf "planemo upload for repository https://github.com/bgruening/galaxytools/tree/master/tools/diff commit 9b11cc5751c0931172d00799b246fcbd63660311"
bgruening
parents:
diff changeset
79
8a18547725cf "planemo upload for repository https://github.com/bgruening/galaxytools/tree/master/tools/diff commit 9b11cc5751c0931172d00799b246fcbd63660311"
bgruening
parents:
diff changeset
80 <citations>
8a18547725cf "planemo upload for repository https://github.com/bgruening/galaxytools/tree/master/tools/diff commit 9b11cc5751c0931172d00799b246fcbd63660311"
bgruening
parents:
diff changeset
81 <citation type="bibtex">
8a18547725cf "planemo upload for repository https://github.com/bgruening/galaxytools/tree/master/tools/diff commit 9b11cc5751c0931172d00799b246fcbd63660311"
bgruening
parents:
diff changeset
82 @misc{gnudiffutils,
8a18547725cf "planemo upload for repository https://github.com/bgruening/galaxytools/tree/master/tools/diff commit 9b11cc5751c0931172d00799b246fcbd63660311"
bgruening
parents:
diff changeset
83 author = {The Free Software Foundation (FSF), Inc},
8a18547725cf "planemo upload for repository https://github.com/bgruening/galaxytools/tree/master/tools/diff commit 9b11cc5751c0931172d00799b246fcbd63660311"
bgruening
parents:
diff changeset
84 year = {2017},
8a18547725cf "planemo upload for repository https://github.com/bgruening/galaxytools/tree/master/tools/diff commit 9b11cc5751c0931172d00799b246fcbd63660311"
bgruening
parents:
diff changeset
85 title = {diff (GNU diffutils)},
8a18547725cf "planemo upload for repository https://github.com/bgruening/galaxytools/tree/master/tools/diff commit 9b11cc5751c0931172d00799b246fcbd63660311"
bgruening
parents:
diff changeset
86 publisher = {The Free Software Foundation (FSF), Inc},
8a18547725cf "planemo upload for repository https://github.com/bgruening/galaxytools/tree/master/tools/diff commit 9b11cc5751c0931172d00799b246fcbd63660311"
bgruening
parents:
diff changeset
87 url = {http://www.gnu.org/software/diffutils/},
8a18547725cf "planemo upload for repository https://github.com/bgruening/galaxytools/tree/master/tools/diff commit 9b11cc5751c0931172d00799b246fcbd63660311"
bgruening
parents:
diff changeset
88 }
8a18547725cf "planemo upload for repository https://github.com/bgruening/galaxytools/tree/master/tools/diff commit 9b11cc5751c0931172d00799b246fcbd63660311"
bgruening
parents:
diff changeset
89 </citation>
8a18547725cf "planemo upload for repository https://github.com/bgruening/galaxytools/tree/master/tools/diff commit 9b11cc5751c0931172d00799b246fcbd63660311"
bgruening
parents:
diff changeset
90 </citations>
8a18547725cf "planemo upload for repository https://github.com/bgruening/galaxytools/tree/master/tools/diff commit 9b11cc5751c0931172d00799b246fcbd63660311"
bgruening
parents:
diff changeset
91 </tool>