diff --git a/rhodecode/templates/changeset/changeset_range.html b/rhodecode/templates/changeset/changeset_range.html --- a/rhodecode/templates/changeset/changeset_range.html +++ b/rhodecode/templates/changeset/changeset_range.html @@ -68,12 +68,35 @@ %for cs in c.cs_ranges: ##${comment.comment_inline_form(cs)} ## diff block -

+
${'r%s:%s' % (cs.revision,h.short_id(cs.raw_id))} -
- gravatar +
+ gravatar +
+
+ + %if len(cs.parents)>1: + ${_('merge')} + %endif + %if cs.branch: + + ${h.link_to(h.shorter(cs.branch),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))} + + %endif + %if h.is_hg(c.rhodecode_repo): + %for book in cs.bookmarks: + + ${h.link_to(h.shorter(book),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))} + + %endfor + %endif + %for tag in cs.tags: + + ${h.link_to(h.shorter(tag),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))} + %endfor + +
-

${diff_block.diff_block(c.changes[cs.raw_id])} ##${comment.comments(cs)}