2015-11-21 18:12:37 +00:00
|
|
|
# Diffuse
|
2015-11-21 17:57:32 +00:00
|
|
|
Version 0.4.8
|
|
|
|
|
|
2015-11-21 18:12:37 +00:00
|
|
|
Copyright (C) 2006-2014 Derrick Moser <derrick_moser@yahoo.com>
|
|
|
|
|
Copyright (C) 2015 Romain Failliot <romain.failliot@foolstep.com>
|
2015-11-21 17:57:32 +00:00
|
|
|
|
|
|
|
|
----
|
|
|
|
|
|
|
|
|
|
Diffuse is a graphical tool for merging and comparing text files. Diffuse is
|
|
|
|
|
able to compare an arbitrary number of files side-by-side and gives users the
|
|
|
|
|
ability to manually adjust line matching and directly edit files. Diffuse can
|
|
|
|
|
also retrieve revisions of files from Bazaar, CVS, Darcs, Git, Mercurial,
|
|
|
|
|
Monotone, RCS, Subversion, and SVK repositories for comparison and merging.
|
|
|
|
|
|
|
|
|
|
Some key features of Diffuse:
|
|
|
|
|
- ability to compare and merge an arbitrary number of files side-by-side (n-way merges)
|
|
|
|
|
- line matching can be manually corrected by the user
|
|
|
|
|
- ability to directly edit files
|
|
|
|
|
- syntax highlighting
|
|
|
|
|
- Bazaar, CVS, Darcs, Git, Mercurial, Monotone, RCS, Subversion, and SVK support
|
|
|
|
|
- Unicode support
|
|
|
|
|
- unlimited undo
|
|
|
|
|
- easy keyboard navigation
|
|
|
|
|
|
|
|
|
|
----
|
|
|
|
|
|
|
|
|
|
Requirements:
|
|
|
|
|
|
|
|
|
|
- Python >= 2.4
|
|
|
|
|
- PyGTK >= 2.10
|
|
|
|
|
|
|
|
|
|
----
|
|
|
|
|
|
|
|
|
|
Diffuse is implemented entirely in Python and should run on any platform with
|
|
|
|
|
Python and PyGTK. If you need to manually install PyGTK, please be aware its
|
|
|
|
|
dependencies should be installed prior to installing PyGTK.
|
|
|
|
|
|
|
|
|
|
Diffuse can be run directly from an untared source distribution on any POSIX
|
|
|
|
|
system or installed with the instructions described in the next section.
|
|
|
|
|
|
|
|
|
|
The location of the personal preferences, state, and initialisation files have
|
|
|
|
|
changed in the 0.4.1 release. Old settings may be migrated using the following
|
|
|
|
|
commands:
|
|
|
|
|
|
|
|
|
|
$ mkdir -p ~/.config/diffuse
|
|
|
|
|
$ mv ~/.diffuse/config ~/.config/diffuse/state
|
|
|
|
|
$ mv ~/.diffuse/* ~/.config/diffuse
|
|
|
|
|
$ rmdir ~/.diffuse
|
|
|
|
|
|
|
|
|
|
The rules for parsing files in ~/.diffuse changed in the 0.3.0 release.
|
|
|
|
|
Non-fatal errors may be reported when parsing old files. These errors can be
|
|
|
|
|
fixed by removing the offending lines (or the entire file) from
|
|
|
|
|
~/.config/diffuse/diffuserc.
|
|
|
|
|
|
|
|
|
|
----
|
|
|
|
|
|
|
|
|
|
Installing on POSIX systems:
|
|
|
|
|
|
|
|
|
|
Run the 'install.py' script to install Diffuse. The script accepts several
|
|
|
|
|
options for customising the installation behaviour. Use the '--help' option
|
|
|
|
|
to obtain a full listing.
|
|
|
|
|
|
|
|
|
|
Diffuse can be removed by running the 'install.py' script with the '--remove'
|
|
|
|
|
option.
|
|
|
|
|
|
|
|
|
|
Specify the '--destdir=' and '--files-only' options for the 'install.py'
|
|
|
|
|
script when using it to build a platform specific package of Diffuse.
|
|
|
|
|
|
|
|
|
|
----
|
|
|
|
|
|
|
|
|
|
Installing on Windows:
|
|
|
|
|
|
|
|
|
|
The 'windows-installer' directory contains scripts for building an installable
|
|
|
|
|
package for Windows that includes all dependencies.
|
|
|
|
|
|
|
|
|
|
Diffuse can be packaged as a portable application by copying the installation
|
|
|
|
|
directory to a pen drive and creating a front end that sets the XDG_CONFIG_HOME
|
|
|
|
|
and XDG_DATA_DIR environment variables prior to launching Diffuse. The
|
|
|
|
|
XDG_CONFIG_HOME and XDG_DATA_DIR environment variables indicate where Diffuse
|
|
|
|
|
should store persistent settings (eg. the path to a writable directory on the
|
|
|
|
|
pen drive).
|
|
|
|
|
|
|
|
|
|
----
|
|
|
|
|
|
|
|
|
|
Help Documentation:
|
|
|
|
|
|
|
|
|
|
Diffuse's help documentation is written in the DocBook format and can be easily
|
|
|
|
|
converted into other formats using XSLT stylesheets. If the local help
|
|
|
|
|
documentation or its browser are unavailable, Diffuse will attempt to display
|
2015-11-21 18:12:37 +00:00
|
|
|
the on-line help documentation using a web browser.
|
