upstream/mercurial-mirror Commit - r7305:c21d236c

hgweb: descend empty directories in web view...

Ry4an Brase -

r7305:c21d236c default

parent child

tests/test-hgweb-descend-empties

0 created 755 +28 0

@@ -0,0 +1,28
	1	#!/bin/sh
	2	# Test chains of near empty directories, terminating 3 different ways:
	3	# - a1: file at level 4 (deepest)
	4	# - b1: two dirs at level 3
	5	# - e1: file at level 2
	6
	7	echo % Set up the repo
	8	hg init test
	9	cd test
	10	mkdir -p a1/a2/a3/a4
	11	mkdir -p b1/b2/b3/b4
	12	mkdir -p b1/b2/c3/c4
	13	mkdir -p d1/d2/d3/d4
	14	echo foo > a1/a2/a3/a4/foo
	15	echo foo > b1/b2/b3/b4/foo
	16	echo foo > b1/b2/c3/c4/foo
	17	echo foo > d1/d2/d3/d4/foo
	18	echo foo > d1/d2/foo
	19	hg ci -Ama
	20
	21	hg serve -n test -p $HGPORT -d --pid-file=hg.pid -E errors.log
	22	cat hg.pid >> $DAEMON_PIDS
	23
	24	echo % manifest with descending
	25	"$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT '/file'
	26
	27	echo % ERRORS ENCOUNTERED
	28	cat errors.log

tests/test-hgweb-descend-empties.out

0 created 644 +51 0

@@ -0,0 +1,51
	1	% Set up the repo
	2	adding a1/a2/a3/a4/foo
	3	adding b1/b2/b3/b4/foo
	4	adding b1/b2/c3/c4/foo
	5	adding d1/d2/d3/d4/foo
	6	adding d1/d2/foo
	7	% manifest with descending
	8	200 Script output follows
	9
	10	<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
	11	<html>
	12	<head>
	13	<link rel="icon" href="/static/hgicon.png" type="image/png">
	14	<meta name="robots" content="index, nofollow" />
	15	<link rel="stylesheet" href="/static/style.css" type="text/css" />
	16
	17	<title>test: files for changeset 9087c84a0f5d</title>
	18	</head>
	19	<body>
	20
	21	<div class="buttons">
	22	<a href="/log/0">changelog</a>
	23	<a href="/shortlog/0">shortlog</a>
	24	<a href="/graph">graph</a>
	25	<a href="/tags">tags</a>
	26	<a href="/rev/9087c84a0f5d">changeset</a>
	27
	28	</div>
	29
	30	<h2>files for changeset 9087c84a0f5d: /</h2>
	31
	32	<table cellpadding="0" cellspacing="0">
	33	<tr class="parity0">
	34	<td><tt>drwxr-xr-x</tt>
	35	<td>
	36	<td>
	37	<td><a href="/file/9087c84a0f5d/">[up]</a>
	38	</tr>
	39	<tr class="parity1"><td><tt>drwxr-xr-x</tt> <td> <td> <td><a href="/file/9087c84a0f5d/a1">a1/</a> <a href="/file/9087c84a0f5d/a1/a2/a3/a4">a2/a3/a4</a><tr class="parity0"><td><tt>drwxr-xr-x</tt> <td> <td> <td><a href="/file/9087c84a0f5d/b1">b1/</a> <a href="/file/9087c84a0f5d/b1/b2">b2</a><tr class="parity1"><td><tt>drwxr-xr-x</tt> <td> <td> <td><a href="/file/9087c84a0f5d/d1">d1/</a> <a href="/file/9087c84a0f5d/d1/d2">d2</a>
	40
	41	</table>
	42
	43	<div class="logo">
	44	<a href="http://www.selenic.com/mercurial/">
	45	<img src="/static/hglogo.png" width=75 height=90 border=0 alt="mercurial"></a>
	46	</div>
	47
	48	</body>
	49	</html>
	50
	51	% ERRORS ENCOUNTERED

mercurial/hgweb/webcommands.py

