Fossil SCM

Additional changes associated with check-in [43b30dcfc330b] on 2014-10-20: Change the %!w format to %!W.

drh 2015-02-26 03:12 trunk
Commit 3b92154af8d44c0e8b90fa864caf784a4a081905
Parent c3d72bd99ef1144…
3 files changed +1 -1 +6 -6 +2 -2
~ src/attach.c ~ src/info.c ~ src/printf.c
M src/attach.c
+1 -1
--- src/attach.c
+++ src/attach.c
@@ -97,11 +97,11 @@
9797
 }
9898
 @ <br><a href="%R/attachview?%s(zUrlTail)">%h(zFilename)</a>
9999
 @ [<a href="%R/attachdownload/%t(zFilename)?%s(zUrlTail)">download</a>]<br />
100100
 if( zComment ) while( fossil_isspace(zComment[0]) ) zComment++;
101101
 if( zComment && zComment[0] ){
102
- @ %!w(zComment)<br />
102
+ @ %!W(zComment)<br />
103103
 }
104104
 if( zPage==0 && zTkt==0 ){
105105
 if( zSrc==0 || zSrc[0]==0 ){
106106
 zSrc = "Deleted from";
107107
 }else {
108108
--- src/attach.c
+++ src/attach.c
@@ -97,11 +97,11 @@
97 }
98 @ <br><a href="%R/attachview?%s(zUrlTail)">%h(zFilename)</a>
99 @ [<a href="%R/attachdownload/%t(zFilename)?%s(zUrlTail)">download</a>]<br />
100 if( zComment ) while( fossil_isspace(zComment[0]) ) zComment++;
101 if( zComment && zComment[0] ){
102 @ %!w(zComment)<br />
103 }
104 if( zPage==0 && zTkt==0 ){
105 if( zSrc==0 || zSrc[0]==0 ){
106 zSrc = "Deleted from";
107 }else {
108
--- src/attach.c
+++ src/attach.c
@@ -97,11 +97,11 @@
97 }
98 @ <br><a href="%R/attachview?%s(zUrlTail)">%h(zFilename)</a>
99 @ [<a href="%R/attachdownload/%t(zFilename)?%s(zUrlTail)">download</a>]<br />
100 if( zComment ) while( fossil_isspace(zComment[0]) ) zComment++;
101 if( zComment && zComment[0] ){
102 @ %!W(zComment)<br />
103 }
104 if( zPage==0 && zTkt==0 ){
105 if( zSrc==0 || zSrc[0]==0 ){
106 zSrc = "Deleted from";
107 }else {
108
M src/info.c
+6 -6
--- src/info.c
+++ src/info.c
@@ -598,14 +598,14 @@
598598
 }else{
599599
 @ <tr><th>User:</th><td>
600600
 hyperlink_to_user(zUser,zDate,"</td></tr>");
601601
 }
602602
 if( zEComment ){
603
- @ <tr><th>Edited&nbsp;Comment:</th><td class="infoComment">%!w(zEComment)</td></tr>
604
- @ <tr><th>Original&nbsp;Comment:</th><td class="infoComment">%!w(zComment)</td></tr>
603
+ @ <tr><th>Edited&nbsp;Comment:</th><td class="infoComment">%!W(zEComment)</td></tr>
604
+ @ <tr><th>Original&nbsp;Comment:</th><td class="infoComment">%!W(zComment)</td></tr>
605605
 }else{
606
- @ <tr><th>Comment:</th><td class="infoComment">%!w(zComment)</td></tr>
606
+ @ <tr><th>Comment:</th><td class="infoComment">%!W(zComment)</td></tr>
607607
 }
608608
 if( g.perm.Admin ){
609609
 db_prepare(&q2,
610610
 "SELECT rcvfrom.ipaddr, user.login, datetime(rcvfrom.mtime)"
611611
 " FROM blob JOIN rcvfrom USING(rcvid) LEFT JOIN user USING(uid)"
@@ -1249,11 +1249,11 @@
12491249
 hyperlink_to_date(zDate,"");
12501250
 }
12511251
 if( zBr && zBr[0] ){
12521252
 @ on branch %z(href("%R/timeline?r=%T",zBr))%h(zBr)</a>
12531253
 }
1254
- @ &mdash; %!w(zCom) (user:
1254
+ @ &mdash; %!W(zCom) (user:
12551255
 hyperlink_to_user(zUser,zDate,")");
12561256
 if( g.perm.Hyperlink ){
12571257
 @ %z(href("%R/finfo?name=%T&ci=%!S",zName,zVers))[ancestry]</a>
12581258
 @ %z(href("%R/annotate?filename=%T&checkin=%!S",zName,zVers))
12591259
 @ [annotate]</a>
@@ -1335,11 +1335,11 @@
13351335
 @ Control file referencing
13361336
 }
13371337
 if( zType[0]!='e' ){
13381338
 hyperlink_to_uuid(zUuid);
13391339
 }
1340
- @ - %!w(zCom) by
1340
+ @ - %!W(zCom) by
13411341
 hyperlink_to_user(zUser,zDate," on");
13421342
 hyperlink_to_date(zDate, ".");
13431343
 if( pDownloadName && blob_size(pDownloadName)==0 ){
13441344
 blob_appendf(pDownloadName, "%S.txt", zUuid);
13451345
 }
@@ -2452,11 +2452,11 @@
24522452
 if( zNewColor && zNewColor[0] ){
24532453
 @ <tr><td style="background-color: %h(zNewColor);">
24542454
 }else{
24552455
 @ <tr><td>
24562456
 }
2457
- @ %!w(blob_str(&comment))
2457
+ @ %!W(blob_str(&comment))
24582458
 blob_zero(&suffix);
24592459
 blob_appendf(&suffix, "(user: %h", zNewUser);
24602460
 db_prepare(&q, "SELECT substr(tagname,5) FROM tagxref, tag"
24612461
 " WHERE tagname GLOB 'sym-*' AND tagxref.rid=%d"
24622462
 " AND tagtype>1 AND tag.tagid=tagxref.tagid",
24632463
--- src/info.c
+++ src/info.c
@@ -598,14 +598,14 @@
598 }else{
599 @ <tr><th>User:</th><td>
600 hyperlink_to_user(zUser,zDate,"</td></tr>");
601 }
602 if( zEComment ){
603 @ <tr><th>Edited&nbsp;Comment:</th><td class="infoComment">%!w(zEComment)</td></tr>
604 @ <tr><th>Original&nbsp;Comment:</th><td class="infoComment">%!w(zComment)</td></tr>
605 }else{
606 @ <tr><th>Comment:</th><td class="infoComment">%!w(zComment)</td></tr>
607 }
608 if( g.perm.Admin ){
609 db_prepare(&q2,
610 "SELECT rcvfrom.ipaddr, user.login, datetime(rcvfrom.mtime)"
611 " FROM blob JOIN rcvfrom USING(rcvid) LEFT JOIN user USING(uid)"
@@ -1249,11 +1249,11 @@
1249 hyperlink_to_date(zDate,"");
1250 }
1251 if( zBr && zBr[0] ){
1252 @ on branch %z(href("%R/timeline?r=%T",zBr))%h(zBr)</a>
1253 }
1254 @ &mdash; %!w(zCom) (user:
1255 hyperlink_to_user(zUser,zDate,")");
1256 if( g.perm.Hyperlink ){
1257 @ %z(href("%R/finfo?name=%T&ci=%!S",zName,zVers))[ancestry]</a>
1258 @ %z(href("%R/annotate?filename=%T&checkin=%!S",zName,zVers))
1259 @ [annotate]</a>
@@ -1335,11 +1335,11 @@
1335 @ Control file referencing
1336 }
1337 if( zType[0]!='e' ){
1338 hyperlink_to_uuid(zUuid);
1339 }
1340 @ - %!w(zCom) by
1341 hyperlink_to_user(zUser,zDate," on");
1342 hyperlink_to_date(zDate, ".");
1343 if( pDownloadName && blob_size(pDownloadName)==0 ){
1344 blob_appendf(pDownloadName, "%S.txt", zUuid);
1345 }
@@ -2452,11 +2452,11 @@
2452 if( zNewColor && zNewColor[0] ){
2453 @ <tr><td style="background-color: %h(zNewColor);">
2454 }else{
2455 @ <tr><td>
2456 }
2457 @ %!w(blob_str(&comment))
2458 blob_zero(&suffix);
2459 blob_appendf(&suffix, "(user: %h", zNewUser);
2460 db_prepare(&q, "SELECT substr(tagname,5) FROM tagxref, tag"
2461 " WHERE tagname GLOB 'sym-*' AND tagxref.rid=%d"
2462 " AND tagtype>1 AND tag.tagid=tagxref.tagid",
2463
--- src/info.c
+++ src/info.c
@@ -598,14 +598,14 @@
598 }else{
599 @ <tr><th>User:</th><td>
600 hyperlink_to_user(zUser,zDate,"</td></tr>");
601 }
602 if( zEComment ){
603 @ <tr><th>Edited&nbsp;Comment:</th><td class="infoComment">%!W(zEComment)</td></tr>
604 @ <tr><th>Original&nbsp;Comment:</th><td class="infoComment">%!W(zComment)</td></tr>
605 }else{
606 @ <tr><th>Comment:</th><td class="infoComment">%!W(zComment)</td></tr>
607 }
608 if( g.perm.Admin ){
609 db_prepare(&q2,
610 "SELECT rcvfrom.ipaddr, user.login, datetime(rcvfrom.mtime)"
611 " FROM blob JOIN rcvfrom USING(rcvid) LEFT JOIN user USING(uid)"
@@ -1249,11 +1249,11 @@
1249 hyperlink_to_date(zDate,"");
1250 }
1251 if( zBr && zBr[0] ){
1252 @ on branch %z(href("%R/timeline?r=%T",zBr))%h(zBr)</a>
1253 }
1254 @ &mdash; %!W(zCom) (user:
1255 hyperlink_to_user(zUser,zDate,")");
1256 if( g.perm.Hyperlink ){
1257 @ %z(href("%R/finfo?name=%T&ci=%!S",zName,zVers))[ancestry]</a>
1258 @ %z(href("%R/annotate?filename=%T&checkin=%!S",zName,zVers))
1259 @ [annotate]</a>
@@ -1335,11 +1335,11 @@
1335 @ Control file referencing
1336 }
1337 if( zType[0]!='e' ){
1338 hyperlink_to_uuid(zUuid);
1339 }
1340 @ - %!W(zCom) by
1341 hyperlink_to_user(zUser,zDate," on");
1342 hyperlink_to_date(zDate, ".");
1343 if( pDownloadName && blob_size(pDownloadName)==0 ){
1344 blob_appendf(pDownloadName, "%S.txt", zUuid);
1345 }
@@ -2452,11 +2452,11 @@
2452 if( zNewColor && zNewColor[0] ){
2453 @ <tr><td style="background-color: %h(zNewColor);">
2454 }else{
2455 @ <tr><td>
2456 }
2457 @ %!W(blob_str(&comment))
2458 blob_zero(&suffix);
2459 blob_appendf(&suffix, "(user: %h", zNewUser);
2460 db_prepare(&q, "SELECT substr(tagname,5) FROM tagxref, tag"
2461 " WHERE tagname GLOB 'sym-*' AND tagxref.rid=%d"
2462 " AND tagtype>1 AND tag.tagid=tagxref.tagid",
2463
M src/printf.c
+2 -2
--- src/printf.c
+++ src/printf.c
@@ -206,12 +206,12 @@
206206
 /*
207207
 ** Return an appropriate set of flags for wiki_convert() for displaying
208208
 ** comments on a timeline. These flag settings are determined by
209209
 ** configuration parameters.
210210
 **
211
-** The altForm2 argument is true for "%!w" (with the "!" alternate-form-2
212
-** flags) and is false for plain "%w". The ! indicates that the text is
211
+** The altForm2 argument is true for "%!W" (with the "!" alternate-form-2
212
+** flags) and is false for plain "%W". The ! indicates that the text is
213213
 ** to be rendered on a form rather than the timeline and that block markup
214214
 ** is acceptable even if the "timeline-block-markup" setting is false.
215215
 */
216216
 static int wiki_convert_flags(int altForm2){
217217
 static int wikiFlags = 0;
218218
--- src/printf.c
+++ src/printf.c
@@ -206,12 +206,12 @@
206 /*
207 ** Return an appropriate set of flags for wiki_convert() for displaying
208 ** comments on a timeline. These flag settings are determined by
209 ** configuration parameters.
210 **
211 ** The altForm2 argument is true for "%!w" (with the "!" alternate-form-2
212 ** flags) and is false for plain "%w". The ! indicates that the text is
213 ** to be rendered on a form rather than the timeline and that block markup
214 ** is acceptable even if the "timeline-block-markup" setting is false.
215 */
216 static int wiki_convert_flags(int altForm2){
217 static int wikiFlags = 0;
218
--- src/printf.c
+++ src/printf.c
@@ -206,12 +206,12 @@
206 /*
207 ** Return an appropriate set of flags for wiki_convert() for displaying
208 ** comments on a timeline. These flag settings are determined by
209 ** configuration parameters.
210 **
211 ** The altForm2 argument is true for "%!W" (with the "!" alternate-form-2
212 ** flags) and is false for plain "%W". The ! indicates that the text is
213 ** to be rendered on a form rather than the timeline and that block markup
214 ** is acceptable even if the "timeline-block-markup" setting is false.
215 */
216 static int wiki_convert_flags(int altForm2){
217 static int wikiFlags = 0;
218

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button