Edgewall Software
Modify

Opened 10 years ago

Closed 10 years ago

Last modified 8 years ago

#9869 closed enhancement (fixed)

When seeing a branch in browse/log the name of the branch isn't shown (Mercurial)

Reported by: Ismael de Esteban <ismael@…> Owned by: Remy Blank
Priority: normal Milestone: 1.0
Component: version control/log view Version:
Severity: normal Keywords:
Cc: Branch:
Release Notes:

In TracRevisionLog and TracBrowser, show the name of the current branch

API Changes:
Internal Changes:

Description

When using mercurial in branched development, in operation with branches never appear the related branch.

Attachments (1)

9869-show-branches-tags-r10426.patch (3.1 KB ) - added by Remy Blank 10 years ago.
Show branches and tags in source browser and change log.

Download all attachments as: .zip

Change History (12)

comment:1 by Remy Blank, 10 years ago

Component: plugin/mercurialversion control/log view
Milestone: 0.13
Owner: set to Remy Blank

The branch name should definitely be shown at least in the revision log. I'm not sure about the browser, though.

by Remy Blank, 10 years ago

Show branches and tags in source browser and change log.

comment:2 by Remy Blank, 10 years ago

9869-show-branches-tags-r10426.patch adds branch and tag labels in the source browser (below the path) and in the change log (after the summary). The styles are the same as in the timeline. The colors stick out a bit, but are not too bad.

comment:3 by Christian Boos, 10 years ago

Applied on demo-0.13: demo-0.13/log/trac.hg. Looks good!

comment:4 by Remy Blank, 10 years ago

Whoa, you're fast :) See also the top-left of demo-0.13/browser/trac.hg.

Ok, I'm going to apply the patch shortly.

comment:5 by Christian Boos, 10 years ago

I just happen to be around … working on a fix similar to r10431 ;-) (I've updated to that version now).

comment:6 by Remy Blank, 10 years ago

Resolution: fixed
Status: newclosed

Patch applied in [10433].

(Mmh… That revision didn't sync…)

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

(Mmh… That revision didn't sync…)

See #9978. I called the hook manually once again.

comment:8 by hvr@…, 10 years ago

btw, why are you excluding master and default branches in [10433], and on the other hand, trunk is not excluded…?

in reply to:  8 comment:9 by Remy Blank, 10 years ago

Replying to hvr@…:

btw, why are you excluding master and default branches in [10433]

I used the same exclusion as we have on the timeline, so I didn't give that any thought. Christian?

and on the other hand, trunk is not excluded…?

Trunk is mostly a Subversion term, which doesn't have the concepts of branch and tag (no, copies don't cut it). We don't show the branches or tags with Subversion (at least up to now), so trunk is never shown anyway.

comment:10 by Christian Boos, 10 years ago

See #9607. My first approach was to allow each backend to contribute to branch/tag ignore lists, but then that proved too complicated for what it was worth (basically adding only 'master' for Git, and 'default' for Mercurial). 'trunk' is not excluded as if it is present in either Mercurial or Git, then it's worth mentioning it, as it's not the default for that kind of repository. I admit that by the same reasoning, a branch named 'master' for a Mercurial repository and a branch named 'default' for a Git repository should be shown as such. So this is indeed perfectible.

comment:11 by Christian Boos, 8 years ago

Release Notes: modified (diff)

Modify Ticket

Change Properties
Set your email in Preferences
Action
as closed The owner will remain Remy Blank.
The resolution will be deleted. Next status will be 'reopened'.
to The owner will be changed from Remy Blank 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.