Re: [PATCH 2/2] gitweb: Option to not display information about owner

3 messages, 2 authors, 2016-06-15 · open the first message on its own page

Re: [PATCH 2/2] gitweb: Option to not display information about owner

From: Junio C Hamano <hidden>
Date: 2016-06-15 22:53:40

Kacper Kornet [off-list ref] writes:

quoted

I am guessing both #5401 and #5551 are $it->{'category'} of @projects[]
elements.

Yes, I have tested the tree with:

gitweb: Improve repository verification
gitweb: Option to omit column with time of the last change
gitweb: Option to not display information about owner

applied on top of v1.7.10. And all tests except 't91??' are passed.
Could you write on top of which revision have you applied these three
patches?

Let's see...

$ git log --oneline --first-parent --boundary master..kk/gitweb-omit-expensive
37e2621 gitweb: Option to not display information about owner
5710be4 gitweb: Option to omit column with time of the last change
75e0dff gitweb: Don't set owner if got empty value from projects.list
- fdec2eb Merge branch 'maint-1.7.9' into maint

I replayed these three on v1.7.10^0

$ git checkout v1.7.10^0
$ git format-patch --stdout fdec2eb..kk/gitweb-omit-expensive | git am -s3c

and the result fails exactly the same way, though.

*** prove ***
t9500-gitweb-standalone-no-errors.sh .. Dubious, test returned 1 (wstat 256, 0x100)
Failed 2/117 subtests
        (less 2 skipped subtests: 113 okay)

Test Summary Report
-------------------
t9500-gitweb-standalone-no-errors.sh (Wstat: 256 Tests: 117 Failed: 2)
  Failed tests:  116-117
  Non-zero exit status: 1
