Display branch name in timeline

[Yann Dirson <ydirson@…>]

The timeline is highly uninformative about commits, when there are branches in a repository. No way to see at first glance which branch was impacted (and well, enforcing a trac-like "branchname in commit message" policy is not the best idea ;)

[Yann Dirson <ydirson@…>]

I realize that for svn this issue is tied to #1135 and possibly not that trivial, but for SCMs with real branch support (git, hg and such), such a feature should not be too hard to implement.

[Christian Boos]

Note that for svn, you can already get some quite informative display when using the following setting in your trac.ini:

[timeline]
changeset_show_files = location

In 0.12, you will see the repository name, in case you're using multiple repositories for tracking your branches (typical Mercurial style, though this is changing with increased support of in-repository named branches).

So, yes, that's a possible improvement we should consider, possibly by adding a branch method to the Changeset class.

[Yann Dirson <ydirson@…>]

Another related issue would be the display of tags. I am not sure if the hg plugin handles tags aside from adding them to the quickjmp list (there is something about Tags as node properties which could get them displayed, but then I'm no hg user and could find no trac-hg public install showing this). Would this better belong to another ticket ?

[Christian Boos]

No, it's fine to discuss that here.

We should probably have a display similar to what the other repository browsers do (e.g. ​http://selenic.com/repo/hg, ​http://repo.or.cz/w/git.git).

[Christian Boos]

First version in attachment:t8843-timeline-show-branches-r9234.patch​ for the Trac part and attachment:t8843-mercurial.patch​ for the MercurialChangeset.get_branches().

[Christian Boos]

TracMercurial: add MercurialChangeset.get_branches()

[Christian Boos]

TracTimeline: display branch information for changesets, when available.

[Remy Blank]

Looks good. You could make the non-head background slightly darker, something like #ffb. As it is, it looks mostly white on my screen. OTOH, too much color is bad, too, so maybe a light grey background would be even better.

[Christian Boos]

Replying to rblank:

… OTOH, too much color is bad, too, so maybe a light grey background would be even better.

Yes, I don't think the non-head branch info should catch the eye, so even if it looks mostly white, I think it's fine. Therefore I picked a lightgrey background in [9247].

[Christian Boos]

Related changes for TracMercurial committed in [9248].

[Christian Boos]

Follow-up to cboos:

I don't think the non-head branch info should catch the eye, so even if it looks mostly white, I think it's fine.

And btw. I think that it still catches too much the eye, so one could even try:

trac/htdocs/css/timeline.css

@@ -77 +77 @@
 dd.changeset .changes .move    { background: #ccc }
 dd.changeset .branch {
  font-size: 85%;
- background: #f6f6f6;
- border: 1px solid #ddd;
+ background: none;
+ border: 1px solid #eee;
  margin: 0 .5em 0 0;
  padding: 0 .2em;
  float: left;

[Remy Blank]

No background looks good, too, but I'd keep the border at #ddd, otherwise it starts looking too much like the branch name is part of the message.

[Remy Blank]

On second thought, I think I prefer the grey background.