App-ccdiff
view release on metacpan or search on metacpan
}
}
next;
}
$d1 .= $c;
$d2 .= $c;
$c =~ s/\S/$chr_eql/g;
$x1 .= $c;
$x2 .= $c;
next;
}
if (@co) {
$heu->{old} += scalar @co;
$d1 .= $cml.$clr_old;
$d1 .= s/\n/$reset\n$clr_old/gr for @co;
$d1 .= $reset.$cmr;
$x1 .= $_ for map { s/[^\t\r\n]/$cmd/gr } @co;
$opt_v and push @h1, map { $opt_U ? charnames::viacode (ord) : unpack "H*"; } @co;
}
if (@cn) {
$heu->{new} += scalar @cn;
$d2 .= $cml.$clr_new;
$d2 .= s/\n/$reset\n$clr_new/gr for @cn;
$d2 .= $reset.$cmr;
$x2 .= $_ for map { s/[^\t\r\n]/$cma/gr } @cn;
$opt_v and push @h2, map { $opt_U ? charnames::viacode (ord) : unpack "H*"; } @cn;
}
}
$heu->{pct} = ($heu->{old} + $heu->{new}) / (2 * $heu->{same});
my @d = map { [ split m/(?<=\n)/ => s/\n*\z/\n/r ] } $d1, $d2;
if ($opt_m) {
$opt_v > 1 and s/(\S+)/ $1 /g for $x1, $x2;
s/[ \t]*\n*\z/\n/ for $x1, $x2;
my @x = map { /\S/ ? [ split m/(?<=\n)/ ] : [] } $x1, $x2;
foreach my $n (0, 1) {
@{$x[$n]} and $d[$n] = [ map {( $d[$n][$_], $x[$n][$_] // "" )} 0 .. (scalar @{$d[$n]} - 1) ];
}
}
if ($opt_v) {
$opt_U && $opt_v > 2 and $_ .= sprintf " (U+%06X)", charnames::vianame ($_) for @h1, @h2;
@h1 and push @{$d[0]}, sprintf " -- ${clr_dbg}verbose$reset : %s\n", join ", " => map { $clr_old.$_.$reset } @h1;
@h2 and push @{$d[1]}, sprintf " -- ${clr_dbg}verbose$reset : %s\n", join ", " => map { $clr_new.$_.$reset } @h2;
}
@d;
} # subdiff
sub read_rc {
my $home = $ENV{HOME} || $ENV{USERPROFILE} || $ENV{HOMEPATH};
foreach my $rcf (
"$home/ccdiff.rc",
"$home/.ccdiffrc",
"$home/.config/ccdiff",
) {
-s $rcf or next;
(stat $rcf)[2] & 022 and next;
open my $fh, "<", $rcf or next;
while (<$fh>) {
my ($k, $v) = (m/^\s*([-\w]+)\s*[:=]\s*(.*\S)/) or next;
$rc{ lc $k
=~ s{[-_]colou?r$}{}ir
=~ s{background}{bg}ir
=~ s{^(?:unicode|utf-?8?)$}{utf8}ir
} = $v
=~ s{U\+?([0-9A-Fa-f]{2,7})}{chr hex $1}ger
=~ s{^(?:no|false)$}{0}ir
=~ s{^(?:yes|true)$}{-1}ir; # -1 is still true
}
}
} # read_rc
# Return the known colors from Term::ANSIColor
# Stolen straight from the pm
sub tac_colors {
my %c256;
foreach my $r (0 .. 5) {
foreach my $g (0 .. 5) {
$c256{lc $_}++ for map {("RGB$r$g$_", "ON_RGB$r$g$_")} 0 .. 5;
}
}
$c256{lc $_}++ for
# Basic colors
qw(
CLEAR RESET BOLD DARK
FAINT ITALIC UNDERLINE UNDERSCORE
BLINK REVERSE CONCEALED
BLACK RED GREEN YELLOW
BLUE MAGENTA CYAN WHITE
ON_BLACK ON_RED ON_GREEN ON_YELLOW
ON_BLUE ON_MAGENTA ON_CYAN ON_WHITE
BRIGHT_BLACK BRIGHT_RED BRIGHT_GREEN BRIGHT_YELLOW
BRIGHT_BLUE BRIGHT_MAGENTA BRIGHT_CYAN BRIGHT_WHITE
ON_BRIGHT_BLACK ON_BRIGHT_RED ON_BRIGHT_GREEN ON_BRIGHT_YELLOW
ON_BRIGHT_BLUE ON_BRIGHT_MAGENTA ON_BRIGHT_CYAN ON_BRIGHT_WHITE
),
# 256 colors
(map { ("ANSI$_", "ON_ANSI$_") } 0 .. 255),
(map { ("GREY$_", "ON_GREY$_") } 0 .. 23);
my $ACV = $Term::ANSIColor::VERSION;
$ACV < 3.02 and delete @c256{grep m/italic/ => keys %c256};
$ACV < 4.00 and delete @c256{grep m/rgb|grey/ => keys %c256};
$ACV < 4.06 and delete @c256{grep m/ansi/ => keys %c256};
sort keys %c256;
} # tac_colors
1;
__END__
=encoding utf-8
=head1 NAME
ccdiff - Colored Character diff
=head1 SYNOPSIS
ccdiff [options] file1|- file2|-
ccdiff [options] dir1 dir2
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
C<verbose> color. The characters used for the markers can be defined in your
configuration file as C<chr_cml> (the character used as marker on the left)
and C<chr_cmr> (the character used as marker on the right).
=item --markers -m
Use markers under each changed character in change-chunks.
C<--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 C<--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 C<chr_old> (the character used as marker under removed characters) and
C<chr_new> (the character used as marker under added characters).
If C<--ellipsis> is also in effect and either the C<chr_eli> is longer than
one character or C<--verbose> level is over 2, this option is automatically
disabled.
=item --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 (C<-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.
=item --pink -p
Change the default C<red> for deleted text to the color closest to pink that
is supported by L<Term::ANSIColor>: C<magenta>.
=item --reverse -r
Reverse/invert the foreground and background for the colored indicators.
If the foreground color has C<bold>, it will be stripped from the new background
color.
=item --swap -s
Swap the colors for new and old.
=item --list-colors
List available colors and exit.
=item --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 C<$NO_COLOR> has a true value or
if the environment variable C<$CLICOLOR> is set to a false value. If set,
C<$CLICOLOR_FORCE> will overrule the default of C<$NO_COLOR>.
=item --old=color
Define the foreground color for deleted text.
=item --new=color
Define the foreground color for added text.
=item --bg=color
Define the background color for changed text.
=item --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 (C<--index=4> or C<-I 4>), display just the
chunk with that index, using the C<verbose> color:
This is useful in combination with C<--verbose>.
=item --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, C<ccdiff> will fall-back to vertical diff.
=item --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 C<(characters removed + characters added) /
(2 * characters unchanged))>.
=item --ellipsis=n -e n
Defines the number of characters to keep on each side of a horizontal-equal
segment. The default is C<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 C<â U02508 \N{BOX DRAWINGS LIGHT QUADRUPLE DASH HORIZONTAL}>
(instead of ⦠U02026, as HORIZONTAL ELLIPSIS does not stand out enough).
With C<-u0me3> that would be like
5,5c5,5
-Satâ07:08:33â 1998,I.â539
- â¼ â¼
+Satâ07:00:33â 1993,I.â539
+ â² â²
With C<-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 C<chr_eli> and/or C<chr_eli_v>.
B<Just Partly Implemented> (WIP)
=back
=head2 Configuration files
In order to be able to overrule the defaults set in C<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 C<=> or
a C<:>, followed by optional white-space and the values, the value is assigned
to the option. The values C<no> and C<false> (case insensitive) are aliases
for C<0>. The values C<yes> and C<true> are aliases to C<-1> (C<-1> being a
true value).
Between parens is the corresponding command-line option.
=over 2
=item 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
=item markers (-m)
markers : false
Defines if markers should be used under changed characters. The default is to
use colors only. The C<-m> command line option will toggle the option when set
from a configuration file.
=item ascii (-a)
ascii : false
Defines to use ASCII markers instead of Unicode markers. The default is to use
Unicode markers.
=item reverse (-r)
reverse : false
Defines if changes are displayed as foreground-color over background-color
or background-color over foreground-color. The default is C<false>, so it will
color the changes with the appropriate color (C<new> or C<old>) over the
default background color.
=item swap (-s)
swap : false
Swap the colors for new and old.
=item new (--new)
new : green
Defines the color to be used for added text. The default is C<green>.
The color C<none> is also accepted and disables this color.
Any color accepted by L<Term::ANSIColor> is allowed. Any other color will
result in a warning. This option can include C<bold> either as prefix or
as suffix.
This option may also be specified as
new-color
new_color
new-colour
new_colour
=item old (--old)
old : red
Defines the color to be used for deleted text. The default is C<red>.
The color C<none> is also accepted and disables this color.
Any color accepted by L<Term::ANSIColor> is allowed. Any other color will
result in a warning. This option can include C<bold> either as prefix or
as suffix.
This option may also be specified as
old-color
old_color
old-colour
old_colour
=item bg (--bg)
bg : white
Defines the color to be used as background for changed text. The default is
C<white>.
The color C<none> is also accepted and disables this color.
Any color accepted by L<Term::ANSIColor> is allowed. Any other color will
result in a warning. The C<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
=item 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 C<0> in the RC file or use
C<--no-header> as a command line argument.
=item old-label
=item new-label
Defines the tag(s) in the header for the source file(s)/stream(s).
App::ccdiff::ccdiff ($left, $right);
=>
< *STDIN Fri Nov 7 10:14:51 2025
> *STDIN Fri Nov 7 10:14:51 2025
App::ccdiff::ccdiff ($left, $right,
{ "old-label" => "OLD", "new-label" => "NEW" });
=>
< OLD Fri Nov 7 10:14:51 2025
> NEW Fri Nov 7 10:14:51 2025
=item verbose
verbose : cyan
Defines the color to be used as color for the verbose tag. The default is
C<cyan>. This color will only be used under C<--verbose>.
The color C<none> is also accepted and disables this color.
Any color accepted by L<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
=item utf8 (-U)
utf8 : yes
Defines whether all I/O is to be interpreted as UTF-8. The default is C<no>.
This option may also be specified as
( run in 0.984 second using v1.01-cache-2.11-cpan-0d23b851a93 )