Fossil SCM
Prevent sym- tag that matches branch name that sorts prior to branch name from displaying an option to cancel the tag. Also clean up a couple strcmp.
Commit
c36ad48a877a9e9fcda39b406ef905c492e1e3a0
Parent
4e463bf7bac9958…
1 file changed
+3
-3
+3
-3
| --- src/info.c | ||
| +++ src/info.c | ||
| @@ -2299,17 +2299,17 @@ | ||
| 2299 | 2299 | @ onkeyup="gebi('newtag').checked=!!this.value" /> |
| 2300 | 2300 | db_prepare(&q, |
| 2301 | 2301 | "SELECT tag.tagid, tagname, tagxref.value FROM tagxref, tag" |
| 2302 | 2302 | " WHERE tagxref.rid=%d AND tagtype>0 AND tagxref.tagid=tag.tagid" |
| 2303 | 2303 | " ORDER BY CASE WHEN tagname GLOB 'sym-*' THEN substr(tagname,5)" |
| 2304 | - " ELSE tagname END /*sort*/", | |
| 2304 | + " ELSE tag.tagid END /*sort*/", | |
| 2305 | 2305 | rid |
| 2306 | 2306 | ); |
| 2307 | 2307 | while( db_step(&q)==SQLITE_ROW ){ |
| 2308 | 2308 | int tagid = db_column_int(&q, 0); |
| 2309 | 2309 | const char *zTagName = db_column_text(&q, 1); |
| 2310 | - int isSpecialTag = strncmp(zTagName, "sym-", 4)!=0; | |
| 2310 | + int isSpecialTag = fossil_strncmp(zTagName, "sym-", 4)!=0; | |
| 2311 | 2311 | char zLabel[30]; |
| 2312 | 2312 | |
| 2313 | 2313 | if (tagid == TAG_CLOSED){ |
| 2314 | 2314 | fHasClosed = 1; |
| 2315 | 2315 | }else if (tagid == TAG_COMMENT){ |
| @@ -2316,11 +2316,11 @@ | ||
| 2316 | 2316 | continue; |
| 2317 | 2317 | }else if (tagid == TAG_BRANCH){ |
| 2318 | 2318 | zBranchName = mprintf("%s", db_column_text(&q, 2)); |
| 2319 | 2319 | continue; |
| 2320 | 2320 | }else if( !isSpecialTag && zBranchName && |
| 2321 | - strcmp(&zTagName[4], zBranchName)==0){ | |
| 2321 | + fossil_strcmp(&zTagName[4], zBranchName)==0){ | |
| 2322 | 2322 | continue; |
| 2323 | 2323 | } |
| 2324 | 2324 | sqlite3_snprintf(sizeof(zLabel), zLabel, "c%d", tagid); |
| 2325 | 2325 | @ <br /><label> |
| 2326 | 2326 | if( P(zLabel) ){ |
| 2327 | 2327 |
| --- src/info.c | |
| +++ src/info.c | |
| @@ -2299,17 +2299,17 @@ | |
| 2299 | @ onkeyup="gebi('newtag').checked=!!this.value" /> |
| 2300 | db_prepare(&q, |
| 2301 | "SELECT tag.tagid, tagname, tagxref.value FROM tagxref, tag" |
| 2302 | " WHERE tagxref.rid=%d AND tagtype>0 AND tagxref.tagid=tag.tagid" |
| 2303 | " ORDER BY CASE WHEN tagname GLOB 'sym-*' THEN substr(tagname,5)" |
| 2304 | " ELSE tagname END /*sort*/", |
| 2305 | rid |
| 2306 | ); |
| 2307 | while( db_step(&q)==SQLITE_ROW ){ |
| 2308 | int tagid = db_column_int(&q, 0); |
| 2309 | const char *zTagName = db_column_text(&q, 1); |
| 2310 | int isSpecialTag = strncmp(zTagName, "sym-", 4)!=0; |
| 2311 | char zLabel[30]; |
| 2312 | |
| 2313 | if (tagid == TAG_CLOSED){ |
| 2314 | fHasClosed = 1; |
| 2315 | }else if (tagid == TAG_COMMENT){ |
| @@ -2316,11 +2316,11 @@ | |
| 2316 | continue; |
| 2317 | }else if (tagid == TAG_BRANCH){ |
| 2318 | zBranchName = mprintf("%s", db_column_text(&q, 2)); |
| 2319 | continue; |
| 2320 | }else if( !isSpecialTag && zBranchName && |
| 2321 | strcmp(&zTagName[4], zBranchName)==0){ |
| 2322 | continue; |
| 2323 | } |
| 2324 | sqlite3_snprintf(sizeof(zLabel), zLabel, "c%d", tagid); |
| 2325 | @ <br /><label> |
| 2326 | if( P(zLabel) ){ |
| 2327 |
| --- src/info.c | |
| +++ src/info.c | |
| @@ -2299,17 +2299,17 @@ | |
| 2299 | @ onkeyup="gebi('newtag').checked=!!this.value" /> |
| 2300 | db_prepare(&q, |
| 2301 | "SELECT tag.tagid, tagname, tagxref.value FROM tagxref, tag" |
| 2302 | " WHERE tagxref.rid=%d AND tagtype>0 AND tagxref.tagid=tag.tagid" |
| 2303 | " ORDER BY CASE WHEN tagname GLOB 'sym-*' THEN substr(tagname,5)" |
| 2304 | " ELSE tag.tagid END /*sort*/", |
| 2305 | rid |
| 2306 | ); |
| 2307 | while( db_step(&q)==SQLITE_ROW ){ |
| 2308 | int tagid = db_column_int(&q, 0); |
| 2309 | const char *zTagName = db_column_text(&q, 1); |
| 2310 | int isSpecialTag = fossil_strncmp(zTagName, "sym-", 4)!=0; |
| 2311 | char zLabel[30]; |
| 2312 | |
| 2313 | if (tagid == TAG_CLOSED){ |
| 2314 | fHasClosed = 1; |
| 2315 | }else if (tagid == TAG_COMMENT){ |
| @@ -2316,11 +2316,11 @@ | |
| 2316 | continue; |
| 2317 | }else if (tagid == TAG_BRANCH){ |
| 2318 | zBranchName = mprintf("%s", db_column_text(&q, 2)); |
| 2319 | continue; |
| 2320 | }else if( !isSpecialTag && zBranchName && |
| 2321 | fossil_strcmp(&zTagName[4], zBranchName)==0){ |
| 2322 | continue; |
| 2323 | } |
| 2324 | sqlite3_snprintf(sizeof(zLabel), zLabel, "c%d", tagid); |
| 2325 | @ <br /><label> |
| 2326 | if( P(zLabel) ){ |
| 2327 |