0 +28 -15

             #
             # Copyright 21 May 2005 - (c) 2005 Jake Edge <jake@edge2.net>
             # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
             #
             # This software may be used and distributed according to the terms
             # of the GNU General Public License, incorporated herein by reference.
             import os, mimetypes, re, cgi
             import webutil
             from mercurial import revlog, archival, templatefilters
             from mercurial.node import short, hex, nullid
             from mercurial.util import binary, datestr
             from mercurial.repo import RepoError
             from common import paritygen, staticfile, get_contact, ErrorResponse
             from common import HTTP_OK, HTTP_FORBIDDEN, HTTP_NOT_FOUND
             from mercurial import graphmod, util
             # __all__ is populated with the allowed commands. Be sure to add to it if
             # you're adding a new command, or the new command won't work.
             __all__ = [
                'log', 'rawfile', 'file', 'changelog', 'shortlog', 'changeset', 'rev',
                'manifest', 'tags', 'summary', 'filediff', 'diff', 'annotate', 'filelog',
                'archive', 'static', 'graph',
             ]
             def log(web, req, tmpl):
                 if 'file' in req.form and req.form['file'][0]:
                     return filelog(web, req, tmpl)
                 else:
                     return changelog(web, req, tmpl)
             def rawfile(web, req, tmpl):
                 path = webutil.cleanpath(web.repo, req.form.get('file', [''])[0])
                 if not path:
                     content = manifest(web, req, tmpl)
                     req.respond(HTTP_OK, web.ctype)
                     return content
                 try:
                     fctx = webutil.filectx(web.repo, req)
                 except revlog.LookupError, inst:
                     try:
                         content = manifest(web, req, tmpl)
                         req.respond(HTTP_OK, web.ctype)
                         return content
                     except ErrorResponse:
                         raise inst
                 path = fctx.path()
                 text = fctx.data()
                 mt = mimetypes.guess_type(path)[0]
                 if mt is None:
                     mt = binary(text) and 'application/octet-stream' or 'text/plain'
                 req.respond(HTTP_OK, mt, path, len(text))
                 return [text]
             def _filerevision(web, tmpl, fctx):
                 f = fctx.path()
                 text = fctx.data()
                 parity = paritygen(web.stripecount)
                 if binary(text):
                     mt = mimetypes.guess_type(f)[0] or 'application/octet-stream'
                     text = '(binary:%s)' % mt
                 def lines():
                     for lineno, t in enumerate(text.splitlines(1)):
                         yield {"line": t,
                                "lineid": "l%d" % (lineno + 1),
                                "linenumber": "% 6d" % (lineno + 1),
                                "parity": parity.next()}
                 return tmpl("filerevision",
                             file=f,
                             path=webutil.up(f),
                             text=lines(),
                             rev=fctx.rev(),
                             node=hex(fctx.node()),
                             author=fctx.user(),
                             date=fctx.date(),
                             desc=fctx.description(),
                             branch=webutil.nodebranchnodefault(fctx),
                             parent=webutil.siblings(fctx.parents()),
                             child=webutil.siblings(fctx.children()),
                             rename=webutil.renamelink(fctx),
                             permissions=fctx.manifest().flags(f))
             def file(web, req, tmpl):
                 path = webutil.cleanpath(web.repo, req.form.get('file', [''])[0])
                 if not path:
                     return manifest(web, req, tmpl)
                 try:
                     return _filerevision(web, tmpl, webutil.filectx(web.repo, req))
                 except revlog.LookupError, inst:
                     try:
                         return manifest(web, req, tmpl)
                     except ErrorResponse:
                         raise inst
             def _search(web, tmpl, query):
                 def changelist(**map):
                     cl = web.repo.changelog
                     count = 0
                     qw = query.lower().split()
                     def revgen():
                         for i in xrange(len(cl) - 1, 0, -100):
                             l = []
                             for j in xrange(max(0, i - 100), i + 1):
                                 ctx = web.repo[j]
                                 l.append(ctx)
                             l.reverse()
                             for e in l:
                                 yield e
                     for ctx in revgen():
                         miss = 0
                         for q in qw:
                             if not (q in ctx.user().lower() or
                                     q in ctx.description().lower() or
                                     q in " ".join(ctx.files()).lower()):
                                 miss = 1
                                 break
                         if miss:
                             continue
                         count += 1
                         n = ctx.node()
                         showtags = webutil.showtag(web.repo, tmpl, 'changelogtag', n)
                         yield tmpl('searchentry',
                                    parity=parity.next(),
                                    author=ctx.user(),
                                    parent=webutil.siblings(ctx.parents()),
                                    child=webutil.siblings(ctx.children()),
                                    changelogtag=showtags,
                                    desc=ctx.description(),
                                    date=ctx.date(),
                                    files=web.listfilediffs(tmpl, ctx.files(), n),
                                    rev=ctx.rev(),
                                    node=hex(n),
                                    tags=webutil.nodetagsdict(web.repo, n),
                                    inbranch=webutil.nodeinbranch(web.repo, ctx),
                                    branches=webutil.nodebranchdict(web.repo, ctx))
                         if count >= web.maxchanges:
                             break
                 cl = web.repo.changelog
                 parity = paritygen(web.stripecount)
                 return tmpl('search',
                             query=query,
                             node=hex(cl.tip()),
                             entries=changelist,
                             archives=web.archivelist("tip"))
             def changelog(web, req, tmpl, shortlog = False):
                 if 'node' in req.form:
                     ctx = webutil.changectx(web.repo, req)
                 else:
                     if 'rev' in req.form:
                         hi = req.form['rev'][0]
                     else:
                         hi = len(web.repo) - 1
                     try:
                         ctx = web.repo[hi]
                     except RepoError:
                         return _search(web, tmpl, hi) # XXX redirect to 404 page?
                 def changelist(limit=0, **map):
                     cl = web.repo.changelog
                     l = [] # build a list in forward order for efficiency
                     for i in xrange(start, end):
                         ctx = web.repo[i]
                         n = ctx.node()
                         showtags = webutil.showtag(web.repo, tmpl, 'changelogtag', n)
                         l.insert(0, {"parity": parity.next(),
                                      "author": ctx.user(),
                                      "parent": webutil.siblings(ctx.parents(), i - 1),
                                      "child": webutil.siblings(ctx.children(), i + 1),
                                      "changelogtag": showtags,
                                      "desc": ctx.description(),
                                      "date": ctx.date(),
                                      "files": web.listfilediffs(tmpl, ctx.files(), n),
                                      "rev": i,
                                      "node": hex(n),
                                      "tags": webutil.nodetagsdict(web.repo, n),
                                      "inbranch": webutil.nodeinbranch(web.repo, ctx),
                                      "branches": webutil.nodebranchdict(web.repo, ctx)
                                     })
                     if limit > 0:
                         l = l[:limit]
                     for e in l:
                         yield e
                 maxchanges = shortlog and web.maxshortchanges or web.maxchanges
                 cl = web.repo.changelog
                 count = len(cl)
                 pos = ctx.rev()
                 start = max(0, pos - maxchanges + 1)
                 end = min(count, start + maxchanges)
                 pos = end - 1
                 parity = paritygen(web.stripecount, offset=start-end)
                 changenav = webutil.revnavgen(pos, maxchanges, count, web.repo.changectx)
                 return tmpl(shortlog and 'shortlog' or 'changelog',
                             changenav=changenav,
                             node=hex(ctx.node()),
                             rev=pos, changesets=count,
                             entries=lambda **x: changelist(limit=0,**x),
                             latestentry=lambda **x: changelist(limit=1,**x),
                             archives=web.archivelist("tip"))
             def shortlog(web, req, tmpl):
                 return changelog(web, req, tmpl, shortlog = True)
             def changeset(web, req, tmpl):
                 ctx = webutil.changectx(web.repo, req)
                 n = ctx.node()
                 showtags = webutil.showtag(web.repo, tmpl, 'changesettag', n)
                 parents = ctx.parents()
                 p1 = parents[0].node()
                 files = []
                 parity = paritygen(web.stripecount)
                 for f in ctx.files():
                     template = f in ctx and 'filenodelink' or 'filenolink'
                     files.append(tmpl(template,
                                       node=hex(n), file=f,
                                       parity=parity.next()))
                 diffs = web.diff(tmpl, p1, n, None)
                 return tmpl('changeset',
                             diff=diffs,
                             rev=ctx.rev(),
                             node=hex(n),
                             parent=webutil.siblings(parents),
                             child=webutil.siblings(ctx.children()),
                             changesettag=showtags,
                             author=ctx.user(),
                             desc=ctx.description(),
                             date=ctx.date(),
                             files=files,
                             archives=web.archivelist(hex(n)),
                             tags=webutil.nodetagsdict(web.repo, n),
                             branch=webutil.nodebranchnodefault(ctx),
                             inbranch=webutil.nodeinbranch(web.repo, ctx),
                             branches=webutil.nodebranchdict(web.repo, ctx))
             rev = changeset
             def manifest(web, req, tmpl):
                 ctx = webutil.changectx(web.repo, req)
                 path = webutil.cleanpath(web.repo, req.form.get('file', [''])[0])
                 mf = ctx.manifest()
                 node = ctx.node()
                 files = {}
+                dirs = {}
                 parity = paritygen(web.stripecount)
                 if path and path[-1] != "/":
                     path += "/"
                 l = len(path)
                 abspath = "/" + path
                 for f, n in mf.items():
                     if f[:l] != path:
                         continue
                     remain = f[l:]
-                    idx = remain.find('/')
+                    elements = remain.split('/')
-                    if idx != -1:
+                    if len(elements) == 1:
-                        remain = remain[:idx+1]
+                        files[remain] = f
-                        n = None
+                    else:
-                    files[remain] = (f, n)
+                        h = dirs # need to retain ref to dirs (root)
+                        for elem in elements[0:-1]:
+                            if elem not in h:
+                                h[elem] = {}
+                            h = h[elem]
+                            if len(h) > 1:
+                                break
+                        h[None] = None # denotes files present
-                if not files:
+                if not files and not dirs:
                     raise ErrorResponse(HTTP_NOT_FOUND, 'path not found: ' + path)
                 def filelist(**map):
                     for f in util.sort(files):
-                        full, fnode = files[f]
+                        full = files[f]
-                        if not fnode:
-                            continue
                         fctx = ctx.filectx(full)
                         yield {"file": full,
                                "parity": parity.next(),
                                "basename": f,
                                "date": fctx.date(),
                                "size": fctx.size(),
                                "permissions": mf.flags(full)}
                 def dirlist(**map):
