Re: What's cooking in git.git (Jul 2015, #01; Wed, 1)

From

Tony Finch <dot@dotat.at>

Date

Jul 22, 2015, 10:05 UTC

Message-ID

<alpine.LSU.2.00.1507220957350.16350@hermes-1.csi.cam.ac.uk>

In-Reply-To

<55AE8ACF.6090508@gmail.com>

Jakub Narębski <jnareb@gmail.com> wrote:

>

Thanks for the review!

> > * tf/gitweb-project-listing (2015-03-19) 5 commits
> >  - gitweb: make category headings into links when they are directories
> >  - gitweb: optionally set project category from its pathname
> >  - gitweb: add a link under the search box to clear a project filter
> >  - gitweb: if the PATH_INFO is incomplete, use it as a project_filter
> >
> >  Update gitweb to make it more pleasant to deal with a hierarchical
> >  forest of repositories.

> Second one, "gitweb: if the PATH_INFO is incomplete, use it as a
> project_filter" looks interesting and quite useful. Though it doesn't
> do much: it allows for handcrafted URL, and provides mechanism to
> create breadcrumbs. It doesn't use this feature in its output...
> Well, I think it doesn't: I cannot check it at this moment.

Hmm, I think this means I need a better commit message.

> What is missing is a support for query parameters path, and not only
> path info.

> Thought some thought is needed for generating (or not) breadcrumbs
> if path_info is turned off.

That already works in unpatched gitweb.

> The third, "gitweb: add a link under the search box to clear a project
> filter" notices a problem... then solves it in strange way. IMVHO
> a better solution would be to add "List all projects" URL together
> with " / " (or other separator) conditionally, if $project_filter
> is set. Or have "List all projects" and add "List projects$limit"
> if $project_filter is set.

Yes, that is exactly what the patch does. I used a suffix "if" to align
the print statements and markup:
+           if $project_filter;

Compare and contrast the search box on these pages:

Perhaps you would prefer the following?

--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -5549,10 +5549,14 @@ sub git_project_search_form {
              "</span>\n" .
              $cgi->submit(-name => 'btnS', -value => 'Search') .
              $cgi->end_form() . "\n" .
-             $cgi->a({-href => href(project => undef, searchtext => undef,
-                                    project_filter => $project_filter)},
-                     esc_html("List all projects$limit")) . "<br />\n";
-       print "</div>\n";
+             $cgi->a({-href => $my_uri}, esc_html("List all projects"));
+       if ($project_filter) {
+               print " / " .
+                   $cgi->a({-href => href(project => undef, action => "project_list",
+                                          project_filter => $project_filter)},
+                           esc_html("List projects$limit"));
+       }
+       print "<br />\n</div>\n";
 }

 # entry for given @keys needs filling if at least one of keys in list

> The last two, which form the crux of this patch series, looks like
> a good idea, though not without a few caveats. I am talking here
> only about conceptual level, not about how it is coded (which has
> few issues as well):
>
> - I think that non-bare repositories "repo/.git" should be
>   treated as one directory entry, i.e. gitweb should not create
>   a separate category for "repo/".  This is admittedly a corner
>   case, but useful for git-instaweb

Yes, that's a bug, thanks for spotting it!

> - I think that people would want to be able to configure how
>   many levels of directory hierarchy gets turned into categories.
>   Perhaps only top level should be turned into category? Deep
>   hierarchies means deep categories (usually with very few
>   repositories) with current implementation.

Good question. I was assuming flat-ish directory hierarchies, but that's
clearly not very true, e.g. https://git.kernel.org/cgit/

I think it would be right to make this a %feature since categories already
nearly fit the %feature per-project override style.

I will send a new version of the series shortly.

Tony.

-- 
f.anthony.n.finch  <dot@dotat.at>  http://dotat.at/
Viking, North Utsire: Westerly 4 or 5, occasionally 6 at first, backing
southerly 3 or 4. Moderate becoming slight. Occasional rain in north. Good,
occasionally moderate.