This is a live mirror of the Perl 5 development currently hosted at https://github.com/perl/perl5
Porting/core-cpan-diff: Don't ignore EOLs or whitespace
authorSteve Hay <steve.m.hay@googlemail.com>
Tue, 17 Mar 2015 18:07:40 +0000 (18:07 +0000)
committerSteve Hay <steve.m.hay@googlemail.com>
Tue, 17 Mar 2015 21:09:21 +0000 (21:09 +0000)
Turning off -b (ignore whitespace) revealed a whitespace difference lurking
in blead's copy of a NEXT test file, which there is no need for.
Turning on --binary revealed EOL differences in numerous Win32API-File
files. Hopefully a future CPAN release will fix those since the files in
its GitHub repo match blead as far as EOLs go already.

Porting/Maintainers.pl
Porting/core-cpan-diff
cpan/NEXT/t/actual.t
t/porting/customized.dat

index 85e1b1b..97a7e21 100755 (executable)
@@ -1259,6 +1259,21 @@ use File::Glob qw(:case);
         'EXCLUDED'     => [
             qr{^ex/},
         ],
+
+        # Currently all EOL differences. Waiting for a new upstream release:
+        # All the files in the GitHub repo have UNIX EOLs already.
+        'CUSTOMIZED'   => [
+            qw( ExtUtils/Myconst2perl.pm
+                Makefile.PL
+                buffers.h
+                cFile.h
+                cFile.pc
+                const2perl.h
+                t/file.t
+                t/tie.t
+                typemap
+                ),
+        ],
     },
 
     'XSLoader' => {
index d538c7e..23ae99f 100644 (file)
@@ -53,7 +53,7 @@ Usage: $0 [opts] [ -d | -v | -x ] [ -a | module ... ]
 -d/--diff     Display file differences using diff(1), rather than just
               listing which files have changed.
 
---diffopts    Options to pass to the diff command. Defaults to '-u'.
+--diffopts    Options to pass to the diff command. Defaults to '-u --binary'.
 
 -f|force      Force download from CPAN of new 02packages.details.txt file
               (with --crosscheck only).
@@ -125,7 +125,7 @@ sub run {
           if ( $reverse || $use_diff || $diff_opts );
     }
     else {
-        $diff_opts = '-u -b' unless defined $diff_opts;
+        $diff_opts = '-u --binary' unless defined $diff_opts;
         usage("can't use -f without --crosscheck") if $force;
     }
 
index c24c2c0..85ae285 100644 (file)
@@ -33,5 +33,5 @@ my $foo = {};
 bless($foo,"A");
 
 eval{ $foo->test }
-       ? fail("Didn't die on missing ancestor") 
+       ? fail("Didn't die on missing ancestor")
        : pass("Correctly dies after full traversal");
index 2d97fff..fa37838 100644 (file)
@@ -1,6 +1,15 @@
 ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/t/pm_to_blib.t 71ebcee355691ce374fcad251b12d8b2412462b3
 PerlIO::via::QuotedPrint cpan/PerlIO-via-QuotedPrint/t/QuotedPrint.t ca39f0146e89de02c746e199c45dcb3e5edad691
 Text::ParseWords cpan/Text-ParseWords/t/ParseWords.t 9bae51c9b944cd5c0bbabe9d397e573976a2be8e
+Win32API::File cpan/Win32API-File/buffers.h 02d230ac9ac7091365128161a0ed671898baefae
+Win32API::File cpan/Win32API-File/cFile.h fca7e383e76979c3ac3adf12d11d1bcd2618e489
+Win32API::File cpan/Win32API-File/cFile.pc 992421eea7782a5957b64f66764f6ffb5093bee4
+Win32API::File cpan/Win32API-File/const2perl.h 521a12d359f5efb68cf8abe1977689b640bc8b7d
+Win32API::File cpan/Win32API-File/ExtUtils/Myconst2perl.pm ce52544f49ac880e20b6171fe38f6560ed845e97
+Win32API::File cpan/Win32API-File/Makefile.PL 605d0aee31aebe84a99408f9ab5f644db57c61c6
+Win32API::File cpan/Win32API-File/t/file.t 124e64aa77e755235eb297644a87fac5388d3d78
+Win32API::File cpan/Win32API-File/t/tie.t 712ea7edd0cc805ce1c0b8172c01b03dd19b583d
+Win32API::File cpan/Win32API-File/typemap 24bff088babeadac0873e8df390d1666d9d9db4a
 podlators cpan/podlators/scripts/pod2man.PL f81acf53f3ff46cdcc5ebdd661c5d13eb35d20d6
 podlators cpan/podlators/scripts/pod2text.PL b4693fcfe4a0a1b38a215cfb8985a65d5d025d69
 version cpan/version/lib/version.pm d0923b895d57f1d669ae36fcf85c87b16db341d1