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