This is an archive of the discontinued Mercurial Phabricator instance.

Differential D113

gitweb: preserve whitespace in description
ClosedPublic

Authored by indygreg on Jul 17 2017, 6:55 PM.

Download Raw Diff

Details

Reviewers

martinvonz

Group Reviewers

hg-reviewers

Commits

rHG875b054e5b95: gitweb: preserve whitespace in description
rHG85ea5d801b1f: gitweb: preserve whitespace in description

Summary

Without this, multiple spaces or tabs in the commit message aren't
preserved and things like tables don't align properly.

As part of adding the CSS rule, we had to cuddle the content
with the <div> to not introduce leading and trailing whitespace.
The "addbreaks" filter was also removed because it would insert
an additional newline, effectively double spacing content.

Diff Detail

Repository

rHG Mercurial

Lint

Lint Skipped

Unit

Unit Tests Skipped

Event Timeline

indygreg created this revision.Jul 17 2017, 6:55 PM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptJul 17 2017, 6:55 PM

Herald added a subscriber: mercurial-devel. · View Herald Transcript

martinvonz accepted this revision.Jul 17 2017, 7:02 PM

This revision is now accepted and ready to land.Jul 17 2017, 7:02 PM

Closed by commit rHG85ea5d801b1f: gitweb: preserve whitespace in description (authored by indygreg). · Explain WhyJul 18 2017, 2:41 PM

This revision was automatically updated to reflect the committed changes.

greenparkvn mentioned this in greenparkvn.Nov 7 2021, 5:21 AM

Revision Contents
Changeset List

			Path	Packages
M			mercurial/templates/gitweb/changelogentry.tmpl (6 lines)
M			mercurial/templates/gitweb/changeset.tmpl (4 lines)
M			mercurial/templates/gitweb/fileannotate.tmpl (4 lines)
M			mercurial/templates/gitweb/filerevision.tmpl (4 lines)
M			mercurial/templates/static/style-gitweb.css (1 line)
M			tests/test-hgweb.t (3 lines)

Diff 224

mercurial/templates/gitweb/changelogentry.tmpl

	<div>			<div>
	<a class="title" href="{url\|urlescape}rev/{node\|short}{sessionvars%urlparameter}"><span class="age">{date\|rfc822date}</span>{desc\|strip\|firstline\|escape\|nonempty}<span class="logtags"> {inbranch%inbranchtag}{branches%branchtag}{tags%tagtag}{bookmarks%bookmarktag}</span></a>			<a class="title" href="{url\|urlescape}rev/{node\|short}{sessionvars%urlparameter}"><span class="age">{date\|rfc822date}</span>{desc\|strip\|firstline\|escape\|nonempty}<span class="logtags"> {inbranch%inbranchtag}{branches%branchtag}{tags%tagtag}{bookmarks%bookmarktag}</span></a>
	</div>			</div>
	<div class="title_text">			<div class="title_text">
	<div class="log_link">			<div class="log_link">
	<a href="{url\|urlescape}rev/{node\|short}{sessionvars%urlparameter}">changeset</a><br/>			<a href="{url\|urlescape}rev/{node\|short}{sessionvars%urlparameter}">changeset</a><br/>
	</div>			</div>
	<i>{author\|obfuscate} [{date\|rfc822date}] rev {rev}</i><br/>			<i>{author\|obfuscate} [{date\|rfc822date}] rev {rev}</i><br/>
	</div>			</div>
	<div class="log_body description">			<div class="log_body description">{desc\|strip\|escape\|websub\|nonempty}
	{desc\|strip\|escape\|websub\|addbreaks\|nonempty}
	<br/>
	<br/>
	</div>			</div>

mercurial/templates/gitweb/changeset.tmpl

	<tr>			<tr>
	<td>changeset {rev}</td>			<td>changeset {rev}</td>
	<td style="font-family:monospace"><a class="list" href="{url\|urlescape}rev/{node\|short}{sessionvars%urlparameter}">{node\|short}</a></td>			<td style="font-family:monospace"><a class="list" href="{url\|urlescape}rev/{node\|short}{sessionvars%urlparameter}">{node\|short}</a></td>
	</tr>			</tr>
	{ifeq(count(parent), '2', parent%changesetparentdiff, parent%changesetparent)}			{ifeq(count(parent), '2', parent%changesetparentdiff, parent%changesetparent)}
	{child%changesetchild}			{child%changesetchild}
	</table></div>			</table></div>

	<div class="page_body description">			<div class="page_body description">{desc\|strip\|escape\|websub\|nonempty}</div>
	{desc\|strip\|escape\|websub\|addbreaks\|nonempty}
	</div>
	<div class="list_head"></div>			<div class="list_head"></div>
	<div class="title_text">			<div class="title_text">
	<table cellspacing="0">			<table cellspacing="0">
	{files}			{files}
	</table></div>			</table></div>

	<div class="page_body diffblocks">{diff}</div>			<div class="page_body diffblocks">{diff}</div>

	{footer}			{footer}

