-
Notifications
You must be signed in to change notification settings - Fork 5
/
Copy pathccdiff.man
637 lines (466 loc) · 21.9 KB
/
ccdiff.man
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
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
App::ccdiff(3) User Contributed Perl Documentation App::ccdiff(3)
NAME
ccdiff - Colored Character diff
SYNOPSIS
ccdiff [options] file1|- file2|-
ccdiff [options] dir1 dir2
ccdiff --help
ccdiff --man
ccdiff --info
DESCRIPTION
Show the diff between two files on a character by character base. In
contrast to the standard diff tools, this tool uses the diff algorithm
horizontally for each line in the vertical diff, highlighting the
changes. This is very handy in hard to spot changes like "O" to 0, "I"
to "l" or 1 and whitespace.
If there are two argument, and both are a folder/directory, a recursive
diff is executed. This is not available whan used as a (sub)class.
OPTIONS
Command line options
--help -?
Show a summary of the available command-line options and exit.
--version -V
Show the version and exit.
--man
Show this manual using pod2man and nroff.
--info
Show this manual using pod2text.
--utf-8 -U
All I/O (streams to compare and standard out) are in UTF-8.
--diff-class=C --dc=C --pp
Select the class used to execute the diff. By default "ccdiff" will
select the first available out of "Algorithm::Diff::XS" or
"Algorithm::Diff".
Sometime the "XS" version fails on encoding and the pure-perl version
will work just fine. You can force "ccdiff" to use either
Select the pure-perl version with any of "PP", "AD",
"Algorthm::Diff", "Algorithm-Diff", or "Algorithm::Diff::PP" (case
insensitive). For convenience, "--dc=pp" can be abbreviated to
"--pp".
--pp
--dc=pp
--dc=algorithm-diff
--diff-class=Algorithm::Diff::PP
Select the XS version with any of "XS", "ADX", "Algorthm::Diff::XS",
or "Algorithm-Diff-XS" (case insensitive).
--dc=xs
--dc=algorithm-diff-xs
--diff-class=Algorithm::Diff::XS
--unified[=3] -u [3]
Generate a unified diff. The number of context lines is optional.
When omitted it defaults to 3. Currently there is no provision of
dealing with overlapping diff chunks. If the common part between two
diff chunks is shorter than twice the number of context lines, some
lines may show twice.
The default is to use traditional diff:
5,5c5,5
< Sat Dec 18 07:00:33 1993,I.O.D.U.,,756194433,1442539
---
> Sat Dec 18 07:08:33 1998,I.O.D.U.,,756194433,1442539
a unified diff (-u1) would be
5,5c5,5
Tue Sep 6 05:43:59 2005,B.O.Q.S.,,1125978239,1943341
-Sat Dec 18 07:00:33 1993,I.O.D.U.,,756194433,1442539
+Sat Dec 18 07:08:33 1998,I.O.D.U.,,756194433,1442539
Mon Feb 23 10:37:02 2004,R.X.K.S.,van,1077529022,1654127
--verbose[=1] -v[1]
Show an additional line for each old or new section in a change chunk
(not for added or deleted lines) that shows the hexadecimal value of
each character. If "--utf-8" is in effect, it will show the Unicode
character name(s).
This is a debugging option, so invisible characters can still be
"seen".
"--verbose" accepts an optional verbosity-level. On level 2 and up,
all horizontal changes get left-and-right markers inserted to enable
seeing the location of the ZERO WIDTH or invisible characters. With
level 3 and up and Unicode enabled, the changed characters will also
show the codepoint in hex.
An example of this:
With -Uu0v0:
1,1c1,1
- A BCDE Fg
+ A BcdEFg
With -Uu0v1:
1,1c1,1
- A BCDE Fg
- -- verbose : SPACE, LATIN CAPITAL LETTER C, LATIN CAPITAL LETTER D, SPACE
+ A BcdEFg
+ -- verbose : LATIN SMALL LETTER C, LATIN SMALL LETTER D, ZERO WIDTH SPACE
With -Uu0v2:
1,1c1,1
- A ? ?B?CD?E? ?Fg
- -- verbose : SPACE, LATIN CAPITAL LETTER C, LATIN CAPITAL LETTER D, SPACE
+ A B?cd?E??Fg
+ -- verbose : LATIN SMALL LETTER C, LATIN SMALL LETTER D, ZERO WIDTH SPACE
With -Uu0v3:
1,1c1,1
- A ? ?B?CD?E? ?Fg
- -- verbose : SPACE (U+000020), LATIN CAPITAL LETTER C (U+000043), LATIN CAPITAL LETTER D (U+000044), SPACE (U+000020)
+ A B?cd?E??Fg
+ -- verbose : LATIN SMALL LETTER C (U+000063), LATIN SMALL LETTER D (U+000064), ZERO WIDTH SPACE (U+00200B)
With -Uu0v2 --ascii:
1,1c1,1
- A > <B>CD<E> <Fg
- -- verbose : SPACE, LATIN CAPITAL LETTER C, LATIN CAPITAL LETTER D, SPACE
+ A B>cd<E><Fg
+ -- verbose : LATIN SMALL LETTER C, LATIN SMALL LETTER D, ZERO WIDTH SPACE
the word "verbose" and the character markers will be displayed using
the "verbose" color. The characters used for the markers can be
defined in your configuration file as "chr_cml" (the character used
as marker on the left) and "chr_cmr" (the character used as marker on
the right).
--markers -m
Use markers under each changed character in change-chunks.
"--markers" is especially useful if the terminal does not support
colors, or if you want to copy/paste the output to (ASCII) mail. See
also "--ascii". The markers will have the same color as added or
deleted text.
This will look like (with unified diff):
5,5c5,5
-Sat Dec 18 07:08:33 1998,I.O.D.U.,,756194433,1442539
- ? ?
+Sat Dec 18 07:00:33 1993,I.O.D.U.,,756194433,1442539
+ ? ?
The characters used for the markers can be defined in your
configuration file as "chr_old" (the character used as marker under
removed characters) and "chr_new" (the character used as marker under
added characters).
If "--ellipsis" is also in effect and either the "chr_eli" is longer
than one character or "--verbose" level is over 2, this option is
automatically disabled.
--ascii -a
Use (colored) ASCII indicators instead of Unicode. The default
indicators are Unicode characters that stand out better. The markers
will have the same color as added or deleted text.
For the vertical markers ("-m") that would look like:
5,5c5,5
-Sat Dec 18 07:08:33 1998,I.O.D.U.,,756194433,1442539
- ^ ^
+Sat Dec 18 07:00:33 1993,I.O.D.U.,,756194433,1442539
+ ^ ^
For the positional indicators, I did consider using U+034e (COMBINING
UPWARDS ARROW BELOW), but as most terminals are probably unable to
show it due to line height changes, I did not pursue the idea.
--pink -p
Change the default "red" for deleted text to the color closest to
pink that is supported by Term::ANSIColor: "magenta".
--reverse -r
Reverse/invert the foreground and background for the colored
indicators.
If the foreground color has "bold", it will be stripped from the new
background color.
--swap -s
Swap the colors for new and old.
--list-colors
List available colors and exit.
--no-colors
Disable all colors. Useful for redirecting the diff output to a file
that is to be included in documentation.
This is the default if the environment variable $NO_COLOR has a true
value or if the environment variable $CLICOLOR is set to a false
value. If set, $CLICOLOR_FORCE will overrule the default of
$NO_COLOR.
--old=color
Define the foreground color for deleted text.
--new=color
Define the foreground color for added text.
--bg=color
Define the background color for changed text.
--index --idx -I
Prefix position indicators with an index.
[001] 5,5c5,5
-Sat Dec 18 07:08:33 1998,I.O.D.U.,,756194433,1442539
+Sat Dec 18 07:00:33 1993,I.O.D.U.,,756194433,1442539
If a positive number is passed ("--index=4" or "-I 4"), display just
the chunk with that index, using the "verbose" color:
This is useful in combination with "--verbose".
--threshold=2 -t 2
Defines the number of lines a change block may differ before the
fall-back of horizontal diff to vertical diff.
If a chunk describes a change, and the number of lines in the
original block has fewer or more lines than the new block and that
difference exceeds this threshold, "ccdiff" will fall-back to
vertical diff.
--heuristics=n -h n
Defines the percentage of character-changes a change block may differ
before the fall-back of horizontal diff to vertical diff.
This percentage is calculated as "(characters removed + characters
added) / (2 * characters unchanged))".
--ellipsis=n -e n
Defines the number of characters to keep on each side of a
horizontal-equal segment. The default is 0, meaning do not compress.
If set to a positive number, and the length of a segment of equal
characters inside a horizontal diff is longer than twice this value,
the middle part is replaced with "? U02508 \N{BOX DRAWINGS LIGHT
QUADRUPLE DASH HORIZONTAL}" (instead of ? U02026, as HORIZONTAL
ELLIPSIS does not stand out enough).
With "-u0me3" that would be like
5,5c5,5
-Sat?07:08:33? 1998,I.?539
- ? ?
+Sat?07:00:33? 1993,I.?539
+ ? ?
With "-u0e3 -v2" like
5,5c5,5
-Sat?9?07:0?0?:33 199?3?,I.?23?539
- -- verbose : DIGIT ZERO, DIGIT THREE
+Sat?9?07:0?8?:33 199?8?,I.?23?539
+ -- verbose : DIGIT EIGHT, DIGIT EIGHT
The text used for the replaced text can be defined in your
configuration file as "chr_eli" and/or "chr_eli_v".
--ignore-case -i
Ignore case on comparison.
--ignore-all-space -w
Ignore all white-space changes. This will set all options "-b", "-Z",
"-E", and "-B".
--ignore-trailing-space -Z
Ignore changes in trailing white-space (tabs and spaces).
--ignore-ws|ignore-space-change -b
Ignore changes in horizontal white-space (tabs and spaces). This does
not include white-space changes that split non-white-space or remove
white-space between two non-white-space elements.
--ignore-tab-expansion -E
NYI
--ignore-blank-lines -B
Just Partly Implemented (WIP)
Configuration files
In order to be able to overrule the defaults set in "ccdiff", one can
set options specific for this login. The following option files are
looked for in this order:
- $HOME/ccdiff.rc
- $HOME/.ccdiffrc
- $HOME/.config/ccdiff
and evaluated in that order. Any options specified in a file later in
that chain will overwrite previously set options.
Option files are only read and evaluated if they are not empty and not
writable by others than the owner.
The syntax of the file is one option per line, where leading and
trailing white-space is ignored. If that line then starts with one of
the options listed below, followed by optional white-space followed by
either an "=" or a ":", followed by optional white-space and the
values, the value is assigned to the option. The values "no" and
"false" (case insensitive) are aliases for 0. The values "yes" and
"true" are aliases to -1 (-1 being a true value).
Between parens is the corresponding command-line option.
unified (-u)
If you prefer unified-diff over old-style diff by default, set this
to the desired number of context lines:
unified : 3
The default is undefined
markers (-m)
markers : false
Defines if markers should be used under changed characters. The
default is to use colors only. The "-m" command line option will
toggle the option when set from a configuration file.
ascii (-a)
ascii : false
Defines to use ASCII markers instead of Unicode markers. The default
is to use Unicode markers.
reverse (-r)
reverse : false
Defines if changes are displayed as foreground-color over
background-color or background-color over foreground-color. The
default is "false", so it will color the changes with the appropriate
color ("new" or "old") over the default background color.
swap (-s)
swap : false
Swap the colors for new and old.
new (--new)
new : green
Defines the color to be used for added text. The default is "green".
The color "none" is also accepted and disables this color.
Any color accepted by Term::ANSIColor is allowed. Any other color
will result in a warning. This option can include "bold" either as
prefix or as suffix.
This option may also be specified as
new-color
new_color
new-colour
new_colour
old (--old)
old : red
Defines the color to be used for deleted text. The default is "red".
The color "none" is also accepted and disables this color.
Any color accepted by Term::ANSIColor is allowed. Any other color
will result in a warning. This option can include "bold" either as
prefix or as suffix.
This option may also be specified as
old-color
old_color
old-colour
old_colour
bg (--bg)
bg : white
Defines the color to be used as background for changed text. The
default is "white".
The color "none" is also accepted and disables this color.
Any color accepted by Term::ANSIColor is allowed. Any other color
will result in a warning. The "bold" attribute is not allowed.
This option may also be specified as
bg-color
bg_color
bg-colour
bg_colour
background
background-color
background_color
background-colour
background_colour
header (-H --header --HC=color --header-color=color)
header : 1
header : blue_on_white
Defines if a header is displayed above the diff (default is 1),
supported colors are allowed.
If the value is a valid supported color, it will show the header in
that color scheme. To disable the header set it to 0 in the RC file
or use "--no-header" as a command line argument.
verbose
verbose : cyan
Defines the color to be used as color for the verbose tag. The
default is "cyan". This color will only be used under "--verbose".
The color "none" is also accepted and disables this color.
Any color accepted by Term::ANSIColor is allowed. Any other color
will result in a warning.
This option may also be specified as
verbose-color
verbose_color
verbose-colour
verbose_colour
utf8 (-U)
utf8 : yes
Defines whether all I/O is to be interpreted as UTF-8. The default is
"no".
This option may also be specified as
unicode
utf
utf-8
index (-I)
index : no
Defines if the position indication for a change chunk is prefixed
with an index number. The default is "no". The index is 1-based.
Without this option, the position indication would be like
5,5c5,5
19,19d18
42a42,42
with this option, it would be
[001] 5,5c5,5
[002] 19,19d18
[005] 42a42,42
When this option contains a positive integer, "ccdiff" will only show
the diff chunk with that index.
emacs
emacs : no
If this option is yes/true, calling "ccdiff" with just one single
argument, and that argument being an existing file, the arguments
will act as
$ ccdiff file~ file
if file~ exists.
threshold (-t)
threshold : 2
Defines the number of lines a change block may differ before the
fall-back of horizontal diff to vertical diff.
heuristics (-h)
heuristics : 40
Defines the percentage of character-changes a change block may differ
before the fall-back of horizontal diff to vertical diff. The default
is undefined, meaning no fallback based on heuristics.
ellipsis (-e)
ellipsis : 0
Defines the number of characters to keep on each side of a
horizontal-equal segment. The default is 0, meaning to not compress.
See also "chr_eli".
chr_old
chr_old : U+25BC
Defines the character used to indicate the position of removed text
on the line below the text when option "-m" is in effect.
chr_new
chr_new : U+25B2
Defines the character used to indicate the position of added text on
the line below the text when option "-m" is in effect.
chr_cml
chr_cml : U+21B1
Defines the character used to indicate the starting position of
changed text in a line when verbose level is 3 and up.
chr_cmr
chr_cmr : U+21B0
Defines the character used to indicate the ending position of changed
text in a line when verbose level is 3 and up.
chr_eli
chr_eli : U+2508
Defines the character used to indicate omitted text in large
unchanged text when "--ellipsis"/"-e" is in effect.
This character is not equally well visible on all terminals or in all
fonts, so you might want to change it to something that stands out
better in your environment. Possible suggestions:
? U+2026 HORIZONTAL ELLIPSIS
? U+2034 TRIPLE PRIME
? U+2037 REVERSED TRIPLE PRIME
? U+2194 LEFT RIGHT ARROW
? U+21ad LEFT RIGHT WAVE ARROW
? U+21ae LEFT RIGHT ARROW WITH STROKE
? U+21b9 LEFTWARDS ARROW TO BAR OVER RIGHTWARDS ARROW TO BAR
? U+21c4 RIGHTWARDS ARROW OVER LEFTWARDS ARROW
? U+21c6 LEFTWARDS ARROW OVER RIGHTWARDS ARROW
? U+21ce LEFT RIGHT DOUBLE ARROW WITH STROKE
? U+21d4 LEFT RIGHT DOUBLE ARROW
? U+21f9 LEFT RIGHT ARROW WITH VERTICAL STROKE
? U+21fc LEFT RIGHT ARROW WITH DOUBLE VERTICAL STROKE
? U+21ff LEFT RIGHT OPEN-HEADED ARROW
? U+224b TRIPLE TILDE
? U+2504 BOX DRAWINGS LIGHT TRIPLE DASH HORIZONTAL
? U+2505 BOX DRAWINGS HEAVY TRIPLE DASH HORIZONTAL
? U+2508 BOX DRAWINGS LIGHT QUADRUPLE DASH HORIZONTAL
? U+2509 BOX DRAWINGS HEAVY QUADRUPLE DASH HORIZONTAL
? U+29fb TRIPLE PLUS
? U+2b0c LEFT RIGHT BLACK ARROW
chr_eli_v
chr_eli_v : U+21A4U+21A6
When using "--ellipsis" with "--verbose" level 2 or up, the single
character indicator will be replaced with this character. If it is 2
characters wide, the length of the compressed part is put between the
characters.
A suggested alternative might be U+21E4U+21E5
iwbZusePP
As Algorithm::Diff::XS is fast but is not 100% drop-in compliant with
Algorithm::Diff and options "-i", "-w", "-b", and "-Z" are likely to
not work in the "XS" version, this option allows automatic switching
to the slower version if any of these options is selected.
Git integration
You can use ccdiff to show diffs in git. It may work like this:
$ git config --global diff.tool ccdiff
$ git config --global difftool.prompt false
$ git config --global difftool.ccdiff.cmd 'ccdiff --utf-8 -u -r $LOCAL $REMOTE'
$ git difftool SHA~..SHA
$ wget https://github.com/Tux/App-ccdiff/raw/master/Files/git-ccdiff \
-O ~/bin/git-ccdiff
$ perl -pi -e 's{/pro/bin/perl}{/usr/bin/env perl}' ~/bin/git-ccdiff
$ chmod 755 ~/bin/git-ccdiff
$ git ccdiff SHA
Of course you can use "curl" instead of "wget" and you can choose your
own (fixed) path to "perl" instead of using "/usr/bin/env".
From then on you can do
$ git ccdiff
$ git ccdiff 5c5a39f2
CAVEATS
Due to the implementation, where both sides of the comparison are
completely kept in memory, this tool might not be able to deal with
(very) large datasets.
Speed
There are situations where Algorithm::Diff takes considerably more time
compared to e.g. GNU diff. Installing Algorithm::Diff::XS will make
"ccdiff" a lot faster. "ccdiff" will choose Algorithm::Diff::XS if
available.
Note however that options like "-i", "-w", "-b", and "-Z" are likely to
be a no-op in Algorithm::Diff::XS, as that has not been implemented and
it is rather unlikely it will be. Choose "--dc=pp" then. If you want
this switch always, set "iwbZusePP = 1" in one of your "Configuration
files".
SEE ALSO
Algorithm::Diff::XS, Algorithm::Diff, Text::Diff
AUTHOR
H.Merijn Brand
COPYRIGHT AND LICENSE
Copyright (C) 2018-2025 H.Merijn Brand. All rights reserved.
This library is free software; you can redistribute and/or modify it
under the same terms as The Artistic License 2.0.
perl v5.40.0 2025-01-03 App::ccdiff(3)