Context Navigation

Modify ↓

#7665 closed defect (fixed)

Incorrect merge diffs in TracMercurial

Reported by:	kent37@…	Owned by:	Christian Boos
Priority:	high	Milestone:	not applicable
Component:	plugin/mercurial	Version:	0.11-stable
Severity:	normal	Keywords:
Cc:		Branch:
Release Notes:
API Changes:
Internal Changes:

Description

When displaying merge changesets from a Mercurial repository, the (diff) links are incorrect. For example I get a link
.../changeset/2?old=71%3A389982237c52
which should be
.../changeset/72?old=71%3A389982237c52.

The problem is at http://trac.edgewall.org/browser/sandbox/mercurial-plugin-0.11/tracext/hg/backend.py?rev=7430#L80
new = context.resource.id[1]

which should be
new = context.resource.id

With this change the above example renders as
.../changeset/72%3A3259b893a4ac?old=71%3A389982237c52.

Problem detected with Trac 0.11.1, TracMercurial 0.11.0.5dev running on Python 2.5 under Windows.

Attachments (0)

Change History (2)

comment:1 by Christian Boos, 16 years ago

Component:	version control/changeset view → plugin/mercurial
Milestone:	→ not applicable
Owner:	set to Christian Boos
Priority:	normal → high

Woops, problem introduced in r7262 (in the 0.12 branch of the plugin, the id is a pair: (reponame,id)).

comment:2 by Christian Boos, 16 years ago

Resolution:	→ fixed
Status:	new → closed

Fixed in r7558. Thanks for the report & solution!

Modify Ticket

Change Properties

Summary:
Description:	When displaying merge changesets from a Mercurial repository, the (diff) links are incorrect. For example I get a link [[BR]] {{{.../changeset/2?old=71%3A389982237c52}}} [[BR]] which should be [[BR]] {{{.../changeset/72?old=71%3A389982237c52}}}. The problem is at http://trac.edgewall.org/browser/sandbox/mercurial-plugin-0.11/tracext/hg/backend.py?rev=7430#L80 [[BR]] {{{new = context.resource.id[1]}}} which should be[[BR]] {{{new = context.resource.id}}} With this change the above example renders as [[BR]] {{{.../changeset/72%3A3259b893a4ac?old=71%3A389982237c52}}}. Problem detected with Trac 0.11.1, TracMercurial 0.11.0.5dev running on Python 2.5 under Windows. You may use WikiFormatting here.
Type:		Priority:
Milestone:		Component:
Version:		Severity:
Keywords:		Cc:	Set your email in Preferences
Branch:
Release Notes:
API Changes:
Internal Changes:

Action

leave as closed The owner will remain Christian Boos.

reopen The resolution will be deleted. Next status will be 'reopened'.

change ownership to The owner will be changed from Christian Boos to the specified user.

Add Comment

Your email or username:

E-mail address and name can be saved in the Preferences .

You may use WikiFormatting here.

Attachments ↑ Description ↑

Note: See TracTickets for help on using tickets.

Download in other formats: