r72701 - in /trunk/libtext-diff-perl: Changes MANIFEST META.yml Makefile.PL debian/changelog lib/Text/Diff.pm lib/Text/Diff/Config.pm lib/Text/Diff/Table.pm
periapt-guest at users.alioth.debian.org
periapt-guest at users.alioth.debian.org
Sun Apr 17 19:13:50 UTC 2011
Author: periapt-guest
Date: Sun Apr 17 19:12:49 2011
New Revision: 72701
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=72701
Log:
New upstream release
Added:
trunk/libtext-diff-perl/lib/Text/Diff/Config.pm
- copied unchanged from r72700, branches/upstream/libtext-diff-perl/current/lib/Text/Diff/Config.pm
Modified:
trunk/libtext-diff-perl/Changes
trunk/libtext-diff-perl/MANIFEST
trunk/libtext-diff-perl/META.yml
trunk/libtext-diff-perl/Makefile.PL
trunk/libtext-diff-perl/debian/changelog
trunk/libtext-diff-perl/lib/Text/Diff.pm
trunk/libtext-diff-perl/lib/Text/Diff/Table.pm
Modified: trunk/libtext-diff-perl/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtext-diff-perl/Changes?rev=72701&op=diff
==============================================================================
--- trunk/libtext-diff-perl/Changes (original)
+++ trunk/libtext-diff-perl/Changes Sun Apr 17 19:12:49 2011
@@ -1,4 +1,11 @@
Changes for Perl extension Text-Diff
+
+1.41 Sun 17 Apr 2011
+ - Add Text::Dif::Config to MANIFEST.
+
+1.40 Sat 16 Apr 2011
+ - Added DIFF_OUTPUT_UNICODE env variable to allow outputting unicode
+ characters. Thanks to Shlomi Fish for the patch.
1.37 Thu 16 Jul 2009
- Switching to a production release
Modified: trunk/libtext-diff-perl/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtext-diff-perl/MANIFEST?rev=72701&op=diff
==============================================================================
--- trunk/libtext-diff-perl/MANIFEST (original)
+++ trunk/libtext-diff-perl/MANIFEST Sun Apr 17 19:12:49 2011
@@ -1,5 +1,6 @@
Changes
lib/Text/Diff.pm
+lib/Text/Diff/Config.pm
lib/Text/Diff/Table.pm
LICENSE
Makefile.PL
Modified: trunk/libtext-diff-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtext-diff-perl/META.yml?rev=72701&op=diff
==============================================================================
--- trunk/libtext-diff-perl/META.yml (original)
+++ trunk/libtext-diff-perl/META.yml Sun Apr 17 19:12:49 2011
@@ -1,6 +1,6 @@
--- #YAML:1.0
name: Text-Diff
-version: 1.37
+version: 1.41
abstract: Perform diffs on files and record sets
author:
- Adam Kennedy <adamk at cpan.org>
@@ -10,15 +10,16 @@
ExtUtils::MakeMaker: 0
build_requires:
ExtUtils::MakeMaker: 0
- Test: 0
requires:
Algorithm::Diff: 1.19
Exporter: 0
+resources:
+ repository: https://github.com/Ovid/Text-Diff
no_index:
directory:
- t
- inc
-generated_by: ExtUtils::MakeMaker version 6.50
+generated_by: ExtUtils::MakeMaker version 6.56
meta-spec:
url: http://module-build.sourceforge.net/META-spec-v1.4.html
version: 1.4
Modified: trunk/libtext-diff-perl/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtext-diff-perl/Makefile.PL?rev=72701&op=diff
==============================================================================
--- trunk/libtext-diff-perl/Makefile.PL (original)
+++ trunk/libtext-diff-perl/Makefile.PL Sun Apr 17 19:12:49 2011
@@ -1,26 +1,27 @@
use strict;
+
BEGIN {
- require 5.005_03;
+ require 5.005_03;
}
use ExtUtils::MakeMaker;
WriteMakefile(
- NAME => 'Text::Diff',
- ABSTRACT => 'Perform diffs on files and record sets',
- VERSION_FROM => 'lib/Text/Diff.pm',
- PREREQ_PM => {
- 'Exporter' => 0,
- 'Algorithm::Diff' => '1.19',
- },
- ($] >= 5.005 ? (
- AUTHOR => 'Adam Kennedy <adamk at cpan.org>',
- ) : ()),
- ($ExtUtils::MakeMaker::VERSION ge '6.30_00' ? (
- LICENSE => 'perl',
- ) : ()),
- ($ExtUtils::MakeMaker::VERSION ge '6.46' ? (
- META_MERGE => {
- build_requires => { Test => 0 }
- }
- ) : ()),
+ NAME => 'Text::Diff',
+ ABSTRACT => 'Perform diffs on files and record sets',
+ VERSION_FROM => 'lib/Text/Diff.pm',
+ PREREQ_PM => {
+ 'Exporter' => 0,
+ 'Algorithm::Diff' => '1.19',
+ },
+ ( $] >= 5.005 ? ( AUTHOR => 'Adam Kennedy <adamk at cpan.org>', ) : () ),
+ (
+ $ExtUtils::MakeMaker::VERSION ge '6.30_00' ? ( LICENSE => 'perl', ) : ()
+ ),
+ (
+ $ExtUtils::MakeMaker::VERSION ge '6.46'
+ ? ( META_MERGE => { build_requires => { Test => 0 } } )
+ : ()
+ ),
+ META_MERGE =>
+ { resources => { repository => 'https://github.com/Ovid/Text-Diff' } },
);
Modified: trunk/libtext-diff-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtext-diff-perl/debian/changelog?rev=72701&op=diff
==============================================================================
--- trunk/libtext-diff-perl/debian/changelog (original)
+++ trunk/libtext-diff-perl/debian/changelog Sun Apr 17 19:12:49 2011
@@ -1,4 +1,4 @@
-libtext-diff-perl (1.37-2) UNRELEASED; urgency=low
+libtext-diff-perl (1.41-1) UNRELEASED; urgency=low
[ Ryan Niebur ]
* Update jawnsy's email address
@@ -9,8 +9,9 @@
[ Nicholas Bamber ]
* Added myself to Uploaders
+ * New upstream release
- -- Ryan Niebur <ryanryan52 at gmail.com> Tue, 01 Sep 2009 21:19:55 -0700
+ -- Nicholas Bamber <nicholas at periapt.co.uk> Sun, 17 Apr 2011 20:14:22 +0100
libtext-diff-perl (1.37-1) unstable; urgency=low
Modified: trunk/libtext-diff-perl/lib/Text/Diff.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtext-diff-perl/lib/Text/Diff.pm?rev=72701&op=diff
==============================================================================
--- trunk/libtext-diff-perl/lib/Text/Diff.pm (original)
+++ trunk/libtext-diff-perl/lib/Text/Diff.pm Sun Apr 17 19:12:49 2011
@@ -7,7 +7,7 @@
use Algorithm::Diff ();
use vars qw{$VERSION @ISA @EXPORT};
BEGIN {
- $VERSION = '1.37';
+ $VERSION = '1.41';
@ISA = 'Exporter';
@EXPORT = 'diff';
};
Modified: trunk/libtext-diff-perl/lib/Text/Diff/Table.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtext-diff-perl/lib/Text/Diff/Table.pm?rev=72701&op=diff
==============================================================================
--- trunk/libtext-diff-perl/lib/Text/Diff/Table.pm (original)
+++ trunk/libtext-diff-perl/lib/Text/Diff/Table.pm Sun Apr 17 19:12:49 2011
@@ -4,17 +4,19 @@
use strict;
use Carp;
use vars qw{$VERSION @ISA @EXPORT_OK};
+use Text::Diff::Config;
+
BEGIN {
- $VERSION = '1.37';
- @ISA = qw( Text::Diff::Base Exporter );
- @EXPORT_OK = qw( expand_tabs );
+ $VERSION = '1.41';
+ @ISA = qw( Text::Diff::Base Exporter );
+ @EXPORT_OK = qw( expand_tabs );
}
my %escapes = map {
my $c =
$_ eq '"' || $_ eq '$' ? qq{'$_'}
- : $_ eq "\\" ? qq{"\\\\"}
- : qq{"$_"};
+ : $_ eq "\\" ? qq{"\\\\"}
+ : qq{"$_"};
( ord eval $c => $_ )
} (
map( chr, 32..126),
@@ -35,11 +37,11 @@
my $spaces = " " x ( 8 - $count % 8 + 8 * length $2 );
$count = 0;
$spaces;
- }
- else {
- $count += length $3;
- $3;
- }
+ }
+ else {
+ $count += length $3;
+ $3;
+ }
}ge;
return $s;
@@ -57,13 +59,16 @@
## use utf8 if available. don't if not.
my $escaper = <<'EOCODE';
sub escape($) {
- use utf8;
- join "", map {
- $_ = ord;
- exists $escapes{$_}
- ? $escapes{$_}
- : sprintf( "\\x{%04x}", $_ );
- } split //, shift;
+ use utf8;
+ join "", map {
+ my $c = $_;
+ $_ = ord;
+ exists $escapes{$_}
+ ? $escapes{$_}
+ : $Text::Diff::Config::Output_Unicode
+ ? $c
+ : sprintf( "\\x{%04x}", $_ );
+ } split //, shift;
}
1;
@@ -115,23 +120,23 @@
$A->[1] eq $B->[1] ? "="
: "*";
if ( $elt_type ne "*" ) {
- if ( $elt_type eq "=" || $A->[1] =~ /\S/ || $B->[1] =~ /\S/ ) {
- $A->[1] = escape trim_trailing_line_ends expand_tabs $A->[1];
- $B->[1] = escape trim_trailing_line_ends expand_tabs $B->[1];
- }
- else {
- $A->[1] = escape $A->[1];
- $B->[1] = escape $B->[1];
- }
+ if ( $elt_type eq "=" || $A->[1] =~ /\S/ || $B->[1] =~ /\S/ ) {
+ $A->[1] = escape trim_trailing_line_ends expand_tabs $A->[1];
+ $B->[1] = escape trim_trailing_line_ends expand_tabs $B->[1];
+ }
+ else {
+ $A->[1] = escape $A->[1];
+ $B->[1] = escape $B->[1];
+ }
}
else {
## not using \z here for backcompat reasons.
$A->[1] =~ /^(\s*?)([^ \t].*?)?(\s*)(?![\n\r])$/s;
my ( $l_ws_A, $body_A, $t_ws_A ) = ( $1, $2, $3 );
- $body_A = "" unless defined $body_A;
+ $body_A = "" unless defined $body_A;
$B->[1] =~ /^(\s*?)([^ \t].*?)?(\s*)(?![\n\r])$/s;
my ( $l_ws_B, $body_B, $t_ws_B ) = ( $1, $2, $3 );
- $body_B = "" unless defined $body_B;
+ $body_B = "" unless defined $body_B;
my $added_escapes;
@@ -378,6 +383,13 @@
Whether or not line 3 should have that tab character escaped is a judgement
call; so far I'm choosing not to.
+=head1 UNICODE
+
+To output the raw unicode chracters consult the documentation of
+L<Text::Diff::Config>. You can set the C<DIFF_OUTPUT_UNICODE> environment
+variable to 1 to output it from the command line. For more information,
+consult this bug: L<https://rt.cpan.org/Ticket/Display.html?id=54214> .
+
=head1 LIMITATIONS
Table formatting requires buffering the entire diff in memory in order to
More information about the Pkg-perl-cvs-commits
mailing list