upstream/mercurial-mirror Commit - r33557:875b054e

gitweb: preserve whitespace in description...

Gregory Szorc -

r33557:875b054e default

parent child

mercurial/templates/gitweb/changelogentry.tmpl

0 +2 -4

             <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>
             </div>
             <div class="title_text">
             <div class="log_link">
             <a href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">changeset</a><br/>
             </div>
             <i>{author|obfuscate} [{date|rfc822date}] rev {rev}</i><br/>
             </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>

mercurial/templates/gitweb/changeset.tmpl

0 +1 -3

             {header}
             <title>{repo|escape}: changeset {rev}:{node|short}</title>
             <link rel="alternate" type="application/atom+xml"
                href="{url|urlescape}atom-log" title="Atom feed for {repo|escape}"/>
             <link rel="alternate" type="application/rss+xml"
                href="{url|urlescape}rss-log" title="RSS feed for {repo|escape}"/>
             </head>
             <body>
             <div class="page_header">
             <a href="{logourl}" title="Mercurial" style="float: right;">Mercurial</a>
             <a href="/">Mercurial</a> {pathdef%breadcrumb} / changeset
             </div>
             <div class="page_nav">
             <div>
             <a href="{url|urlescape}summary{sessionvars%urlparameter}">summary</a> |
             <a href="{url|urlescape}shortlog/{symrev}{sessionvars%urlparameter}">shortlog</a> |
             <a href="{url|urlescape}log/{symrev}{sessionvars%urlparameter}">changelog</a> |
             <a href="{url|urlescape}graph/{symrev}{sessionvars%urlparameter}">graph</a> |
             <a href="{url|urlescape}tags{sessionvars%urlparameter}">tags</a> |
             <a href="{url|urlescape}bookmarks{sessionvars%urlparameter}">bookmarks</a> |
             <a href="{url|urlescape}branches{sessionvars%urlparameter}">branches</a> |
             <a href="{url|urlescape}file/{symrev}{sessionvars%urlparameter}">files</a> |
             changeset |
             <a href="{url|urlescape}raw-rev/{symrev}">raw</a> {archives%archiveentry} |
             <a href="{url|urlescape}help{sessionvars%urlparameter}">help</a>
             </div>
             {searchform}
             </div>
             <div>
             <a class="title" href="{url|urlescape}raw-rev/{node|short}">{desc|strip|escape|firstline|nonempty} <span class="logtags">{inbranch%inbranchtag}{branches%branchtag}{tags%tagtag}{bookmarks%bookmarktag}</span></a>
             </div>
             <div class="title_text">
             <table cellspacing="0">
             <tr><td>author</td><td>{author|obfuscate}</td></tr>
             <tr><td></td><td class="date age">{date|rfc822date}</td></tr>
             {branch%changesetbranch}
             <tr>
              <td>changeset {rev}</td>
              <td style="font-family:monospace"><a class="list" href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a></td>
             </tr>
             {ifeq(count(parent), '2', parent%changesetparentdiff, parent%changesetparent)}
             {child%changesetchild}
             </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="title_text">
             <table cellspacing="0">
             {files}
             </table></div>
             <div class="page_body diffblocks">{diff}</div>
             {footer}

mercurial/templates/gitweb/fileannotate.tmpl

0 +1 -3

             {header}
             <title>{repo|escape}: {file|escape}@{node|short} (annotated)</title>
             <link rel="alternate" type="application/atom+xml"
                href="{url|urlescape}atom-log" title="Atom feed for {repo|escape}"/>
             <link rel="alternate" type="application/rss+xml"
                href="{url|urlescape}rss-log" title="RSS feed for {repo|escape}"/>
             </head>
             <body>
             <div class="page_header">
             <a href="{logourl}" title="Mercurial" style="float: right;">Mercurial</a>
             <a href="/">Mercurial</a> {pathdef%breadcrumb} / annotate
             </div>
             <div class="page_nav">
             <div>
             <a href="{url|urlescape}summary{sessionvars%urlparameter}">summary</a> |
             <a href="{url|urlescape}shortlog{sessionvars%urlparameter}">shortlog</a> |
             <a href="{url|urlescape}log{sessionvars%urlparameter}">changelog</a> |
             <a href="{url|urlescape}graph{sessionvars%urlparameter}">graph</a> |
             <a href="{url|urlescape}tags{sessionvars%urlparameter}">tags</a> |
             <a href="{url|urlescape}bookmarks{sessionvars%urlparameter}">bookmarks</a> |
             <a href="{url|urlescape}branches{sessionvars%urlparameter}">branches</a> |
             <a href="{url|urlescape}file/{symrev}{path|urlescape}{sessionvars%urlparameter}">files</a> |
             <a href="{url|urlescape}rev/{symrev}{sessionvars%urlparameter}">changeset</a> |
             <a href="{url|urlescape}file/{symrev}/{file|urlescape}{sessionvars%urlparameter}">file</a> |
             <a href="{url|urlescape}file/tip/{file|urlescape}{sessionvars%urlparameter}">latest</a> |
             <a href="{url|urlescape}log/{symrev}/{file|urlescape}{sessionvars%urlparameter}">revisions</a> |
             annotate |
             <a href="{url|urlescape}diff/{symrev}/{file|urlescape}{sessionvars%urlparameter}">diff</a> |
             <a href="{url|urlescape}comparison/{symrev}/{file|urlescape}{sessionvars%urlparameter}">comparison</a> |
             <a href="{url|urlescape}raw-file/{symrev}/{file|urlescape}">raw</a> |
             <a href="{url|urlescape}help{sessionvars%urlparameter}">help</a>
             </div>
             {searchform}
             </div>
             <div class="title">{file|escape}</div>
             <div class="title_text">
             <table cellspacing="0">
             <tr>
              <td>author</td>
              <td>{author|obfuscate}</td>
             </tr>
             <tr>
              <td></td>
              <td class="date age">{date|rfc822date}</td>
             </tr>
             {branch%filerevbranch}
             <tr>
              <td>changeset {rev}</td>
              <td style="font-family:monospace"><a class="list" href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a></td>
             </tr>
             {parent%fileannotateparent}
             {child%fileannotatechild}
             <tr>
              <td>permissions</td>
              <td style="font-family:monospace">{permissions|permissions}</td>
             </tr>
             </table>
             </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">
             <table>
             <tbody class="sourcelines"
                    data-logurl="{url|urlescape}log/{symrev}/{file|urlescape}"
                    data-selectabletag="TR"
                    data-ishead="{ishead}">
             {annotate%annotateline}
             </tbody>
             </table>
             </div>
             <script type="text/javascript" src="{staticurl|urlescape}followlines.js"></script>
             {footer}

