Fossil SCM
For opened working trees, store current branch at top of manifest.tags.
Commit
0fb54e5afe2a60e4605d61ea47050046fd355656
Parent
de9e7651a97afcc…
1 file changed
+8
+8
| --- src/checkout.c | ||
| +++ src/checkout.c | ||
| @@ -189,10 +189,18 @@ | ||
| 189 | 189 | |
| 190 | 190 | void get_checkin_taglist(int rid, Blob *pOut){ |
| 191 | 191 | char *zTags; |
| 192 | 192 | Stmt stmt; |
| 193 | 193 | blob_reset(pOut); |
| 194 | + if( g.localOpen ){ | |
| 195 | + char *zCurrent; | |
| 196 | + int vid; | |
| 197 | + vid = db_lget_int("checkout", 0); | |
| 198 | + zCurrent = db_text(0, "SELECT value FROM tagxref" | |
| 199 | + " WHERE rid=%d AND tagid=%d", vid, TAG_BRANCH); | |
| 200 | + blob_appendf(pOut, "branch=%s\n", zCurrent); | |
| 201 | + } | |
| 194 | 202 | db_prepare(&stmt, "SELECT substr(tagname, 5)" |
| 195 | 203 | " FROM tagxref, tag" |
| 196 | 204 | " WHERE tagxref.rid=%d" |
| 197 | 205 | " AND tagxref.tagtype>0" |
| 198 | 206 | " AND tag.tagid=tagxref.tagid" |
| 199 | 207 |
| --- src/checkout.c | |
| +++ src/checkout.c | |
| @@ -189,10 +189,18 @@ | |
| 189 | |
| 190 | void get_checkin_taglist(int rid, Blob *pOut){ |
| 191 | char *zTags; |
| 192 | Stmt stmt; |
| 193 | blob_reset(pOut); |
| 194 | db_prepare(&stmt, "SELECT substr(tagname, 5)" |
| 195 | " FROM tagxref, tag" |
| 196 | " WHERE tagxref.rid=%d" |
| 197 | " AND tagxref.tagtype>0" |
| 198 | " AND tag.tagid=tagxref.tagid" |
| 199 |
| --- src/checkout.c | |
| +++ src/checkout.c | |
| @@ -189,10 +189,18 @@ | |
| 189 | |
| 190 | void get_checkin_taglist(int rid, Blob *pOut){ |
| 191 | char *zTags; |
| 192 | Stmt stmt; |
| 193 | blob_reset(pOut); |
| 194 | if( g.localOpen ){ |
| 195 | char *zCurrent; |
| 196 | int vid; |
| 197 | vid = db_lget_int("checkout", 0); |
| 198 | zCurrent = db_text(0, "SELECT value FROM tagxref" |
| 199 | " WHERE rid=%d AND tagid=%d", vid, TAG_BRANCH); |
| 200 | blob_appendf(pOut, "branch=%s\n", zCurrent); |
| 201 | } |
| 202 | db_prepare(&stmt, "SELECT substr(tagname, 5)" |
| 203 | " FROM tagxref, tag" |
| 204 | " WHERE tagxref.rid=%d" |
| 205 | " AND tagxref.tagtype>0" |
| 206 | " AND tag.tagid=tagxref.tagid" |
| 207 |