-                    for f in util.sort(files):
+                    for d in util.sort(dirs):
-                        full, fnode = files[f]
-                        if fnode:
-                            continue
+                        emptydirs = []
+                        h = dirs[d]
+                        while isinstance(h, dict) and len(h) == 1:
+                            k,v = h.items()[0]
+                            if v:
+                                emptydirs.append(k)
+                            h = v
+                        path = "%s%s" % (abspath, d)
                         yield {"parity": parity.next(),
-                               "path": "%s%s" % (abspath, f),
+                               "path": path,
-                               "basename": f[:-1]}
+                               "emptydirs": "/".join(emptydirs),
+                               "basename": d}
                 return tmpl("manifest",
                             rev=ctx.rev(),
                             node=hex(node),
                             path=abspath,
                             up=webutil.up(abspath),
                             upparity=parity.next(),
                             fentries=filelist,
                             dentries=dirlist,
                             archives=web.archivelist(hex(node)),
                             tags=webutil.nodetagsdict(web.repo, node),
                             inbranch=webutil.nodeinbranch(web.repo, ctx),
                             branches=webutil.nodebranchdict(web.repo, ctx))
             def tags(web, req, tmpl):
                 i = web.repo.tagslist()
                 i.reverse()
                 parity = paritygen(web.stripecount)
                 def entries(notip=False,limit=0, **map):
                     count = 0
                     for k, n in i:
                         if notip and k == "tip":
                             continue
                         if limit > 0 and count >= limit:
                             continue
                         count = count + 1
                         yield {"parity": parity.next(),
                                "tag": k,
                                "date": web.repo[n].date(),
                                "node": hex(n)}
                 return tmpl("tags",
                             node=hex(web.repo.changelog.tip()),
                             entries=lambda **x: entries(False,0, **x),
                             entriesnotip=lambda **x: entries(True,0, **x),
                             latestentry=lambda **x: entries(True,1, **x))
             def summary(web, req, tmpl):
                 i = web.repo.tagslist()
                 i.reverse()
                 def tagentries(**map):
                     parity = paritygen(web.stripecount)
                     count = 0
                     for k, n in i:
                         if k == "tip": # skip tip
                             continue
                         count += 1
                         if count > 10: # limit to 10 tags
                             break
                         yield tmpl("tagentry",
                                    parity=parity.next(),
                                    tag=k,
                                    node=hex(n),
                                    date=web.repo[n].date())
                 def branches(**map):
                     parity = paritygen(web.stripecount)
                     b = web.repo.branchtags()
                     l = [(-web.repo.changelog.rev(n), n, t) for t, n in b.items()]
                     for r,n,t in util.sort(l):
                         yield {'parity': parity.next(),
                                'branch': t,
                                'node': hex(n),
                                'date': web.repo[n].date()}
                 def changelist(**map):
                     parity = paritygen(web.stripecount, offset=start-end)
                     l = [] # build a list in forward order for efficiency
                     for i in xrange(start, end):
                         ctx = web.repo[i]
                         n = ctx.node()
                         hn = hex(n)
                         l.insert(0, tmpl(
                            'shortlogentry',
                             parity=parity.next(),
                             author=ctx.user(),
                             desc=ctx.description(),
                             date=ctx.date(),
                             rev=i,
                             node=hn,
                             tags=webutil.nodetagsdict(web.repo, n),
                             inbranch=webutil.nodeinbranch(web.repo, ctx),
                             branches=webutil.nodebranchdict(web.repo, ctx)))
                     yield l
                 cl = web.repo.changelog
                 count = len(cl)
                 start = max(0, count - web.maxchanges)
                 end = min(count, start + web.maxchanges)
                 return tmpl("summary",
                             desc=web.config("web", "description", "unknown"),
                             owner=get_contact(web.config) or "unknown",
                             lastchange=cl.read(cl.tip())[2],
                             tags=tagentries,
                             branches=branches,
                             shortlog=changelist,
                             node=hex(cl.tip()),
                             archives=web.archivelist("tip"))
             def filediff(web, req, tmpl):
                 fctx, ctx = None, None
                 try:
                     fctx = webutil.filectx(web.repo, req)
                 except LookupError:
                     ctx = webutil.changectx(web.repo, req)
                     path = webutil.cleanpath(web.repo, req.form['file'][0])
                     if path not in ctx.files():
                         raise
                 if fctx is not None:
                     n = fctx.node()
                     path = fctx.path()
                     parents = fctx.parents()
                     p1 = parents and parents[0].node() or nullid
                 else:
                     n = ctx.node()
                     # path already defined in except clause
                     parents = ctx.parents()
                     p1 = parents and parents[0].node() or nullid
                 diffs = web.diff(tmpl, p1, n, [path])
                 rename = fctx and webutil.renamelink(fctx) or []
                 ctx = fctx and fctx or ctx
                 return tmpl("filediff",
                             file=path,
                             node=hex(n),
                             rev=ctx.rev(),
                             date=ctx.date(),
                             desc=ctx.description(),
                             author=ctx.user(),
                             rename=rename,
                             branch=webutil.nodebranchnodefault(ctx),
                             parent=webutil.siblings(parents),
                             child=webutil.siblings(ctx.children()),
                             diff=diffs)
             diff = filediff
             def annotate(web, req, tmpl):
                 fctx = webutil.filectx(web.repo, req)
                 f = fctx.path()
                 parity = paritygen(web.stripecount)
                 def annotate(**map):
                     last = None
                     if binary(fctx.data()):
                         mt = (mimetypes.guess_type(fctx.path())[0]
                               or 'application/octet-stream')
                         lines = enumerate([((fctx.filectx(fctx.filerev()), 1),
                                             '(binary:%s)' % mt)])
                     else:
                         lines = enumerate(fctx.annotate(follow=True, linenumber=True))
                     for lineno, ((f, targetline), l) in lines:
                         fnode = f.filenode()
                         if last != fnode:
                             last = fnode
                         yield {"parity": parity.next(),
                                "node": hex(f.node()),
                                "rev": f.rev(),
                                "author": f.user(),
                                "desc": f.description(),
                                "file": f.path(),
                                "targetline": targetline,
                                "line": l,
                                "lineid": "l%d" % (lineno + 1),
                                "linenumber": "% 6d" % (lineno + 1)}
                 return tmpl("fileannotate",
                             file=f,
                             annotate=annotate,
                             path=webutil.up(f),
                             rev=fctx.rev(),
                             node=hex(fctx.node()),
                             author=fctx.user(),
                             date=fctx.date(),
                             desc=fctx.description(),
                             rename=webutil.renamelink(fctx),
                             branch=webutil.nodebranchnodefault(fctx),
                             parent=webutil.siblings(fctx.parents()),
                             child=webutil.siblings(fctx.children()),
                             permissions=fctx.manifest().flags(f))
             def filelog(web, req, tmpl):
                 try:
                     fctx = webutil.filectx(web.repo, req)
                     f = fctx.path()
                     fl = fctx.filelog()
                 except revlog.LookupError:
                     f = webutil.cleanpath(web.repo, req.form['file'][0])
                     fl = web.repo.file(f)
                     numrevs = len(fl)
                     if not numrevs: # file doesn't exist at all
                         raise
                     rev = webutil.changectx(web.repo, req).rev()
                     first = fl.linkrev(fl.node(0))
                     if rev < first: # current rev is from before file existed
                         raise
                     frev = numrevs - 1
                     while fl.linkrev(fl.node(frev)) > rev:
                         frev -= 1
                     fctx = web.repo.filectx(f, fl.linkrev(fl.node(frev)))
                 count = fctx.filerev() + 1
                 pagelen = web.maxshortchanges
                 start = max(0, fctx.filerev() - pagelen + 1) # first rev on this page
                 end = min(count, start + pagelen) # last rev on this page
                 parity = paritygen(web.stripecount, offset=start-end)
                 def entries(limit=0, **map):
                     l = []
                     for i in xrange(start, end):
                         ctx = fctx.filectx(i)
                         l.insert(0, {"parity": parity.next(),
                                      "filerev": i,
                                      "file": f,
                                      "node": hex(ctx.node()),
                                      "author": ctx.user(),
                                      "date": ctx.date(),
                                      "rename": webutil.renamelink(fctx),
                                      "parent": webutil.siblings(fctx.parents()),
                                      "child": webutil.siblings(fctx.children()),
                                      "desc": ctx.description()})
                     if limit > 0:
                         l = l[:limit]
                     for e in l:
                         yield e
                 nodefunc = lambda x: fctx.filectx(fileid=x)
                 nav = webutil.revnavgen(end - 1, pagelen, count, nodefunc)
                 return tmpl("filelog", file=f, node=hex(fctx.node()), nav=nav,
                             entries=lambda **x: entries(limit=0, **x),
                             latestentry=lambda **x: entries(limit=1, **x))
             def archive(web, req, tmpl):
                 type_ = req.form.get('type', [None])[0]
                 allowed = web.configlist("web", "allow_archive")
                 key = req.form['node'][0]
                 if type_ not in web.archives:
                     msg = 'Unsupported archive type: %s' % type_
                     raise ErrorResponse(HTTP_NOT_FOUND, msg)
                 if not ((type_ in allowed or
                     web.configbool("web", "allow" + type_, False))):
                     msg = 'Archive type not allowed: %s' % type_
                     raise ErrorResponse(HTTP_FORBIDDEN, msg)
                 reponame = re.sub(r"\W+", "-", os.path.basename(web.reponame))
                 cnode = web.repo.lookup(key)
                 arch_version = key
                 if cnode == key or key == 'tip':
                     arch_version = short(cnode)
                 name = "%s-%s" % (reponame, arch_version)
                 mimetype, artype, extension, encoding = web.archive_specs[type_]
                 headers = [
                     ('Content-Type', mimetype),
                     ('Content-Disposition', 'attachment; filename=%s%s' % (name, extension))
                 ]
                 if encoding:
                     headers.append(('Content-Encoding', encoding))
                 req.header(headers)
                 req.respond(HTTP_OK)
                 archival.archive(web.repo, req, cnode, artype, prefix=name)
                 return []
             def static(web, req, tmpl):
                 fname = req.form['file'][0]
                 # a repo owner may set web.static in .hg/hgrc to get any file
                 # readable by the user running the CGI script
                 static = web.config("web", "static", None, untrusted=False)
                 if not static:
                     tp = web.templatepath
                     if isinstance(tp, str):
                         tp = [tp]
                     static = [os.path.join(p, 'static') for p in tp]
                 return [staticfile(static, fname, req)]
             def graph(web, req, tmpl):
                 rev = webutil.changectx(web.repo, req).rev()
                 bg_height = 39
                 max_rev = len(web.repo) - 1
                 revcount = min(max_rev, int(req.form.get('revcount', [25])[0]))
                 revnode = web.repo.changelog.node(rev)
                 revnode_hex = hex(revnode)
                 uprev = min(max_rev, rev + revcount)
                 downrev = max(0, rev - revcount)
                 lessrev = max(0, rev - revcount / 2)
                 maxchanges = web.maxshortchanges or web.maxchanges
                 count = len(web.repo)
                 changenav = webutil.revnavgen(rev, maxchanges, count, web.repo.changectx)
                 tree = list(graphmod.graph(web.repo, rev, downrev))
                 canvasheight = (len(tree) + 1) * bg_height - 27;
                 data = []
                 for i, (ctx, vtx, edges) in enumerate(tree):
                     node = short(ctx.node())
                     age = templatefilters.age(ctx.date())
                     desc = templatefilters.firstline(ctx.description())
                     desc = cgi.escape(desc)
                     user = cgi.escape(templatefilters.person(ctx.user()))
                     branch = ctx.branch()
                     branch = branch, web.repo.branchtags().get(branch) == ctx.node()
                     data.append((node, vtx, edges, desc, user, age, branch, ctx.tags()))
                 return tmpl('graph', rev=rev, revcount=revcount, uprev=uprev,
                             lessrev=lessrev, revcountmore=revcount and 2 * revcount or 1,
                             revcountless=revcount / 2, downrev=downrev,
                             canvasheight=canvasheight, bg_height=bg_height,
                             jsdata=data, node=revnode_hex, changenav=changenav)

