Diff and patch tables
This is a library for comparing tables, producing a summary of their differences, and using such a summary as a patch file. It is optimized for comparing tables that share a common origin, in other words multiple versions of the "same" table.
For a live demo, see:
Install the library for your favorite language:
Other translations are available here:
Or use the library to view csv diffs on github via a chrome extension:
The diff format used by
daff is specified here:
This library is a stripped down version of the coopy toolbox (see http://share.find.coop). To compare tables from different origins, or with automatically generated IDs, or other complications, check out the coopy toolbox.
You can run
daff.rb as a utility program:
$ daffdaff can produce and apply tabular diffs.Call as:daff [--output OUTPUT.csv] a.csv b.csvdaff [--output OUTPUT.csv] parent.csv a.csv b.csvdaff [--output OUTPUT.ndjson] a.ndjson b.ndjsondaff patch [--inplace] [--output OUTPUT.csv] a.csv patch.csvdaff merge [--inplace] [--output OUTPUT.csv] parent.csv a.csv b.csvdaff trim [--output OUTPUT.csv] source.csvdaff render [--output OUTPUT.html] diff.csvdaff gitdaff versionThe --inplace option to patch and merge will result in modification of a.csv.If you need more control, here is the full list of flags:daff diff [--output OUTPUT.csv] [--context NUM] [--all] [--act ACT] a.csv b.csv--context NUM: show NUM rows of context--all: do not prune unchanged rows--act ACT: show only a certain kind of change (update, insert, delete)daff diff --git path old-file old-hex old-mode new-file new-hex new-mode--git: process arguments provided by git to diff driversdaff render [--output OUTPUT.html] [--css CSS.css] [--fragment] [--plain] diff.csv--css CSS.css: generate a suitable css file to go with the html--fragment: generate just a html fragment rather than a page--plain: do not use fancy utf8 characters to make arrows prettier
Formats supported are CSV, TSV, and ndjson.
daff git csv to install daff as a diff and merge handler
*.csv files in your repository. Run
daff git for instructions
on doing this manually. Your CSV diffs and merges will get smarter,
since git will suddenly understand about rows and columns, not just lines:
You can use
daff as a library from any supported language. We take
daff on a webpage,
Or if using node outside the browser:
var daff = ;
For concreteness, assume we have two versions of a table,
var data1 ='Country''Capital''Ireland''Dublin''France''Paris''Spain''Barcelona';var data2 ='Country''Code''Capital''Ireland''ie''Dublin''France''fr''Paris''Spain''es''Madrid''Germany''de''Berlin';
To make those tables accessible to the library, we wrap them
var table1 = data1;var table2 = data2;
We can now compute the alignment between the rows and columns in the two tables:
var alignment = daffalign;
To produce a diff from the alignment, we first need a table for the output:
var data_diff = ;var table_diff = data_diff;
Using default options for the diff:
var flags = ;var highlighter = alignmentflags;highlighter;
The diff is now in
data_diff in highlighter format, see
'!' '' '+++' '''@@' 'Country' 'Code' 'Capital''+' 'Ireland' 'ie' 'Dublin''+' 'France' 'fr' 'Paris''->' 'Spain' 'es' 'Barcelona->Madrid''+++' 'Germany' 'de' 'Berlin'
For visualization, you may want to convert this to a HTML table with appropriate classes on cells so you can color-code inserts, deletes, updates, etc. You can do this with:
var diff2html = ;diff2html;var table_diff_html = diff2html;
For 3-way differences (that is, comparing two tables given knowledge
of a common ancestor) use
daff.compareTables3 (give ancestor
table as the first argument).
Here is how to apply that difference as a patch:
var patcher = table1table_diff;patcher;// table1 should now equal table2
For other languages, you should find sample code in the packages on the Releases page.
daff library is written in Haxe, which
can be translated reasonably well into at least the following languages:
Some translations are done for you on the
To make another translation, or to compile from source
first follow the Haxe getting started tutorial for the
language you care about. At the time of writing, if you are on OSX, you should
install haxe using
brew install haxe --HEAD. Then do one of:
make jsmake phpmake pymake javamake csmake cpp
For each language, the
daff library expects to be handed an interface to tables you create, rather than creating them
itself. This is to avoid inefficient copies from one format to another. You'll find a
SimpleTable class you can use if
you find this awkward.
daffclasses at http://paulfitz.github.io/daff-doc/
makefor data, with daff in the mix. "Since git considers changes on a per-line basis, looking at diffs of comma-delimited and tab-delimited files can get obnoxious. The program daff fixes this problem."
daff is distributed under the MIT License.