From 8ec8da0491ad89604700b3e29a227966f6d84ba1 Mon Sep 17 00:00:00 2001 From: Perl Tidy Date: Wed, 5 Dec 2018 15:38:52 -0500 Subject: no bug - reformat all the code using the new perltidy rules --- Bugzilla/PatchReader/DiffPrinter/template.pm | 72 ++++++++++++++-------------- 1 file changed, 36 insertions(+), 36 deletions(-) (limited to 'Bugzilla/PatchReader/DiffPrinter/template.pm') diff --git a/Bugzilla/PatchReader/DiffPrinter/template.pm b/Bugzilla/PatchReader/DiffPrinter/template.pm index 4120f1d8a..54f3b4419 100644 --- a/Bugzilla/PatchReader/DiffPrinter/template.pm +++ b/Bugzilla/PatchReader/DiffPrinter/template.pm @@ -11,10 +11,10 @@ sub new { bless $this, $class; $this->{TEMPLATE_PROCESSOR} = $_[0]; - $this->{HEADER_TEMPLATE} = $_[1]; - $this->{FILE_TEMPLATE} = $_[2]; - $this->{FOOTER_TEMPLATE} = $_[3]; - $this->{ARGS} = $_[4] || {}; + $this->{HEADER_TEMPLATE} = $_[1]; + $this->{FILE_TEMPLATE} = $_[2]; + $this->{FOOTER_TEMPLATE} = $_[3]; + $this->{ARGS} = $_[4] || {}; $this->{ARGS}{file_count} = 0; return $this; @@ -23,20 +23,20 @@ sub new { sub start_patch { my $this = shift; $this->{TEMPLATE_PROCESSOR}->process($this->{HEADER_TEMPLATE}, $this->{ARGS}) - || ::ThrowTemplateError($this->{TEMPLATE_PROCESSOR}->error()); + || ::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()); + || ::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} = shift; + $this->{ARGS}{file}{plus_lines} = 0; $this->{ARGS}{file}{minus_lines} = 0; @{$this->{ARGS}{sections}} = (); } @@ -45,9 +45,11 @@ 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}"; + $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})); @@ -55,7 +57,7 @@ sub end_file { } $this->{TEMPLATE_PROCESSOR}->process($this->{FILE_TEMPLATE}, $this->{ARGS}) - || ::ThrowTemplateError($this->{TEMPLATE_PROCESSOR}->error()); + || ::ThrowTemplateError($this->{TEMPLATE_PROCESSOR}->error()); @{$this->{ARGS}{sections}} = (); delete $this->{ARGS}{file}; } @@ -64,47 +66,46 @@ sub next_section { my $this = shift; my ($section) = @_; - $this->{ARGS}{file}{plus_lines} += $section->{plus_lines}; + $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 = []; + 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}; + push @{$section->{groups}}, + {context => $context_lines, plus => $plus_lines, minus => $minus_lines}; $context_lines = []; - $plus_lines = []; - $minus_lines = []; + $plus_lines = []; + $minus_lines = []; } $last_line_char = ' '; push @{$context_lines}, substr($line, 1); - } elsif ($line =~ /^\+/) { + } + 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 = []; + 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 =~ /^-/) { + } + 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 = []; + push @{$section->{groups}}, + {context => $context_lines, plus => $plus_lines, minus => $minus_lines}; + $context_lines = []; + $plus_lines = []; + $minus_lines = []; $last_line_char = ''; } $last_line_char = '-'; @@ -112,9 +113,8 @@ sub next_section { } } - push @{$section->{groups}}, {context => $context_lines, - plus => $plus_lines, - minus => $minus_lines}; + push @{$section->{groups}}, + {context => $context_lines, plus => $plus_lines, minus => $minus_lines}; push @{$this->{ARGS}{sections}}, $section; } -- cgit v1.2.3-24-g4f1b