Fossil SCM

"comment" tag from check-in's cannot be canceled: that would result in a check-in without a comment! Extraneous dot in label text.

jan.nijtmans 2013-12-03 14:56 UTC trunk
Commit 2d2ab567547e1e473e559b453a17d64444e77ab3
Parent f8eefabe6a9d3db…
2 files changed +2 -1 +2 -1
~ src/info.c ~ src/info.c
M src/info.c
+2 -1
--- src/info.c
+++ src/info.c
@@ -2285,10 +2285,11 @@
22852285
 );
22862286
 while( db_step(&q)==SQLITE_ROW ){
22872287
 int tagid = db_column_int(&q, 0);
22882288
 const char *zTagName = db_column_text(&q, 1);
22892289
 char zLabel[30];
2290
+ if (tagid == TAG_COMMENT) continue;
22902291
 sqlite3_snprintf(sizeof(zLabel), zLabel, "c%d", tagid);
22912292
 @ <br /><label>
22922293
 if( P(zLabel) ){
22932294
 @ <input type="checkbox" name="c%d(tagid)" checked="checked" />
22942295
 }else{
@@ -2318,11 +2319,11 @@
23182319
 ){
23192320
 @ <tr><th align="right" valign="top">Leaf Closure:</th>
23202321
 @ <td valign="top">
23212322
 @ <label><input type="checkbox" name="close"%s(zCloseFlag) />
23222323
 @ Mark this leaf as "closed" so that it no longer appears on the
2323
- @ "leaves" page and is no longer labeled as a "<b>Leaf</b>".</label>
2324
+ @ "leaves" page and is no longer labeled as a "<b>Leaf</b>"</label>
23242325
 @ </td></tr>
23252326
 }
23262327
23272328
23282329
 @ <tr><td colspan="2">
23292330
--- src/info.c
+++ src/info.c
@@ -2285,10 +2285,11 @@
2285 );
2286 while( db_step(&q)==SQLITE_ROW ){
2287 int tagid = db_column_int(&q, 0);
2288 const char *zTagName = db_column_text(&q, 1);
2289 char zLabel[30];
 
2290 sqlite3_snprintf(sizeof(zLabel), zLabel, "c%d", tagid);
2291 @ <br /><label>
2292 if( P(zLabel) ){
2293 @ <input type="checkbox" name="c%d(tagid)" checked="checked" />
2294 }else{
@@ -2318,11 +2319,11 @@
2318 ){
2319 @ <tr><th align="right" valign="top">Leaf Closure:</th>
2320 @ <td valign="top">
2321 @ <label><input type="checkbox" name="close"%s(zCloseFlag) />
2322 @ Mark this leaf as "closed" so that it no longer appears on the
2323 @ "leaves" page and is no longer labeled as a "<b>Leaf</b>".</label>
2324 @ </td></tr>
2325 }
2326
2327
2328 @ <tr><td colspan="2">
2329
--- src/info.c
+++ src/info.c
@@ -2285,10 +2285,11 @@
2285 );
2286 while( db_step(&q)==SQLITE_ROW ){
2287 int tagid = db_column_int(&q, 0);
2288 const char *zTagName = db_column_text(&q, 1);
2289 char zLabel[30];
2290 if (tagid == TAG_COMMENT) continue;
2291 sqlite3_snprintf(sizeof(zLabel), zLabel, "c%d", tagid);
2292 @ <br /><label>
2293 if( P(zLabel) ){
2294 @ <input type="checkbox" name="c%d(tagid)" checked="checked" />
2295 }else{
@@ -2318,11 +2319,11 @@
2319 ){
2320 @ <tr><th align="right" valign="top">Leaf Closure:</th>
2321 @ <td valign="top">
2322 @ <label><input type="checkbox" name="close"%s(zCloseFlag) />
2323 @ Mark this leaf as "closed" so that it no longer appears on the
2324 @ "leaves" page and is no longer labeled as a "<b>Leaf</b>"</label>
2325 @ </td></tr>
2326 }
2327
2328
2329 @ <tr><td colspan="2">
2330
M src/info.c
+2 -1
--- src/info.c
+++ src/info.c
@@ -2285,10 +2285,11 @@
22852285
 );
