* [PATCH] Revert "gitweb: extend blame to show links to diff and previous"
@ 2006-09-28 0:22 Luben Tuikov
0 siblings, 0 replies; 2+ messages in thread
From: Luben Tuikov @ 2006-09-28 0:22 UTC (permalink / raw)
To: git
[-- Attachment #1: Type: text/plain, Size: 299 bytes --]
This concept is very fine, but it makes blame slow
across renames and across branches, so revert it.
There is a better way to do this.
This reverts commit 03d06a8e26f4fbd37800d1e1125c6ecf4c104466.
---
gitweb/gitweb.perl | 18 +-----------------
1 files changed, 1 insertions(+), 17 deletions(-)
[-- Attachment #2: 1207600725-p1.txt --]
[-- Type: text/plain, Size: 1738 bytes --]
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index d2519f0..56638f2 100755
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -2439,7 +2439,7 @@ sub git_blame2 {
print <<HTML;
<div class="page_body">
<table class="blame">
-<tr><th>Prev</th><th>Diff</th><th>Commit</th><th>Line</th><th>Data</th></tr>
+<tr><th>Commit</th><th>Line</th><th>Data</th></tr>
HTML
while (<$fd>) {
/^([0-9a-fA-F]{40}).*?(\d+)\)\s{1}(\s*.*)/;
@@ -2447,8 +2447,6 @@ HTML
my $rev = substr($full_rev, 0, 8);
my $lineno = $2;
my $data = $3;
- my %pco = parse_commit($full_rev);
- my $parent = $pco{'parent'};
if (!defined $last_rev) {
$last_rev = $full_rev;
@@ -2457,25 +2455,11 @@ HTML
$current_color = ++$current_color % $num_colors;
}
print "<tr class=\"$rev_color[$current_color]\">\n";
- # Print the Prev link
- print "<td class=\"sha1\">";
- print $cgi->a({-href => href(action=>"blame", hash_base=>$parent, file_name=>$file_name)},
- esc_html(substr($parent, 0, 8)));
- print "</td>\n";
- # Print the Diff (blobdiff) link
- print "<td>";
- print $cgi->a({-href => href(action=>"blobdiff", file_name=>$file_name, hash_parent_base=>$parent,
- hash_base=>$full_rev)},
- esc_html("Diff"));
- print "</td>\n";
- # Print the Commit link
print "<td class=\"sha1\">" .
$cgi->a({-href => href(action=>"commit", hash=>$full_rev, file_name=>$file_name)},
esc_html($rev)) . "</td>\n";
- # Print the Line number
print "<td class=\"linenr\"><a id=\"l$lineno\" href=\"#l$lineno\" class=\"linenr\">" .
esc_html($lineno) . "</a></td>\n";
- # Print the Data
print "<td class=\"pre\">" . esc_html($data) . "</td>\n";
print "</tr>\n";
}
--
1.4.2.1.g271e
^ permalink raw reply related [flat|nested] 2+ messages in thread* [PATCH] Revert "gitweb: extend blame to show links to diff and previous"
@ 2006-09-28 0:18 Luben Tuikov
0 siblings, 0 replies; 2+ messages in thread
From: Luben Tuikov @ 2006-09-28 0:18 UTC (permalink / raw)
To: git
[-- Attachment #1: Type: text/plain, Size: 299 bytes --]
This concept is very fine, but it makes blame slow
across renames and across branches, so revert it.
There is a better way to do this.
This reverts commit 03d06a8e26f4fbd37800d1e1125c6ecf4c104466.
---
gitweb/gitweb.perl | 18 +-----------------
1 files changed, 1 insertions(+), 17 deletions(-)
[-- Attachment #2: 2795696785-p1.patch --]
[-- Type: application/octet-stream, Size: 1738 bytes --]
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index d2519f0..56638f2 100755
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -2439,7 +2439,7 @@ sub git_blame2 {
print <<HTML;
<div class="page_body">
<table class="blame">
-<tr><th>Prev</th><th>Diff</th><th>Commit</th><th>Line</th><th>Data</th></tr>
+<tr><th>Commit</th><th>Line</th><th>Data</th></tr>
HTML
while (<$fd>) {
/^([0-9a-fA-F]{40}).*?(\d+)\)\s{1}(\s*.*)/;
@@ -2447,8 +2447,6 @@ HTML
my $rev = substr($full_rev, 0, 8);
my $lineno = $2;
my $data = $3;
- my %pco = parse_commit($full_rev);
- my $parent = $pco{'parent'};
if (!defined $last_rev) {
$last_rev = $full_rev;
@@ -2457,26 +2455,11 @@ HTML
$current_color = ++$current_color % $num_colors;
}
print "<tr class=\"$rev_color[$current_color]\">\n";
- # Print the Prev link
- print "<td class=\"sha1\">";
- print $cgi->a({-href => href(action=>"blame", hash_base=>$parent, file_name=>$file_name)},
- esc_html(substr($parent, 0, 8)));
- print "</td>\n";
- # Print the Diff (blobdiff) link
- print "<td>";
- print $cgi->a({-href => href(action=>"blobdiff", file_name=>$file_name, hash_parent_base=>$parent,
- hash_base=>$full_rev)},
- esc_html("Diff"));
- print "</td>\n";
- # Print the Commit link
print "<td class=\"sha1\">" .
$cgi->a({-href => href(action=>"commit", hash=>$full_rev, file_name=>$file_name)},
esc_html($rev)) . "</td>\n";
- # Print the Line number
print "<td class=\"linenr\"><a id=\"l$lineno\" href=\"#l$lineno\" class=\"linenr\">" .
esc_html($lineno) . "</a></td>\n";
- # Print the Data
print "<td class=\"pre\">" . esc_html($data) . "</td>\n";
print "</tr>\n";
}
--
1.4.2.1.g271e
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2006-09-28 0:22 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-09-28 0:22 [PATCH] Revert "gitweb: extend blame to show links to diff and previous" Luben Tuikov
-- strict thread matches above, loose matches on Subject: below --
2006-09-28 0:18 Luben Tuikov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox