1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
|
#!/usr/bin/perl
# NAME
# fixdiff.pl - fix line endings in svn diff to match lineending of existing files
# SYNOPSIS
# perl fixdiff.pl a.diff | patch -p0 ...
# DESCRIPTION:
# parse diff and modify the hunks to match the line ending of the target files
# This is useful, when the compared trees to generate the diff are on a
# different architecture than that of the one where the patch is to be
# applied.
# LICENSE:
# Copyright 2008 Jürgen E. Fischer <jef@norbit.de>
# GPL2
use strict;
use warnings;
my $dos;
while(<>) {
if( /^Index: (.*)\n/ ) {
my $file=$1;
$dos=0;
if(-f $file) {
open F, $file;
binmode(F);
$dos=1 if scalar(<F>) =~ /\r\n$/;
close F;
#warn "$file in DOS mode!" if $dos;
} else {
warn "$file not found.";
}
} elsif(/^$/) {
# skip empty lines
next;
} elsif(/^===================================================================/ ||
/^---/ ||
/^\+\+\+/ ||
/^@@/) {
print;
} elsif($dos && !/\r\n$/) {
chop;
print "$_\r\n";
} elsif(!$dos && /\r\n$/) {
chop;
chop;
print "$_\n";
} else {
print;
}
}
|