1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
|
.. -*- coding: utf-8 -*-
================================================================================
xxdiff-qt6: Updated Graphical File And Directories Comparator And Merge Tool
================================================================================
.. contents:: Table of Contents
..
1 Description
1.1 Features
1.1.1 Unicode and Inline Editing
2 Documentation
2.1 Screenshots
3 Download
3.1 Tools
4 Reporting Bugs
5 Installation
5.1 Dependencies
5.2 Portability
6 Copyright and License
7 Authorship
Description
===========
This is a fork of `xxdiff <http://github.com/blais/xxdiff>`_, a graphical file and
directories comparator and merge tool. See there for full information about this
program, including documentation and more instructions.
Features
--------
- Comparing **two** files, **three** files, or two **directories**
(shallow and recursive);
- **Horizontal diffs** highlighting;
- Files can be **merged** interactively and resulting output
visualized and saved;
- Has features to assist in performing **merge reviews/policing**;
- Can **unmerge CVS conflicts** in automatically merged file and
display them as two files, to help resolve conflicts;
- Uses **external diff program** to compute differences: works with
GNU diff, SGI diff and ClearCase's cleardiff, and any other diff
whose output is similar to those;
- Fully customizable with a resource file;
- Look-and-feel similar to Rudy Wortel's/SGI xdiff, it is desktop
agnostic (i.e. will work equally well with KDE or Gnome);
- Features and output that ease integration with scripts.
**xxdiff** was (and probably still is) tested daily in a merge
reviewing/policing context by more than 50 engineers at `discreet
<http://www.discreet.com>`_, and since this task is a
significant part of their development process, many of the features
are a direct result of suggestions from these people while the author
was working there.
Unicode and Inline Editing
~~~~~~~~~~~~~~~~~~~~~~~~~~
**xxdiff** does not support comparing files encoded with Unicode.
Also, it does not support inline editing of the diffed files. If you
need these features, you could try emacs or Meld (although both of
these lack some of the most interesting features of xxdiff).
Documentation
=============
- `User's Manual
<https://htmlpreview.github.io/?https://github.com/blais/xxdiff/blob/master/doc/xxdiff-doc.html>`_
*(user's manual, all features, FAQ)*
- `The almost secret nifty features of xxdiff <doc/xxdiff-secrets.html>`_
- `Integrating xxdiff with scripts <doc/xxdiff-integration.html>`_
- `Helper Scripts for xxdiff <doc/xxdiff-scripts.html>`_
- `CHANGES <CHANGES>`_ *(news, recent changes, history)*
- `TODO <TODO>`_ *(future features, wishlist)*
Screenshots
-----------
- `Screenshots <doc/screenshots/gallery/index.html>`_
Download
========
* Source code can be found in the public GitHub repository, here:
http://github.com/blais/xxdiff
There are no releases. Pick up the source for from Github.
Tools
-----
**xxdiff** comes with a bunch of wrapper Python scripts that invoke xxdiff in
creative ways. The author has been using these for a long time now and decided
for version 3.0 to clean them up and make them a little more generic so everyone
can use them. As of version 3.2, the standalone scripts have been refactored a
great deal, to share code together and to make them more stable. All this code
is now distributed with xxdiff, in an ``xxdiff`` Python package, which you can
leverage to build your own file transformation scripts around xxdiff.
See the document `Helper Scripts for xxdiff <doc/xxdiff-scripts.html>`_ for full
details.
The scripts are available in the xxdiff distribution. To install them and the
accompanying Python package, use the standard distutils procedure::
su - # before root
cd xxdiff-3.x
python setup.py install
Other tools can be found in the distribution under the tools/ directory (CVS,
ClearCase, etc.).
Reporting Bugs
==============
* `Reporting Bugs <https://github.com/blais/xxdiff/issues>`_
*(bugs and feature requests)*
Installation
============
Dependencies
------------
Build dependencies are:
- Qt5, Qt6 or higher
- A C++ compiler (g++ or clang), flex and yacc
Runtime dependencies are:
- Qt5, Qt6 or higher
Portability
-----------
The Qt6 version of xxdiff was only tested on Fedora GNU/Linux and Ubuntu Linux.
Copyright and License
=====================
xxdiff Copyright (C) 2001-2022 Martin Blais. All Rights Reserved.
This code is distributed under the `GNU General Public License <COPYING>`_;
Authorship
==========
* Martin Blais <blais@furius.ca>
* Port to Qt4 by Alexandre Feblot <alexandre.feblot@gmail.com>
* Port to Qt5 and Windows 7 by Rene J.V. Bertin <rjvbertin@gmail.com>
* Port to Qt6 by Lior Silberman <lior3.1415+xxdiff-qt6@gmail.com>
|
