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 b''
	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 b''
	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

                 node = ctx.node()
                 files = {}
+                dirs = {}
                 parity = paritygen(web.stripecount)
                 if path and path[-1] != "/":
                     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,
                                "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(),

templates/coal/map

0 +1 -1

             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

templates/gitweb/map

0 +1 -1

             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

templates/map

0 +1 -1

             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

templates/paper/map

0 +1 -1

             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

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