|
Lines 1-8
Link Here
|
| 1 |
--- lib/PatchReader/Raw.pm.orig 2014-09-20 06:54:09 UTC |
1 |
--- lib/PatchReader/Raw.pm.orig 2015-02-19 16:02:48 UTC |
| 2 |
+++ lib/PatchReader/Raw.pm |
2 |
+++ lib/PatchReader/Raw.pm |
| 3 |
@@ -41,7 +41,7 @@ |
3 |
@@ -40,8 +40,25 @@ sub next_line { |
|
|
4 |
|
| 4 |
return if $line =~ /^\?/; |
5 |
return if $line =~ /^\?/; |
| 5 |
|
6 |
|
|
|
7 |
+ # FreeBSD bug #197607 - svn property changes are |
| 8 |
+ # displayed as line additions in Bugzilla. We'll |
| 9 |
+ # just ignore the whole property section. |
| 10 |
+ if ($this->{in_prop} == 1) { |
| 11 |
+ if ($line =~ /^Index:\s*([\S ]+)/) { |
| 12 |
+ # End of property changes, continue normally. |
| 13 |
+ $this->{in_prop} = 0; |
| 14 |
+ } else { |
| 15 |
+ # Ignore property lines |
| 16 |
+ return; |
| 17 |
+ } |
| 18 |
+ } elsif ($line =~ /^Property changes on:.*$/) { |
| 19 |
+ # SVN property changes, skip everything until the next index... |
| 20 |
+ $this->{in_prop} = 1; |
| 21 |
+ return; |
| 22 |
+ } |
| 23 |
+ |
| 6 |
# patch header parsing |
24 |
# patch header parsing |
| 7 |
- if ($line =~ /^---\s*([\S ]+)\s*\t([^\t\r\n]*)\s*(\S*)/) { |
25 |
- if ($line =~ /^---\s*([\S ]+)\s*\t([^\t\r\n]*)\s*(\S*)/) { |
| 8 |
+ if ($line =~ /^---\s+([\S ]+)\s*?(?:\t([^\t\r\n]*)\s*(\S*))?/) { |
26 |
+ if ($line =~ /^---\s+([\S ]+)\s*?(?:\t([^\t\r\n]*)\s*(\S*))?/) { |
|
Lines 9-15
Link Here
|
| 9 |
$this->_maybe_end_file(); |
27 |
$this->_maybe_end_file(); |
| 10 |
|
28 |
|
| 11 |
if ($1 eq "/dev/null") { |
29 |
if ($1 eq "/dev/null") { |
| 12 |
@@ -54,9 +54,11 @@ |
30 |
@@ -54,9 +71,11 @@ sub next_line { |
| 13 |
|
31 |
|
| 14 |
$this->{IN_HEADER} = 1; |
32 |
$this->{IN_HEADER} = 1; |
| 15 |
|
33 |
|