mercurial/templates/gitweb/filerevision.tmpl

0 +1 -3

             {header}
             <title>{repo|escape}: {file|escape}@{node|short}</title>
             <link rel="alternate" type="application/atom+xml"
                href="{url|urlescape}atom-log" title="Atom feed for {repo|escape}"/>
             <link rel="alternate" type="application/rss+xml"
                href="{url|urlescape}rss-log" title="RSS feed for {repo|escape}"/>
             </head>
             <body>
             <div class="page_header">
             <a href="{logourl}" title="Mercurial" style="float: right;">Mercurial</a>
             <a href="/">Mercurial</a> {pathdef%breadcrumb} / file revision
             </div>
             <div class="page_nav">
             <div>
             <a href="{url|urlescape}summary{sessionvars%urlparameter}">summary</a> |
             <a href="{url|urlescape}shortlog{sessionvars%urlparameter}">shortlog</a> |
             <a href="{url|urlescape}log{sessionvars%urlparameter}">changelog</a> |
             <a href="{url|urlescape}graph{sessionvars%urlparameter}">graph</a> |
             <a href="{url|urlescape}tags{sessionvars%urlparameter}">tags</a> |
             <a href="{url|urlescape}bookmarks{sessionvars%urlparameter}">bookmarks</a> |
             <a href="{url|urlescape}branches{sessionvars%urlparameter}">branches</a> |
             <a href="{url|urlescape}file/{symrev}{path|urlescape}{sessionvars%urlparameter}">files</a> |
             <a href="{url|urlescape}rev/{symrev}{sessionvars%urlparameter}">changeset</a> |
             file |
             <a href="{url|urlescape}file/tip/{file|urlescape}{sessionvars%urlparameter}">latest</a> |
             <a href="{url|urlescape}log/{symrev}/{file|urlescape}{sessionvars%urlparameter}">revisions</a> |
             <a href="{url|urlescape}annotate/{symrev}/{file|urlescape}{sessionvars%urlparameter}">annotate</a> |
             <a href="{url|urlescape}diff/{symrev}/{file|urlescape}{sessionvars%urlparameter}">diff</a> |
             <a href="{url|urlescape}comparison/{symrev}/{file|urlescape}{sessionvars%urlparameter}">comparison</a> |
             <a href="{url|urlescape}raw-file/{symrev}/{file|urlescape}">raw</a> |
             <a href="{url|urlescape}help{sessionvars%urlparameter}">help</a>
             </div>
             {searchform}
             </div>
             <div class="title">{file|escape}</div>
             <div class="title_text">
             <table cellspacing="0">
             <tr>
              <td>author</td>
              <td>{author|obfuscate}</td>
             </tr>
             <tr>
              <td></td>
              <td class="date age">{date|rfc822date}</td>
             </tr>
             {branch%filerevbranch}
             <tr>
              <td>changeset {rev}</td>
              <td style="font-family:monospace"><a class="list" href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a></td>
             </tr>
             {parent%filerevparent}
             {child%filerevchild}
             <tr>
              <td>permissions</td>
              <td style="font-family:monospace">{permissions|permissions}</td>
             </tr>
             </table>
             </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">
             <pre class="sourcelines stripes"
                  data-logurl="{url|urlescape}log/{symrev}/{file|urlescape}"
                  data-selectabletag="SPAN"
                  data-ishead="{ishead}">
             {text%fileline}
             </pre>
             </div>
             <script type="text/javascript" src="{staticurl|urlescape}followlines.js"></script>
             {footer}

mercurial/templates/static/style-gitweb.css

