Skip to contentSkip to conversation

gitweb: Slight visual improvements to commitdiff view

PATCH New Jakub Narebski 4 participants 7 messages Aug 11, 2016

lore
Share & tools
lore
#5 lore raw
In reply to Luben Tuikov
Quoted 7 lines · Luben Tuikov

--- Jakub Narebski <[email protected]> wrote:
...

Quoted 2 lines

Those changes might wait for proper refactoring of gitweb CSS (having for example 8px padding in one place only).

Excellent! I'd like this explanation to be part of the commit message if that patchset is committed to git.git.

I'd like that kind of explanation with the patch in a single message when it is ready to be applied, too.

I'll leave it up to you guys to decide if CSS refactoring should go in first (I personally feel it probably is the case, in which case this patch would need to be rebased I suspect).

#6 lore raw

Dear diary, on Fri, Oct 27, 2006 at 03:42:06AM CEST, I got a letter where Junio C Hamano <[email protected]> said that...

Quoted 10 lines
Quoted 7 lines · Luben Tuikov

--- Jakub Narebski <[email protected]> wrote:
...

Quoted 2 lines

Those changes might wait for proper refactoring of gitweb CSS (having for example 8px padding in one place only).

Excellent! I'd like this explanation to be part of the commit message if that patchset is committed to git.git.

Quoted 6 lines

I'd like that kind of explanation with the patch in a single message when it is ready to be applied, too.

I'll leave it up to you guys to decide if CSS refactoring should go in first (I personally feel it probably is the case, in which case this patch would need to be rebased I suspect).

We don't have any such patch, do we? So let anyone doing that patch take this one into account and merge in whatever we have, I'd say.

Signature · 4 lines
				Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
