upstream/mercurial-mirror Commit - r8372:783c8c78

paper: break long lines in map file

Martin Geisler -

r8372:783c8c78 default

parent child

templates/paper/map

0 +130 -16

@@ -23,8 +23,30 b' searchentry = shortlogentry.tmpl'
23	changeset = changeset.tmpl	23	changeset = changeset.tmpl
24	manifest = manifest.tmpl	24	manifest = manifest.tmpl
25		25
26	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" alt="dir."/> {basename\|escape}/</a> <a href="{url}file/{node\|short}{path\|urlescape}/{emptydirs\|urlescape}{sessionvars%urlparameter}">{emptydirs\|escape}</a></td><td class="size"></td><td class="permissions">drwxr-xr-x</td></tr>'	26	direntry = '
27	fileentry = '<tr class="fileline parity{parity}"><td class="filename"><a href="{url}file/{node\|short}/{file\|urlescape}{sessionvars%urlparameter}"><img src="{staticurl}coal-file.png" alt="file"/> {basename\|escape}</a></td><td class="size">{size}</td><td class="permissions">{permissions\|permissions}</td></tr>'	27	<tr class="fileline parity{parity}">
		28	<td class="name">
		29	<a href="{url}file/{node\|short}{path\|urlescape}{sessionvars%urlparameter}">
		30	<img src="{staticurl}coal-folder.png" alt="dir."/> {basename\|escape}/
		31	</a>
		32	<a href="{url}file/{node\|short}{path\|urlescape}/{emptydirs\|urlescape}{sessionvars%urlparameter}">
		33	{emptydirs\|escape}
		34	</a>
		35	</td>
		36	<td class="size"></td>
		37	<td class="permissions">drwxr-xr-x</td>
		38	</tr>'
		39
		40	fileentry = '
		41	<tr class="fileline parity{parity}">
		42	<td class="filename">
		43	<a href="{url}file/{node\|short}/{file\|urlescape}{sessionvars%urlparameter}">
		44	<img src="{staticurl}coal-file.png" alt="file"/> {basename\|escape}
		45	</a>
		46	</td>
		47	<td class="size">{size}</td>
		48	<td class="permissions">{permissions\|permissions}</td>
		49	</tr>'
28		50
29	filerevision = filerevision.tmpl	51	filerevision = filerevision.tmpl
30	fileannotate = fileannotate.tmpl	52	fileannotate = fileannotate.tmpl
@@ -33,7 +55,14 b' filelog = filelog.tmpl'
33	fileline = '<div class="parity{parity} source"><a href="#{lineid}" id="{lineid}">{linenumber}</a> {line\|escape}</div>'	55	fileline = '<div class="parity{parity} source"><a href="#{lineid}" id="{lineid}">{linenumber}</a> {line\|escape}</div>'
34	filelogentry = filelogentry.tmpl	56	filelogentry = filelogentry.tmpl
35		57
36	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="source"><a href="#{lineid}" id="{lineid}">{linenumber}</a> {line\|escape}</td></tr>'	58	annotateline = '
		59	<tr class="parity{parity}">
		60	<td class="annotate">
		61	<a href="{url}annotate/{node\|short}/{file\|urlescape}{sessionvars%urlparameter}#{targetline}"
		62	title="{node\|short}: {desc\|escape\|firstline}">{author\|user}@{rev}</a>
		63	</td>
		64	<td class="source"><a href="#{lineid}" id="{lineid}">{linenumber}</a> {line\|escape}</td>
		65	</tr>'