templates/coal/map

0 +1 -1

             default = 'shortlog'
             mimetype = 'text/html; charset={encoding}'
             header = header.tmpl
             footer = footer.tmpl
             search = search.tmpl
             changelog = shortlog.tmpl
             shortlog = shortlog.tmpl
             shortlogentry = shortlogentry.tmpl
             graph = graph.tmpl
             naventry = '<a href="{url}log/{node|short}{sessionvars%urlparameter}">{label|escape}</a> '
             navshortentry = '<a href="{url}shortlog/{node|short}{sessionvars%urlparameter}">{label|escape}</a> '
             navgraphentry = '<a href="{url}graph/{node|short}{sessionvars%urlparameter}">{label|escape}</a> '
             filenaventry = '<a href="{url}log/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{label|escape}</a> '
             filedifflink = '<a href="{url}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{file|escape}</a> '
             filenodelink = '<a href="{url}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{file|escape}</a> '
             filenolink = '{file|escape} '
             fileellipses = '...'
             changelogentry = shortlogentry.tmpl
             searchentry = shortlogentry.tmpl
             changeset = changeset.tmpl
             manifest = manifest.tmpl
-            direntry = '<tr class="fileline parity{parity}"><td class="name"><a href="{url}file/{node|short}{path|urlescape}{sessionvars%urlparameter}"><img src="{staticurl}coal-folder.png"> {basename|escape}/</a><td class="size"></td><td class="permissions">drwxr-xr-x</td></tr>'
+            direntry = '<tr class="fileline parity{parity}"><td class="name"><a href="{url}file/{node|short}{path|urlescape}{sessionvars%urlparameter}"><img src="{staticurl}coal-folder.png"> {basename|escape}/</a> <a href="{url}file/{node|short}{path|urlescape}/{emptydirs|urlescape}{sessionvars%urlparameter}">{emptydirs|escape}</a><td class="size"></td><td class="permissions">drwxr-xr-x</td></tr>'
             fileentry = '<tr class="fileline parity{parity}"><td class="filename"><a href="{url}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}#l1"><img src="{staticurl}coal-file.png"> {basename|escape}</a></td><td class="size">{size}</td><td class="permissions">{permissions|permissions}</td></tr>'
             filerevision = filerevision.tmpl
             fileannotate = fileannotate.tmpl
             filediff = filediff.tmpl
             filelog = filelog.tmpl
             fileline = '<tr class="parity{parity}"><td class="lineno"><a href="#{lineid}" id="{lineid}">{linenumber}</a></td><td class="source">{line|escape}</td></tr>'
             filelogentry = filelogentry.tmpl
             annotateline = '<tr class="parity{parity}"><td class="annotate"><a href="{url}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}#{targetline}" title="{node|short}: {desc|escape|firstline}">{author|user}@{rev}</a></td><td class="lineno"><a href="#{lineid}" id="{lineid}">{linenumber}</a></td><td class="source">{line|escape}</td></tr>'
             diffblock = '<table class="bigtable parity{parity}">{lines}</table>'
             difflineplus = '<tr><td class="lineno"><a href="#{lineid}" id="{lineid}">{linenumber}</a></td><td class="source plusline">{line|escape}</td></tr>'
             difflineminus = '<tr><td class="lineno"><a href="#{lineid}" id="{lineid}">{linenumber}</a></td><td class="source minusline">{line|escape}</td></tr>'
             difflineat = '<tr><td class="lineno"><a href="#{lineid}" id="{lineid}">{linenumber}</a></td><td class="source atline">{line|escape}</td></tr>'
             diffline = '<tr><td class="lineno"><a href="#{lineid}" id="{lineid}">{linenumber}</a></td><td class="source">{line|escape}</td></tr>'
             changelogparent = '<tr><th class="parent">parent {rev}:</th><td class="parent"><a href="{url}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a></td></tr>'
             changesetparent = '<a href="{url}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a> '
             filerevparent = '<a href="{url}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{rename%filerename}{node|short}</a> '
             filerevchild = '<a href="{url}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{node|short}</a> '
             filerename = '{file|escape}@'
             filelogrename = '<tr><th>base:</th><td><a href="{url}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{file|escape}@{node|short}</a></td></tr>'
             fileannotateparent = '<tr><td class="metatag">parent:</td><td><a href="{url}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{rename%filerename}{node|short}</a></td></tr>'
             changesetchild = '<a href="{url}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a>'
             changelogchild = '<tr><th class="child">child</th><td class="child"><a href="{url}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a></td></tr>'
             fileannotatechild = '<tr><td class="metatag">child:</td><td><a href="{url}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{node|short}</a></td></tr>'
             tags = tags.tmpl
             tagentry = '<tr class="tagEntry parity{parity}"><td><a href="{url}rev/{node|short}{sessionvars%urlparameter}">{tag|escape}</a></td><td class="node">{node|short}</td></tr>'
             changelogtag = '<span class="tag">{name|escape}</span> '
             changesettag = '<span class="tag">{tag|escape}</span> '
             filediffparent = '<tr><th class="parent">parent {rev}:</th><td class="parent"><a href="{url}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a></td></tr>'
             filelogparent = '<tr><th>parent {rev}:</th><td><a href="{url}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{node|short}</a></td></tr>'
             filediffchild = '<tr><th class="child">child {rev}:</th><td class="child"><a href="{url}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a></td></tr>'
             filelogchild = '<tr><th>child {rev}:</th><td><a href="{url}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{node|short}</a></td></tr>'
             indexentry = '<tr class="parity{parity}"><td><a href="{url}{sessionvars%urlparameter}">{name|escape}</a></td><td>{description}</td><td>{contact|obfuscate}</td><td class="age">{lastchange|age} ago</td><td class="indexlinks">{archives%indexarchiveentry}</td></tr>\n'
             indexarchiveentry = '<a href="{url}archive/{node|short}{extension|urlescape}">&nbsp;&darr;{type|escape}</a>'
             index = index.tmpl
             archiveentry = '<li><a href="{url}archive/{node|short}{extension|urlescape}">{type|escape}</a></li>'
             notfound = notfound.tmpl
             error = error.tmpl
             urlparameter = '{separator}{name}={value|urlescape}'
             hiddenformentry = '<input type="hidden" name="{name}" value="{value|escape}" />'

