- ${field.new}
- 
+ ${field.new
+ }
added
${field.rendered}
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
@@ -13,7 +13,9 @@
order=(order != 'name' and order or None), desc=desc)}">$entry.name
- ${pretty_size(entry.content_length)}
+ ${pretty_size(entry.content_length)
+ }
|
${display_rev(entry.rev)}
diff --git a/trac/versioncontrol/templates/repository_index.html b/trac/versioncontrol/templates/repository_index.html
--- a/trac/versioncontrol/templates/repository_index.html
+++ b/trac/versioncontrol/templates/repository_index.html
@@ -5,7 +5,7 @@
-
@@ -13,11 +13,13 @@
$reponame
+ href="${href.browser(repos.reponame, order=(order != 'name' and order or None), desc=desc)}">$reponame
- |
+
+
+ |
${repos.display_rev(change.rev)}
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
@@ -330,7 +330,7 @@
path = req.args.get('path', '/')
rev = req.args.get('rev', '')
- if rev in ('', 'HEAD'):
+ if rev.lower() in ('', 'head'):
rev = None
order = req.args.get('order', 'name').lower()
desc = req.args.has_key('desc')
@@ -499,20 +499,23 @@
timerange = TimeRange(youngest.date)
else:
timerange.insert(youngest.date)
- entry = (reponame, repoinfo, repos, youngest, None)
+ raw_href = self._get_download_href(context.href, repos,
+ None, None)
+ entry = (reponame, repoinfo, repos, youngest, None,
+ raw_href)
else:
- entry = (reponame, repoinfo, None, None, "XXX")
+ entry = (reponame, repoinfo, None, None, "XXX", None)
except TracError, err:
entry = (reponame, repoinfo, None, None,
- exception_to_unicode(err))
+ exception_to_unicode(err), None)
repositories.append(entry)
# Ordering of repositories
if order == 'date':
- def repo_order((reponame, repoinfo, repos, youngest, err)):
+ def repo_order((reponame, repoinfo, repos, youngest, err, href)):
return youngest and youngest.date
else:
- def repo_order((reponame, repoinfo, repos, youngest, err)):
+ def repo_order((reponame, repoinfo, repos, youngest, err, href)):
return embedded_numbers(reponame.lower())
repositories = sorted(repositories, key=repo_order, reverse=desc)
@@ -522,13 +525,16 @@
def _render_dir(self, req, repos, node, rev, order, desc):
req.perm(node.resource).require('BROWSER_VIEW')
+ download_href = self._get_download_href
# Entries metadata
class entry(object):
- __slots__ = 'name rev kind isdir path content_length'.split()
+ _copy = 'name rev kind isdir path content_length'.split()
+ __slots__ = _copy + ['raw_href']
def __init__(self, node):
- for f in entry.__slots__:
+ for f in entry._copy:
setattr(self, f, getattr(node, f))
+ self.raw_href = download_href(req.href, repos, node, rev)
entries = [entry(n) for n in node.get_entries()
if n.can_view(req.perm)]
@@ -574,16 +580,8 @@
entries = sorted(entries, key=browse_order, reverse=desc)
# ''Zip Archive'' alternate link
- path = node.path.strip('/')
- if repos.reponame:
- path = repos.reponame + '/' + path
- if any(fnmatchcase(path, p.strip('/'))
- for p in self.downloadable_paths):
- zip_href = req.href.changeset(rev or repos.youngest_rev,
- repos.reponame or None, node.path,
- old=rev,
- old_path=repos.reponame or '/',
- format='zip')
+ zip_href = self._get_download_href(req.href, repos, node, rev)
+ if zip_href:
add_link(req, 'alternate', zip_href, _('Zip Archive'),
'application/zip', 'zip')
@@ -675,6 +673,21 @@
'annotate': force_source,
}
+ def _get_download_href(self, href, repos, node, rev):
+ """Return the URL for downloading a file, or a directory as a ZIP."""
+ if node is not None and node.isfile:
+ return href.export(rev or 'HEAD', repos.reponame or None,
+ node.path)
+ path = npath = node is not None and node.path.strip('/') or ''
+ if repos.reponame:
+ path = (repos.reponame + '/' + npath).rstrip('/')
+ if any(fnmatchcase(path, p.strip('/'))
+ for p in self.downloadable_paths):
+ return href.changeset(rev or repos.youngest_rev,
+ repos.reponame or None, npath,
+ old=rev, old_path=repos.reponame or '/',
+ format='zip')
+
# public methods
def render_properties(self, mode, context, props):
@@ -739,9 +752,13 @@
elif '@' in export:
path, rev = export.split('@', 1)
else:
- rev, path = 'HEAD', export
- return tag.a(label, class_='export',
- href=formatter.href.export(rev, path) + fragment)
+ rev, path = None, export
+ node, raw_href, title = self._get_link_info(path, rev, formatter.href,
+ formatter.perm)
+ if raw_href:
+ return tag.a(label, class_='export', href=raw_href + fragment,
+ title=title)
+ return tag.a(label, class_='missing export')
def _format_browser_link(self, formatter, ns, path, label):
path, query, fragment = formatter.split_link(path)
@@ -749,15 +766,34 @@
match = self.PATH_LINK_RE.match(path)
if match:
path, rev, marks = match.groups()
- return tag.a(label, class_='source',
- href=(formatter.href.browser(path, rev=rev, marks=marks) +
- query + fragment))
+ href = formatter.href
+ src_href = href.browser(path, rev=rev, marks=marks) + query + fragment
+ node, raw_href, title = self._get_link_info(path, rev, formatter.href,
+ formatter.perm)
+ if not node:
+ return tag.a(label, class_='missing source')
+ link = tag.a(label, class_='source', href=src_href)
+ if raw_href:
+ link = tag(link, tag.a(u'\u200b', href=raw_href + fragment,
+ title=title, class_='trac-rawlink'))
+ return link
PATH_LINK_RE = re.compile(r"([^@#:]*)" # path
r"[@:]([^#:]+)?" # rev
r"(?::(\d+(?:-\d+)?(?:,\d+(?:-\d+)?)*))?" # marks
)
+ def _get_link_info(self, path, rev, href, perm):
+ rm = RepositoryManager(self.env)
+ reponame, repos, npath = rm.get_repository_by_path(path)
+ node = get_allowed_node(repos, npath, rev, perm)
+ if node is not None:
+ raw_href = self._get_download_href(href, repos, node, rev)
+ title = node.isfile and _("Download") \
+ or _("Download as Zip archive")
+ return (node, raw_href, title)
+ return (None, None, None)
+
# IHTMLPreviewAnnotator methods
def get_annotation_type(self):
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
@@ -3,7 +3,7 @@
import unittest
from trac.test import Mock
-from trac.versioncontrol import NoSuchChangeset
+from trac.versioncontrol import NoSuchChangeset, NoSuchNode
from trac.versioncontrol.api import *
from trac.versioncontrol.web_ui import *
from trac.wiki.tests import formatter
@@ -23,11 +23,22 @@
return '200'
else:
raise NoSuchChangeset(rev)
-
+
+def _get_node(path, rev=None):
+ if path == 'foo':
+ return Mock(path=path, rev=rev, isfile=False,
+ can_view=lambda resource: True)
+ elif path == 'missing/file':
+ raise NoSuchNode(path, rev)
+ else:
+ return Mock(path=path, rev=rev, isfile=True,
+ can_view=lambda resource: True)
+
def _get_repository(reponame):
return Mock(reponame=reponame, youngest_rev='200',
get_changeset=_get_changeset,
- normalize_rev=_normalize_rev)
+ normalize_rev=_normalize_rev,
+ get_node=_get_node)
def repository_setup(tc):
setattr(tc.env, 'get_repository', _get_repository)
@@ -252,7 +263,7 @@
"""
-SOURCE_TEST_CASES = """
+SOURCE_TEST_CASES = u"""
============================== source: link resolver
source:/foo/bar
source:/foo/bar#42 # no long works as rev spec
@@ -264,18 +275,20 @@
source:/foo/bar@42#L20
source:/foo/bar@head#L20
source:/foo/bar@#L20
+source:/missing/file
------------------------------
-source:/foo/bar
-source:/foo/bar#42 # no long works as rev spec
-source:/foo/bar#head #
-source:/foo/bar@42
-source:/foo/bar@head
-source:/foo%20bar/baz%2Bquux
-source:@42
-source:/foo/bar@42#L20
-source:/foo/bar@head#L20
-source:/foo/bar@#L20
+source:/foo/bar\u200b
+source:/foo/bar#42\u200b # no long works as rev spec
+source:/foo/bar#head\u200b #
+source:/foo/bar@42\u200b
+source:/foo/bar@head\u200b
+source:/foo%20bar/baz%2Bquux\u200b
+source:@42\u200b
+source:/foo/bar@42#L20\u200b
+source:/foo/bar@head#L20\u200b
+source:/foo/bar@#L20\u200b
+source:/missing/file
------------------------------
============================== source: link resolver + query
@@ -284,7 +297,7 @@
------------------------------
source:/foo?order=size&desc=1
-source:/foo/bar?format=raw
+source:/foo/bar?format=raw\u200b
------------------------------
============================== source: provider, with quoting
@@ -294,10 +307,10 @@
[source:"even with whitespaces" Path with spaces]
------------------------------
-source:'even with whitespaces'
-source:"even with whitespaces"
-Path with spaces
-Path with spaces
+source:'even with whitespaces'\u200b
+source:"even with whitespaces"\u200b
+Path with spaces\u200b
+Path with spaces\u200b
------------------------------
============================== export: link resolver
@@ -306,16 +319,16 @@
export:/foo/pict.gif@123
------------------------------
-export:/foo/bar.html
-export:123:/foo/pict.gif
-export:/foo/pict.gif@123
+export:/foo/bar.html
+export:123:/foo/pict.gif
+export:/foo/pict.gif@123
------------------------------
============================== export: link resolver + fragment
export:/foo/bar.html#header
------------------------------
-export:/foo/bar.html#header
+export:/foo/bar.html#header
------------------------------
""" # " (be Emacs friendly...)
diff --git a/trac/versioncontrol/web_ui/util.py b/trac/versioncontrol/web_ui/util.py
--- a/trac/versioncontrol/web_ui/util.py
+++ b/trac/versioncontrol/web_ui/util.py
@@ -19,12 +19,11 @@
from genshi.builder import tag
from trac.resource import ResourceNotFound
-from trac.util.datefmt import pretty_timedelta
-from trac.util.text import shorten_line
from trac.util.translation import tag_, _
from trac.versioncontrol.api import NoSuchNode, NoSuchChangeset
-__all__ = ['get_changes', 'get_path_links', 'get_existing_node']
+__all__ = ['get_changes', 'get_path_links', 'get_existing_node',
+ 'get_allowed_node']
def get_changes(repos, revs):
changes = {}
@@ -69,3 +68,12 @@
tag.p(tag_("You can %(search)s in the repository history to see "
"if that path existed but was later removed",
search=search_a))))
+
+def get_allowed_node(repos, path, rev, perm):
+ if repos is not None:
+ try:
+ node = repos.get_node(path, rev)
+ except NoSuchNode:
+ return None
+ if node.can_view(perm):
+ return node
| | 
