Mercurial > kallithea
changeset 4334:1a659a59be4a
changesets: don't show SVN style 'rXXX:' revision numbers if show_revision_number is false
author | Mads Kiilerich <madski@unity3d.com> |
---|---|
date | Tue, 10 Dec 2013 19:30:37 +0100 |
parents | c597adba8459 |
children | 2ea889757ba1 |
files | kallithea/controllers/files.py kallithea/lib/helpers.py kallithea/templates/bookmarks/bookmarks_data.html kallithea/templates/branches/branches_data.html kallithea/templates/changeset/changeset.html kallithea/templates/changeset/changeset_range.html kallithea/templates/compare/compare_cs.html kallithea/templates/files/diff_2way.html kallithea/templates/files/file_diff.html kallithea/templates/files/files_browser.html kallithea/templates/files/files_edit.html kallithea/templates/files/files_source.html kallithea/templates/tags/tags_data.html |
diffstat | 13 files changed, 30 insertions(+), 32 deletions(-) [+] |
line wrap: on
line diff
--- a/kallithea/controllers/files.py Tue Dec 10 19:30:37 2013 +0100 +++ b/kallithea/controllers/files.py Tue Dec 10 19:30:37 2013 +0100 @@ -779,7 +779,7 @@ for chs in changesets: #_branch = '(%s)' % chs.branch if _hg else '' _branch = chs.branch - n_desc = 'r%s:%s (%s)' % (chs.revision, chs.short_id, _branch) + n_desc = '%s (%s)' % (h.show_id(chs), _branch) changesets_group[0].append((chs.raw_id, n_desc,)) hist_l.append(changesets_group)
--- a/kallithea/lib/helpers.py Tue Dec 10 19:30:37 2013 +0100 +++ b/kallithea/lib/helpers.py Tue Dec 10 19:30:37 2013 +0100 @@ -358,8 +358,7 @@ "</b> %s<br/></div>") tooltip_html = tooltip_html % (author, date, message) - lnk_format = '%5s:%s' % ('r%s' % changeset.revision, - short_id(changeset.raw_id)) + lnk_format = show_id(changeset) uri = link_to( lnk_format, url('changeset_home', repo_name=repo_name,
--- a/kallithea/templates/bookmarks/bookmarks_data.html Tue Dec 10 19:30:37 2013 +0100 +++ b/kallithea/templates/bookmarks/bookmarks_data.html Tue Dec 10 19:30:37 2013 +0100 @@ -28,7 +28,7 @@ <td>${book[1].revision}</td> <td> <div> - <pre><a href="${h.url('changeset_home',repo_name=c.repo_name,revision=book[1].raw_id)}">r${book[1].revision}:${h.short_id(book[1].raw_id)}</a></pre> + <pre><a href="${h.url('changeset_home',repo_name=c.repo_name,revision=book[1].raw_id)}">${h.show_id(book[1])}</a></pre> </div> </td> <td>
--- a/kallithea/templates/branches/branches_data.html Tue Dec 10 19:30:37 2013 +0100 +++ b/kallithea/templates/branches/branches_data.html Tue Dec 10 19:30:37 2013 +0100 @@ -29,7 +29,7 @@ <td>${branch[1].revision}</td> <td> <div> - <pre><a href="${h.url('changeset_home',repo_name=c.repo_name,revision=branch[1].raw_id)}">r${branch[1].revision}:${h.short_id(branch[1].raw_id)}</a></pre> + <pre><a href="${h.url('changeset_home',repo_name=c.repo_name,revision=branch[1].raw_id)}">${h.show_id(branch[1])}</a></pre> </div> </td> <td> @@ -56,7 +56,7 @@ <td>${branch[1].revision}</td> <td> <div> - <pre><a href="${h.url('changeset_home',repo_name=c.repo_name,revision=branch[1].raw_id)}">r${branch[1].revision}:${h.short_id(branch[1].raw_id)}</a></pre> + <pre><a href="${h.url('changeset_home',repo_name=c.repo_name,revision=branch[1].raw_id)}">${h.show_id(branch[1])}</a></pre> </div> </td> <td></td>
--- a/kallithea/templates/changeset/changeset.html Tue Dec 10 19:30:37 2013 +0100 +++ b/kallithea/templates/changeset/changeset.html Tue Dec 10 19:30:37 2013 +0100 @@ -10,7 +10,7 @@ </%def> <%def name="breadcrumbs_links()"> - ${_('Changeset')} - <span class='hash'>r${c.changeset.revision}:${h.short_id(c.changeset.raw_id)}</span> + ${_('Changeset')} - <span class='hash'>${h.show_id(c.changeset)}</span> </%def> <%def name="page_nav()">
--- a/kallithea/templates/changeset/changeset_range.html Tue Dec 10 19:30:37 2013 +0100 +++ b/kallithea/templates/changeset/changeset_range.html Tue Dec 10 19:30:37 2013 +0100 @@ -2,7 +2,7 @@ <%inherit file="/base/base.html"/> <%def name="title()"> - ${_('%s Changesets') % c.repo_name} - r${c.cs_ranges[0].revision}:${h.short_id(c.cs_ranges[0].raw_id)} > r${c.cs_ranges[-1].revision}:${h.short_id(c.cs_ranges[-1].raw_id)} + ${_('%s Changesets') % c.repo_name} - ${h.show_id(c.cs_ranges[0])} > ${h.show_id(c.cs_ranges[-1])} %if c.site_name: · ${c.site_name} %endif @@ -10,9 +10,9 @@ <%def name="breadcrumbs_links()"> ${_('Changesets')} - - r${c.cs_ranges[0].revision}:${h.short_id(c.cs_ranges[0].raw_id)} + ${h.link_to(h.show_id(c.cs_ranges[0]),h.url('changeset_home',repo_name=c.repo_name,revision=c.cs_ranges[0]))}</td> <i class="icon-arrow-right"></i> - r${c.cs_ranges[-1].revision}:${h.short_id(c.cs_ranges[-1].raw_id)} + ${h.link_to(h.show_id(c.cs_ranges[-1]),h.url('changeset_home',repo_name=c.repo_name,revision=c.cs_ranges[-1]))}</td> </%def> <%def name="page_nav()"> @@ -30,9 +30,9 @@ <div id="body" class="diffblock"> <div class="code-header"> <div> - r${c.cs_ranges[0].revision}:${h.short_id(c.cs_ranges[0].raw_id)} + ${h.show_id(c.cs_ranges[0])} <i class="icon-arrow-right"></i> - r${c.cs_ranges[-1].revision}:${h.short_id(c.cs_ranges[-1].raw_id)} + ${h.show_id(c.cs_ranges[-1])} <a style="font-weight: bold" href="${h.url('compare_url',repo_name=c.repo_name,org_ref_type='rev',org_ref_name=getattr(c.cs_ranges[0].parents[0] if c.cs_ranges[0].parents else h.EmptyChangeset(),'raw_id'),other_ref_type='rev',other_ref_name=c.cs_ranges[-1].raw_id)}" class="btn btn-small"><i class="icon-loop"></i> Compare Revisions</a> </div> </div> @@ -58,17 +58,17 @@ </div> <div style="font-size:1.1em;font-weight: bold;clear:both;padding-top:10px">${_('Files affected')}</div> <div class="cs_files"> - %for cs in c.cs_ranges: - <div class="cur_cs">${h.link_to('r%s:%s' % (cs.revision,h.short_id(cs.raw_id)),h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}</div> - %for FID, (cs1, cs2, change, path, diff, stats) in c.changes[cs.raw_id].iteritems(): - <div class="cs_${change}"> - <div class="node"> - ${h.link_to(h.safe_unicode(path),h.url.current(anchor=FID))} - </div> - <div class="changes">${h.fancy_file_stats(stats)}</div> - </div> - %endfor - %endfor + %for cs in c.cs_ranges: + <div class="cur_cs">${h.link_to(h.show_id(cs),h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}</div> + %for FID, (cs1, cs2, change, path, diff, stats) in c.changes[cs.raw_id].iteritems(): + <div class="cs_${change}"> + <div class="node"> + ${h.link_to(h.safe_unicode(path),h.url.current(anchor=FID))} + </div> + <div class="changes">${h.fancy_file_stats(stats)}</div> + </div> + %endfor + %endfor </div> </div> @@ -79,7 +79,7 @@ ##${comment.comment_inline_form(cs)} ## diff block <div class="h3"> - <a class="tooltip" title="${h.tooltip(cs.message)}" href="${h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id)}">${'r%s:%s' % (cs.revision,h.short_id(cs.raw_id))}</a> + <a class="tooltip" title="${h.tooltip(cs.message)}" href="${h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id)}">${h.show_id(cs)}</a> <div class="gravatar"> <img alt="gravatar" src="${h.gravatar_url(h.email_or_none(cs.author),20)}"/> </div>
--- a/kallithea/templates/compare/compare_cs.html Tue Dec 10 19:30:37 2013 +0100 +++ b/kallithea/templates/compare/compare_cs.html Tue Dec 10 19:30:37 2013 +0100 @@ -23,8 +23,7 @@ <td style="width: 140px"><span class="tooltip" title="${h.tooltip(h.age(cs.date))}">${cs.date}</span></td> <td><div class="gravatar" commit_id="${cs.raw_id}"><img alt="gravatar" src="${h.gravatar_url(h.email_or_none(cs.author),14)}"/></div></td> <td><div class="author">${h.person(cs.author)}</div></td> - <td>${h.link_to('r%s:%s' % (cs.revision,h.short_id(cs.raw_id)),h.url('changeset_home',repo_name=c.other_repo.repo_name,revision=cs.raw_id))} - </td> + <td>${h.link_to(h.show_id(cs),h.url('changeset_home',repo_name=c.other_repo.repo_name,revision=cs.raw_id))}</td> <td> %if cs.branch: <span class="branchtag">${cs.branch}</span>
--- a/kallithea/templates/files/diff_2way.html Tue Dec 10 19:30:37 2013 +0100 +++ b/kallithea/templates/files/diff_2way.html Tue Dec 10 19:30:37 2013 +0100 @@ -19,7 +19,7 @@ </%def> <%def name="breadcrumbs_links()"> - ${_('File diff')} r${c.changeset_1.revision}:${h.short_id(c.changeset_1.raw_id)} → r${c.changeset_2.revision}:${h.short_id(c.changeset_2.raw_id)} + ${_('File diff')} ${h.show_id(c.changeset_1)} → ${h.show_id(c.changeset_2)} </%def> <%def name="page_nav()">
--- a/kallithea/templates/files/file_diff.html Tue Dec 10 19:30:37 2013 +0100 +++ b/kallithea/templates/files/file_diff.html Tue Dec 10 19:30:37 2013 +0100 @@ -8,7 +8,7 @@ </%def> <%def name="breadcrumbs_links()"> - ${_('File diff')} r${c.changeset_1.revision}:${h.short_id(c.changeset_1.raw_id)} → r${c.changeset_2.revision}:${h.short_id(c.changeset_2.raw_id)} + ${_('File diff')} ${h.show_id(c.changeset_1)} → ${h.show_id(c.changeset_2)} </%def> <%def name="page_nav()">
--- a/kallithea/templates/files/files_browser.html Tue Dec 10 19:30:37 2013 +0100 +++ b/kallithea/templates/files/files_browser.html Tue Dec 10 19:30:37 2013 +0100 @@ -83,7 +83,7 @@ <td> %if node.is_file(): <div class="tooltip" title="${h.tooltip(node.last_changeset.message)}"> - <pre>${'r%s:%s' % (node.last_changeset.revision,node.last_changeset.short_id)}</pre> + <pre>${h.show_id(node.last_changeset)}</pre> </div> %endif </td>
--- a/kallithea/templates/files/files_edit.html Tue Dec 10 19:30:37 2013 +0100 +++ b/kallithea/templates/files/files_edit.html Tue Dec 10 19:30:37 2013 +0100 @@ -45,7 +45,7 @@ <div class="code-header"> <div class="stats"> <div class="left"><i class="icon-file"></i></div> - <div class="left item">${h.link_to("r%s:%s" % (c.file.changeset.revision,h.short_id(c.file.changeset.raw_id)),h.url('changeset_home',repo_name=c.repo_name,revision=c.file.changeset.raw_id))}</div> + <div class="left item">${h.link_to(h.show_id(c.file.changeset),h.url('changeset_home',repo_name=c.repo_name,revision=c.file.changeset.raw_id))}</div> <div class="left item">${h.format_byte_size(c.file.size,binary=True)}</div> <div class="left item last">${c.file.mimetype}</div> <div class="buttons">
--- a/kallithea/templates/files/files_source.html Tue Dec 10 19:30:37 2013 +0100 +++ b/kallithea/templates/files/files_source.html Tue Dec 10 19:30:37 2013 +0100 @@ -22,7 +22,7 @@ <div class="code-header"> <div class="stats"> <div class="left img"><i class="icon-file"></i></div> - <div class="left item"><pre class="tooltip" title="${h.tooltip(h.fmt_date(c.file_changeset.date))}">${h.link_to("r%s:%s" % (c.file_changeset.revision,h.short_id(c.file_changeset.raw_id)),h.url('changeset_home',repo_name=c.repo_name,revision=c.file_changeset.raw_id))}</pre></div> + <div class="left item"><pre class="tooltip" title="${h.tooltip(h.fmt_date(c.file_changeset.date))}">${h.link_to(h.show_id(c.file_changeset),h.url('changeset_home',repo_name=c.repo_name,revision=c.file_changeset.raw_id))}</pre></div> <div class="left item"><pre>${h.format_byte_size(c.file.size,binary=True)}</pre></div> <div class="left item last"><pre>${c.file.mimetype}</pre></div> <div class="buttons">
--- a/kallithea/templates/tags/tags_data.html Tue Dec 10 19:30:37 2013 +0100 +++ b/kallithea/templates/tags/tags_data.html Tue Dec 10 19:30:37 2013 +0100 @@ -29,7 +29,7 @@ <td>${tag[1].revision}</td> <td> <div> - <pre><a href="${h.url('changeset_home',repo_name=c.repo_name,revision=tag[1].raw_id)}">r${tag[1].revision}:${h.short_id(tag[1].raw_id)}</a></pre> + <pre><a href="${h.url('changeset_home',repo_name=c.repo_name,revision=tag[1].raw_id)}">${h.show_id(tag[1])}</a></pre> </div> </td> <td>