37		66
38	diffblock = '<div class="source bottomline parity{parity}"><pre>{lines}</pre></div>'	67	diffblock = '<div class="source bottomline parity{parity}"><pre>{lines}</pre></div>'
39	difflineplus = '<a href="#{lineid}" id="{lineid}">{linenumber}</a> <span class="plusline">{line\|escape}</span>'	68	difflineplus = '<a href="#{lineid}" id="{lineid}">{linenumber}</a> <span class="plusline">{line\|escape}</span>'
@@ -41,7 +70,11 b' difflineminus = \'<a href="#{lineid}" id='
41	difflineat = '<a href="#{lineid}" id="{lineid}">{linenumber}</a> <span class="atline">{line\|escape}</span>'	70	difflineat = '<a href="#{lineid}" id="{lineid}">{linenumber}</a> <span class="atline">{line\|escape}</span>'
42	diffline = '<a href="#{lineid}" id="{lineid}">{linenumber}</a> {line\|escape}'	71	diffline = '<a href="#{lineid}" id="{lineid}">{linenumber}</a> {line\|escape}'
43		72
44	changelogparent = '<tr><th class="parent">parent {rev}:</th><td class="parent"><a href="{url}rev/{node\|short}{sessionvars%urlparameter}">{node\|short}</a></td></tr>'	73	changelogparent = '
		74	<tr>
		75	<th class="parent">parent {rev}:</th>
		76	<td class="parent"><a href="{url}rev/{node\|short}{sessionvars%urlparameter}">{node\|short}</a></td>
		77	</tr>'
45		78
46	changesetparent = '<a href="{url}rev/{node\|short}{sessionvars%urlparameter}">{node\|short}</a> '	79	changesetparent = '<a href="{url}rev/{node\|short}{sessionvars%urlparameter}">{node\|short}</a> '
47		80
@@ -49,27 +82,108 b' filerevparent = \'<a href="{url}file/{nod'
49	filerevchild = '<a href="{url}file/{node\|short}/{file\|urlescape}{sessionvars%urlparameter}">{node\|short}</a> '	82	filerevchild = '<a href="{url}file/{node\|short}/{file\|urlescape}{sessionvars%urlparameter}">{node\|short}</a> '
50		83
51	filerename = '{file\|escape}@'	84	filerename = '{file\|escape}@'
52	filelogrename = '<tr><th>base:</th><td><a href="{url}file/{node\|short}/{file\|urlescape}{sessionvars%urlparameter}">{file\|escape}@{node\|short}</a></td></tr>'	85	filelogrename = '
53	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>'	86	<tr>
		87	<th>base:</th>
		88	<td>
		89	<a href="{url}file/{node\|short}/{file\|urlescape}{sessionvars%urlparameter}">
		90	{file\|escape}@{node\|short}
		91	</a>
		92	</td>
		93	</tr>'
		94	fileannotateparent = '
		95	<tr>
		96	<td class="metatag">parent:</td>
		97	<td>
		98	<a href="{url}annotate/{node\|short}/{file\|urlescape}{sessionvars%urlparameter}">
		99	{rename%filerename}{node\|short}
		100	</a>
		101	</td>
		102	</tr>'
54	changesetchild = ' <a href="{url}rev/{node\|short}{sessionvars%urlparameter}">{node\|short}</a>'	103	changesetchild = ' <a href="{url}rev/{node\|short}{sessionvars%urlparameter}">{node\|short}</a>'
55	changelogchild = '<tr><th class="child">child</th><td class="child"><a href="{url}rev/{node\|short}{sessionvars%urlparameter}">{node\|short}</a></td></tr>'	104	changelogchild = '
56	fileannotatechild = '<tr><td class="metatag">child:</td><td><a href="{url}annotate/{node\|short}/{file\|urlescape}{sessionvars%urlparameter}">{node\|short}</a></td></tr>'	105	<tr>
		106	<th class="child">child</th>
		107	<td class="child">
		108	<a href="{url}rev/{node\|short}{sessionvars%urlparameter}">
		109	{node\|short}
		110	</a>
		111	</td>
		112	</tr>'
		113	fileannotatechild = '
		114	<tr>
		115	<td class="metatag">child:</td>
		116	<td>
		117	<a href="{url}annotate/{node\|short}/{file\|urlescape}{sessionvars%urlparameter}">
		118	{node\|short}
		119	</a>
		120	</td>
		121	</tr>'
