Re: gitweb and remote branches

["Giuseppe Bilotta" <giuseppe.bilotta@gmail.com>]

On 8/30/07, Jakub Narebski <jnareb@gmail.com> wrote:
> On Thu, 30 August 2007, Giuseppe Bilotta wrote:
> > What I had in mind was a way to modify 'heads' view with a boolean
> > option that enable/disabled remotes view.
>
> That is a good idea. We can for example use extra_options ('opt')
> parameter to pass 'refs/remotes' etc. to 'heads' view. Or we can
> use some new CGI parameter. Or just make it configurable in gitweb
> configuration, with per repository override, i.e. make it into
> %feature.

For the time being I've made it into a project-overridable %feature.
(It was easier to set up than I though.) I do like the idea of having
it also as an additional CGI parameter.

> > 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.
>
> Care to provide some ascii-art mockup?

(monospace view)

[heads]                | [remotes]
date headname links    | date headname links
date headname links    | date headname links

or a variation thereof. However, I have a 1600x1200 screen so not
everybody might be confortable with such a view.

> What I had in mind was for 'summary' view (*bold*, _underline_):
>
>   [heads]
>   27 min ago       _gitweb-allheads_   shortlog | log | tree
>   24 hours ago     master              shortlog | log | tree
>
>   [remotes]
>   *origin*
>     24 hours ago    man        shortlog | log | tree
>     24 hours ago    html       shortlog | log | tree
>     24 hours ago    next       shortlog | log | tree
>     24 hours ago    pu         shortlog | log | tree
>     24 hours ago    _master_   shortlog | log | tree
>     2 weeks ago     maint      shortlog | log | tree
>     2 weeks ago     todo       shortlog | log | tree
>
> and similarly for 'remotes' view (or 'heads').

I think I like yours better. I had just implemented split
remotes/heads list in summary view, so I'll keep working towards your
idea.

> Note that we remove remote name from remote branch name, although
> we can leave it as is (i.e. origin/man vs. man),

Yes, I'll work on this next.

> and that we filter
> out HEAD if it points to existing branch, marking one of the branches
> as current instead.

I don't know if I'll be able to implement this, but I'll try :)

> > 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.
>
> On
>
>   http://oblomov.dnsalias.org/git?p=git.git;a=heads
>
> I don't see any difference between formatting of remote heads and local
> branches.

Indeed, I removed the thing when I started working on the repo.

> > 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.
>
> Or refs/svn. I think that dumping remotes directly into refs/remotes
> and not to refs/remotes/<remote> is a bug (also in git-svn).

I think so too. I'll report it as a bug to the git-svn developers.

> > 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.
>
> You can also make a git fork at http://repo.or.cz

Oh, interesting. Just clicking on the 'fork' link in
http://repo.or.cz/w/git/gitweb.git and filling up the form?

I'll set that up as a mirror shortly.


-- 
Giuseppe "Oblomov" Bilotta