Fossil SCM
Revert to original ordering to retain sorting of special tags. Get the branch name prior to the loop that displays the special and sym- tags.
Commit
818c0acd07c481baf5ff70f4b509988519735597
Parent
c36ad48a877a9e9…
1 file changed
+4
-2
+4
-2
| --- src/info.c | ||
| +++ src/info.c | ||
| @@ -2295,15 +2295,18 @@ | ||
| 2295 | 2295 | @ <td valign="top"> |
| 2296 | 2296 | @ <label><input type="checkbox" id="newtag" name="newtag"%s(zNewTagFlag) /> |
| 2297 | 2297 | @ Add the following new tag name to this check-in:</label> |
| 2298 | 2298 | @ <input type="text" style="width:15;" name="tagname" value="%h(zNewTag)" |
| 2299 | 2299 | @ onkeyup="gebi('newtag').checked=!!this.value" /> |
| 2300 | + zBranchName = db_text(0, "SELECT value FROM tagxref, tag" | |
| 2301 | + " WHERE tagxref.rid=%d AND tagtype>0 AND tagxref.tagid=tag.tagid" | |
| 2302 | + " AND tagxref.tagid=%d", rid, TAG_BRANCH); | |
| 2300 | 2303 | db_prepare(&q, |
| 2301 | 2304 | "SELECT tag.tagid, tagname, tagxref.value FROM tagxref, tag" |
| 2302 | 2305 | " WHERE tagxref.rid=%d AND tagtype>0 AND tagxref.tagid=tag.tagid" |
| 2303 | 2306 | " ORDER BY CASE WHEN tagname GLOB 'sym-*' THEN substr(tagname,5)" |
| 2304 | - " ELSE tag.tagid END /*sort*/", | |
| 2307 | + " ELSE tagname END /*sort*/", | |
| 2305 | 2308 | rid |
| 2306 | 2309 | ); |
| 2307 | 2310 | while( db_step(&q)==SQLITE_ROW ){ |
| 2308 | 2311 | int tagid = db_column_int(&q, 0); |
| 2309 | 2312 | const char *zTagName = db_column_text(&q, 1); |
| @@ -2313,11 +2316,10 @@ | ||
| 2313 | 2316 | if (tagid == TAG_CLOSED){ |
| 2314 | 2317 | fHasClosed = 1; |
| 2315 | 2318 | }else if (tagid == TAG_COMMENT){ |
| 2316 | 2319 | continue; |
| 2317 | 2320 | }else if (tagid == TAG_BRANCH){ |
| 2318 | - zBranchName = mprintf("%s", db_column_text(&q, 2)); | |
| 2319 | 2321 | continue; |
| 2320 | 2322 | }else if( !isSpecialTag && zBranchName && |
| 2321 | 2323 | fossil_strcmp(&zTagName[4], zBranchName)==0){ |
| 2322 | 2324 | continue; |
| 2323 | 2325 | } |
| 2324 | 2326 |
| --- src/info.c | |
| +++ src/info.c | |
| @@ -2295,15 +2295,18 @@ | |
| 2295 | @ <td valign="top"> |
| 2296 | @ <label><input type="checkbox" id="newtag" name="newtag"%s(zNewTagFlag) /> |
| 2297 | @ Add the following new tag name to this check-in:</label> |
| 2298 | @ <input type="text" style="width:15;" name="tagname" value="%h(zNewTag)" |
| 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); |
| @@ -2313,11 +2316,10 @@ | |
| 2313 | if (tagid == TAG_CLOSED){ |
| 2314 | fHasClosed = 1; |
| 2315 | }else if (tagid == TAG_COMMENT){ |
| 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 |
| --- src/info.c | |
| +++ src/info.c | |
| @@ -2295,15 +2295,18 @@ | |
| 2295 | @ <td valign="top"> |
| 2296 | @ <label><input type="checkbox" id="newtag" name="newtag"%s(zNewTagFlag) /> |
| 2297 | @ Add the following new tag name to this check-in:</label> |
| 2298 | @ <input type="text" style="width:15;" name="tagname" value="%h(zNewTag)" |
| 2299 | @ onkeyup="gebi('newtag').checked=!!this.value" /> |
| 2300 | zBranchName = db_text(0, "SELECT value FROM tagxref, tag" |
| 2301 | " WHERE tagxref.rid=%d AND tagtype>0 AND tagxref.tagid=tag.tagid" |
| 2302 | " AND tagxref.tagid=%d", rid, TAG_BRANCH); |
| 2303 | db_prepare(&q, |
| 2304 | "SELECT tag.tagid, tagname, tagxref.value FROM tagxref, tag" |
| 2305 | " WHERE tagxref.rid=%d AND tagtype>0 AND tagxref.tagid=tag.tagid" |
| 2306 | " ORDER BY CASE WHEN tagname GLOB 'sym-*' THEN substr(tagname,5)" |
| 2307 | " ELSE tagname END /*sort*/", |
| 2308 | rid |
| 2309 | ); |
| 2310 | while( db_step(&q)==SQLITE_ROW ){ |
| 2311 | int tagid = db_column_int(&q, 0); |
| 2312 | const char *zTagName = db_column_text(&q, 1); |
| @@ -2313,11 +2316,10 @@ | |
| 2316 | if (tagid == TAG_CLOSED){ |
| 2317 | fHasClosed = 1; |
| 2318 | }else if (tagid == TAG_COMMENT){ |
| 2319 | continue; |
| 2320 | }else if (tagid == TAG_BRANCH){ |
| 2321 | continue; |
| 2322 | }else if( !isSpecialTag && zBranchName && |
| 2323 | fossil_strcmp(&zTagName[4], zBranchName)==0){ |
| 2324 | continue; |
| 2325 | } |
| 2326 |