57	tags = tags.tmpl	122	tags = tags.tmpl
58	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>'	123	tagentry = '
		124	<tr class="tagEntry parity{parity}">
		125	<td>
		126	<a href="{url}rev/{node\|short}{sessionvars%urlparameter}">
		127	{tag\|escape}
		128	</a>
		129	</td>
		130	<td class="node">
		131	{node\|short}
		132	</td>
		133	</tr>'
59	branches = branches.tmpl	134	branches = branches.tmpl
60	branchentry = '<tr class="tagEntry parity{parity}"><td><a href="{url}shortlog/{node\|short}{sessionvars%urlparameter}">{branch\|escape}</a></td><td class="node">{node\|short}</td></tr>'	135	branchentry = '
		136	<tr class="tagEntry parity{parity}">
		137	<td>
		138	<a href="{url}shortlog/{node\|short}{sessionvars%urlparameter}">
		139	{branch\|escape}
		140	</a>
		141	</td>
		142	<td class="node">
		143	{node\|short}
		144	</td>
		145	</tr>'
61	changelogtag = '<span class="tag">{name\|escape}</span> '	146	changelogtag = '<span class="tag">{name\|escape}</span> '
62	changesettag = '<span class="tag">{tag\|escape}</span> '	147	changesettag = '<span class="tag">{tag\|escape}</span> '
63	changelogbranchhead = '<span class="branchhead">{name\|escape}</span> '	148	changelogbranchhead = '<span class="branchhead">{name\|escape}</span> '
64	changelogbranchname = '<span class="branchname">{name\|escape}</span> '	149	changelogbranchname = '<span class="branchname">{name\|escape}</span> '
65	filediffparent = '<tr><th class="parent">parent {rev}:</th><td class="parent"><a href="{url}rev/{node\|short}{sessionvars%urlparameter}">{node\|short}</a></td></tr>'	150
66	filelogparent = '<tr><th>parent {rev}:</th><td><a href="{url}file/{node\|short}/{file\|urlescape}{sessionvars%urlparameter}">{node\|short}</a></td></tr>'	151	filediffparent = '
67	filediffchild = '<tr><th class="child">child {rev}:</th><td class="child"><a href="{url}rev/{node\|short}{sessionvars%urlparameter}">{node\|short}</a></td></tr>'	152	<tr>
68	filelogchild = '<tr><th>child {rev}:</th><td><a href="{url}file/{node\|short}/{file\|urlescape}{sessionvars%urlparameter}">{node\|short}</a></td></tr>'	153	<th class="parent">parent {rev}:</th>
69	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'	154	<td class="parent"><a href="{url}rev/{node\|short}{sessionvars%urlparameter}">{node\|short}</a></td>
		155	</tr>'
		156	filelogparent = '
		157	<tr>
		158	<th>parent {rev}:</th>
		159	<td><a href="{url}file/{node\|short}/{file\|urlescape}{sessionvars%urlparameter}">{node\|short}</a></td>
		160	</tr>'
		161	filediffchild = '
		162	<tr>
		163	<th class="child">child {rev}:</th>
		164	<td class="child"><a href="{url}rev/{node\|short}{sessionvars%urlparameter}">{node\|short}</a>
		165	</td>
		166	</tr>'
		167	filelogchild = '
		168	<tr>
		169	<th>child {rev}:</th>
		170	<td><a href="{url}file/{node\|short}/{file\|urlescape}{sessionvars%urlparameter}">{node\|short}</a></td>
		171	</tr>'
		172
		173	indexentry = '
		174	<tr class="parity{parity}">
		175	<td><a href="{url}{sessionvars%urlparameter}">{name\|escape}</a></td>
		176	<td>{description}</td>
		177	<td>{contact\|obfuscate}</td>
		178	<td class="age">{lastchange\|age} ago</td>
		179	<td class="indexlinks">{archives%indexarchiveentry}</td>
		180	</tr>\n'