mercurial/templates/gitweb/fileannotate.tmpl

	{child%fileannotatechild}			{child%fileannotatechild}
	<tr>			<tr>
	<td>permissions</td>			<td>permissions</td>
	<td style="font-family:monospace">{permissions\|permissions}</td>			<td style="font-family:monospace">{permissions\|permissions}</td>
	</tr>			</tr>
	</table>			</table>
	</div>			</div>

	<div class="page_path description">			<div class="page_path description">{desc\|strip\|escape\|websub\|nonempty}</div>
	{desc\|strip\|escape\|websub\|addbreaks\|nonempty}
	</div>
	<div class="page_body">			<div class="page_body">
	<table>			<table>
	<tbody class="sourcelines"			<tbody class="sourcelines"
	data-logurl="{url\|urlescape}log/{symrev}/{file\|urlescape}"			data-logurl="{url\|urlescape}log/{symrev}/{file\|urlescape}"
	data-selectabletag="TR"			data-selectabletag="TR"
	data-ishead="{ishead}">			data-ishead="{ishead}">
	{annotate%annotateline}			{annotate%annotateline}
	</tbody>			</tbody>
	</table>			</table>
	</div>			</div>

	<script type="text/javascript" src="{staticurl\|urlescape}followlines.js"></script>			<script type="text/javascript" src="{staticurl\|urlescape}followlines.js"></script>

	{footer}			{footer}

mercurial/templates/gitweb/filerevision.tmpl

	{child%filerevchild}			{child%filerevchild}
	<tr>			<tr>
	<td>permissions</td>			<td>permissions</td>
	<td style="font-family:monospace">{permissions\|permissions}</td>			<td style="font-family:monospace">{permissions\|permissions}</td>
	</tr>			</tr>
	</table>			</table>
	</div>			</div>

	<div class="page_path description">			<div class="page_path description">{desc\|strip\|escape\|websub\|nonempty}</div>
	{desc\|strip\|escape\|websub\|addbreaks\|nonempty}
	</div>

	<div class="page_body">			<div class="page_body">
	<pre class="sourcelines stripes"			<pre class="sourcelines stripes"
	data-logurl="{url\|urlescape}log/{symrev}/{file\|urlescape}"			data-logurl="{url\|urlescape}log/{symrev}/{file\|urlescape}"
	data-selectabletag="SPAN"			data-selectabletag="SPAN"
	data-ishead="{ishead}">			data-ishead="{ishead}">
	{text%fileline}			{text%fileline}
	</pre>			</pre>
	</div>			</div>

	<script type="text/javascript" src="{staticurl\|urlescape}followlines.js"></script>			<script type="text/javascript" src="{staticurl\|urlescape}followlines.js"></script>

	{footer}			{footer}

mercurial/templates/static/style-gitweb.css

	tr:target td,			tr:target td,
	pre.sourcelines > span:target,			pre.sourcelines > span:target,
	pre.sourcelines.stripes > span:target {			pre.sourcelines.stripes > span:target {
	background-color: #bfdfff;			background-color: #bfdfff;
	}			}

	.description {			.description {
	font-family: monospace;			font-family: monospace;
				white-space: pre;
	}			}

	/* Followlines */			/* Followlines */
	tbody.sourcelines > tr.followlines-selected,			tbody.sourcelines > tr.followlines-selected,
	pre.sourcelines > span.followlines-selected {			pre.sourcelines > span.followlines-selected {
	background-color: #99C7E9 !important;			background-color: #99C7E9 !important;
	}			}

tests/test-hgweb.t


	$ $PYTHON -c "print len(file('access.log').readlines()), 'log lines written'"			$ $PYTHON -c "print len(file('access.log').readlines()), 'log lines written'"
	14 log lines written			14 log lines written

	static file			static file

	$ get-with-headers.py --twice localhost:$HGPORT 'static/style-gitweb.css' - date etag server			$ get-with-headers.py --twice localhost:$HGPORT 'static/style-gitweb.css' - date etag server
	200 Script output follows			200 Script output follows
	content-length: 8985			content-length: 9007
	content-type: text/css			content-type: text/css

	body { font-family: sans-serif; font-size: 12px; border:solid #d9d8d1; border-width:1px; margin:10px; background: white; color: black; }			body { font-family: sans-serif; font-size: 12px; border:solid #d9d8d1; border-width:1px; margin:10px; background: white; color: black; }
	a { color:#0000cc; }			a { color:#0000cc; }
	a:hover, a:visited, a:active { color:#880000; }			a:hover, a:visited, a:active { color:#880000; }
	div.page_header { height:25px; padding:8px; font-size:18px; font-weight:bold; background-color:#d9d8d1; }			div.page_header { height:25px; padding:8px; font-size:18px; font-weight:bold; background-color:#d9d8d1; }
	div.page_header a:visited { color:#0000cc; }			div.page_header a:visited { color:#0000cc; }
	div.page_header a:hover { color:#880000; }			div.page_header a:hover { color:#880000; }
	tr:target td,			tr:target td,
	pre.sourcelines > span:target,			pre.sourcelines > span:target,
	pre.sourcelines.stripes > span:target {			pre.sourcelines.stripes > span:target {
	background-color: #bfdfff;			background-color: #bfdfff;
	}			}

	.description {			.description {
	font-family: monospace;			font-family: monospace;
				white-space: pre;
	}			}

	/* Followlines */			/* Followlines */
	tbody.sourcelines > tr.followlines-selected,			tbody.sourcelines > tr.followlines-selected,
	pre.sourcelines > span.followlines-selected {			pre.sourcelines > span.followlines-selected {
	background-color: #99C7E9 !important;			background-color: #99C7E9 !important;
	}			}

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	224		Jul 17 2017, 6:55 PM	★	★
Diff 2	278	rHG85ea5d801b1fb2b26d99fd3604a6a97abd4f7b0b	Jul 17 2017, 6:54 PM	★	★