Edgewall Software
Modify

Opened 10 years ago

Closed 10 years ago

Last modified 8 years ago

#9607 closed enhancement (fixed)

Rework branch labeling in the timeline

Reported by: Christian Boos Owned by: Christian Boos
Priority: normal Milestone: 1.0
Component: version control Version: 0.13dev
Severity: normal Keywords: branch tag label
Cc: Branch:
Release Notes:

Timeline: the changesets entries display their associated tags, if any

API Changes:

versioncontrol: added Changeset.get_tags() [10077]

Internal Changes:

Description (last modified by Christian Boos)

In #8843, we added the possibility to display the branch information for each changeset in the timeline.

However, it doesn't look that nice when we also display the list of changed files inline: Example for #8843, as it looks like in Trac 0.12

It would be better to show this label like the gitweb and the hg web interfaces do, after the changeset number, not on the next line.

A second (minor) issue with the above is that we always show the default label for Mercurial repositories. I ended up using a simple ignore list (default, master).

With display-branch-in-event-title-r9966.patch, we have: New layout for the branch labels

A second step is to add support for displaying the tag labels.

With display-tags-in-changeset-events-r9966.patch, we have: Show the tag labelsShow the tag labels (a bit further down in the history)

Attachments (6)

timeline-8843.png (22.7 KB ) - added by Christian Boos 10 years ago.
Example for #8843, as it looks like in Trac 0.12
timeline-new-branch-labels.png (19.6 KB ) - added by Christian Boos 10 years ago.
New layout for the branch labels
timeline-new-tag-labels-1.png (20.2 KB ) - added by Christian Boos 10 years ago.
Show the tag labels
timeline-new-tag-labels-2.png (16.9 KB ) - added by Christian Boos 10 years ago.
Show the tag labels (a bit further down in the history)
display-branch-in-event-title-r9966.patch (3.0 KB ) - added by Christian Boos 10 years ago.
display branch name label in the timeline event's title line instead of its description. Applies on r10060.
display-tags-in-changeset-events-r9966.patch (2.5 KB ) - added by Christian Boos 10 years ago.
display tag labels for the changeset events in the timeline. Applies on display-branch-in-event-title-r9966.patch.

Download all attachments as: .zip

Change History (14)

by Christian Boos, 10 years ago

Attachment: timeline-8843.png added

Example for #8843, as it looks like in Trac 0.12

by Christian Boos, 10 years ago

New layout for the branch labels

by Christian Boos, 10 years ago

Show the tag labels

by Christian Boos, 10 years ago

Show the tag labels (a bit further down in the history)

by Christian Boos, 10 years ago

display branch name label in the timeline event's title line instead of its description. Applies on r10060.

by Christian Boos, 10 years ago

display tag labels for the changeset events in the timeline. Applies on display-branch-in-event-title-r9966.patch.

comment:1 by Christian Boos, 10 years ago

Description: modified (diff)

comment:2 by Christian Boos, 10 years ago

Remy, your comment on this, please? ;-)

comment:3 by Remy Blank, 10 years ago

I don't have time to dive into the code ATM, but the result is very nice.

comment:4 by Christian Boos, 10 years ago

API Changes: modified (diff)
Release Notes: modified (diff)
Resolution: fixed
Status: newclosed

Well, the code was cleaned up during the process of creating this ticket (I previously had some filtering arguments in get_branches() I was not fully convinced about), so my remaining question mark was more if you liked the final result ;-)

Applied in [10076:10077].

comment:5 by fbrettschneider@…, 8 years ago

I noticed that branch timeline-displaying does not work for SVN commits, though it does with Mercurial commits; you can check that on the t.e.o timeline. Is there a ticket tracking this remaining issue?

in reply to:  5 ; comment:6 by Christian Boos, 8 years ago

Replying to fbrettschneider@…:

I noticed that branch timeline-displaying does not work for SVN commits

Right, it's not implemented for svn.

Is there a ticket tracking this remaining issue?

No, please create a feature request if you like (PatchWelcome applies ;-) ). Implementation hint: same code as for changeset_show_files=location, combined with matching on the patterns given in [svn] branches / tags.

in reply to:  6 ; comment:7 by Christian Boos, 8 years ago

(and btw, one of the reason it's not implemented is precisely because [timeline] changeset_show_files=location somehow already fills that need, you may want to have a try)

in reply to:  7 comment:8 by fbrettschneider@…, 8 years ago

Replying to cboos:

… because [timeline] changeset_show_files=location somehow already fills that need

Yes, it's perfect for me. Thanks for your hint.

Modify Ticket

Change Properties
Set your email in Preferences
Action
as closed The owner will remain Christian Boos.
The resolution will be deleted. Next status will be 'reopened'.
to The owner will be changed from Christian Boos to the specified user.

Add Comment


E-mail address and name can be saved in the Preferences .
 
Note: See TracTickets for help on using tickets.