Show More
@@ -264,11 +264,12 b' shortlog = shortlog.tmpl' | |||
|
264 | 264 | graph = graph.tmpl |
|
265 | 265 | phasetag = '{ifeq(phase, 'public', '', '<span class="phasetag" title="{phase|escape}">{phase|escape}</span> ')}' |
|
266 | 266 | obsoletetag = '{if(obsolete, '<span class="obsoletetag" title="obsolete">obsolete</span> ')}' |
|
267 | instabilitytag = '<span class="instabilitytag" title="{name|escape}">{name|escape}</span> ' | |
|
267 | 268 | tagtag = '<span class="tagtag" title="{name|escape}">{name|escape}</span> ' |
|
268 | 269 | branchtag = '<span class="branchtag" title="{name|escape}">{name|escape}</span> ' |
|
269 | 270 | inbranchtag = '<span class="inbranchtag" title="{name|escape}">{name|escape}</span> ' |
|
270 | 271 | bookmarktag = '<span class="bookmarktag" title="{name|escape}">{name|escape}</span> ' |
|
271 | alltags = '<span class="logtags">{phasetag}{obsoletetag}{inbranch%inbranchtag}{branches%branchtag}{tags%tagtag}{bookmarks%bookmarktag}</span>' | |
|
272 | alltags = '<span class="logtags">{phasetag}{obsoletetag}{instabilities%instabilitytag}{inbranch%inbranchtag}{branches%branchtag}{tags%tagtag}{bookmarks%bookmarktag}</span>' | |
|
272 | 273 | shortlogentry = ' |
|
273 | 274 | <tr class="parity{parity}"> |
|
274 | 275 | <td class="age"><i class="age">{date|rfc822date}</i></td> |
@@ -223,11 +223,12 b" filecompchild = '" | |||
|
223 | 223 | shortlog = shortlog.tmpl |
|
224 | 224 | phasetag = '{ifeq(phase, 'public', '', '<span class="phasetag" title="{phase|escape}">{phase|escape}</span> ')}' |
|
225 | 225 | obsoletetag = '{if(obsolete, '<span class="obsoletetag" title="obsolete">obsolete</span> ')}' |
|
226 | instabilitytag = '<span class="instabilitytag" title="{name|escape}">{name|escape}</span> ' | |
|
226 | 227 | tagtag = '<span class="tagtag" title="{name|escape}">{name|escape}</span> ' |
|
227 | 228 | branchtag = '<span class="branchtag" title="{name|escape}">{name|escape}</span> ' |
|
228 | 229 | inbranchtag = '<span class="inbranchtag" title="{name|escape}">{name|escape}</span> ' |
|
229 | 230 | bookmarktag = '<span class="bookmarktag" title="{name|escape}">{name|escape}</span> ' |
|
230 | alltags = '<span class="logtags">{phasetag}{obsoletetag}{inbranch%inbranchtag}{branches%branchtag}{tags%tagtag}{bookmarks%bookmarktag}</span>' | |
|
231 | alltags = '<span class="logtags">{phasetag}{obsoletetag}{instabilities%instabilitytag}{inbranch%inbranchtag}{branches%branchtag}{tags%tagtag}{bookmarks%bookmarktag}</span>' | |
|
231 | 232 | shortlogentry = ' |
|
232 | 233 | <tr class="parity{parity}"> |
|
233 | 234 | <td class="nowrap age">{date|rfc822date}</td> |
@@ -200,12 +200,13 b" branchentry = '" | |||
|
200 | 200 | </tr>' |
|
201 | 201 | phasetag = '{ifeq(phase, 'public', '', '<span class="phase">{phase|escape}</span> ')}' |
|
202 | 202 | obsoletetag = '{if(obsolete, '<span class="obsolete">obsolete</span> ')}' |
|
203 | instabilitytag = '<span class="instability">{name|escape}</span> ' | |
|
203 | 204 | changelogtag = '<span class="tag">{name|escape}</span> ' |
|
204 | 205 | changesettag = '<span class="tag">{tag|escape}</span> ' |
|
205 | 206 | changesetbookmark = '<span class="tag">{bookmark|escape}</span> ' |
|
206 | 207 | changelogbranchhead = '<span class="branchhead">{name|escape}</span> ' |
|
207 | 208 | changelogbranchname = '<span class="branchname">{name|escape}</span> ' |
|
208 | alltags = '{phasetag}{obsoletetag}{inbranch%changelogbranchname}{branches%changelogbranchhead}{tags%changelogtag}{bookmarks%changelogtag}' | |
|
209 | alltags = '{phasetag}{obsoletetag}{instabilities%instabilitytag}{inbranch%changelogbranchname}{branches%changelogbranchhead}{tags%changelogtag}{bookmarks%changelogtag}' | |
|
209 | 210 | |
|
210 | 211 | filediffparent = ' |
|
211 | 212 | <tr> |
@@ -26,6 +26,10 b'' | |||
|
26 | 26 | <th class="obsolete">obsolete:</th> |
|
27 | 27 | <td class="obsolete">yes</td> |
|
28 | 28 | </tr>')} |
|
29 | {ifeq(count(instabilities), '0', '', '<tr> | |
|
30 | <th class="instabilities">instabilities:</th> | |
|
31 | <td class="instabilities">{instabilities%"{name} "|escape}</td> | |
|
32 | </tr>')} | |
|
29 | 33 | <tr> |
|
30 | 34 | <th class="files"><a href="{url|urlescape}file/{node|short}{sessionvars%urlparameter}">files</a>:</th> |
|
31 | 35 | <td class="files">{files}</td> |
@@ -41,6 +41,10 b'' | |||
|
41 | 41 | <th class="obsolete">obsolete:</th> |
|
42 | 42 | <td class="obsolete">yes</td> |
|
43 | 43 | </tr>')} |
|
44 | {ifeq(count(instabilities), '0', '', '<tr> | |
|
45 | <th class="instabilities">instabilities:</th> | |
|
46 | <td class="instabilities">{instabilities%"{name} "|escape}</td> | |
|
47 | </tr>')} | |
|
44 | 48 | <tr> |
|
45 | 49 | <th class="files">files:</th> |
|
46 | 50 | <td class="files">{files}</td> |
@@ -130,6 +130,10 b' span.logtags span.obsoletetag {' | |||
|
130 | 130 | background-color: #dddddd; |
|
131 | 131 | border-color: #e4e4e4 #a3a3a3 #a3a3a3 #e4e4e4; |
|
132 | 132 | } |
|
133 | span.logtags span.instabilitytag { | |
|
134 | background-color: #ffb1c0; | |
|
135 | border-color: #ffbbc8 #ff4476 #ff4476 #ffbbc8; | |
|
136 | } | |
|
133 | 137 | span.logtags span.tagtag { |
|
134 | 138 | background-color: #ffffaa; |
|
135 | 139 | border-color: #ffffcc #ffee00 #ffee00 #ffffcc; |
@@ -241,6 +241,10 b' span.logtags span.obsoletetag {' | |||
|
241 | 241 | background-color: #dddddd; |
|
242 | 242 | border-color: #e4e4e4 #a3a3a3 #a3a3a3 #e4e4e4; |
|
243 | 243 | } |
|
244 | span.logtags span.instabilitytag { | |
|
245 | background-color: #ffb1c0; | |
|
246 | border-color: #ffbbc8 #ff4476 #ff4476 #ffbbc8; | |
|
247 | } | |
|
244 | 248 | span.logtags span.tagtag { |
|
245 | 249 | background-color: #ffffaa; |
|
246 | 250 | border-color: #ffffcc #ffee00 #ffee00 #ffffcc; |
@@ -155,6 +155,15 b' a { text-decoration:none; }' | |||
|
155 | 155 | vertical-align: baseline; |
|
156 | 156 | } |
|
157 | 157 | |
|
158 | .instability { | |
|
159 | color: #000; | |
|
160 | font-size: 70%; | |
|
161 | border-bottom: 1px solid #000; | |
|
162 | font-weight: normal; | |
|
163 | margin-left: .5em; | |
|
164 | vertical-align: baseline; | |
|
165 | } | |
|
166 | ||
|
158 | 167 | .tag { |
|
159 | 168 | color: #999; |
|
160 | 169 | font-size: 70%; |
@@ -340,7 +340,7 b' static file' | |||
|
340 | 340 | |
|
341 | 341 | $ get-with-headers.py --twice localhost:$HGPORT 'static/style-gitweb.css' - date etag server |
|
342 | 342 | 200 Script output follows |
|
343 |
content-length: 9 |
|
|
343 | content-length: 9374 | |
|
344 | 344 | content-type: text/css |
|
345 | 345 | |
|
346 | 346 | body { font-family: sans-serif; font-size: 12px; border:solid #d9d8d1; border-width:1px; margin:10px; background: white; color: black; } |
@@ -475,6 +475,10 b' static file' | |||
|
475 | 475 | background-color: #dddddd; |
|
476 | 476 | border-color: #e4e4e4 #a3a3a3 #a3a3a3 #e4e4e4; |
|
477 | 477 | } |
|
478 | span.logtags span.instabilitytag { | |
|
479 | background-color: #ffb1c0; | |
|
480 | border-color: #ffbbc8 #ff4476 #ff4476 #ffbbc8; | |
|
481 | } | |
|
478 | 482 | span.logtags span.tagtag { |
|
479 | 483 | background-color: #ffffaa; |
|
480 | 484 | border-color: #ffffcc #ffee00 #ffee00 #ffffcc; |
@@ -1034,6 +1034,20 b' check obsolete changeset' | |||
|
1034 | 1034 | <th class="obsolete">obsolete:</th> |
|
1035 | 1035 | <td class="obsolete">yes</td> |
|
1036 | 1036 | |
|
1037 | check changeset with instabilities | |
|
1038 | ||
|
1039 | $ get-with-headers.py localhost:$HGPORT 'log?rev=first(phasedivergent())&style=paper' | grep '<span class="instability">' | |
|
1040 | <span class="phase">draft</span> <span class="instability">orphan</span> <span class="instability">phase-divergent</span> | |
|
1041 | $ get-with-headers.py localhost:$HGPORT 'log?rev=first(phasedivergent())&style=coal' | grep '<span class="instability">' | |
|
1042 | <span class="phase">draft</span> <span class="instability">orphan</span> <span class="instability">phase-divergent</span> | |
|
1043 | $ get-with-headers.py localhost:$HGPORT 'log?rev=first(phasedivergent())&style=gitweb' | grep '<span class="logtags">' | |
|
1044 | <span class="logtags"><span class="phasetag" title="draft">draft</span> <span class="instabilitytag" title="orphan">orphan</span> <span class="instabilitytag" title="phase-divergent">phase-divergent</span> </span> | |
|
1045 | $ get-with-headers.py localhost:$HGPORT 'log?rev=first(phasedivergent())&style=monoblue' | grep '<span class="logtags">' | |
|
1046 | <span class="logtags"><span class="phasetag" title="draft">draft</span> <span class="instabilitytag" title="orphan">orphan</span> <span class="instabilitytag" title="phase-divergent">phase-divergent</span> </span> | |
|
1047 | $ get-with-headers.py localhost:$HGPORT 'log?rev=first(phasedivergent())&style=spartan' | grep 'class="instabilities"' | |
|
1048 | <th class="instabilities">instabilities:</th> | |
|
1049 | <td class="instabilities">orphan phase-divergent </td> | |
|
1050 | ||
|
1037 | 1051 | $ killdaemons.py |
|
1038 | 1052 | |
|
1039 | 1053 | $ rm hg.pid access.log errors.log |
General Comments 0
You need to be logged in to leave comments.
Login now