Re: gitweb and remote branches

From: Giuseppe Bilotta <giuseppe.bilotta@gmail.com>
Date: Aug 30, 2007, 07:18 UTC
Message-ID: <cb7bb73a0708300018u37f5c465u5d87eae0eb23543c@mail.gmail.com>
In-Reply-To: <200708300001.39203.jnareb@gmail.com>

On 8/30/07, Jakub Narebski <jnareb@gmail.com> wrote:

> For quick'n'dirty solution this might be enough. For proper patch to
> be accepted I don't think so.

That's fine, it wasn't meant to be :)

> First, in the idea to show also remote branches (from refs/remotes),
> I wanted to separate heads list from remotes list in the 'summary'
> view, and add 'remotes' view or modify 'heads' view to accept some
> parameter specyfying kind of refs.

What I had in mind was a way to modify 'heads' view with a boolean option that enable/disabled remotes view. For their visualizations, I had in mind a split 'heads' secion, with the lhs being as it is now, and the rhs having the remotes.

However, I wasn't sure if such a view would have been appreciated, so I went for the merged view and used the spans to make the heads appear as they do in the shortlog, as a clear way to mark which ones were local and which ones were remote.

Show 5 quoted lines

> Second, what was stopping me from implementing that was an idea to
> separate remote branches into categories (like gitwbe-xmms2 categories
> of projects) defined by the remote it belongs to. And this is not so
> easy if we want to respect old .git/branches/ and .git/remotes/ remote
> config in addition to new config based remote config.

I don't know what gitweb-xmms2 does, but I think I understand what you mean, and I like the idea. However, it's even harder if you consider that even the latest git-svn plops all the svn-converted refs straight into refs/remotes and not in a subdir such as refs/remotes/svn.

OTOH, we have to start from somewhere so we can build the feature step by step.

Show 8 quoted lines

> > Giuseppe "Oblomov" Bilotta
> >
> > --- gitweb.cgi        2007-08-26 12:41:13.000000000 +0200
> > +++ gitweb.cgi-my     2007-08-28 13:47:15.000000000 +0200
>
> It is better to use git to manage source and to generate patches
> (use git-format-patch, check Documentation/SubmittingPatches),
> and use gitweb/gitweb.perl and not installed version.

Oh, I know, this was just a very quick hack on the thing installed by my Debian distribution. I've since checkoued out the git.git repository and I'll be working on that now.

Show 20 quoted lines

> > @@ -3237,8 +3238,10 @@ sub git_heads_body {
> >               $alternate ^= 1;
> >               print "<td><i>$ref{'age'}</i></td>\n" .
> >                     ($curr ? "<td class=\"current_head\">" : "<td>") .
> > +                   "<span class=\"refs\"><span class=\"$ref{'class'}\">" .
> >                     $cgi->a({-href => href(action=>"shortlog", hash=>$ref{'name'}),
> >                              -class => "list name"},esc_html($ref{'name'})) .
> > +                   "</span></span>" .
> >                     "</td>\n" .
> >                     "<td class=\"link\">" .
> >                     $cgi->a({-href => href(action=>"shortlog",
> > hash=>$ref{'name'})}, "shortlog") . " | " .
> >
>
> I don't understand this double span. First, you can set multiple
> classes for HTML element by separating them by space, e.g.
>
>                 "<span class=\"refs\ $ref{'class'}\">"
>
> And you could have given appropriate class to <td> or <a> element

Actually, that was just a quick hack to make the heads appear in the heads list in the same way as they appear in the shortlog, to differentiate between them. And that requires the double span ;)

Of course, I'd rather hack the CSS now that I've got the git repository.

I'll be working on it here

http://oblomov.dnsalias.org/git?p=git.git;a=shortlog;h=gitweb-allheads

and keep you posted on my progress.

-- 
Giuseppe "Oblomov" Bilotta