undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gitweb: Mark commits with no "previous" in 'blame' view

Browse Source 
Use "no-previous" class to mark blamed commits which do not have
"previous" header.  Those are commits in which blamed file was created
(added); this includes boundary commits.  This means that 'linenr'
link leads to blamed commit, not (one of) parent of blamed commit.
Therefore currently line number for such commit uses bold weight font
to denote this situation; the effect is subtle.

Use "multiple-previous" class in the opposite situation, where blamed
commit has multiple "previous" headers (is an evil merge).  Currently
this class is not used for styling.  In this situation 'linenr' link
leads to first of "previous" commits (first parent).

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jakub Narebski 2009-07-25 00:44:04 +02:00 committed by Junio C Hamano
parent 11930423d1
commit 3665e7e7f2
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gitweb/gitweb.css
View File

@ -242,7 +242,8 @@ tr.dark:hover {
background-color: #edece6; background-color: #edece6;
} }
tr.boundary td.sha1 { tr.boundary td.sha1,
tr.no-previous td.linenr {
font-weight: bold; font-weight: bold;
} }

7
gitweb/gitweb.perl
View File

@ -4819,7 +4819,7 @@ HTML
my ($full_rev, $orig_lineno, $lineno, $group_size) = my ($full_rev, $orig_lineno, $lineno, $group_size) =
($line =~ /^([0-9a-f]{40}) (\d+) (\d+)(?: (\d+))?$/); ($line =~ /^([0-9a-f]{40}) (\d+) (\d+)(?: (\d+))?$/);
if (!exists $metainfo{$full_rev}) { if (!exists $metainfo{$full_rev}) {
$metainfo{$full_rev} = {}; $metainfo{$full_rev} = { 'nprevious' => 0 };
} }
my $meta = $metainfo{$full_rev}; my $meta = $metainfo{$full_rev};
my $data; my $data;
@ -4829,6 +4829,9 @@ HTML
if ($data =~ /^(\S+)(?: (.*))?$/) { if ($data =~ /^(\S+)(?: (.*))?$/) {
$meta->{$1} = $2 unless exists $meta->{$1}; $meta->{$1} = $2 unless exists $meta->{$1};
} }
if ($data =~ /^previous /) {
$meta->{'nprevious'}++;
}
} }
my $short_rev = substr($full_rev, 0, 8); my $short_rev = substr($full_rev, 0, 8);
my $author = $meta->{'author'}; my $author = $meta->{'author'};
@ -4840,6 +4843,8 @@ HTML
} }
my $tr_class = $rev_color[$current_color]; my $tr_class = $rev_color[$current_color];
$tr_class .= ' boundary' if (exists $meta->{'boundary'}); $tr_class .= ' boundary' if (exists $meta->{'boundary'});
$tr_class .= ' no-previous' if ($meta->{'nprevious'} == 0);
$tr_class .= ' multiple-previous' if ($meta->{'nprevious'} > 1);
print "<tr id=\"l$lineno\" class=\"$tr_class\">\n"; print "<tr id=\"l$lineno\" class=\"$tr_class\">\n";
if ($group_size) { if ($group_size) {
print "<td class=\"sha1\""; print "<td class=\"sha1\"";