70	indexarchiveentry = '<a href="{url}archive/{node\|short}{extension\|urlescape}"> ↓{type\|escape}</a>'	181	indexarchiveentry = '<a href="{url}archive/{node\|short}{extension\|urlescape}"> ↓{type\|escape}</a>'
71	index = index.tmpl	182	index = index.tmpl
72	archiveentry = '<li><a href="{url}archive/{node\|short}{extension\|urlescape}">{type\|escape}</a></li>'	183	archiveentry = '
		184	<li>
		185	<a href="{url}archive/{node\|short}{extension\|urlescape}">{type\|escape}</a>
		186	</li>'
73	notfound = notfound.tmpl	187	notfound = notfound.tmpl
74	error = error.tmpl	188	error = error.tmpl
75	urlparameter = '{separator}{name}={value\|urlescape}'	189	urlparameter = '{separator}{name}={value\|urlescape}'

tests/test-hgweb-descend-empties.out

0 +37 -1

@@ -61,7 +61,43 b' files, or words in the commit message</d'
61	<td class="size"></td>	61	<td class="size"></td>
62	<td class="permissions">drwxr-xr-x</td>	62	<td class="permissions">drwxr-xr-x</td>
63	</tr>	63	</tr>
64	<tr class="fileline parity1"><td class="name"><a href="/file/9087c84a0f5d/a1"><img src="/static/coal-folder.png" alt="dir."/> a1/</a> <a href="/file/9087c84a0f5d/a1/a2/a3/a4">a2/a3/a4</a></td><td class="size"></td><td class="permissions">drwxr-xr-x</td></tr><tr class="fileline parity0"><td class="name"><a href="/file/9087c84a0f5d/b1"><img src="/static/coal-folder.png" alt="dir."/> b1/</a> <a href="/file/9087c84a0f5d/b1/b2">b2</a></td><td class="size"></td><td class="permissions">drwxr-xr-x</td></tr><tr class="fileline parity1"><td class="name"><a href="/file/9087c84a0f5d/d1"><img src="/static/coal-folder.png" alt="dir."/> d1/</a> <a href="/file/9087c84a0f5d/d1/d2">d2</a></td><td class="size"></td><td class="permissions">drwxr-xr-x</td></tr>	64
		65	<tr class="fileline parity1">
		66	<td class="name">
		67	<a href="/file/9087c84a0f5d/a1">
		68	<img src="/static/coal-folder.png" alt="dir."/> a1/
		69	</a>
		70	<a href="/file/9087c84a0f5d/a1/a2/a3/a4">
		71	a2/a3/a4
		72	</a>
		73	</td>
		74	<td class="size"></td>
		75	<td class="permissions">drwxr-xr-x</td>
		76	</tr>
		77	<tr class="fileline parity0">
		78	<td class="name">
		79	<a href="/file/9087c84a0f5d/b1">
		80	<img src="/static/coal-folder.png" alt="dir."/> b1/
		81	</a>
		82	<a href="/file/9087c84a0f5d/b1/b2">
		83	b2
		84	</a>
		85	</td>
		86	<td class="size"></td>
		87	<td class="permissions">drwxr-xr-x</td>
		88	</tr>
		89	<tr class="fileline parity1">
		90	<td class="name">
		91	<a href="/file/9087c84a0f5d/d1">
		92	<img src="/static/coal-folder.png" alt="dir."/> d1/
		93	</a>
		94	<a href="/file/9087c84a0f5d/d1/d2">
		95	d2
		96	</a>
		97	</td>
		98	<td class="size"></td>
		99	<td class="permissions">drwxr-xr-x</td>
		100	</tr>
65		101
66	</table>	102	</table>
67	</div>	103	</div>