#!/bin/perl -sp0777i<X+d*lMLa^*lN%0]dsXx++lMlN/dsM0<j]dsj
$/=unpack('H*',$_);$_=`echo 16dio\U$k"SK$/SM$n\EsN0p[lN*1
#0 lore raw

PATCH 1/1 gitweb: Slight visual improvements to commitdiff view

---
 gitweb/gitweb.css  |   14 +++++++++++++-
 gitweb/gitweb.perl |   15 +++++++++------
 2 files changed, 22 insertions(+), 7 deletions(-)
gitweb/gitweb.css +13 -1
index 0eda982..cb2c627 100644
@@ -114,7 +114,7 @@ div.log_link {
 	width: 136px;
 }
 
-div.list_head {
+div.diff_tree_head {
 	padding: 6px 8px 4px;
 	border: solid #d9d8d1;
 	border-width: 1px 0px 0px;
@@ -128,6 +128,18 @@ div.author_date {
 	font-style: italic;
 }
 
+div.commitdiff_log {
+	padding: 8px;
+	border: solid #d9d8d1;
+	border-width: 0px 0px 1px 0px;
+}
+
+div.patchset {
+	padding-top: 8px;
+	border: solid #d9d8d1;
+	border-width: 1px 0px 0px 0px;
+}
+
 a.list {
 	text-decoration: none;
 	color: #000000;
gitweb/gitweb.perl +4 -3
index 0d2ea72..a33cae1 100755
@@ -1844,11 +1844,11 @@ sub git_print_tree_entry {
 sub git_difftree_body {
 	my ($difftree, $hash, $parent) = @_;
 
-	print "<div class=\"list_head\">\n";
 	if ($#{$difftree} > 10) {
+		print "<div class=\"list_head\">\n";
 		print(($#{$difftree} + 1) . " files changed:\n");
+		print "</div>\n";
 	}
-	print "</div>\n";
 
 	print "<table class=\"diff_tree\">\n";
 	my $alternate = 1;
@@ -2055,7 +2055,8 @@ sub git_patchset_body {
 
 			# for now, no extended header, hence we skip empty patches
 			# companion to	next LINE if $in_header;
-			if ($diffinfo->{'from_id'} eq $diffinfo->{'to_id'}) { # no change
+			if ($diffinfo->{'from_id'} eq $diffinfo->{'to_id'}) {
+				# no change, empty patch
 				$in_header = 1;
 				next LINE;
 			}
@@ -3486,13 +3487,15 @@ sub git_commitdiff {
 		git_print_page_nav('commitdiff','', $hash,$co{'tree'},$hash, 

$formats_nav);
git_print_header_div('commit', esc_html($co{'title'}) . $ref, $hash); git_print_authorship(\%co);
- print "<div class=\"page_body\">\n";
+
if (@{$co{'comment'}} > 1) {
- print "<div class=\"log\">\n";
+ print "<div class=\"commitdiff_log\">\n";
git_print_log($co{'comment'}, -final_empty_line=> 1, -remove_title
=> 1);
- print "</div>\n"; # class="log"
+ print "</div>\n"; # class="commitdiff_log"
}

+ print "<div class=\"page_body\">\n";
+
} elsif ($format eq 'plain') {
my $refs = git_get_references("tags"); my $tagname = git_get_rev_name_tags($hash);

Signature · 1 line
1.4.3.3
#3 lore raw
In reply to Luben Tuikov
Quoted 8 lines · Luben Tuikov

Can you please explain what both patches actually do?

"slight visual improvements to commitdiff view" leaves much, _much_ to be desired and is hardly a commit message suitable to live in git.git.

Please describe what you found objectionable, why, how you decided to fix it and why you decided to fix it that way.

Adding difftree/whatchanged output to commitdiff view was somewhat hasty, without taking care of details like separator between message body and difftree, and separator between difftree and patchset.

First, I have removed creating empty divs. The div with number of changed files in git_difftree_body is added only if the message about number of changed files is displayed (above 10).

Second, I have moved commit message body in commitdiff outside "page_body" div, to be together with "author_date" div with authorship info. The name of class was changed from "log" to more informative "commitdiff_log". This required some changes and additions to CSS. Now "commitdiff_log" div is responsible for displaying line separatring it from "page_body".

I have added not full line above "patchset" div (between patchet and difftree). It is added by "patchset" div and separated by 8px padding.

Those changes might wait for proper refactoring of gitweb CSS (having for example 8px padding in one place only).

Signature · 1 line
Jakub Narebski
#4 lore raw
Quoted 11 lines · --- Jakub Narebski

First, I have removed creating empty divs. The div with number of changed files in git_difftree_body is added only if the message about number of changed files is displayed (above 10).

Second, I have moved commit message body in commitdiff outside "page_body" div, to be together with "author_date" div with authorship info. The name of class was changed from "log" to more informative "commitdiff_log". This required some changes and additions to CSS. Now "commitdiff_log" div is responsible for displaying line separatring it from "page_body".

Quoted 6 lines

I have added not full line above "patchset" div (between patchet and difftree). It is added by "patchset" div and separated by 8px padding.

Those changes might wait for proper refactoring of gitweb CSS (having for example 8px padding in one place only).

Excellent! I'd like this explanation to be part of the commit message if that patchset is committed to git.git.

Luben

#2 lore raw
In reply to Jakub Narebski

Can you please explain what both patches actually do?

"slight visual improvements to commitdiff view" leaves much, _much_ to be desired and is hardly a commit message suitable to live in git.git.

Please describe what you found objectionable, why, how you decided to fix it and why you decided to fix it that way.

Thanks,
Luben

#1 lore raw

PATCH 1/1 gitweb: Slight visual improvements to commitdiff view

In reply to Jakub Narebski

---
This amend fixes regression which caused signoff lines to be not highlighted as such.

 gitweb/gitweb.css  |   16 ++++++++++++++--
 gitweb/gitweb.perl |   18 ++++++++++--------
 2 files changed, 24 insertions(+), 10 deletions(-)
gitweb/gitweb.css +14 -2
index 0eda982..83d900d 100644
@@ -100,7 +100,7 @@ span.age {
 	font-style: italic;
 }
 
-div.page_body span.signoff {
+span.signoff {
 	color: #888888;
 }
 
@@ -114,7 +114,7 @@ div.log_link {
 	width: 136px;
 }
 
-div.list_head {
+div.diff_tree_head {
 	padding: 6px 8px 4px;
 	border: solid #d9d8d1;
 	border-width: 1px 0px 0px;
@@ -128,6 +128,18 @@ div.author_date {
 	font-style: italic;
 }
 
+div.commitdiff_log {
+	padding: 8px;
+	border: solid #d9d8d1;
+	border-width: 0px 0px 1px 0px;
+}
+
+div.patchset {
+	padding-top: 8px;
+	border: solid #d9d8d1;
+	border-width: 1px 0px 0px 0px;
+}
+
 a.list {
 	text-decoration: none;
 	color: #000000;
gitweb/gitweb.perl +10 -8
index 0d2ea72..044a47d 100755
@@ -1844,11 +1844,11 @@ sub git_print_tree_entry {
 sub git_difftree_body {
 	my ($difftree, $hash, $parent) = @_;
 
-	print "<div class=\"list_head\">\n";
 	if ($#{$difftree} > 10) {
+		print "<div class=\"list_head\">\n";
 		print(($#{$difftree} + 1) . " files changed:\n");
+		print "</div>\n";
 	}
-	print "</div>\n";
 
 	print "<table class=\"diff_tree\">\n";
 	my $alternate = 1;
@@ -2053,9 +2053,9 @@ sub git_patchset_body {
 			}
 			$patch_idx++;
 
-			# for now, no extended header, hence we skip empty patches
-			# companion to	next LINE if $in_header;
-			if ($diffinfo->{'from_id'} eq $diffinfo->{'to_id'}) { # no change
+			# for now we skip empty patches
+			if ($diffinfo->{'from_id'} eq $diffinfo->{'to_id'}) {
+				# no change, empty patch
 				$in_header = 1;
 				next LINE;
 			}
@@ -3486,13 +3486,15 @@ sub git_commitdiff {
 		git_print_page_nav('commitdiff','', $hash,$co{'tree'},$hash, $formats_nav);
 		git_print_header_div('commit', esc_html($co{'title'}) . $ref, $hash);
 		git_print_authorship(\%co);
-		print "<div class=\"page_body\">\n";
+
 		if (@{$co{'comment'}} > 1) {
-			print "<div class=\"log\">\n";
+			print "<div class=\"commitdiff_log\">\n";
 			git_print_log($co{'comment'}, -final_empty_line=> 1, -remove_title => 1);
-			print "</div>\n"; # class="log"
+			print "</div>\n"; # class="commitdiff_log"
 		}
 
+		print "<div class=\"page_body\">\n";
+
 	} elsif ($format eq 'plain') {
 		my $refs = git_get_references("tags");
 		my $tagname = git_get_rev_name_tags($hash);
Signature · 1 line
1.4.3.3