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 --- showdependencytree.cgi | 118 +++++++++++++++++++++++++------------------------ 1 file changed, 61 insertions(+), 57 deletions(-) (limited to 'showdependencytree.cgi') diff --git a/showdependencytree.cgi b/showdependencytree.cgi index 7f594632e..eecbb6de6 100755 --- a/showdependencytree.cgi +++ b/showdependencytree.cgi @@ -20,9 +20,10 @@ use List::Util qw(max); my $user = Bugzilla->login(); -my $cgi = Bugzilla->cgi; +my $cgi = Bugzilla->cgi; my $template = Bugzilla->template; -my $vars = {}; +my $vars = {}; + # Connect to the shadow database if this installation is using one to improve # performance. my $dbh = Bugzilla->switch_to_shadow_db(); @@ -34,12 +35,12 @@ my $dbh = Bugzilla->switch_to_shadow_db(); # Make sure the bug ID is a positive integer representing an existing # bug that the user is authorized to access. my $bug = Bugzilla::Bug->check(scalar $cgi->param('id')); -my $id = $bug->id; +my $id = $bug->id; local our $hide_resolved = $cgi->param('hide_resolved') ? 1 : 0; local our $maxdepth = $cgi->param('maxdepth') || 0; if ($maxdepth !~ /^\d+$/) { - $maxdepth = 0; + $maxdepth = 0; } ################################################################################ @@ -51,7 +52,7 @@ local our $realdepth = 0; # Generate the tree of bugs that this bug depends on and a list of IDs # appearing in the tree. -my $dependson_tree = { $id => $bug }; +my $dependson_tree = {$id => $bug}; my $dependson_ids = {}; GenerateTree($id, "dependson", 1, $dependson_tree, $dependson_ids); $vars->{'dependson_tree'} = $dependson_tree; @@ -59,7 +60,7 @@ $vars->{'dependson_ids'} = [keys(%$dependson_ids)]; # Generate the tree of bugs that this bug blocks and a list of IDs # appearing in the tree. -my $blocked_tree = { $id => $bug }; +my $blocked_tree = {$id => $bug}; my $blocked_ids = {}; GenerateTree($id, "blocked", 1, $blocked_tree, $blocked_ids); $vars->{'blocked_tree'} = $blocked_tree; @@ -77,70 +78,73 @@ $template->process("bug/dependency-tree.html.tmpl", $vars) # Tree Generation Functions sub GenerateTree { - my ($bug_id, $relationship, $depth, $bugs, $ids) = @_; - - # determine just the list of bug ids - _generate_bug_ids($bug_id, $relationship, $depth, $ids); - my $bug_ids = [ keys %$ids ]; - return unless @$bug_ids; - - # load all the bugs at once - foreach my $bug (@{ Bugzilla::Bug->new_from_list($bug_ids) }) { - if (!$bug->{error}) { - $bugs->{$bug->id} = $bug; - } + my ($bug_id, $relationship, $depth, $bugs, $ids) = @_; + + # determine just the list of bug ids + _generate_bug_ids($bug_id, $relationship, $depth, $ids); + my $bug_ids = [keys %$ids]; + return unless @$bug_ids; + + # load all the bugs at once + foreach my $bug (@{Bugzilla::Bug->new_from_list($bug_ids)}) { + if (!$bug->{error}) { + $bugs->{$bug->id} = $bug; } + } - # preload bug visibility - Bugzilla->user->visible_bugs($bug_ids); + # preload bug visibility + Bugzilla->user->visible_bugs($bug_ids); - # and generate the tree - _generate_tree($bug_id, $relationship, $depth, $bugs, $ids); + # and generate the tree + _generate_tree($bug_id, $relationship, $depth, $bugs, $ids); } sub _generate_bug_ids { - my ($bug_id, $relationship, $depth, $ids) = @_; - - # Record this depth in the global $realdepth variable if it's farther - # than we've gone before. - $realdepth = max($realdepth, $depth); - - my $dependencies = _get_dependencies($bug_id, $relationship); - foreach my $dep_id (@$dependencies) { - if (!$maxdepth || $depth <= $maxdepth) { - $ids->{$dep_id} = 1; - _generate_bug_ids($dep_id, $relationship, $depth + 1, $ids); - } + my ($bug_id, $relationship, $depth, $ids) = @_; + + # Record this depth in the global $realdepth variable if it's farther + # than we've gone before. + $realdepth = max($realdepth, $depth); + + my $dependencies = _get_dependencies($bug_id, $relationship); + foreach my $dep_id (@$dependencies) { + if (!$maxdepth || $depth <= $maxdepth) { + $ids->{$dep_id} = 1; + _generate_bug_ids($dep_id, $relationship, $depth + 1, $ids); } + } } sub _generate_tree { - my ($bug_id, $relationship, $depth, $bugs, $ids) = @_; - - my $dependencies = _get_dependencies($bug_id, $relationship); - - foreach my $dep_id (@$dependencies) { - # recurse - if (!$maxdepth || $depth < $maxdepth) { - _generate_tree($dep_id, $relationship, $depth + 1, $bugs, $ids); - } - - # remove bugs according to visiblity - if (!Bugzilla->user->can_see_bug($dep_id)) { - delete $ids->{$dep_id}; - } - elsif (!grep { $_ == $dep_id } @{ $bugs->{dependencies}->{$bug_id} }) { - push @{ $bugs->{dependencies}->{$bug_id} }, $dep_id; - } + my ($bug_id, $relationship, $depth, $bugs, $ids) = @_; + + my $dependencies = _get_dependencies($bug_id, $relationship); + + foreach my $dep_id (@$dependencies) { + + # recurse + if (!$maxdepth || $depth < $maxdepth) { + _generate_tree($dep_id, $relationship, $depth + 1, $bugs, $ids); + } + + # remove bugs according to visiblity + if (!Bugzilla->user->can_see_bug($dep_id)) { + delete $ids->{$dep_id}; + } + elsif (!grep { $_ == $dep_id } @{$bugs->{dependencies}->{$bug_id}}) { + push @{$bugs->{dependencies}->{$bug_id}}, $dep_id; } + } } sub _get_dependencies { - my ($bug_id, $relationship) = @_; - my $cache = Bugzilla->request_cache->{dependency_cache} ||= {}; - return $cache->{$bug_id}->{$relationship} ||= - $relationship eq 'dependson' - ? Bugzilla::Bug::EmitDependList('blocked', 'dependson', $bug_id, $hide_resolved) - : Bugzilla::Bug::EmitDependList('dependson', 'blocked', $bug_id, $hide_resolved); + my ($bug_id, $relationship) = @_; + my $cache = Bugzilla->request_cache->{dependency_cache} ||= {}; + return $cache->{$bug_id}->{$relationship} + ||= $relationship eq 'dependson' + ? Bugzilla::Bug::EmitDependList('blocked', 'dependson', $bug_id, + $hide_resolved) + : Bugzilla::Bug::EmitDependList('dependson', 'blocked', $bug_id, + $hide_resolved); } -- cgit v1.2.3-24-g4f1b