22862286
 while( db_step(&q)==SQLITE_ROW ){
22872287
 int tagid = db_column_int(&q, 0);
22882288
 const char *zTagName = db_column_text(&q, 1);
22892289
 char zLabel[30];
2290
+ if (tagid == TAG_COMMENT) continue;
22902291
 sqlite3_snprintf(sizeof(zLabel), zLabel, "c%d", tagid);
22912292
 @ <br /><label>
22922293
 if( P(zLabel) ){
22932294
 @ <input type="checkbox" name="c%d(tagid)" checked="checked" />
22942295
 }else{
@@ -2318,11 +2319,11 @@
23182319
 ){
23192320
 @ <tr><th align="right" valign="top">Leaf Closure:</th>
23202321
 @ <td valign="top">
23212322
 @ <label><input type="checkbox" name="close"%s(zCloseFlag) />
23222323
 @ Mark this leaf as "closed" so that it no longer appears on the
2323
- @ "leaves" page and is no longer labeled as a "<b>Leaf</b>".</label>
2324
+ @ "leaves" page and is no longer labeled as a "<b>Leaf</b>"</label>
23242325
 @ </td></tr>
23252326
 }
23262327
23272328
23282329
 @ <tr><td colspan="2">
23292330
--- src/info.c
+++ src/info.c
@@ -2285,10 +2285,11 @@
2285 );
2286 while( db_step(&q)==SQLITE_ROW ){
2287 int tagid = db_column_int(&q, 0);
2288 const char *zTagName = db_column_text(&q, 1);
2289 char zLabel[30];
 
2290 sqlite3_snprintf(sizeof(zLabel), zLabel, "c%d", tagid);
2291 @ <br /><label>
2292 if( P(zLabel) ){
2293 @ <input type="checkbox" name="c%d(tagid)" checked="checked" />
2294 }else{
@@ -2318,11 +2319,11 @@
2318 ){
2319 @ <tr><th align="right" valign="top">Leaf Closure:</th>
2320 @ <td valign="top">
2321 @ <label><input type="checkbox" name="close"%s(zCloseFlag) />
2322 @ Mark this leaf as "closed" so that it no longer appears on the
2323 @ "leaves" page and is no longer labeled as a "<b>Leaf</b>".</label>
2324 @ </td></tr>
2325 }
2326
2327
2328 @ <tr><td colspan="2">
2329
--- src/info.c
+++ src/info.c
@@ -2285,10 +2285,11 @@
2285 );
2286 while( db_step(&q)==SQLITE_ROW ){
2287 int tagid = db_column_int(&q, 0);
2288 const char *zTagName = db_column_text(&q, 1);
2289 char zLabel[30];
2290 if (tagid == TAG_COMMENT) continue;
2291 sqlite3_snprintf(sizeof(zLabel), zLabel, "c%d", tagid);
2292 @ <br /><label>
2293 if( P(zLabel) ){
2294 @ <input type="checkbox" name="c%d(tagid)" checked="checked" />
2295 }else{
@@ -2318,11 +2319,11 @@
2319 ){
2320 @ <tr><th align="right" valign="top">Leaf Closure:</th>
2321 @ <td valign="top">
2322 @ <label><input type="checkbox" name="close"%s(zCloseFlag) />
2323 @ Mark this leaf as "closed" so that it no longer appears on the
2324 @ "leaves" page and is no longer labeled as a "<b>Leaf</b>"</label>
2325 @ </td></tr>
2326 }
2327
2328
2329 @ <tr><td colspan="2">
2330

Keyboard Shortcuts

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