# HG changeset patch # User *** failed to import extension hggit: No module named hggit # Date 2010-08-26 20:09:55 # Node ID dee0e7eb0370bcf04d20aafdb46e09d011483976 # Parent dccf4b2226ec66c90a4be1ac27993883cf1530c6 removed decodes, thus it should be implemented on vcs side fixed bug on annotation links in helpers diff --git a/pylons_app/controllers/summary.py b/pylons_app/controllers/summary.py --- a/pylons_app/controllers/summary.py +++ b/pylons_app/controllers/summary.py @@ -124,9 +124,9 @@ class SummaryController(BaseController): tmpl1 = u"""{label:"%s",data:%s,schema:["commits"]},""" for author in aggregate: - d += tmpl0 % (author.decode('utf8'), + d += tmpl0 % (author, tmpl1 \ - % (author.decode('utf8'), + % (author, [{"time":x, "commits":aggregate[author][x]['commits'], "added":aggregate[author][x]['added'], diff --git a/pylons_app/lib/helpers.py b/pylons_app/lib/helpers.py --- a/pylons_app/lib/helpers.py +++ b/pylons_app/lib/helpers.py @@ -220,7 +220,8 @@ def pygmentize(filenode, **kwargs): pygmentize function using pygments @param filenode: """ - return literal(code_highlight(filenode.content, filenode.lexer, HtmlFormatter(**kwargs))) + return literal(code_highlight(filenode.content, + filenode.lexer, HtmlFormatter(**kwargs))) def pygmentize_annotation(filenode, **kwargs): """ @@ -241,7 +242,8 @@ def pygmentize_annotation(filenode, **kw return "color: rgb(%s) ! important;" % (', '.join(col)) def url_func(changeset): - tooltip_html = "
Author: %s
Date: %s
Message: %s
" + tooltip_html = "
Author:"+\ + " %s
Date: %s
Message: %s
" tooltip_html = tooltip_html % (changeset.author, changeset.date, @@ -250,7 +252,7 @@ def pygmentize_annotation(filenode, **kw changeset.raw_id) uri = link_to( lnk_format, - url('changeset_home', repo_name='test', + url('changeset_home', repo_name=changeset.repository.name, revision=changeset.raw_id), style=get_color_string(changeset.raw_id), class_='tooltip', diff --git a/pylons_app/templates/changelog/changelog.html b/pylons_app/templates/changelog/changelog.html --- a/pylons_app/templates/changelog/changelog.html +++ b/pylons_app/templates/changelog/changelog.html @@ -61,7 +61,7 @@ ${h.email_or_none(cs.author)}
- ${h.link_to(h.wrap_paragraphs(cs.message.decode('utf-8','replace')), + ${h.link_to(h.wrap_paragraphs(cs.message), h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}
@@ -78,7 +78,7 @@ %endif %for p_cs in reversed(cs.parents):
${_('Parent')} ${p_cs.revision}: ${h.link_to(p_cs.raw_id, - h.url('changeset_home',repo_name=c.repo_name,revision=p_cs.raw_id),title=p_cs.message.decode('utf-8','replace'))} + h.url('changeset_home',repo_name=c.repo_name,revision=p_cs.raw_id),title=p_cs.message)}
%endfor