[PATCH 4/7] gitweb: Add treediff view
- From
- Martin Koegler <mkoegler@auto.tuwien.ac.at>
- Date
- Apr 16, 2007, 20:20 UTC
- Message-ID
- <20070416202010.GB2592@auto.tuwien.ac.at>
- In-Reply-To
- <85de402216e82cc0f220df9d27370a33538a232a.1176659094.git.mkoegler@auto.tuwien.ac.at>
git_treediff supports comparing different trees. A tree can be specified either as hash or as base hash and filename. --- New version, as I found a bug in the expiration handling code.
I removed the parent links for now, as they require more discussion.
This patch uses empty fp/f for the root directory and does not propagte f to fp. Patch 6 adds this.
gitweb/gitweb.perl | 116 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 116 insertions(+), 0 deletions(-)
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl index 1551d95..c2dc82d 100755 --- a/gitweb/gitweb.perl +++ b/gitweb/gitweb.perl @@ -450,6 +450,8 @@ my %actions = ( "tag" => \&git_tag, "tags" => \&git_tags, "tree" => \&git_tree, + "treediff" => \&git_treediff, + "treediff_plain" => \&git_treediff_plain, "snapshot" => \&git_snapshot, "object" => \&git_object, # those below don't need $project @@ -4174,6 +4176,120 @@ sub git_commitdiff_plain { git_commitdiff('plain'); } +sub git_treediff { + my $format = shift || 'html'; + my $expires = '+1d'; + + # non-textual hash id's can be cached + if (defined $hash && $hash !~ m/^[0-9a-fA-F]{40}$/) { + $expires = undef; + } elsif (defined $hash_parent && $hash_parent !~ m/^[0-9a-fA-F]{40}$/) { + $expires = undef; + } elsif (defined $hash_base && $hash_base !~ m/^[0-9a-fA-F]{40}$/) { + $expires = undef; + } elsif (defined $hash_parent_base && $hash_parent_base !~ m/^[0-9a-fA-F]{40}$/) { + $expires = undef; + } + + # we need to prepare $formats_nav before any parameter munging + my $formats_nav; + if ($format eq 'html') { + $formats_nav = + $cgi->a({-href => href(action=>"treediff_plain", + hash=>$hash, hash_parent=>$hash_parent, + hash_base=>$hash_base, hash_parent_base=>$hash_parent_base, + file_name=>$file_name, file_parent=>$file_parent)}, + "raw"); + } + + if (!defined $hash) { + if (!defined $hash_base) { + die_error(undef,'tree parameter missing'); + } + $hash = $hash_base; + $hash .= ":".$file_name if (defined $file_name); + } + + if (!defined $hash_parent) { + if (!defined $hash_parent_base) { + die_error(undef,'tree parameter missing'); + } + $hash_parent = $hash_parent_base; + $hash_parent .= ":".$file_parent if (defined $file_parent); + } + + # read treediff + my $fd; + my @difftree; + if ($format eq 'html') { + open $fd, "-|", git_cmd(), "diff-tree", '-r', @diff_opts, + "--no-commit-id", "--patch-with-raw", "--full-index", + $hash_parent, $hash, "--" + or die_error(undef, "Open git-diff-tree failed"); + + while (my $line = <$fd>) { + chomp $line; + # empty line ends raw part of diff-tree output + last unless $line; + push @difftree, $line; + } + + } elsif ($format eq 'plain') { + open $fd, "-|", git_cmd(), "diff-tree", '-r', @diff_opts, + '-p', $hash_parent, $hash, "--" + or die_error(undef, "Open git-diff-tree failed"); + + } else { + die_error(undef, "Unknown treediff format"); + } + + # write header + if ($format eq 'html') { + git_header_html(undef, $expires); + if (defined $hash_base && (my %co = parse_commit($hash_base))) { + git_print_page_nav('','', $hash_base,$co{'tree'},$hash_base, $formats_nav); + git_print_header_div('commit', esc_html($co{'title'}), $hash_base); + } else { + print "<div class=\"page_nav\"><br/>$formats_nav<br/></div>\n"; + print "<div class=\"title\">$hash vs $hash_parent</div>\n"; + } + print "<div class=\"page_body\">\n"; + + } elsif ($format eq 'plain') { + my $filename = basename($project) . "-$hash-$hash_parent.patch"; + + print $cgi->header( + -type => 'text/plain', + -charset => 'utf-8', + -expires => $expires, + -content_disposition => 'inline; filename="' . "$filename" . '"'); + + print "X-Git-Url: " . $cgi->self_url() . "\n\n"; + print "---\n\n"; + } + + # write patch + if ($format eq 'html') { + git_difftree_body(\@difftree, $hash_base, $hash_parent_base, $file_name, $file_parent); + print "<br/>\n"; + + git_patchset_body($fd, \@difftree, $hash_base, $hash_parent_base, $file_name, $file_parent); + close $fd; + print "</div>\n"; # class="page_body" + git_footer_html(); + + } elsif ($format eq 'plain') { + local $/ = undef; + print <$fd>; + close $fd + or print "Reading git-diff-tree failed\n"; + } +} + +sub git_treediff_plain { + git_treediff('plain'); +} + sub git_history { if (!defined $hash_base) { $hash_base = git_get_head_hash($project);
-- 1.5.1.1.85.gf1888