templates/gitweb/map

0 +1 -1

             default = 'summary'
             mimetype = 'text/html; charset={encoding}'
             header = header.tmpl
             footer = footer.tmpl
             search = search.tmpl
             changelog = changelog.tmpl
             summary = summary.tmpl
             error = error.tmpl
             notfound = notfound.tmpl
             naventry = '<a href="{url}log/{node|short}{sessionvars%urlparameter}">{label|escape}</a> '
             navshortentry = '<a href="{url}shortlog/{node|short}{sessionvars%urlparameter}">{label|escape}</a> '
             navgraphentry = '<a href="{url}graph/{node|short}{sessionvars%urlparameter}">{label|escape}</a> '
             filenaventry = '<a href="{url}log/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{label|escape}</a> '
             filedifflink = '<a href="#url#diff/#node|short#/#file|urlescape#{sessionvars%urlparameter}">#file|escape#</a> '
             filenodelink = '<tr class="parity#parity#"><td><a class="list" href="{url}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">#file|escape#</a></td><td></td><td class="link"><a href="#url#file/#node|short#/#file|urlescape#{sessionvars%urlparameter}">file</a> | <a href="#url#annotate/#node|short#/#file|urlescape#{sessionvars%urlparameter}">annotate</a> | <a href="#url#diff/#node|short#/#file|urlescape#{sessionvars%urlparameter}">diff</a> | <a href="#url#log/#node|short#/#file|urlescape#{sessionvars%urlparameter}">revisions</a></td></tr>'
             filenolink = '<tr class="parity#parity#"><td><a class="list" href="{url}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">#file|escape#</a></td><td></td><td class="link">file | annotate | <a href="#url#diff/#node|short#/#file|urlescape#{sessionvars%urlparameter}">diff</a> | <a href="#url#log/#node|short#/#file|urlescape#{sessionvars%urlparameter}">revisions</a></td></tr>'
             fileellipses = '...'
             changelogentry = changelogentry.tmpl
             searchentry = changelogentry.tmpl
             changeset = changeset.tmpl
             manifest = manifest.tmpl
