Bug 779862: shift PatchReader into bugzilla namespace and fix long standing issues

2 files changed, 180 insertions, 0 deletions

diff --git a/Bugzilla/PatchReader/DiffPrinter/raw.pm b/Bugzilla/PatchReader/DiffPrinter/raw.pm
new file mode 100644
index 000000000..ceb425800
--- /dev/null
+++ b/Bugzilla/PatchReader/DiffPrinter/raw.pm
@@ -0,0 +1,61 @@
+package Bugzilla::PatchReader::DiffPrinter::raw;
+
+use strict;
+
+sub new {
+  my $class = shift;
+  $class = ref($class) || $class;
+  my $this = {};
+  bless $this, $class;
+
+  $this->{OUTFILE} = @_ ? $_[0] : *STDOUT;
+  my $fh = $this->{OUTFILE};
+
+  return $this;
+}
+
+sub start_patch {
+}
+
+sub end_patch {
+}
+
+sub start_file {
+  my $this = shift;
+  my ($file) = @_;
+
+  my $fh = $this->{OUTFILE};
+  if ($file->{rcs_filename}) {
+    print $fh "Index: $file->{filename}\n";
+    print $fh "===================================================================\n";
+    print $fh "RCS file: $file->{rcs_filename}\n";
+  }
+  my $old_file = $file->{is_add} ? "/dev/null" : $file->{filename};
+  my $old_date = $file->{old_date_str} || "";
+  print $fh "--- $old_file\t$old_date";
+  print $fh "\t$file->{old_revision}" if $file->{old_revision};
+  print $fh "\n";
+  my $new_file = $file->{is_remove} ? "/dev/null" : $file->{filename};
+  my $new_date = $file->{new_date_str} || "";
+  print $fh "+++ $new_file\t$new_date";
+  print $fh "\t$file->{new_revision}" if $file->{new_revision};
+  print $fh "\n";
+}
+
+sub end_file {
+}
+
+sub next_section {
+  my $this = shift;
+  my ($section) = @_;
+
+  return unless $section->{old_start} || $section->{new_start};
+  my $fh = $this->{OUTFILE};
+  print $fh "@@ -$section->{old_start},$section->{old_lines} +$section->{new_start},$section->{new_lines} @@ $section->{func_info}\n";
+  foreach my $line (@{$section->{lines}}) {
+    $line =~ s/(\r?\n?)$/\n/;
+    print $fh $line;
+  }
+}
+
+1
diff --git a/Bugzilla/PatchReader/DiffPrinter/template.pm b/Bugzilla/PatchReader/DiffPrinter/template.pm
new file mode 100644
index 000000000..6545e9336
--- /dev/null
+++ b/Bugzilla/PatchReader/DiffPrinter/template.pm
@@ -0,0 +1,119 @@
+package Bugzilla::PatchReader::DiffPrinter::template;
+
+use strict;
+
+sub new {
+  my $class = shift;
+  $class = ref($class) || $class;
+  my $this = {};
+  bless $this, $class;
+
+  $this->{TEMPLATE_PROCESSOR} = $_[0];
+  $this->{HEADER_TEMPLATE} = $_[1];
+  $this->{FILE_TEMPLATE} = $_[2];
+  $this->{FOOTER_TEMPLATE} = $_[3];
+  $this->{ARGS} = $_[4] || {};
+
+  $this->{ARGS}{file_count} = 0;
+  return $this;
+}
+
+sub start_patch {
+  my $this = shift;
+  $this->{TEMPLATE_PROCESSOR}->process($this->{HEADER_TEMPLATE}, $this->{ARGS})
+      || ::ThrowTemplateError($this->{TEMPLATE_PROCESSOR}->error());
+}
+
+sub end_patch {
+  my $this = shift;
+  $this->{TEMPLATE_PROCESSOR}->process($this->{FOOTER_TEMPLATE}, $this->{ARGS})
+      || ::ThrowTemplateError($this->{TEMPLATE_PROCESSOR}->error());
+}
+
+sub start_file {
+  my $this = shift;
+  $this->{ARGS}{file_count}++;
+  $this->{ARGS}{file} = shift;
+  $this->{ARGS}{file}{plus_lines} = 0;
+  $this->{ARGS}{file}{minus_lines} = 0;
+  @{$this->{ARGS}{sections}} = ();
+}
+
+sub end_file {
+  my $this = shift;
+  my $file = $this->{ARGS}{file};
+  if ($file->{canonical} && $file->{old_revision} && $this->{ARGS}{bonsai_url}) {
+    $this->{ARGS}{bonsai_prefix} = "$this->{ARGS}{bonsai_url}/cvsblame.cgi?file=$file->{filename}&rev=$file->{old_revision}";
+  }
+  if ($file->{canonical} && $this->{ARGS}{lxr_url}) {
+    # Cut off the lxr root, if any
+    my $filename = $file->{filename};
+    $filename = substr($filename, length($this->{ARGS}{lxr_root}));
+    $this->{ARGS}{lxr_prefix} = "$this->{ARGS}{lxr_url}/source/$filename";
+  }
+
+  $this->{TEMPLATE_PROCESSOR}->process($this->{FILE_TEMPLATE}, $this->{ARGS})
+      || ::ThrowTemplateError($this->{TEMPLATE_PROCESSOR}->error());
+  @{$this->{ARGS}{sections}} = ();
+  delete $this->{ARGS}{file};
+}
+
+sub next_section {
+  my $this = shift;
+  my ($section) = @_;
+
+  $this->{ARGS}{file}{plus_lines} += $section->{plus_lines};
+  $this->{ARGS}{file}{minus_lines} += $section->{minus_lines};
+
+  # Get groups of lines and print them
+  my $last_line_char = '';
+  my $context_lines = [];
+  my $plus_lines = [];
+  my $minus_lines = [];
+  foreach my $line (@{$section->{lines}}) {
+    $line =~ s/\r?\n?$//;
+    if ($line =~ /^ /) {
+      if ($last_line_char ne ' ') {
+        push @{$section->{groups}}, {context => $context_lines,
+                                     plus => $plus_lines,
+                                     minus => $minus_lines};
+        $context_lines = [];
+        $plus_lines = [];
+        $minus_lines = [];
+      }
+      $last_line_char = ' ';
+      push @{$context_lines}, substr($line, 1);
+    } elsif ($line =~ /^\+/) {
+      if ($last_line_char eq ' ' || $last_line_char eq '-' && @{$plus_lines}) {
+        push @{$section->{groups}}, {context => $context_lines,
+                                     plus => $plus_lines,
+                                     minus => $minus_lines};
+        $context_lines = [];
+        $plus_lines = [];
+        $minus_lines = [];
+        $last_line_char = '';
+      }
+      $last_line_char = '+';
+      push @{$plus_lines}, substr($line, 1);
+    } elsif ($line =~ /^-/) {
+      if ($last_line_char eq '+' && @{$minus_lines}) {
+        push @{$section->{groups}}, {context => $context_lines,
+                                     plus => $plus_lines,
+                                     minus => $minus_lines};
+        $context_lines = [];
+        $plus_lines = [];
+        $minus_lines = [];
+        $last_line_char = '';
+      }
+      $last_line_char = '-';
+      push @{$minus_lines}, substr($line, 1);
+    }
+  }
+
+  push @{$section->{groups}}, {context => $context_lines,
+                               plus => $plus_lines,
+                               minus => $minus_lines};
+  push @{$this->{ARGS}{sections}}, $section;
+}
+
+1