+ title="${_('Show what was removed (content at revision %(old_rev)s)', old_rev=display_rev(item.old.rev))}">
$path
@@ -108,7 +110,7 @@
($kind from
+ title="${_('Show original file (revision %(old_rev)s)', old_rev=display_rev(item.old.rev))}">
$item.old.path )
diff --git a/trac/versioncontrol/templates/dir_entries.html b/trac/versioncontrol/templates/dir_entries.html
--- a/trac/versioncontrol/templates/dir_entries.html
+++ b/trac/versioncontrol/templates/dir_entries.html
@@ -16,7 +16,7 @@
${pretty_size(entry.content_length)}
- $entry.rev
+ ${display_rev(entry.rev)}
/
-@
+@
$rev
+ title="${_('View changeset %(rev)s', rev=drev)}">$drev
- $change.rev
+ ${repos.display_rev(change.rev)}
diff --git a/trac/versioncontrol/templates/revisionlog.html b/trac/versioncontrol/templates/revisionlog.html
--- a/trac/versioncontrol/templates/revisionlog.html
+++ b/trac/versioncontrol/templates/revisionlog.html
@@ -123,10 +123,10 @@
@@ -138,14 +138,14 @@
- @$item.existing_rev
+ title="${_('Browse at revision %(rev)s', rev=display_rev(item.existing_rev))}">
+ @${display_rev(item.existing_rev)}
+ title="${_('View removal changeset [%(rev)s]', rev=display_rev(item.rev))}">
+ rev=display_rev(item.rev), path=item.path or '/')}">
${http_date(change.date)}
- Revision $item.rev: ${shorten_line(change.message)}
+ Revision ${display_rev(item.rev)}: ${shorten_line(change.message)}
${abs_href.changeset(item.rev, reponame, item.path)}
${
diff --git a/trac/versioncontrol/templates/revisionlog.txt b/trac/versioncontrol/templates/revisionlog.txt
--- a/trac/versioncontrol/templates/revisionlog.txt
+++ b/trac/versioncontrol/templates/revisionlog.txt
@@ -6,7 +6,7 @@
{% for item in items %}\
{% with change = changes[item.rev]; extra = extra_changes[item.rev] %}\
-${http_date(change.date)} ${format_author(change.author)} [$item.rev]
+${http_date(change.date)} ${format_author(change.author)} [${display_rev(item.rev)}]
{% for idx, file in enumerate(extra.files) %}\
{% if 'FILE_VIEW' in perm(repos.resource.child('source', file, version=change.rev)) %}\
* $file (${dict(edit='modified', add='added', delete='deleted',
diff --git a/trac/versioncontrol/web_ui/browser.py b/trac/versioncontrol/web_ui/browser.py
--- a/trac/versioncontrol/web_ui/browser.py
+++ b/trac/versioncontrol/web_ui/browser.py
@@ -356,6 +356,7 @@
# Find node for the requested path/rev
context = Context.from_request(req)
node = None
+ display_rev = lambda rev: rev
if repos:
try:
if rev:
@@ -370,6 +371,8 @@
context = context(repos.resource.child('source', path,
version=rev_or_latest))
+ display_rev = repos.display_rev
+
# Prepare template data
path_links = get_path_links(req.href, reponame, path, rev,
order, desc)
@@ -394,6 +397,7 @@
'context': context, 'reponame': reponame, 'repos': repos,
'repoinfo': repoinfo,
'path': path, 'rev': node and node.rev, 'stickyrev': rev,
+ 'display_rev': display_rev,
'created_path': node and node.created_path,
'created_rev': node and node.created_rev,
'properties': properties_data,
@@ -421,7 +425,7 @@
href = req.href.browser(reponame,
node.created_path, rev=prev_rev)
add_link(req, 'prev', href,
- _('Revision %(num)s', num=prev_rev))
+ _('Revision %(num)s', num=display_rev(prev_rev)))
if rev is not None:
add_link(req, 'up', req.href.browser(reponame,
node.created_path))
@@ -431,7 +435,7 @@
href = req.href.browser(reponame, node.created_path,
rev=next_rev)
add_link(req, 'next', href,
- _('Revision %(num)s', num=next_rev))
+ _('Revision %(num)s', num=display_rev(next_rev)))
prevnext_nav(req, _('Previous Revision'), _('Next Revision'),
_('Latest Revision'))
else:
diff --git a/trac/versioncontrol/web_ui/changeset.py b/trac/versioncontrol/web_ui/changeset.py
--- a/trac/versioncontrol/web_ui/changeset.py
+++ b/trac/versioncontrol/web_ui/changeset.py
@@ -331,17 +331,17 @@
rpath = new_path.replace('/','_')
if chgset:
if restricted:
- filename = 'changeset_%s_r%s' % (rpath, new)
+ filename = 'changeset_%s_%s' % (rpath, new)
else:
- filename = 'changeset_r%s' % new
+ filename = 'changeset_%s' % new
else:
if restricted:
- filename = 'diff-%s-from-r%s-to-r%s' \
+ filename = 'diff-%s-from-%s-to-%s' \
% (rpath, old, new)
elif old_path == '/': # special case for download (#238)
- filename = '%s-r%s' % (rpath, old)
+ filename = '%s-%s' % (rpath, old)
else:
- filename = 'diff-from-%s-r%s-to-%s-r%s' \
+ filename = 'diff-from-%s-%s-to-%s-%s' \
% (old_path.replace('/','_'), old, rpath, new)
if format == 'diff':
self._render_diff(req, filename, repos, data)
@@ -381,6 +381,8 @@
def _render_html(self, req, repos, chgset, restricted, xhr, data):
"""HTML version"""
data['restricted'] = restricted
+ display_rev = repos.display_rev
+ data['display_rev'] = display_rev
browser = BrowserModule(self.env)
reponame = repos.reponame or None
@@ -406,6 +408,7 @@
yield old_node, new_node, kind, change
def _changeset_title(rev):
+ rev = display_rev(rev)
if restricted:
return _('Changeset %(id)s for %(path)s', id=rev,
path=path)
@@ -436,7 +439,7 @@
else:
add_link(req, 'first',
req.href.changeset(oldest_rev, reponame),
- _('Changeset %(id)s', id=oldest_rev))
+ _('Changeset %(id)s', id=display_rev(oldest_rev)))
prev_path = data['old_path']
prev_rev = repos.previous_rev(chgset.rev)
if prev_rev:
@@ -457,7 +460,8 @@
else:
add_link(req, 'last',
req.href.changeset(youngest_rev, reponame),
- _('Changeset %(id)s', id=youngest_rev))
+ _('Changeset %(id)s',
+ id=display_rev(youngest_rev)))
next_rev = repos.next_rev(chgset.rev)
if next_rev:
next_href = req.href.changeset(next_rev, reponame)
@@ -484,7 +488,7 @@
reponame, node.created_path, rev=node.created_rev,
annotate=annotated and 'blame' or None)
title = _('Show revision %(rev)s of this file in browser',
- rev=node.rev)
+ rev=display_rev(node.rev))
return {'path': node.path, 'rev': node.rev,
'shortrev': repos.short_rev(node.rev),
'href': href, 'title': title}
@@ -630,7 +634,7 @@
href = req.href.changeset(new_node.rev, reponame,
new_node.path)
title = _('Show the changeset %(id)s restricted to '
- '%(path)s', id=new_node.rev,
+ '%(path)s', id=display_rev(new_node.rev),
path=new_node.path)
else:
href = req.href.changeset(
@@ -640,8 +644,9 @@
old_path=pathjoin(repos.reponame,
old_node.created_path))
title = _('Show the %(range)s differences restricted '
- 'to %(path)s', range='r%s:%s' % (
- old_node.rev, new_node.rev),
+ 'to %(path)s', range='[%s:%s]' % (
+ display_rev(old_node.rev),
+ display_rev(new_node.rev)),
path=new_node.path)
info['href'] = href
info['title'] = old_node and title
@@ -782,7 +787,7 @@
def title_for_diff(self, data):
if data['new_path'] == data['old_path']:
# ''diff between 2 revisions'' mode
- return 'Diff r%s:%s for %s' \
+ return 'Diff [%s:%s] for %s' \
% (data['old_rev'] or 'latest', data['new_rev'] or 'latest',
data['new_path'] or '/')
else:
@@ -999,10 +1004,12 @@
single and 1 or 2, repo=', '.join(repos_for_uid))
else:
title = ngettext('Changeset ', 'Changesets ', single and 1 or 2)
+ drev_a = older_cset.repos.display_rev(rev_a)
if single:
- title = tag(title, tag.em('[%s]' % rev_a))
+ title = tag(title, tag.em('[%s]' % drev_a))
else:
- title = tag(title, tag.em('[%s-%s]' % (rev_a, rev_b)))
+ drev_b = cset.repos.display_rev(rev_b)
+ title = tag(title, tag.em('[%s-%s]' % (drev_a, drev_b)))
if field == 'title':
return title
elif field == 'summary':
diff --git a/trac/versioncontrol/web_ui/log.py b/trac/versioncontrol/web_ui/log.py
--- a/trac/versioncontrol/web_ui/log.py
+++ b/trac/versioncontrol/web_ui/log.py
@@ -104,7 +104,8 @@
rev = revranges.b
except ValueError:
pass
- rev = unicode(repos.normalize_rev(rev))
+ rev = unicode(repos.normalize_rev(rev))
+ display_rev = repos.display_rev
# The `history()` method depends on the mode:
# * for ''stop on copy'' and ''follow copies'', it's `Node.history()`
@@ -195,7 +196,7 @@
# FIXME: we should send a 404 error here
raise TracError(_("The file or directory '%(path)s' doesn't "
"exist at revision %(rev)s or at any previous revision.",
- path=path, rev=rev), _('Nonexistent path'))
+ path=path, rev=display_rev(rev)), _('Nonexistent path'))
def make_log_href(path, **args):
link_rev = rev
@@ -223,7 +224,7 @@
revs=next_revranges)
add_link(req, 'next', older_revisions_href,
_('Revision Log (restarting at %(path)s, rev. %(rev)s)',
- path=next_path, rev=next_rev))
+ path=next_path, rev=display_rev(next_rev)))
# only show fully 'limit' results, use `change == None` as a marker
info[-1]['change'] = None
@@ -258,8 +259,8 @@
'context': Context.from_request(req, 'source', path,
parent=repos.resource),
'reponame': repos.reponame or None, 'repos': repos,
- 'path': path, 'rev': rev, 'stop_rev': stop_rev,
- 'revranges': revranges,
+ 'path': path, 'rev': rev, 'stop_rev': stop_rev,
+ 'display_rev': display_rev, 'revranges': revranges,
'mode': mode, 'verbose': verbose, 'limit' : limit,
'items': info, 'changes': changes,
'email_map': email_map, 'extra_changes': extra_changes,
diff --git a/trac/versioncontrol/web_ui/tests/wikisyntax.py b/trac/versioncontrol/web_ui/tests/wikisyntax.py
--- a/trac/versioncontrol/web_ui/tests/wikisyntax.py
+++ b/trac/versioncontrol/web_ui/tests/wikisyntax.py
@@ -231,8 +231,8 @@
diff:trunk//branch
diff:trunk@12//branch@23
-diff:trunk@12:23
-diff:@12:23
+diff:trunk@12:23
+diff:@12:23
------------------------------
============================== diff: link resolver + query
@@ -246,7 +246,7 @@
diff://
------------------------------
-diff://
+diff://
------------------------------
"""