0 +1 0

             body { font-family: sans-serif; font-size: 12px; border:solid #d9d8d1; border-width:1px; margin:10px; background: white; color: black; }
             a { color:#0000cc; }
             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 a:visited { color:#0000cc; }
             div.page_header a:hover { color:#880000; }
             div.page_nav {
                 padding:8px;
                 display: flex;
                 justify-content: space-between;
                 align-items: center;
             }
             div.page_nav a:visited { color:#0000cc; }
             div.extra_nav {
                 padding: 8px;
             }
             div.extra_nav a:visited {
                 color: #0000cc;
             }
             div.page_path { padding:8px; border:solid #d9d8d1; border-width:0px 0px 1px}
             div.page_footer { padding:4px 8px; background-color: #d9d8d1; }
             div.page_footer_text { float:left; color:#555555; font-style:italic; }
             div.page_body { padding:8px; }
             div.title, a.title {
             	display:block; padding:6px 8px;
             	font-weight:bold; background-color:#edece6; text-decoration:none; color:#000000;
             }
             a.title:hover { background-color: #d9d8d1; }
             div.title_text { padding:6px 0px; border: solid #d9d8d1; border-width:0px 0px 1px; }
             div.log_body { padding:8px 8px 8px 150px; }
             .age { white-space:nowrap; }
             span.age { position:relative; float:left; width:142px; font-style:italic; }
             div.log_link {
             	padding:0px 8px;
             	font-size:10px; font-family:sans-serif; font-style:normal;
             	position:relative; float:left; width:136px;
             }
             div.list_head { padding:6px 8px 4px; border:solid #d9d8d1; border-width:1px 0px 0px; font-style:italic; }
             a.list { text-decoration:none; color:#000000; }
             a.list:hover { text-decoration:underline; color:#880000; }
             table { padding:8px 4px; }
             th { padding:2px 5px; font-size:12px; text-align:left; }
             .parity0 { background-color:#ffffff; }
             tr.dark, .parity1, pre.sourcelines.stripes > :nth-child(4n+4) { background-color:#f6f6f0; }
             tr.light:hover, .parity0:hover, tr.dark:hover, .parity1:hover,
             pre.sourcelines.stripes > :nth-child(4n+2):hover,
             pre.sourcelines.stripes > :nth-child(4n+4):hover,
             pre.sourcelines.stripes > :nth-child(4n+1):hover + :nth-child(4n+2),
             pre.sourcelines.stripes > :nth-child(4n+3):hover + :nth-child(4n+4) { background-color:#edece6; }
             td { padding:2px 5px; font-size:12px; vertical-align:top; }
             td.closed { background-color: #99f; }
             td.link { padding:2px 5px; font-family:sans-serif; font-size:10px; }
             td.indexlinks { white-space: nowrap; }
             td.indexlinks a {
               padding: 2px 5px; line-height: 10px;
               border: 1px solid;
               color: #ffffff; background-color: #7777bb;
               border-color: #aaaadd #333366 #333366 #aaaadd;
               font-weight: bold;  text-align: center; text-decoration: none;
               font-size: 10px;
             }
             td.indexlinks a:hover { background-color: #6666aa; }
             div.pre { font-family:monospace; font-size:12px; white-space:pre; }
             div.diff_info { font-family:monospace; color:#000099; background-color:#edece6; font-style:italic; }
             div.index_include { border:solid #d9d8d1; border-width:0px 0px 1px; padding:12px 8px; }
             .search {
                 margin-right: 8px;
             }
             div#hint {
               position: absolute;
               display: none;
               width: 250px;
               padding: 5px;
               background: #ffc;
               border: 1px solid yellow;
               border-radius: 5px;
             }
             #searchform:hover div#hint { display: block; }
             tr.thisrev a { color:#999999; text-decoration: none; }
             tr.thisrev pre { color:#009900; }
             td.annotate {
               white-space: nowrap;
             }
             div.annotate-info {
               z-index: 5;
               display: none;
               position: absolute;
               background-color: #FFFFFF;
               border: 1px solid #d9d8d1;
               text-align: left;
               color: #000000;
               padding: 5px;
             }
             div.annotate-info a { color: #0000FF; text-decoration: underline; }
             td.annotate:hover div.annotate-info { display: inline; }
             .linenr { color:#999999; text-decoration:none }
             div.rss_logo { float: right; white-space: nowrap; }
             div.rss_logo a {
             	padding:3px 6px; line-height:10px;
             	border:1px solid; border-color:#fcc7a5 #7d3302 #3e1a01 #ff954e;
             	color:#ffffff; background-color:#ff6600;
             	font-weight:bold; font-family:sans-serif; font-size:10px;
             	text-align:center; text-decoration:none;
             }
             div.rss_logo a:hover { background-color:#ee5500; }
             pre { margin: 0; }
             span.logtags span {
             	padding: 0px 4px;
             	font-size: 10px;
             	font-weight: normal;
             	border: 1px solid;
             	background-color: #ffaaff;
             	border-color: #ffccff #ff00ee #ff00ee #ffccff;
             }
             span.logtags span.tagtag {
             	background-color: #ffffaa;
             	border-color: #ffffcc #ffee00 #ffee00 #ffffcc;
             }
             span.logtags span.branchtag {
             	background-color: #aaffaa;
             	border-color: #ccffcc #00cc33 #00cc33 #ccffcc;
             }
             span.logtags span.inbranchtag {
             	background-color: #d5dde6;
             	border-color: #e3ecf4 #9398f4 #9398f4 #e3ecf4;
             }
             span.logtags span.bookmarktag {
             	background-color: #afdffa;
             	border-color: #ccecff #46ace6 #46ace6 #ccecff;
             }
             span.difflineplus { color:#008800; }
             span.difflineminus { color:#cc0000; }
             span.difflineat { color:#990099; }
             div.diffblocks { counter-reset: lineno; }
             div.diffblock { counter-increment: lineno; }
             pre.sourcelines { position: relative; counter-reset: lineno; }
             pre.sourcelines > span {
             	display: inline-block;
             	box-sizing: border-box;
             	width: 100%;
             	padding: 0 0 0 5em;
             	counter-increment: lineno;
             	vertical-align: top;
             }
             pre.sourcelines > span:before {
             	-moz-user-select: -moz-none;
             	-khtml-user-select: none;
             	-webkit-user-select: none;
             	-ms-user-select: none;
             	user-select: none;
             	display: inline-block;
             	margin-left: -6em;
             	width: 4em;
             	color: #999;
             	text-align: right;
             	content: counters(lineno,".");
             	float: left;
             }
             pre.sourcelines > a {
             	display: inline-block;
             	position: absolute;
             	left: 0px;
             	width: 4em;
             	height: 1em;
             }
             tr:target td,
             pre.sourcelines > span:target,
             pre.sourcelines.stripes > span:target {
             	background-color: #bfdfff;
             }
             .description {
                 font-family: monospace;
+                white-space: pre;
             }
             /* Followlines */
             tbody.sourcelines > tr.followlines-selected,
             pre.sourcelines > span.followlines-selected {
               background-color: #99C7E9 !important;
             }
             div#followlines {
               background-color: #B7B7B7;
               border: 1px solid #CCC;
               border-radius: 5px;
               padding: 4px;
               position: fixed;
             }
             div.followlines-cancel {
               text-align: right;
             }
             div.followlines-cancel > button {
               line-height: 80%;
               padding: 0;
               border: 0;
               border-radius: 2px;
               background-color: inherit;
               font-weight: bold;
             }
             div.followlines-cancel > button:hover {
               color: #FFFFFF;
               background-color: #CF1F1F;
             }
             div.followlines-link {
               margin: 2px;
               margin-top: 4px;
               font-family: sans-serif;
             }
             .btn-followlines {
               display: none;
               cursor: pointer;
               box-sizing: content-box;
               font-size: 11px;
               width: 13px;
               height: 13px;
               border-radius: 3px;
               margin: 0px;
               margin-top: -2px;
               padding: 0px;
               background-color: #E5FDE5;
               border: 1px solid #9BC19B;
               font-family: monospace;
               text-align: center;
               line-height: 5px;
             }
             tr .btn-followlines {
               position: absolute;
             }
             span .btn-followlines {
               float: left;
             }
             span.followlines-select .btn-followlines {
               margin-left: -1.6em;
             }
             .btn-followlines:hover {
               transform: scale(1.1, 1.1);
             }
             .btn-followlines .followlines-plus {
               color: green;
             }
             .btn-followlines .followlines-minus {
               color: red;
             }
             .btn-followlines-end {
               background-color: #ffdcdc;
             }
             .sourcelines tr:hover .btn-followlines,
             .sourcelines span.followlines-select:hover > .btn-followlines {
               display: inline;
             }
             .btn-followlines-hidden,
             .sourcelines tr:hover .btn-followlines-hidden {
               display: none;
             }
             /* Graph */
             div#wrapper {
             	position: relative;
             	margin: 0;
             	padding: 0;
             	margin-top: 3px;
             }
             canvas {
             	position: absolute;
             	z-index: 5;
             	top: -0.9em;
             	margin: 0;
             }
             ul#nodebgs {
             	list-style: none inside none;
             	padding: 0;
             	margin: 0;
             	top: -0.7em;
             }
             ul#graphnodes li, ul#nodebgs li {
             	height: 39px;
             }
             ul#graphnodes {
             	position: absolute;
             	z-index: 10;
             	top: -0.8em;
             	list-style: none inside none;
             	padding: 0;
             }
             ul#graphnodes li .info {
             	display: block;
             	font-size: 100%;
             	position: relative;
             	top: -3px;
             	font-style: italic;
             }
             /* Comparison */
             .legend {
                 padding: 1.5% 0 1.5% 0;
             }
             .legendinfo {
                 border: 1px solid #d9d8d1;
                 font-size: 80%;
                 text-align: center;
                 padding: 0.5%;
             }
             .equal {
                 background-color: #ffffff;
             }
             .delete {
                 background-color: #faa;
                 color: #333;
             }
             .insert {
                 background-color: #ffa;
             }
             .replace {
                 background-color: #e8e8e8;
             }
             .comparison {
                 overflow-x: auto;
             }
             .header th {
                 text-align: center;
             }
             .block {
                 border-top: 1px solid #d9d8d1;
             }
             .scroll-loading {
               -webkit-animation: change_color 1s linear 0s infinite alternate;
               -moz-animation: change_color 1s linear 0s infinite alternate;
               -o-animation: change_color 1s linear 0s infinite alternate;
               animation: change_color 1s linear 0s infinite alternate;
             }
             @-webkit-keyframes change_color {
               from { background-color: #A0CEFF; } to {  }
             }
             @-moz-keyframes change_color {
               from { background-color: #A0CEFF; } to {  }
             }
             @-o-keyframes change_color {
               from { background-color: #A0CEFF; } to {  }
             }
             @keyframes change_color {
               from { background-color: #A0CEFF; } to {  }
             }
             .scroll-loading-error {
                 background-color: #FFCCCC !important;
             }
             #doc {
                 margin: 0 8px;
             }

tests/test-hgweb.t

0 +2 -1

             #require serve
             Some tests for hgweb. Tests static files, plain files and different 404's.
               $ hg init test
               $ cd test
               $ mkdir da
               $ echo foo > da/foo
               $ echo foo > foo
               $ hg ci -Ambase
               adding da/foo
               adding foo
               $ hg bookmark -r0 '@'
               $ hg bookmark -r0 'a b c'
               $ hg bookmark -r0 'd/e/f'
               $ hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log
               $ cat hg.pid >> $DAEMON_PIDS
             manifest
               $ (get-with-headers.py localhost:$HGPORT 'file/tip/?style=raw')
 Script output follows
               drwxr-xr-x da
               -rw-r--r-- 4 foo
               $ (get-with-headers.py localhost:$HGPORT 'file/tip/da?style=raw')
 Script output follows
               -rw-r--r-- 4 foo
             plain file
               $ get-with-headers.py localhost:$HGPORT 'file/tip/foo?style=raw'
 Script output follows
               foo
             should give a 404 - static file that does not exist
               $ get-with-headers.py localhost:$HGPORT 'static/bogus'
 Not Found
               <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
               <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
               <head>
               <link rel="icon" href="/static/hgicon.png" type="image/png" />
               <meta name="robots" content="index, nofollow" />
               <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
               <script type="text/javascript" src="/static/mercurial.js"></script>
               <title>test: error</title>
               </head>
               <body>
               <div class="container">
               <div class="menu">
               <div class="logo">
               <a href="https://mercurial-scm.org/">
               <img src="/static/hglogo.png" width=75 height=90 border=0 alt="mercurial" /></a>
               </div>
               <ul>
               <li><a href="/shortlog">log</a></li>
               <li><a href="/graph">graph</a></li>
               <li><a href="/tags">tags</a></li>
               <li><a href="/bookmarks">bookmarks</a></li>
               <li><a href="/branches">branches</a></li>
               </ul>
               <ul>
               <li><a href="/help">help</a></li>
               </ul>
               </div>
               <div class="main">
               <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
               <h3>error</h3>
               <form class="search" action="/log">
               <p><input name="rev" id="search1" type="text" size="30" value="" /></p>
               <div id="hint">Find changesets by keywords (author, files, the commit message), revision
               number or hash, or <a href="/help/revsets">revset expression</a>.</div>
               </form>
               <div class="description">
               <p>
               An error occurred while processing your request:
               </p>
               <p>
               Not Found
               </p>
               </div>
               </div>
               </div>
               </body>
               </html>
               [1]
             should give a 404 - bad revision
               $ get-with-headers.py localhost:$HGPORT 'file/spam/foo?style=raw'
 Not Found
               error: revision not found: spam
               [1]
             should give a 400 - bad command
               $ get-with-headers.py localhost:$HGPORT 'file/tip/foo?cmd=spam&style=raw'
 * (glob)
               error: no such method: spam
               [1]
               $ get-with-headers.py --headeronly localhost:$HGPORT '?cmd=spam'
 no such method: spam
               [1]
             should give a 400 - bad command as a part of url path (issue4071)
               $ get-with-headers.py --headeronly localhost:$HGPORT 'spam'
 no such method: spam
               [1]
               $ get-with-headers.py --headeronly localhost:$HGPORT 'raw-spam'
 no such method: spam
               [1]
               $ get-with-headers.py --headeronly localhost:$HGPORT 'spam/tip/foo'
 no such method: spam
               [1]
             should give a 404 - file does not exist
               $ get-with-headers.py localhost:$HGPORT 'file/tip/bork?style=raw'
 Not Found
               error: bork@2ef0ac749a14: not found in manifest
               [1]
               $ get-with-headers.py localhost:$HGPORT 'file/tip/bork'
 Not Found
               <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
               <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
               <head>
               <link rel="icon" href="/static/hgicon.png" type="image/png" />
               <meta name="robots" content="index, nofollow" />
               <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
               <script type="text/javascript" src="/static/mercurial.js"></script>
               <title>test: error</title>
               </head>
               <body>
               <div class="container">
               <div class="menu">
               <div class="logo">
               <a href="https://mercurial-scm.org/">
               <img src="/static/hglogo.png" width=75 height=90 border=0 alt="mercurial" /></a>
               </div>
               <ul>
               <li><a href="/shortlog">log</a></li>
               <li><a href="/graph">graph</a></li>
               <li><a href="/tags">tags</a></li>
               <li><a href="/bookmarks">bookmarks</a></li>
               <li><a href="/branches">branches</a></li>
               </ul>
               <ul>
               <li><a href="/help">help</a></li>
               </ul>
               </div>
               <div class="main">
               <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
               <h3>error</h3>
               <form class="search" action="/log">
               <p><input name="rev" id="search1" type="text" size="30" value="" /></p>
               <div id="hint">Find changesets by keywords (author, files, the commit message), revision
               number or hash, or <a href="/help/revsets">revset expression</a>.</div>
               </form>
               <div class="description">
               <p>
               An error occurred while processing your request:
               </p>
               <p>
               bork@2ef0ac749a14: not found in manifest
               </p>
               </div>
               </div>
               </div>
               </body>
               </html>
               [1]
               $ get-with-headers.py localhost:$HGPORT 'diff/tip/bork?style=raw'
 Not Found
               error: bork@2ef0ac749a14: not found in manifest
               [1]
             try bad style
               $ (get-with-headers.py localhost:$HGPORT 'file/tip/?style=foobar')
 Script output follows
               <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
               <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
               <head>
               <link rel="icon" href="/static/hgicon.png" type="image/png" />
               <meta name="robots" content="index, nofollow" />
               <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
               <script type="text/javascript" src="/static/mercurial.js"></script>
               <title>test: 2ef0ac749a14 /</title>
               </head>
               <body>
               <div class="container">
               <div class="menu">
               <div class="logo">
               <a href="https://mercurial-scm.org/">
               <img src="/static/hglogo.png" alt="mercurial" /></a>
               </div>
               <ul>
               <li><a href="/shortlog/tip">log</a></li>
               <li><a href="/graph/tip">graph</a></li>
               <li><a href="/tags">tags</a></li>
               <li><a href="/bookmarks">bookmarks</a></li>
               <li><a href="/branches">branches</a></li>
               </ul>
               <ul>
               <li><a href="/rev/tip">changeset</a></li>
               <li class="active">browse</li>
               </ul>
               <ul>
               </ul>
               <ul>
                <li><a href="/help">help</a></li>
               </ul>
               </div>
               <div class="main">
               <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
               <h3>
                directory / @ 0:<a href="/rev/2ef0ac749a14">2ef0ac749a14</a>
                <span class="tag">tip</span> <span class="tag">@</span> <span class="tag">a b c</span> <span class="tag">d/e/f</span>
               </h3>
               <form class="search" action="/log">
               <p><input name="rev" id="search1" type="text" size="30" value="" /></p>
               <div id="hint">Find changesets by keywords (author, files, the commit message), revision
               number or hash, or <a href="/help/revsets">revset expression</a>.</div>
               </form>
               <table class="bigtable">
               <thead>
               <tr>
                 <th class="name">name</th>
                 <th class="size">size</th>
                 <th class="permissions">permissions</th>
               </tr>
               </thead>
               <tbody class="stripes2">
               <tr class="fileline">
                 <td class="name"><a href="/file/tip/">[up]</a></td>
                 <td class="size"></td>
                 <td class="permissions">drwxr-xr-x</td>
               </tr>
               <tr class="fileline">
               <td class="name">
               <a href="/file/tip/da">
               <img src="/static/coal-folder.png" alt="dir."/> da/
               </a>
               <a href="/file/tip/da/">
               </a>
               </td>
               <td class="size"></td>
               <td class="permissions">drwxr-xr-x</td>
               </tr>
               <tr class="fileline">
               <td class="filename">
               <a href="/file/tip/foo">
               <img src="/static/coal-file.png" alt="file"/> foo
               </a>
               </td>
               <td class="size">4</td>
               <td class="permissions">-rw-r--r--</td>
               </tr>
               </tbody>
               </table>
               </div>
               </div>
               </body>
               </html>
             stop and restart
               $ killdaemons.py
               $ hg serve -p $HGPORT -d --pid-file=hg.pid -A access.log
               $ cat hg.pid >> $DAEMON_PIDS
             Test the access/error files are opened in append mode
               $ $PYTHON -c "print len(file('access.log').readlines()), 'log lines written'"
 log lines written
             static file
               $ get-with-headers.py --twice localhost:$HGPORT 'static/style-gitweb.css' - date etag server
 Script output follows
-              content-length: 8985
+              content-length: 9007
               content-type: text/css
               body { font-family: sans-serif; font-size: 12px; border:solid #d9d8d1; border-width:1px; margin:10px; background: white; color: black; }
               a { color:#0000cc; }
               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 a:visited { color:#0000cc; }
               div.page_header a:hover { color:#880000; }
               div.page_nav {
                   padding:8px;
                   display: flex;
                   justify-content: space-between;
                   align-items: center;
               }
               div.page_nav a:visited { color:#0000cc; }
               div.extra_nav {
                   padding: 8px;
               }
               div.extra_nav a:visited {
                   color: #0000cc;
               }
               div.page_path { padding:8px; border:solid #d9d8d1; border-width:0px 0px 1px}
               div.page_footer { padding:4px 8px; background-color: #d9d8d1; }
               div.page_footer_text { float:left; color:#555555; font-style:italic; }
               div.page_body { padding:8px; }
               div.title, a.title {
               	display:block; padding:6px 8px;
               	font-weight:bold; background-color:#edece6; text-decoration:none; color:#000000;
               }
               a.title:hover { background-color: #d9d8d1; }
               div.title_text { padding:6px 0px; border: solid #d9d8d1; border-width:0px 0px 1px; }
               div.log_body { padding:8px 8px 8px 150px; }
               .age { white-space:nowrap; }
               span.age { position:relative; float:left; width:142px; font-style:italic; }
               div.log_link {
               	padding:0px 8px;
               	font-size:10px; font-family:sans-serif; font-style:normal;
               	position:relative; float:left; width:136px;
               }
               div.list_head { padding:6px 8px 4px; border:solid #d9d8d1; border-width:1px 0px 0px; font-style:italic; }
               a.list { text-decoration:none; color:#000000; }
               a.list:hover { text-decoration:underline; color:#880000; }
               table { padding:8px 4px; }
               th { padding:2px 5px; font-size:12px; text-align:left; }
               .parity0 { background-color:#ffffff; }
               tr.dark, .parity1, pre.sourcelines.stripes > :nth-child(4n+4) { background-color:#f6f6f0; }
               tr.light:hover, .parity0:hover, tr.dark:hover, .parity1:hover,
               pre.sourcelines.stripes > :nth-child(4n+2):hover,
               pre.sourcelines.stripes > :nth-child(4n+4):hover,
               pre.sourcelines.stripes > :nth-child(4n+1):hover + :nth-child(4n+2),
               pre.sourcelines.stripes > :nth-child(4n+3):hover + :nth-child(4n+4) { background-color:#edece6; }
               td { padding:2px 5px; font-size:12px; vertical-align:top; }
               td.closed { background-color: #99f; }
               td.link { padding:2px 5px; font-family:sans-serif; font-size:10px; }
               td.indexlinks { white-space: nowrap; }
               td.indexlinks a {
                 padding: 2px 5px; line-height: 10px;
                 border: 1px solid;
                 color: #ffffff; background-color: #7777bb;
                 border-color: #aaaadd #333366 #333366 #aaaadd;
                 font-weight: bold;  text-align: center; text-decoration: none;
                 font-size: 10px;
               }
               td.indexlinks a:hover { background-color: #6666aa; }
               div.pre { font-family:monospace; font-size:12px; white-space:pre; }
               div.diff_info { font-family:monospace; color:#000099; background-color:#edece6; font-style:italic; }
               div.index_include { border:solid #d9d8d1; border-width:0px 0px 1px; padding:12px 8px; }
               .search {
                   margin-right: 8px;
               }
               div#hint {
                 position: absolute;
                 display: none;
                 width: 250px;
                 padding: 5px;
                 background: #ffc;
                 border: 1px solid yellow;
                 border-radius: 5px;
               }
               #searchform:hover div#hint { display: block; }
               tr.thisrev a { color:#999999; text-decoration: none; }
               tr.thisrev pre { color:#009900; }
               td.annotate {
                 white-space: nowrap;
               }
               div.annotate-info {
                 z-index: 5;
                 display: none;
                 position: absolute;
                 background-color: #FFFFFF;
                 border: 1px solid #d9d8d1;
                 text-align: left;
                 color: #000000;
                 padding: 5px;
               }
               div.annotate-info a { color: #0000FF; text-decoration: underline; }
               td.annotate:hover div.annotate-info { display: inline; }
               .linenr { color:#999999; text-decoration:none }
               div.rss_logo { float: right; white-space: nowrap; }
               div.rss_logo a {
               	padding:3px 6px; line-height:10px;
               	border:1px solid; border-color:#fcc7a5 #7d3302 #3e1a01 #ff954e;
               	color:#ffffff; background-color:#ff6600;
               	font-weight:bold; font-family:sans-serif; font-size:10px;
               	text-align:center; text-decoration:none;
               }
               div.rss_logo a:hover { background-color:#ee5500; }
               pre { margin: 0; }
               span.logtags span {
               	padding: 0px 4px;
               	font-size: 10px;
               	font-weight: normal;
               	border: 1px solid;
               	background-color: #ffaaff;
               	border-color: #ffccff #ff00ee #ff00ee #ffccff;
               }
               span.logtags span.tagtag {
               	background-color: #ffffaa;
               	border-color: #ffffcc #ffee00 #ffee00 #ffffcc;
               }
               span.logtags span.branchtag {
               	background-color: #aaffaa;
               	border-color: #ccffcc #00cc33 #00cc33 #ccffcc;
               }
               span.logtags span.inbranchtag {
               	background-color: #d5dde6;
               	border-color: #e3ecf4 #9398f4 #9398f4 #e3ecf4;
               }
               span.logtags span.bookmarktag {
               	background-color: #afdffa;
               	border-color: #ccecff #46ace6 #46ace6 #ccecff;
               }
               span.difflineplus { color:#008800; }
               span.difflineminus { color:#cc0000; }
               span.difflineat { color:#990099; }
               div.diffblocks { counter-reset: lineno; }
               div.diffblock { counter-increment: lineno; }
               pre.sourcelines { position: relative; counter-reset: lineno; }
               pre.sourcelines > span {
               	display: inline-block;
               	box-sizing: border-box;
               	width: 100%;
               	padding: 0 0 0 5em;
               	counter-increment: lineno;
               	vertical-align: top;
               }
               pre.sourcelines > span:before {
               	-moz-user-select: -moz-none;
               	-khtml-user-select: none;
               	-webkit-user-select: none;
               	-ms-user-select: none;
               	user-select: none;
               	display: inline-block;
               	margin-left: -6em;
               	width: 4em;
               	color: #999;
               	text-align: right;
               	content: counters(lineno,".");
               	float: left;
               }
               pre.sourcelines > a {
               	display: inline-block;
               	position: absolute;
               	left: 0px;
               	width: 4em;
               	height: 1em;
               }
               tr:target td,
               pre.sourcelines > span:target,
               pre.sourcelines.stripes > span:target {
               	background-color: #bfdfff;
               }
               .description {
                   font-family: monospace;
+                  white-space: pre;
               }
               /* Followlines */
               tbody.sourcelines > tr.followlines-selected,
               pre.sourcelines > span.followlines-selected {
                 background-color: #99C7E9 !important;
               }
               div#followlines {
                 background-color: #B7B7B7;
                 border: 1px solid #CCC;
                 border-radius: 5px;
                 padding: 4px;
                 position: fixed;
               }
               div.followlines-cancel {
                 text-align: right;
               }
               div.followlines-cancel > button {
                 line-height: 80%;
                 padding: 0;
                 border: 0;
                 border-radius: 2px;
                 background-color: inherit;
                 font-weight: bold;
               }
               div.followlines-cancel > button:hover {
                 color: #FFFFFF;
                 background-color: #CF1F1F;
               }
               div.followlines-link {
                 margin: 2px;
                 margin-top: 4px;
                 font-family: sans-serif;
               }
               .btn-followlines {
                 display: none;
                 cursor: pointer;
                 box-sizing: content-box;
                 font-size: 11px;
                 width: 13px;
                 height: 13px;
                 border-radius: 3px;
                 margin: 0px;
                 margin-top: -2px;
                 padding: 0px;
                 background-color: #E5FDE5;
                 border: 1px solid #9BC19B;
                 font-family: monospace;
                 text-align: center;
                 line-height: 5px;
               }
               tr .btn-followlines {
                 position: absolute;
               }
               span .btn-followlines {
                 float: left;
               }
               span.followlines-select .btn-followlines {
                 margin-left: -1.6em;
               }
               .btn-followlines:hover {
                 transform: scale(1.1, 1.1);
               }
               .btn-followlines .followlines-plus {
                 color: green;
               }
               .btn-followlines .followlines-minus {
                 color: red;
               }
               .btn-followlines-end {
                 background-color: #ffdcdc;
               }
               .sourcelines tr:hover .btn-followlines,
               .sourcelines span.followlines-select:hover > .btn-followlines {
                 display: inline;
               }
               .btn-followlines-hidden,
               .sourcelines tr:hover .btn-followlines-hidden {
                 display: none;
               }
               /* Graph */
               div#wrapper {
               	position: relative;
               	margin: 0;
               	padding: 0;
               	margin-top: 3px;
               }
               canvas {
               	position: absolute;
               	z-index: 5;
               	top: -0.9em;
               	margin: 0;
               }
               ul#nodebgs {
               	list-style: none inside none;
               	padding: 0;
               	margin: 0;
               	top: -0.7em;
               }
               ul#graphnodes li, ul#nodebgs li {
               	height: 39px;
               }
               ul#graphnodes {
               	position: absolute;
               	z-index: 10;
               	top: -0.8em;
               	list-style: none inside none;
               	padding: 0;
               }
               ul#graphnodes li .info {
               	display: block;
               	font-size: 100%;
               	position: relative;
               	top: -3px;
               	font-style: italic;
               }
               /* Comparison */
               .legend {
                   padding: 1.5% 0 1.5% 0;
               }
               .legendinfo {
                   border: 1px solid #d9d8d1;
                   font-size: 80%;
                   text-align: center;
                   padding: 0.5%;
               }
               .equal {
                   background-color: #ffffff;
               }
               .delete {
                   background-color: #faa;
                   color: #333;
               }
               .insert {
                   background-color: #ffa;
               }
               .replace {
                   background-color: #e8e8e8;
               }
               .comparison {
                   overflow-x: auto;
               }
               .header th {
                   text-align: center;
               }
               .block {
                   border-top: 1px solid #d9d8d1;
               }
               .scroll-loading {
                 -webkit-animation: change_color 1s linear 0s infinite alternate;
                 -moz-animation: change_color 1s linear 0s infinite alternate;
                 -o-animation: change_color 1s linear 0s infinite alternate;
                 animation: change_color 1s linear 0s infinite alternate;
               }
               @-webkit-keyframes change_color {
                 from { background-color: #A0CEFF; } to {  }
               }
               @-moz-keyframes change_color {
                 from { background-color: #A0CEFF; } to {  }
               }
               @-o-keyframes change_color {
                 from { background-color: #A0CEFF; } to {  }
               }
               @keyframes change_color {
                 from { background-color: #A0CEFF; } to {  }
               }
               .scroll-loading-error {
                   background-color: #FFCCCC !important;
               }
               #doc {
                   margin: 0 8px;
               }
 Not Modified
             phase changes are refreshed (issue4061)
               $ echo bar >> foo
               $ hg ci -msecret --secret
               $ get-with-headers.py localhost:$HGPORT 'log?style=raw'
 Script output follows
               # HG changelog
               # Node ID 2ef0ac749a14e4f57a5a822464a0902c6f7f448f
               changeset:   2ef0ac749a14e4f57a5a822464a0902c6f7f448f
               revision:    0
               user:        test
               date:        Thu, 01 Jan 1970 00:00:00 +0000
               summary:     base
               branch:      default
               tag:         tip
               bookmark:    @
               bookmark:    a b c
               bookmark:    d/e/f
               $ hg phase --draft tip
               $ get-with-headers.py localhost:$HGPORT 'log?style=raw'
 Script output follows
               # HG changelog
               # Node ID a084749e708a9c4c0a5b652a2a446322ce290e04
               changeset:   a084749e708a9c4c0a5b652a2a446322ce290e04
               revision:    1
               user:        test
               date:        Thu, 01 Jan 1970 00:00:00 +0000
               summary:     secret
               branch:      default
               tag:         tip
               changeset:   2ef0ac749a14e4f57a5a822464a0902c6f7f448f
               revision:    0
               user:        test
               date:        Thu, 01 Jan 1970 00:00:00 +0000
               summary:     base
               bookmark:    @
               bookmark:    a b c
               bookmark:    d/e/f
             access bookmarks
               $ get-with-headers.py localhost:$HGPORT 'rev/@?style=paper' | egrep '^200|changeset 0:'
 Script output follows
                changeset 0:<a href="/rev/2ef0ac749a14?style=paper">2ef0ac749a14</a>
               $ get-with-headers.py localhost:$HGPORT 'rev/%40?style=paper' | egrep '^200|changeset 0:'
 Script output follows
                changeset 0:<a href="/rev/2ef0ac749a14?style=paper">2ef0ac749a14</a>
               $ get-with-headers.py localhost:$HGPORT 'rev/a%20b%20c?style=paper' | egrep '^200|changeset 0:'
 Script output follows
                changeset 0:<a href="/rev/2ef0ac749a14?style=paper">2ef0ac749a14</a>
               $ get-with-headers.py localhost:$HGPORT 'rev/d%252Fe%252Ff?style=paper' | egrep '^200|changeset 0:'
 Script output follows
                changeset 0:<a href="/rev/2ef0ac749a14?style=paper">2ef0ac749a14</a>
             no style can be loaded from directories other than the specified paths
               $ mkdir -p x/templates/fallback
               $ cat <<EOF > x/templates/fallback/map
               > default = 'shortlog'
               > shortlog = 'fall back to default\n'
               > mimetype = 'text/plain'
               > EOF
               $ cat <<EOF > x/map
               > default = 'shortlog'
               > shortlog = 'access to outside of templates directory\n'
               > mimetype = 'text/plain'
               > EOF
               $ killdaemons.py
               $ hg serve -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log \
               > --config web.style=fallback --config web.templates=x/templates
               $ cat hg.pid >> $DAEMON_PIDS
               $ get-with-headers.py localhost:$HGPORT "?style=`pwd`/x"
 Script output follows
               fall back to default
               $ get-with-headers.py localhost:$HGPORT '?style=..'
 Script output follows
               fall back to default
               $ get-with-headers.py localhost:$HGPORT '?style=./..'
 Script output follows
               fall back to default
               $ get-with-headers.py localhost:$HGPORT '?style=.../.../'
 Script output follows
               fall back to default
             errors
               $ cat errors.log
             Uncaught exceptions result in a logged error and canned HTTP response
               $ killdaemons.py
               $ hg serve --config extensions.hgweberror=$TESTDIR/hgweberror.py -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log
               $ cat hg.pid >> $DAEMON_PIDS
               $ get-with-headers.py localhost:$HGPORT 'raiseerror' transfer-encoding content-type
 Internal Server Error
               transfer-encoding: chunked
               Internal Server Error (no-eol)
               [1]
               $ killdaemons.py
               $ head -1 errors.log
               .* Exception happened during processing request '/raiseerror': (re)
             Uncaught exception after partial content sent
               $ hg serve --config extensions.hgweberror=$TESTDIR/hgweberror.py -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log
               $ cat hg.pid >> $DAEMON_PIDS
               $ get-with-headers.py localhost:$HGPORT 'raiseerror?partialresponse=1' transfer-encoding content-type
 Script output follows
               transfer-encoding: chunked
               content-type: text/plain
               partial content
               Internal Server Error (no-eol)
               $ killdaemons.py
               $ cd ..

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