README
1<!--
2 Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
3
4 SPDX-License-Identifier: BSD-2-Clause
5-->
6
7============================
8Graphical Diff for Mercurial
9============================
10
11This code lets you do a graphical diff in mercurial of Isabelle files
12using FileMerge, a OS X merge program.
13
14There are two parts:
151. Setting up mercurial to use FileMerge
162. Running a preprocessor script over the Isabelle files to produce Unicode.
17
18======
19Usage
20======
21
22hg opendiff
23
24=====================================
25Setting up mercurial to use FileMerge
26=====================================
27
28As documented at
29http://mercurial.selenic.com/wiki/TipsAndTricks#Using_FileMerge.app.2BAC8-opendiff_as_the_diff_program_.28OS_X.29
30
311. Add the below to your .hgrc file
32
33[extensions]
34hgext.extdiff =
35
36[extdiff]
37cmd.opendiff = fmdiff
38
392. Add fmdiff to a folder somewhere in your path.
40http://soft.vub.ac.be/svn-gen/bdefrain/fmscripts/
41
42=======================================
43Setting up a predecessor for FileMerge
44=======================================
45
46FileMerge doesn't understand x-symbols, but can run a preprocessor over
47files first before it does a diff. (It appears as though you can't use
48FileMerge to merge files when you do this.)
49
50Thus, symbols.py does a find/replace on various x-symbols and replaces
51them with their Unicode equivalents.
52
53In FileMerge, go to FileMerge->Preferences���->Filters
54Below the current filters, double-click and add:
55thy ~/xsymbol.py $(FILE) Filtered No
56
57Change the location to where the xsymbol script is located.
58