Files=1, Tests=117, 15 wallclock secs ( 0.07 usr  0.00 sys + 10.18 cusr  1.42 csys = 11.67 CPU)
Result: FAIL
make[1]: *** [prove] Error 1
make[1]: Leaving directory `/srv/git/t'
make: *** [test] Error 2

Re: [PATCH 2/2] gitweb: Option to not display information about owner

From: Kacper Kornet <hidden>
Date: 2016-06-15 22:53:40

On Thu, Apr 26, 2012 at 08:53:22AM -0700, Junio C Hamano wrote:

Kacper Kornet [off-list ref] writes:

quoted

I am guessing both #5401 and #5551 are $it->{'category'} of @projects[]
elements.

quoted

Yes, I have tested the tree with:

quoted

gitweb: Improve repository verification
gitweb: Option to omit column with time of the last change
gitweb: Option to not display information about owner

quoted

applied on top of v1.7.10. And all tests except 't91??' are passed.
Could you write on top of which revision have you applied these three
patches?

Let's see...

$ git log --oneline --first-parent --boundary master..kk/gitweb-omit-expensive
37e2621 gitweb: Option to not display information about owner
5710be4 gitweb: Option to omit column with time of the last change
75e0dff gitweb: Don't set owner if got empty value from projects.list
- fdec2eb Merge branch 'maint-1.7.9' into maint

I replayed these three on v1.7.10^0

$ git checkout v1.7.10^0
$ git format-patch --stdout fdec2eb..kk/gitweb-omit-expensive | git am -s3c

and the result fails exactly the same way, though.

Appereantly I have managed to send the different patch then I have
applied in my private tree. I'm sorry for my mistake. In a short time I
will send the correct one.

-- 
  Kacper Kornet

[PATCH v2 2/2] gitweb: Option to not display information about owner

From: Kacper Kornet <hidden>
Date: 2016-06-15 22:53:40

In some setups the repository owner is not a well defined concept
and administrator can prefer it to be not shown. This commit add
and an option that enable to reach this effect.

Signed-off-by: Kacper Kornet <redacted>
---
 Documentation/gitweb.conf.txt |    3 +++
 gitweb/gitweb.perl            |   21 +++++++++++++++------
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/Documentation/gitweb.conf.txt b/Documentation/gitweb.conf.txt
index d240a2f..4b8d1b1 100644
--- a/Documentation/gitweb.conf.txt
+++ b/Documentation/gitweb.conf.txt

@@ -503,6 +503,9 @@ $omit_age_column::
 	If true, omit the column with date of the most current commit on the
 	projects list page. It can save a bit of I/O and a fork per repository.
 
+$omit_owner::
+	If true prevents displaying information about repository owner.
+
 $per_request_config::
 	If this is set to code reference, it will be run once for each request.
 	You can	set parts of configuration that change per session this way.

diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index 6bddbff..6dbeb2f 100755
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl

@@ -136,6 +136,9 @@ our $export_ok = "++GITWEB_EXPORT_OK++";
 # don't generate age column on the projects list page
 our $omit_age_column = 0;
 
+# don't generate information about owners of repositories
+our $omit_owner=0;
+
 # show repository only if this subroutine returns true
 # when given the path to the project, for example:
 #    sub { return -e "$_[0]/git-daemon-export-ok"; }

@@ -5495,8 +5498,10 @@ sub git_project_list_rows {
 		                        ? esc_html_match_hl_chopped($pr->{'descr_long'},
 		                                                    $pr->{'descr'}, $search_regexp)
 		                        : esc_html($pr->{'descr'})) .
-		      "</td>\n" .
-		      "<td><i>" . chop_and_escape_str($pr->{'owner'}, 15) . "</i></td>\n";
+		      "</td>\n";
+		unless ($omit_owner) {
+		        print "<td><i>" . chop_and_escape_str($pr->{'owner'}, 15) . "</i></td>\n";
+		}
 		unless ($omit_age_column) {
 		        print "<td class=\"". age_class($pr->{'age'}) . "\">" .
 		            (defined $pr->{'age_string'} ? $pr->{'age_string'} : "No commits") . "</td>\n";

@@ -5532,7 +5537,9 @@ sub git_project_list_body {
 	                                 'tagfilter'  => $tagfilter)
 		if ($tagfilter || $search_regexp);
 	# fill the rest
-	my @all_fields = $omit_age_column ? ('descr', 'descr_long', 'owner', 'ctags', 'category') : ();
+	my @all_fields = ('descr', 'descr_long', 'ctags', 'category');
+	push @all_fields, ('age', 'age_string') unless($omit_age_column);
+	push @all_fields, 'owner' unless($omit_owner);
 	@projects = fill_project_list_info(\@projects, @all_fields);
 
 	$order ||= $default_projects_order;

@@ -5564,7 +5571,7 @@ sub git_project_list_body {
 		}
 		print_sort_th('project', $order, 'Project');
 		print_sort_th('descr', $order, 'Description');
-		print_sort_th('owner', $order, 'Owner');
+		print_sort_th('owner', $order, 'Owner') unless $omit_owner;
 		print_sort_th('age', $order, 'Last Change') unless $omit_age_column;
 		print "<th></th>\n" . # for links
 		      "</tr>\n";

@@ -6318,8 +6325,10 @@ sub git_summary {
 
 	print "<div class=\"title\">&nbsp;</div>\n";
 	print "<table class=\"projects_list\">\n" .
-	      "<tr id=\"metadata_desc\"><td>description</td><td>" . esc_html($descr) . "</td></tr>\n" .
-	      "<tr id=\"metadata_owner\"><td>owner</td><td>" . esc_html($owner) . "</td></tr>\n";
+	      "<tr id=\"metadata_desc\"><td>description</td><td>" . esc_html($descr) . "</td></tr>\n";
+        unless ($omit_owner) {
+	        print  "<tr id=\"metadata_owner\"><td>owner</td><td>" . esc_html($owner) . "</td></tr>\n";
+        }
 	if (defined $cd{'rfc2822'}) {
 		print "<tr id=\"metadata_lchange\"><td>last change</td>" .
 		      "<td>".format_timestamp_html(\%cd)."</td></tr>\n";

-- 
1.7.10

-- 
  Kacper Kornet

`h`	back out one level
`j`	next message in thread
`k`	previous message in thread
`l`	drill in
`Esc`	close help / fold thread tree
`?`	toggle this help