-            direntry = '<tr class="parity#parity#"><td style="font-family:monospace">drwxr-xr-x</td><td style="font-family:monospace"></td><td style="font-family:monospace"></td><td><a href="#url#file/#node|short##path|urlescape#{sessionvars%urlparameter}">#basename|escape#</a></td><td class="link"><a href="#url#file/#node|short##path|urlescape#{sessionvars%urlparameter}">files</a></td></tr>'
+            direntry = '<tr class="parity#parity#"><td style="font-family:monospace">drwxr-xr-x</td><td style="font-family:monospace"></td><td style="font-family:monospace"></td><td><a href="#url#file/#node|short##path|urlescape#{sessionvars%urlparameter}">#basename|escape#</a> <a href="#url#file/#node|short##path|urlescape#/#emptydirs|urlescape#{sessionvars%urlparameter}">#emptydirs|escape#</a></td><td class="link"><a href="#url#file/#node|short##path|urlescape#{sessionvars%urlparameter}">files</a></td></tr>'
             fileentry = '<tr class="parity#parity#"><td style="font-family:monospace">#permissions|permissions#</td><td style="font-family:monospace" align=right>#date|isodate#</td><td style="font-family:monospace" align=right>#size#</td><td class="list"><a class="list" href="#url#file/#node|short#/#file|urlescape#{sessionvars%urlparameter}">#basename|escape#</a></td><td class="link"><a href="#url#file/#node|short#/#file|urlescape#{sessionvars%urlparameter}">file</a> | <a href="#url#log/#node|short#/#file|urlescape#{sessionvars%urlparameter}">revisions</a> | <a href="#url#annotate/#node|short#/#file|urlescape#{sessionvars%urlparameter}">annotate</a></td></tr>'
             filerevision = filerevision.tmpl
             fileannotate = fileannotate.tmpl
             filediff = filediff.tmpl
             filelog = filelog.tmpl
             fileline = '<div style="font-family:monospace" class="parity#parity#"><pre><a class="linenr" href="##lineid#" id="#lineid#">#linenumber#</a> #line|escape#</pre></div>'
             annotateline = '<tr style="font-family:monospace" class="parity#parity#"><td class="linenr" style="text-align: right;"><a href="#url#annotate/#node|short#/#file|urlescape#{sessionvars%urlparameter}#l{targetline}" title="{node|short}: {desc|escape|firstline}">#author|user#@#rev#</a></td><td><pre><a class="linenr" href="##lineid#" id="#lineid#">#linenumber#</a></pre></td><td><pre>#line|escape#</pre></td></tr>'
             difflineplus = '<span style="color:#008800;"><a class="linenr" href="##lineid#" id="#lineid#">#linenumber#</a> #line|escape#</span>'
             difflineminus = '<span style="color:#cc0000;"><a class="linenr" href="##lineid#" id="#lineid#">#linenumber#</a> #line|escape#</span>'
             difflineat = '<span style="color:#990099;"><a class="linenr" href="##lineid#" id="#lineid#">#linenumber#</a> #line|escape#</span>'
             diffline = '<span><a class="linenr" href="##lineid#" id="#lineid#">#linenumber#</a> #line|escape#</span>'
             changelogparent = '<tr><th class="parent">parent #rev#:</th><td class="parent"><a href="#url#rev/#node|short#{sessionvars%urlparameter}">#node|short#</a></td></tr>'
             changesetbranch = '<tr><td>branch</td><td>{name}</td></tr>'
             changesetparent = '<tr><td>parent {rev}</td><td style="font-family:monospace"><a class="list" href="{url}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a></td></tr>'
             filerevbranch = '<tr><td>branch</td><td>{name}</td></tr>'
             filerevparent = '<tr><td>parent {rev}</td><td style="font-family:monospace"><a class="list" href="{url}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{rename%filerename}{node|short}</a></td></tr>'
             filerename = '{file|escape}@'
             filelogrename = '| <a href="{url}file/#node|short#/#file|urlescape#{sessionvars%urlparameter}">base</a>'
             fileannotateparent = '<tr><td>parent {rev}</td><td style="font-family:monospace"><a class="list" href="{url}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{rename%filerename}{node|short}</a></td></tr>'
             changelogchild = '<tr><th class="child">child #rev#:</th><td class="child"><a href="{url}rev/#node|short#{sessionvars%urlparameter}">#node|short#</a></td></tr>'
             changesetchild = '<tr><td>child {rev}</td><td style="font-family:monospace"><a class="list" href="{url}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a></td></tr>'
             filerevchild = '<tr><td>child {rev}</td><td style="font-family:monospace"><a class="list" href="{url}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{node|short}</a></td></tr>'
             fileannotatechild = '<tr><td>child {rev}</td><td style="font-family:monospace"><a class="list" href="{url}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{node|short}</a></td></tr>'
             tags = tags.tmpl
             tagentry = '<tr class="parity#parity#"><td class="age"><i>#date|age# ago</i></td><td><a class="list" href="{url}rev/{node|short}{sessionvars%urlparameter}"><b>#tag|escape#</b></a></td><td class="link"><a href="{url}rev/#node|short#{sessionvars%urlparameter}">changeset</a> | <a href="{url}log/#node|short#{sessionvars%urlparameter}">changelog</a> | <a href="{url}file/#node|short#{sessionvars%urlparameter}">files</a></td></tr>'
             branchentry = '<tr class="parity{parity}"><td class="age"><i>{date|age} ago</i></td><td><a class="list" href="{url}rev/{node|short}{sessionvars%urlparameter}"><b>{node|short}</b></a></td><td>{branch|escape}</td><td class="link"><a href="{url}rev/{node|short}{sessionvars%urlparameter}">changeset</a> | <a href="{url}log/{node|short}{sessionvars%urlparameter}">changelog</a> | <a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a></td></tr>'
             diffblock = '<pre>#lines#</pre>'
             filediffparent = '<tr><td>parent {rev}</td><td style="font-family:monospace"><a class="list" href="{url}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{node|short}</a></td></tr>'
             filelogparent = '<tr><td align="right">parent #rev#:&nbsp;</td><td><a href="{url}file/{node|short}/#file|urlescape#{sessionvars%urlparameter}">#node|short#</a></td></tr>'
             filediffchild = '<tr><td>child {rev}</td><td style="font-family:monospace"><a class="list" href="{url}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{node|short}</a></td></tr>'
             filelogchild = '<tr><td align="right">child #rev#:&nbsp;</td><td><a href="{url}file{node|short}/#file|urlescape#{sessionvars%urlparameter}">#node|short#</a></td></tr>'
             shortlog = shortlog.tmpl
             graph = graph.tmpl
             tagtag = '<span class="tagtag" title="{name}">{name}</span> '
             branchtag = '<span class="branchtag" title="{name}">{name}</span> '
             inbranchtag = '<span class="inbranchtag" title="{name}">{name}</span> '
             shortlogentry = '<tr class="parity#parity#"><td class="age"><i>#date|age# ago</i></td><td><i>#author|person#</i></td><td><a class="list" href="{url}rev/#node|short#{sessionvars%urlparameter}"><b>#desc|strip|firstline|escape#</b> <span class="logtags">{inbranch%inbranchtag}{branches%branchtag}{tags%tagtag}</span></a></td><td class="link" nowrap><a href="{url}rev/#node|short#{sessionvars%urlparameter}">changeset</a> | <a href="{url}file/#node|short#{sessionvars%urlparameter}">files</a></td></tr>'
             filelogentry = '<tr class="parity#parity#"><td class="age"><i>#date|age# ago</i></td><td><a class="list" href="{url}rev/#node|short#{sessionvars%urlparameter}"><b>#desc|strip|firstline|escape#</b></a></td><td class="link"><a href="{url}file/#node|short#/#file|urlescape#{sessionvars%urlparameter}">file</a>&nbsp;|&nbsp;<a href="{url}diff/#node|short#/#file|urlescape#{sessionvars%urlparameter}">diff</a>&nbsp;|&nbsp;<a href="{url}annotate/#node|short#/#file|urlescape#{sessionvars%urlparameter}">annotate</a> #rename%filelogrename#</td></tr>'
             archiveentry = ' | <a href="{url}archive/{node|short}{extension}">#type|escape#</a> '
             indexentry = '<tr class="parity{parity}"><td><a class="list" href="{url}{sessionvars%urlparameter}"><b>{name|escape}</b></a></td><td>{description}</td><td>{contact|obfuscate}</td><td class="age">{lastchange|age} ago</td><td class="indexlinks">{archives%indexarchiveentry}</td><td><div class="rss_logo"><a href="{url}rss-log">RSS</a> <a href="{url}atom-log">Atom</a></div></td></tr>\n'
             indexarchiveentry = ' <a href="{url}archive/{node|short}{extension}">{type|escape}</a> '
             index = index.tmpl
             urlparameter = '#separator##name#=#value|urlescape#'
             hiddenformentry = '<input type="hidden" name="#name#" value="#value|escape#" />'

