kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

1) Add a space to the second white-space block, when matching filenames as some

Browse source 
diff version must uses spaces to separate the filename and timestamp (that
or somepeople do cut-n-pasting of patches).

2) add the comma "," to the pattern used to match line numbers, to match POSIX.
This commit is contained in:
sbd 2010-07-04 22:18:28 +00:00
parent 4df632d853
commit f66158f0f0
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
pkgtools/pkgdiff/files/patchdiff.pl
View file

@ -1,6 +1,6 @@
#!@PERL5@
#
# $NetBSD: patchdiff.pl,v 1.10 2008/11/05 23:18:18 wiz Exp $
# $NetBSD: patchdiff.pl,v 1.11 2010/07/04 22:18:28 sbd Exp $
#
# patchdiff: compares a set of patches patch-aa, patch-ab, ... in
# $WRKDIR/.newpatches in the with another set in patches.
@ -23,7 +23,7 @@ sub getfilename {
local *handle;
open(handle, $fname);
while (<handle>) {
next unless m/^\+\+\+[ ]([^ ]*)/;
next unless m/^\+\+\+[ ]([^ ]*)/;
close(handle);
$_ = $1;
chomp();
@ -105,14 +105,14 @@ foreach $patch (keys%new) {
#
# In particular, remove hunks with:
# . NetBSD RCS Id tag differences
$diff=~s/^\d+c\d+\n..\$[N]etBSD.*\$\n---\n..\$[N]etBSD.*\$\n//m;
$diff=~s/^[\d,]+c[\d,]+\n..\$[N]etBSD.*\$\n---\n..\$[N]etBSD.*\$\n//m;
# . only the name or date of the output file changed
$diff=~s/^\d+c\d+\n..\+\+\+.*\n---\n..\+\+\+.*\n//m;
$diff=~s/^[\d,]+c[\d,]+\n..\+\+\+.*\n---\n..\+\+\+.*\n//m;
# . only the name or date of the input file changed
$diff=~s/^\d+c\d+\n.\s---\s.*\.orig\s.*\n---\n.\s---\s.*\n//m;
$diff=~s/^\d+c\d+\n.\s---\s.*\n---\n.\s---\s.*\.orig\s.*\n//m;
$diff=~s/^[\d,]+c[\d,]+\n.\s---\s.*\.orig\s.*\n---\n.\s---\s.*\n//m;
$diff=~s/^[\d,]+c[\d,]+\n.\s---\s.*\n---\n.\s---\s.*\.orig\s.*\n//m;
# . only line numbers changed
$diff=~s/^\d+c\d+\n.\s@@\s.*\s@@.*\n---\n.\s@@\s.*\s@@.*\n//mg;
$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";
}