TEXTNote: this is a STARTstrong-1-1TEXTmerge-1-1ENDstrong-1-1 changeset ...

[anonymous]

Changeset view contains strange text, for example changeset:a311aa01ebcb/mercurial-plugin/ looks like this:

Parents:
    44:ed4f0932196b (diff), 45:7c49d0e31747 (diff)
    TEXTNote: this is a STARTstrong-1-1TEXTmerge-1-1ENDstrong-1-1 changeset, the changes displayed below correspond to the merge itself.-1-1
    TEXTUse the STARTtt-1-1TEXT(diff)-1-1ENDtt-1-1 links above to see all the changes relative to each parent.-1-1

Maybe only for Mercurial repositories?

[anonymous]

• Git​: tag.span(Markup(_("Note: this is a <strong>merge" ...
• Mercurial​: tag.span(tag_("Note: this is a %(merge)s changeset, " ... merge=tag.strong('merge')),

[Jun Omae]

Thanks for the reporting.

[Jun Omae]

Properties in Git repository are correctly rendered, e.g. [857da2682/jomae.git].

[Jun Omae]

The mercurial-plugin directly depends Genshi library. We should import tag from trac.util.html to work on Trac 1.0 through 1.3dev.

tracext/hg/backend.py

@@ -25 +25 @@
 
 import pkg_resources
 
-from genshi.builder import tag
-
 from trac.core import *
 from trac.config import BoolOption, ChoiceOption, ListOption, PathOption
 from trac.env import ISystemInfoProvider
 from trac.util import arity
 from trac.util.datefmt import FixedOffset, utc
+from trac.util.html import tag
 from trac.util.text import exception_to_unicode, shorten_line, to_unicode
 from trac.util.translation import _, domain_functions
 from trac.versioncontrol.api import Changeset, Node, Repository, \

[Ryan J Ollos]

IIRC, we have to use from trac.util.html import html as tag for compatibility with an early version of 1.0.x (< 1.0.2?)

[Peter Suter]

Changes in comment:4 (or with comment:5 for compatibility) seem good to me.

[Jun Omae]

Thanks for the suggestion and reviews. Pushed the change in comment:5 ([d54f77082b03/mercurial-plugin]).