tests/test-hgwebdir.out

0 +96 -12

@@ -70,17 +70,94 b' 200 Script output follows'
70	<th><a href="?sort=lastchange">Last change</a></th>	70	<th><a href="?sort=lastchange">Last change</a></th>
71	<th> </th>	71	<th> </th>
72	</tr>	72	</tr>
73	<tr class="parity0"><td><a href="/b/?style=paper">b</a></td><td>unknown</td><td>Foo Bar <foo.bar@example.com></td><td class="age">seconds ago</td><td class="indexlinks"></td></tr>	73
74	<tr class="parity1"><td><a href="/coll/a/?style=paper">coll/a</a></td><td>unknown</td><td>Foo Bar <foo.bar@example.com></td><td class="age">seconds ago</td><td class="indexlinks"></td></tr>	74	<tr class="parity0">
75	<tr class="parity0"><td><a href="/coll/a/.hg/patches/?style=paper">coll/a/.hg/patches</a></td><td>unknown</td><td>Foo Bar <foo.bar@example.com></td><td class="age">seconds ago</td><td class="indexlinks"></td></tr>	75	<td><a href="/b/?style=paper">b</a></td>
76	<tr class="parity1"><td><a href="/coll/b/?style=paper">coll/b</a></td><td>unknown</td><td>Foo Bar <foo.bar@example.com></td><td class="age">seconds ago</td><td class="indexlinks"></td></tr>	76	<td>unknown</td>
77	~~<tr class="parity0"><td><a href="/coll/c/?style=paper">coll/c</a></td><td>unknown</td>~~<td>Foo Bar <foo.bar@example.com></td>~~<td class="age">seconds ago</td><td class="indexlinks"></td></tr>~~	77	<td>Foo Bar <foo.bar@example.com></td>
78	<tr class="parity1"><td><a href="/rcoll/a/?style=paper">rcoll/a</a></td><td>unknown</td><td>Foo Bar <foo.bar@example.com></td><td class="age">seconds ago</td><td class="indexlinks"></td></tr>	78	<td class="age">seconds ago</td>
79	<tr class="parity0"><td><a href="/rcoll/a/.hg/patches/?style=paper">rcoll/a/.hg/patches</a></td><td>unknown</td><td>Foo Bar <foo.bar@example.com></td><td class="age">seconds ago</td><td class="indexlinks"></td></tr>	79	<td class="indexlinks"></td>
80	<tr class="parity1"><td><a href="/rcoll/b/?style=paper">rcoll/b</a></td><td>unknown</td><td>Foo Bar <foo.bar@example.com></td><td class="age">seconds ago</td><td class="indexlinks"></td></tr>	80	</tr>
81	<tr class="parity0"><td><a href="/rcoll/b/d/?style=paper">rcoll/b/d</a></td><td>unknown</td><td>Foo Bar <foo.bar@example.com></td><td class="age">seconds ago</td><td class="indexlinks"></td></tr>	81
82	<tr class="parity1"><td><a href="/rcoll/c/?style=paper">rcoll/c</a></td><td>unknown</td><td>Foo Bar <foo.bar@example.com></td><td class="age">seconds ago</td><td class="indexlinks"></td></tr>	82	<tr class="parity1">
83	<tr class="parity0"><td><a href="/t/a/?style=paper">t/a</a></td><td>unknown</td><td>Foo Bar <foo.bar@example.com></td><td class="age">seconds ago</td><td class="indexlinks"></td></tr>	83	<td><a href="/coll/a/?style=paper">coll/a</a></td>
		84	<td>unknown</td>
		85	<td>Foo Bar <foo.bar@example.com></td>
		86	<td class="age">seconds ago</td>
		87	<td class="indexlinks"></td>
		88	</tr>
		89
		90	<tr class="parity0">
		91	<td><a href="/coll/a/.hg/patches/?style=paper">coll/a/.hg/patches</a></td>
		92	<td>unknown</td>
		93	<td>Foo Bar <foo.bar@example.com></td>
		94	<td class="age">seconds ago</td>
		95	<td class="indexlinks"></td>
		96	</tr>
		97
		98	<tr class="parity1">
		99	<td><a href="/coll/b/?style=paper">coll/b</a></td>
		100	<td>unknown</td>
		101	<td>Foo Bar <foo.bar@example.com></td>
		102	<td class="age">seconds ago</td>
		103	<td class="indexlinks"></td>
		104	</tr>
		105
		106	<tr class="parity0">
		107	<td><a href="/coll/c/?style=paper">coll/c</a></td>
		108	<td>unknown</td>
		109	<td>Foo Bar <foo.bar@example.com></td>
		110	<td class="age">seconds ago</td>
		111	<td class="indexlinks"></td>
		112	</tr>
		113
		114	<tr class="parity1">
		115	<td><a href="/rcoll/a/?style=paper">rcoll/a</a></td>
		116	<td>unknown</td>
		117	<td>Foo Bar <foo.bar@example.com></td>
		118	<td class="age">seconds ago</td>
		119	<td class="indexlinks"></td>
		120	</tr>
		121
		122	<tr class="parity0">
		123	<td><a href="/rcoll/a/.hg/patches/?style=paper">rcoll/a/.hg/patches</a></td>
		124	<td>unknown</td>
		125	<td>Foo Bar <foo.bar@example.com></td>
		126	<td class="age">seconds ago</td>
		127	<td class="indexlinks"></td>
		128	</tr>
		129
		130	<tr class="parity1">
		131	<td><a href="/rcoll/b/?style=paper">rcoll/b</a></td>
		132	<td>unknown</td>
		133	<td>Foo Bar <foo.bar@example.com></td>
		134	<td class="age">seconds ago</td>
		135	<td class="indexlinks"></td>
		136	</tr>
		137
		138	<tr class="parity0">
		139	<td><a href="/rcoll/b/d/?style=paper">rcoll/b/d</a></td>
		140	<td>unknown</td>
		141	<td>Foo Bar <foo.bar@example.com></td>
		142	<td class="age">seconds ago</td>
		143	<td class="indexlinks"></td>
		144	</tr>
		145
		146	<tr class="parity1">
		147	<td><a href="/rcoll/c/?style=paper">rcoll/c</a></td>
		148	<td>unknown</td>
		149	<td>Foo Bar <foo.bar@example.com></td>
		150	<td class="age">seconds ago</td>
		151	<td class="indexlinks"></td>
		152	</tr>
		153
		154	<tr class="parity0">
		155	<td><a href="/t/a/?style=paper">t/a</a></td>
		156	<td>unknown</td>
		157	<td>Foo Bar <foo.bar@example.com></td>
		158	<td class="age">seconds ago</td>
		159	<td class="indexlinks"></td>
		160	</tr>
84		161
85	</table>	162	</table>
86	</div>	163	</div>
@@ -129,7 +206,14 b' 200 Script output follows'
129	<th><a href="?sort=lastchange">Last change</a></th>	206	<th><a href="?sort=lastchange">Last change</a></th>
130	<th> </th>	207	<th> </th>
131	</tr>	208	</tr>
132	<tr class="parity0"><td><a href="/t/a/?style=paper">a</a></td><td>unknown</td><td>Foo Bar <foo.bar@example.com></td><td class="age">seconds ago</td><td class="indexlinks"></td></tr>	209
		210	<tr class="parity0">
		211	<td><a href="/t/a/?style=paper">a</a></td>
		212	<td>unknown</td>
		213	<td>Foo Bar <foo.bar@example.com></td>
		214	<td class="age">seconds ago</td>
		215	<td class="indexlinks"></td>
		216	</tr>
133		217
134	</table>	218	</table>
135	</div>	219	</div>

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