templates/map

0 +1 -1

             default = 'shortlog'
             mimetype = 'text/html; charset={encoding}'
             header = header.tmpl
             footer = footer.tmpl
             search = search.tmpl
             changelog = changelog.tmpl
             shortlog = shortlog.tmpl
             shortlogentry = shortlogentry.tmpl
             graph = graph.tmpl
             naventry = '<a href="{url}log/{node|short}{sessionvars%urlparameter}">{label|escape}</a> '
             navshortentry = '<a href="{url}shortlog/{node|short}{sessionvars%urlparameter}">{label|escape}</a> '
             navgraphentry = '<a href="{url}graph/{node|short}{sessionvars%urlparameter}">{label|escape}</a> '
             filenaventry = '<a href="{url}log/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{label|escape}</a> '
             filedifflink = '<a href="#url#diff/#node|short#/#file|urlescape#{sessionvars%urlparameter}">#file|escape#</a> '
             filenodelink = '<a href="#url#file/#node|short#/#file|urlescape#{sessionvars%urlparameter}">#file|escape#</a> '
             filenolink = '{file|escape} '
             fileellipses = '...'
             changelogentry = changelogentry.tmpl
             searchentry = changelogentry.tmpl
             changeset = changeset.tmpl
             manifest = manifest.tmpl
-            direntry = '<tr class="parity#parity#"><td><tt>drwxr-xr-x</tt>&nbsp;<td>&nbsp;<td>&nbsp;<td><a href="#url#file/#node|short##path|urlescape#{sessionvars%urlparameter}">#basename|escape#/</a>'
+            direntry = '<tr class="parity#parity#"><td><tt>drwxr-xr-x</tt>&nbsp;<td>&nbsp;<td>&nbsp;<td><a href="#url#file/#node|short##path|urlescape#{sessionvars%urlparameter}">#basename|escape#/</a> <a href="#url#file/#node|short##path|urlescape#/#emptydirs|urlescape#{sessionvars%urlparameter}">#emptydirs|urlescape#</a>'
             fileentry = '<tr class="parity#parity#"><td><tt>#permissions|permissions#</tt>&nbsp;<td align=right><tt class="date">#date|isodate#</tt>&nbsp;<td align=right><tt>#size#</tt>&nbsp;<td><a href="#url#file/#node|short#/#file|urlescape#{sessionvars%urlparameter}">#basename|escape#</a>'
             filerevision = filerevision.tmpl
             fileannotate = fileannotate.tmpl
             filediff = filediff.tmpl
             filelog = filelog.tmpl
             fileline = '<div class="parity#parity#"><a class="lineno" href="##lineid#" id="#lineid#">#linenumber#</a>#line|escape#</div>'
             filelogentry = filelogentry.tmpl
             annotateline = '<tr class="parity#parity#"><td class="annotate"><a href="#url#annotate/#node|short#/#file|urlescape#{sessionvars%urlparameter}#l{targetline}" title="{node|short}: {desc|escape|firstline}">#author|user#@#rev#</a></td><td><a class="lineno" href="##lineid#" id="#lineid#">#linenumber#</a></td><td><pre>#line|escape#</pre></td></tr>'
             difflineplus = '<span class="plusline"><a class="lineno" href="##lineid#" id="#lineid#">#linenumber#</a>#line|escape#</span>'
             difflineminus = '<span class="minusline"><a class="lineno" href="##lineid#" id="#lineid#">#linenumber#</a>#line|escape#</span>'
             difflineat = '<span class="atline"><a class="lineno" href="##lineid#" id="#lineid#">#linenumber#</a>#line|escape#</span>'
             diffline = '<a class="lineno" href="##lineid#" id="#lineid#">#linenumber#</a>#line|escape#'
             changelogparent = '<tr><th class="parent">parent #rev#:</th><td class="parent"><a href="#url#rev/#node|short#{sessionvars%urlparameter}">#node|short#</a></td></tr>'
             changesetparent = '<tr><th class="parent">parent #rev#:</th><td class="parent"><a href="#url#rev/#node|short#{sessionvars%urlparameter}">#node|short#</a></td></tr>'
             filerevparent = '<tr><td class="metatag">parent:</td><td><a href="{url}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{rename%filerename}{node|short}</a></td></tr>'
             filerename = '{file|escape}@'
             filelogrename = '<tr><th>base:</th><td><a href="#url#file/#node|short#/#file|urlescape#{sessionvars%urlparameter}">#file|escape#@#node|short#</a></td></tr>'
             fileannotateparent = '<tr><td class="metatag">parent:</td><td><a href="{url}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{rename%filerename}{node|short}</a></td></tr>'
             changesetchild = '<tr><th class="child">child #rev#:</th><td class="child"><a href="#url#rev/#node|short#{sessionvars%urlparameter}">#node|short#</a></td></tr>'
             changelogchild = '<tr><th class="child">child #rev#:</th><td class="child"><a href="#url#rev/#node|short#{sessionvars%urlparameter}">#node|short#</a></td></tr>'
             filerevchild = '<tr><td class="metatag">child:</td><td><a href="#url#file/#node|short#/#file|urlescape#{sessionvars%urlparameter}">#node|short#</a></td></tr>'
             fileannotatechild = '<tr><td class="metatag">child:</td><td><a href="#url#annotate/#node|short#/#file|urlescape#{sessionvars%urlparameter}">#node|short#</a></td></tr>'
             tags = tags.tmpl
             tagentry = '<li class="tagEntry parity#parity#"><tt class="node">#node#</tt> <a href="#url#rev/#node|short#{sessionvars%urlparameter}">#tag|escape#</a></li>'
             diffblock = '<pre class="parity#parity#">#lines#</pre>'
             changelogtag = '<tr><th class="tag">tag:</th><td class="tag">#tag|escape#</td></tr>'
             changesettag = '<tr><th class="tag">tag:</th><td class="tag">#tag|escape#</td></tr>'
             filediffparent = '<tr><th class="parent">parent #rev#:</th><td class="parent"><a href="#url#rev/#node|short#{sessionvars%urlparameter}">#node|short#</a></td></tr>'
             filelogparent = '<tr><th>parent #rev#:</th><td><a href="#url#file/#node|short#/#file|urlescape#{sessionvars%urlparameter}">#node|short#</a></td></tr>'
             filediffchild = '<tr><th class="child">child #rev#:</th><td class="child"><a href="#url#rev/#node|short#{sessionvars%urlparameter}">#node|short#</a></td></tr>'
             filelogchild = '<tr><th>child #rev#:</th><td><a href="#url#file/#node|short#/#file|urlescape#{sessionvars%urlparameter}">#node|short#</a></td></tr>'
             indexentry = '<tr class="parity#parity#"><td><a href="#url#{sessionvars%urlparameter}">#name|escape#</a></td><td>#description#</td><td>#contact|obfuscate#</td><td class="age">#lastchange|age# ago</td><td class="indexlinks"><a href="#url#rss-log">RSS</a> <a href="#url#atom-log">Atom</a> #archives%archiveentry#</td></tr>'
             index = index.tmpl
             archiveentry = '<a href="#url#archive/#node|short##extension|urlescape#">#type|escape#</a> '
             notfound = notfound.tmpl
             error = error.tmpl
             urlparameter = '#separator##name#=#value|urlescape#'
             hiddenformentry = '<input type="hidden" name="#name#" value="#value|escape#" />'

