--- pkgsrc/pkgtools/pkgdiff/files/patchdiff.pl 2007/07/12 15:35:43 1.8 +++ pkgsrc/pkgtools/pkgdiff/files/patchdiff.pl 2011/03/04 15:57:07 1.15 @@ -1,19 +1,40 @@ #!@PERL5@ # -# $NetBSD: patchdiff.pl,v 1.8 2007/07/12 15:35:43 joerg Exp $ +# $NetBSD: patchdiff.pl,v 1.15 2011/03/04 15:57:07 wiz Exp $ # -# patchdiff: compares a set of patches patch-aa, patch-ab, ... in -# $WRKDIR/.newpatches in the with another set in patches. +# patchdiff: compares a set of patches in the patch dir with their predecessors +# +# Copyright (c) 2000, 2011 by Dieter Baron and +# Thomas Klausner +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHORS +# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED +# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS +# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +# POSSIBILITY OF SUCH DAMAGE. # -# Copyright (c) 2000 by Dieter Baron and -# Thomas Klausner -# All Rights Reserved. Absolutely no warranty. use Getopt::Std; use Cwd; use File::Spec; -my $oldpatchdir, $newpatchdir; +my $patchdir, $patchdir; my $wrkdir, $thisdir; my %orig, %new; @@ -23,10 +44,11 @@ sub getfilename { local *handle; open(handle, $fname); while () { - next unless m/^\+\+\+[ ]([^ ]*)/; + next unless m/^\+\+\+[ ]([^ ]*)/; close(handle); $_ = $1; chomp(); + s/^\.\///; # ignore leading "./", if any. return $_; } close(handle); @@ -47,14 +69,14 @@ sub putinhash { close(handle); } -getopts('d:h'); +getopts('Dd:h'); if ($opt_h) { ($prog) = ($0 =~ /([^\/]+)$/); print STDERR <) { + $orig = $_; + chomp($orig); + $new = $orig; + $new =~ s/.orig$//; + + if (! -f "$new") { + print "File $new removed\n"; + } else { # system("diff",$orig{$patch},$new{$patch}); - $diff=`diff $orig{$patch} $new{$patch}`; - $diff=~s/^\dc\d\n..\$[N]etBSD.*\$\n---\n..\$[N]etBSD.*\$\n//m; - $diff=~s/^\dc\d\n..\+\+\+.*\n---\n..\+\+\+.*\n//m; + $diff=`diff $orig $new`; + # the following regex try to eliminate uninteresting differences + # The general structure of the diffs-to-be-removed is: + # 25c25 + # < --- something.orig 2008-08-08 08:08 + # --- + # > --- something.orig 2008-08-08 18:08 + # + # In particular, remove hunks with: + # . NetBSD RCS Id tag differences + $diff=~s/^[\d,]+c[\d,]+\n..\$[N]etBSD.*\$\n---\n..\$[N]etBSD.*\$\n//m; + # . the name of the input file changed + # (if the name of the output file has changed, patches + # won't get matched up anyway) + # . time of the input and/or output file changed + # . line numbers changed + $diff=~s/^[\d,]+c[\d,]+\n(?:.\s---\s(:?\S+).*\n)?(?:.\s\+\+\+\s(\S+).*\n)?(?:.\s@@\s(?:.*)\s@@.*\n)?---\n(?:.\s---\s\S+.*\n)?(?:.\s\+\+\+\s\S+.*\n)?(?:.\s@@\s.*\s@@.*\n)?//m; + # . only line numbers changed + $diff=~s/^[\d,]+c[\d,]+\n.\s@@\s.*\s@@.*\n---\n.\s@@\s.*\s@@.*\n//mg; if ($diff) { - print "Comparing $orig{$patch} to $new{$patch}\n$diff"; + if (! -s $orig) { + print "New file $new\n"; + } else { + print "Comparing $orig to $new\n$diff"; + } + } else { + # restore previous version to get rid of uninteresting diffs + rename "$orig", "$new"; } - } else { - print "Only in new: $new{$patch} ($patch)\n" - } + } }