##// END OF EJS Templates
Issue #880: Simple misspelling ('occured') in web error message.
Jesse Glick -
r5837:2580d418 default
parent child Browse files
Show More
@@ -1,15 +1,15
1 #header#
1 #header#
2 <title>Mercurial Error</title>
2 <title>Mercurial Error</title>
3 </head>
3 </head>
4 <body>
4 <body>
5
5
6 <h2>Mercurial Error</h2>
6 <h2>Mercurial Error</h2>
7
7
8 <p>
8 <p>
9 An error occured while processing your request:
9 An error occurred while processing your request:
10 </p>
10 </p>
11 <p>
11 <p>
12 #error|escape#
12 #error|escape#
13 </p>
13 </p>
14
14
15 #footer#
15 #footer#
@@ -1,25 +1,25
1 #header#
1 #header#
2 <title>#repo|escape#: Error</title>
2 <title>#repo|escape#: Error</title>
3 <link rel="alternate" type="application/atom+xml"
3 <link rel="alternate" type="application/atom+xml"
4 href="{url}atom-log" title="Atom feed for #repo|escape#"/>
4 href="{url}atom-log" title="Atom feed for #repo|escape#"/>
5 <link rel="alternate" type="application/rss+xml"
5 <link rel="alternate" type="application/rss+xml"
6 href="{url}rss-log" title="RSS feed for #repo|escape#"/>
6 href="{url}rss-log" title="RSS feed for #repo|escape#"/>
7 </head>
7 </head>
8 <body>
8 <body>
9
9
10 <div class="page_header">
10 <div class="page_header">
11 <a href="http://www.selenic.com/mercurial/" title="Mercurial" style="float: right;">Mercurial</a><a href="{url}summary{sessionvars%urlparameter}">#repo|escape#</a> / error
11 <a href="http://www.selenic.com/mercurial/" title="Mercurial" style="float: right;">Mercurial</a><a href="{url}summary{sessionvars%urlparameter}">#repo|escape#</a> / error
12 </div>
12 </div>
13
13
14 <div class="page_nav">
14 <div class="page_nav">
15 <a href="{url}summary{sessionvars%urlparameter}">summary</a> | <a href="{url}shortlog{sessionvars%urlparameter}">shortlog</a> | <a href="{url}log{sessionvars%urlparameter}">changelog</a> | <a href="{url}tags{sessionvars%urlparameter}">tags</a> | <a href="{url}file/#node|short#{sessionvars%urlparameter}">manifest</a><br/>
15 <a href="{url}summary{sessionvars%urlparameter}">summary</a> | <a href="{url}shortlog{sessionvars%urlparameter}">shortlog</a> | <a href="{url}log{sessionvars%urlparameter}">changelog</a> | <a href="{url}tags{sessionvars%urlparameter}">tags</a> | <a href="{url}file/#node|short#{sessionvars%urlparameter}">manifest</a><br/>
16 </div>
16 </div>
17
17
18 <div class="page_body">
18 <div class="page_body">
19 <br/>
19 <br/>
20 <i>An error occured while processing your request</i><br/>
20 <i>An error occurred while processing your request</i><br/>
21 <br/>
21 <br/>
22 {error|escape}
22 {error|escape}
23 </div>
23 </div>
24
24
25 #footer#
25 #footer#
@@ -1,138 +1,138
1 adding da/foo
1 adding da/foo
2 adding foo
2 adding foo
3 % manifest
3 % manifest
4 200 Script output follows
4 200 Script output follows
5
5
6
6
7 drwxr-xr-x da
7 drwxr-xr-x da
8 -rw-r--r-- 4 foo
8 -rw-r--r-- 4 foo
9
9
10
10
11 200 Script output follows
11 200 Script output follows
12
12
13
13
14 -rw-r--r-- 4 foo
14 -rw-r--r-- 4 foo
15
15
16
16
17 % plain file
17 % plain file
18 200 Script output follows
18 200 Script output follows
19
19
20 foo
20 foo
21 % should give a 404 - static file that does not exist
21 % should give a 404 - static file that does not exist
22 404 Not Found
22 404 Not Found
23
23
24 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
24 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
25 <html>
25 <html>
26 <head>
26 <head>
27 <link rel="icon" href="/static/hgicon.png" type="image/png">
27 <link rel="icon" href="/static/hgicon.png" type="image/png">
28 <meta name="robots" content="index, nofollow" />
28 <meta name="robots" content="index, nofollow" />
29 <link rel="stylesheet" href="/static/style.css" type="text/css" />
29 <link rel="stylesheet" href="/static/style.css" type="text/css" />
30
30
31 <title>Mercurial Error</title>
31 <title>Mercurial Error</title>
32 </head>
32 </head>
33 <body>
33 <body>
34
34
35 <h2>Mercurial Error</h2>
35 <h2>Mercurial Error</h2>
36
36
37 <p>
37 <p>
38 An error occured while processing your request:
38 An error occurred while processing your request:
39 </p>
39 </p>
40 <p>
40 <p>
41 Not Found
41 Not Found
42 </p>
42 </p>
43
43
44
44
45 <div class="logo">
45 <div class="logo">
46 powered by<br/>
46 powered by<br/>
47 <a href="http://www.selenic.com/mercurial/">mercurial</a>
47 <a href="http://www.selenic.com/mercurial/">mercurial</a>
48 </div>
48 </div>
49
49
50 </body>
50 </body>
51 </html>
51 </html>
52
52
53 % should give a 404 - bad revision
53 % should give a 404 - bad revision
54 404 Not Found
54 404 Not Found
55
55
56
56
57 error: revision not found: spam
57 error: revision not found: spam
58 % should give a 400 - bad command
58 % should give a 400 - bad command
59 400
59 400
60
60
61
61
62 error: No such method: spam
62 error: No such method: spam
63 % should give a 404 - file does not exist
63 % should give a 404 - file does not exist
64 404 Not Found
64 404 Not Found
65
65
66
66
67 error: Path not found: bork/
67 error: Path not found: bork/
68 % stop and restart
68 % stop and restart
69 7 log lines written
69 7 log lines written
70 % static file
70 % static file
71 200 Script output follows
71 200 Script output follows
72
72
73 body { font-family: sans-serif; font-size: 12px; margin:0px; border:solid #d9d8d1; border-width:1px; margin:10px; }
73 body { font-family: sans-serif; font-size: 12px; margin:0px; border:solid #d9d8d1; border-width:1px; margin:10px; }
74 a { color:#0000cc; }
74 a { color:#0000cc; }
75 a:hover, a:visited, a:active { color:#880000; }
75 a:hover, a:visited, a:active { color:#880000; }
76 div.page_header { height:25px; padding:8px; font-size:18px; font-weight:bold; background-color:#d9d8d1; }
76 div.page_header { height:25px; padding:8px; font-size:18px; font-weight:bold; background-color:#d9d8d1; }
77 div.page_header a:visited { color:#0000cc; }
77 div.page_header a:visited { color:#0000cc; }
78 div.page_header a:hover { color:#880000; }
78 div.page_header a:hover { color:#880000; }
79 div.page_nav { padding:8px; }
79 div.page_nav { padding:8px; }
80 div.page_nav a:visited { color:#0000cc; }
80 div.page_nav a:visited { color:#0000cc; }
81 div.page_path { padding:8px; border:solid #d9d8d1; border-width:0px 0px 1px}
81 div.page_path { padding:8px; border:solid #d9d8d1; border-width:0px 0px 1px}
82 div.page_footer { padding:4px 8px; background-color: #d9d8d1; }
82 div.page_footer { padding:4px 8px; background-color: #d9d8d1; }
83 div.page_footer_text { float:left; color:#555555; font-style:italic; }
83 div.page_footer_text { float:left; color:#555555; font-style:italic; }
84 div.page_body { padding:8px; }
84 div.page_body { padding:8px; }
85 div.title, a.title {
85 div.title, a.title {
86 display:block; padding:6px 8px;
86 display:block; padding:6px 8px;
87 font-weight:bold; background-color:#edece6; text-decoration:none; color:#000000;
87 font-weight:bold; background-color:#edece6; text-decoration:none; color:#000000;
88 }
88 }
89 a.title:hover { background-color: #d9d8d1; }
89 a.title:hover { background-color: #d9d8d1; }
90 div.title_text { padding:6px 0px; border: solid #d9d8d1; border-width:0px 0px 1px; }
90 div.title_text { padding:6px 0px; border: solid #d9d8d1; border-width:0px 0px 1px; }
91 div.log_body { padding:8px 8px 8px 150px; }
91 div.log_body { padding:8px 8px 8px 150px; }
92 .age { white-space:nowrap; }
92 .age { white-space:nowrap; }
93 span.age { position:relative; float:left; width:142px; font-style:italic; }
93 span.age { position:relative; float:left; width:142px; font-style:italic; }
94 div.log_link {
94 div.log_link {
95 padding:0px 8px;
95 padding:0px 8px;
96 font-size:10px; font-family:sans-serif; font-style:normal;
96 font-size:10px; font-family:sans-serif; font-style:normal;
97 position:relative; float:left; width:136px;
97 position:relative; float:left; width:136px;
98 }
98 }
99 div.list_head { padding:6px 8px 4px; border:solid #d9d8d1; border-width:1px 0px 0px; font-style:italic; }
99 div.list_head { padding:6px 8px 4px; border:solid #d9d8d1; border-width:1px 0px 0px; font-style:italic; }
100 a.list { text-decoration:none; color:#000000; }
100 a.list { text-decoration:none; color:#000000; }
101 a.list:hover { text-decoration:underline; color:#880000; }
101 a.list:hover { text-decoration:underline; color:#880000; }
102 table { padding:8px 4px; }
102 table { padding:8px 4px; }
103 th { padding:2px 5px; font-size:12px; text-align:left; }
103 th { padding:2px 5px; font-size:12px; text-align:left; }
104 tr.light:hover, .parity0:hover { background-color:#edece6; }
104 tr.light:hover, .parity0:hover { background-color:#edece6; }
105 tr.dark, .parity1 { background-color:#f6f6f0; }
105 tr.dark, .parity1 { background-color:#f6f6f0; }
106 tr.dark:hover, .parity1:hover { background-color:#edece6; }
106 tr.dark:hover, .parity1:hover { background-color:#edece6; }
107 td { padding:2px 5px; font-size:12px; vertical-align:top; }
107 td { padding:2px 5px; font-size:12px; vertical-align:top; }
108 td.link { padding:2px 5px; font-family:sans-serif; font-size:10px; }
108 td.link { padding:2px 5px; font-family:sans-serif; font-size:10px; }
109 div.pre { font-family:monospace; font-size:12px; white-space:pre; }
109 div.pre { font-family:monospace; font-size:12px; white-space:pre; }
110 div.diff_info { font-family:monospace; color:#000099; background-color:#edece6; font-style:italic; }
110 div.diff_info { font-family:monospace; color:#000099; background-color:#edece6; font-style:italic; }
111 div.index_include { border:solid #d9d8d1; border-width:0px 0px 1px; padding:12px 8px; }
111 div.index_include { border:solid #d9d8d1; border-width:0px 0px 1px; padding:12px 8px; }
112 div.search { margin:4px 8px; position:absolute; top:56px; right:12px }
112 div.search { margin:4px 8px; position:absolute; top:56px; right:12px }
113 .linenr { color:#999999; text-decoration:none }
113 .linenr { color:#999999; text-decoration:none }
114 a.rss_logo {
114 a.rss_logo {
115 float:right; padding:3px 6px; line-height:10px;
115 float:right; padding:3px 6px; line-height:10px;
116 border:1px solid; border-color:#fcc7a5 #7d3302 #3e1a01 #ff954e;
116 border:1px solid; border-color:#fcc7a5 #7d3302 #3e1a01 #ff954e;
117 color:#ffffff; background-color:#ff6600;
117 color:#ffffff; background-color:#ff6600;
118 font-weight:bold; font-family:sans-serif; font-size:10px;
118 font-weight:bold; font-family:sans-serif; font-size:10px;
119 text-align:center; text-decoration:none;
119 text-align:center; text-decoration:none;
120 }
120 }
121 a.rss_logo:hover { background-color:#ee5500; }
121 a.rss_logo:hover { background-color:#ee5500; }
122 pre { margin: 0; }
122 pre { margin: 0; }
123 span.logtags span {
123 span.logtags span {
124 padding: 0px 4px;
124 padding: 0px 4px;
125 font-size: 10px;
125 font-size: 10px;
126 font-weight: normal;
126 font-weight: normal;
127 border: 1px solid;
127 border: 1px solid;
128 background-color: #ffaaff;
128 background-color: #ffaaff;
129 border-color: #ffccff #ff00ee #ff00ee #ffccff;
129 border-color: #ffccff #ff00ee #ff00ee #ffccff;
130 }
130 }
131 span.logtags span.tagtag {
131 span.logtags span.tagtag {
132 background-color: #ffffaa;
132 background-color: #ffffaa;
133 border-color: #ffffcc #ffee00 #ffee00 #ffffcc;
133 border-color: #ffffcc #ffee00 #ffee00 #ffffcc;
134 }
134 }
135 span.logtags span.branchtag {
135 span.logtags span.branchtag {
136 background-color: #aaffaa;
136 background-color: #aaffaa;
137 border-color: #ccffcc #00cc33 #00cc33 #ccffcc;
137 border-color: #ccffcc #00cc33 #00cc33 #ccffcc;
138 }
138 }
General Comments 0
You need to be logged in to leave comments. Login now