templates/paper/map

0 +1 -1

             default = 'shortlog'
             mimetype = 'text/html; charset={encoding}'
             header = header.tmpl
             footer = ../coal/footer.tmpl
             search = ../coal/search.tmpl
             changelog = ../coal/shortlog.tmpl
             shortlog = ../coal/shortlog.tmpl
             shortlogentry = ../coal/shortlogentry.tmpl
             graph = ../coal/graph.tmpl
             naventry = '<a href="{url}log/{node|short}{sessionvars%urlparameter}">{label|escape}</a> '
             navshortentry = '<a href="{url}shortlog/{node|short}{sessionvars%urlparameter}">{label|escape}</a> '
             navgraphentry = '<a href="{url}graph/{node|short}{sessionvars%urlparameter}">{label|escape}</a> '
             filenaventry = '<a href="{url}log/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{label|escape}</a> '
             filedifflink = '<a href="{url}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{file|escape}</a> '
             filenodelink = '<a href="{url}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{file|escape}</a> '
             filenolink = '{file|escape} '
             fileellipses = '...'
             changelogentry = ../coal/shortlogentry.tmpl
             searchentry = ../coal/shortlogentry.tmpl
             changeset = ../coal/changeset.tmpl
             manifest = ../coal/manifest.tmpl
-            direntry = '<tr class="fileline parity{parity}"><td class="name"><a href="{url}file/{node|short}{path|urlescape}{sessionvars%urlparameter}"><img src="{staticurl}coal-folder.png"> {basename|escape}/</a><td class="size"></td><td class="permissions">drwxr-xr-x</td></tr>'
+            direntry = '<tr class="fileline parity{parity}"><td class="name"><a href="{url}file/{node|short}{path|urlescape}{sessionvars%urlparameter}"><img src="{staticurl}coal-folder.png"> {basename|escape}/</a> <a href="{url}file/{node|short}{path|urlescape}/{emptydirs|urlescape}{sessionvars%urlparameter}">{emptydirs|escape}</a><td class="size"></td><td class="permissions">drwxr-xr-x</td></tr>'
             fileentry = '<tr class="fileline parity{parity}"><td class="filename"><a href="{url}file/{node|short}/{file|urlescape}#l1{sessionvars%urlparameter}"><img src="{staticurl}coal-file.png"> {basename|escape}</a></td><td class="size">{size}</td><td class="permissions">{permissions|permissions}</td></tr>'
             filerevision = ../coal/filerevision.tmpl
             fileannotate = ../coal/fileannotate.tmpl
             filediff = ../coal/filediff.tmpl
             filelog = ../coal/filelog.tmpl
             fileline = '<tr class="parity{parity}"><td class="lineno"><a href="#{lineid}" id="{lineid}">{linenumber}</a></td><td class="source">{line|escape}</td></tr>'
             filelogentry = ../coal/filelogentry.tmpl
             annotateline = '<tr class="parity{parity}"><td class="annotate"><a href="{url}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}#{targetline}" title="{node|short}: {desc|escape|firstline}">{author|user}@{rev}</a></td><td class="lineno"><a href="#{lineid}" id="{lineid}">{linenumber}</a></td><td class="source">{line|escape}</td></tr>'
             diffblock = '<table class="bigtable parity{parity}">{lines}</table>'
             difflineplus = '<tr><td class="lineno"><a href="#{lineid}" id="{lineid}">{linenumber}</a></td><td class="source plusline">{line|escape}</td></tr>'
             difflineminus = '<tr><td class="lineno"><a href="#{lineid}" id="{lineid}">{linenumber}</a></td><td class="source minusline">{line|escape}</td></tr>'
             difflineat = '<tr><td class="lineno"><a href="#{lineid}" id="{lineid}">{linenumber}</a></td><td class="source atline">{line|escape}</td></tr>'
             diffline = '<tr><td class="lineno"><a href="#{lineid}" id="{lineid}">{linenumber}</a></td><td class="source">{line|escape}</td></tr>'
             changelogparent = '<tr><th class="parent">parent {rev}:</th><td class="parent"><a href="{url}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a></td></tr>'
             changesetparent = '<a href="{url}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a> '
             filerevparent = '<a href="{url}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{rename%filerename}{node|short}</a> '
             filerevchild = '<a href="{url}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{node|short}</a> '
             filerename = '{file|escape}@'
             filelogrename = '<tr><th>base:</th><td><a href="{url}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{file|escape}@{node|short}</a></td></tr>'
             fileannotateparent = '<tr><td class="metatag">parent:</td><td><a href="{url}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{rename%filerename}{node|short}</a></td></tr>'
             changesetchild = '<a href="{url}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a>'
             changelogchild = '<tr><th class="child">child</th><td class="child"><a href="{url}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a></td></tr>'
             fileannotatechild = '<tr><td class="metatag">child:</td><td><a href="{url}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{node|short}</a></td></tr>'
             tags = ../coal/tags.tmpl
             tagentry = '<tr class="tagEntry parity{parity}"><td><a href="{url}rev/{node|short}{sessionvars%urlparameter}">{tag|escape}</a></td><td class="node">{node|short}</td></tr>'
             changelogtag = '<tr><th class="tag">tag:</th><td class="tag">{tag|escape}</td></tr>'
             changelogtag = '<span class="tag">{name|escape}</span> '
             changesettag = '<span class="tag">{tag|escape}</span> '
             filediffparent = '<tr><th class="parent">parent {rev}:</th><td class="parent"><a href="{url}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a></td></tr>'
             filelogparent = '<tr><th>parent {rev}:</th><td><a href="{url}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{node|short}</a></td></tr>'
             filediffchild = '<tr><th class="child">child {rev}:</th><td class="child"><a href="{url}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a></td></tr>'
             filelogchild = '<tr><th>child {rev}:</th><td><a href="{url}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{node|short}</a></td></tr>'
             indexentry = '<tr class="parity{parity}"><td><a href="{url}{sessionvars%urlparameter}">{name|escape}</a></td><td>{description}</td><td>{contact|obfuscate}</td><td class="age">{lastchange|age} ago</td><td class="indexlinks">{archives%indexarchiveentry}</td></tr>\n'
             indexarchiveentry = '<a href="{url}archive/{node|short}{extension|urlescape}">&nbsp;&darr;{type|escape}</a>'
             index = ../coal/index.tmpl
             archiveentry = '<li><a href="{url}archive/{node|short}{extension|urlescape}">{type|escape}</a></li>'
             notfound = ../coal/notfound.tmpl
             error = ../coal/error.tmpl
             urlparameter = '{separator}{name}={value|urlescape}'
             hiddenformentry = '<input type="hidden" name="{name}" value="{value|escape}" />'

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages