Fossil SCM
When using $EDITOR to enter a commit message, tags provided via the --tag flag are now listed, per ML request.
Commit
ae00c6310943d1470536b3ce14f373ffd90b6ec7
Parent
128f606fdaa9463…
1 file changed
+14
-1
+14
-1
| --- src/checkin.c | ||
| +++ src/checkin.c | ||
| @@ -855,11 +855,24 @@ | ||
| 855 | 855 | blob_appendf(&prompt, "# user: %s\n", p->zUserOvrd ? p->zUserOvrd : login_name()); |
| 856 | 856 | if( p->zBranch && p->zBranch[0] ){ |
| 857 | 857 | blob_appendf(&prompt, "# tags: %s\n#\n", p->zBranch); |
| 858 | 858 | }else{ |
| 859 | 859 | char *zTags = info_tags_of_checkin(parent_rid, 1); |
| 860 | - if( zTags ) blob_appendf(&prompt, "# tags: %z\n#\n", zTags); | |
| 860 | + if( zTags || p->azTag ){ | |
| 861 | + blob_append(&prompt, "# tags: ", 8); | |
| 862 | + if(zTags){ | |
| 863 | + blob_appendf(&prompt, "%z%s", zTags, p->azTag ? ", " : ""); | |
| 864 | + } | |
| 865 | + if(p->azTag){ | |
| 866 | + int i = 0; | |
| 867 | + for( ; p->azTag[i]; ++i ){ | |
| 868 | + blob_appendf(&prompt, "%s%s", p->azTag[i], | |
| 869 | + p->azTag[i+1] ? ", " : ""); | |
| 870 | + } | |
| 871 | + } | |
| 872 | + blob_appendf(&prompt, "\n#\n"); | |
| 873 | + } | |
| 861 | 874 | } |
| 862 | 875 | status_report(&prompt, "# ", 1, 0); |
| 863 | 876 | if( g.markPrivate ){ |
| 864 | 877 | blob_append(&prompt, |
| 865 | 878 | "# PRIVATE BRANCH: This check-in will be private and will not sync to\n" |
| 866 | 879 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -855,11 +855,24 @@ | |
| 855 | blob_appendf(&prompt, "# user: %s\n", p->zUserOvrd ? p->zUserOvrd : login_name()); |
| 856 | if( p->zBranch && p->zBranch[0] ){ |
| 857 | blob_appendf(&prompt, "# tags: %s\n#\n", p->zBranch); |
| 858 | }else{ |
| 859 | char *zTags = info_tags_of_checkin(parent_rid, 1); |
| 860 | if( zTags ) blob_appendf(&prompt, "# tags: %z\n#\n", zTags); |
| 861 | } |
| 862 | status_report(&prompt, "# ", 1, 0); |
| 863 | if( g.markPrivate ){ |
| 864 | blob_append(&prompt, |
| 865 | "# PRIVATE BRANCH: This check-in will be private and will not sync to\n" |
| 866 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -855,11 +855,24 @@ | |
| 855 | blob_appendf(&prompt, "# user: %s\n", p->zUserOvrd ? p->zUserOvrd : login_name()); |
| 856 | if( p->zBranch && p->zBranch[0] ){ |
| 857 | blob_appendf(&prompt, "# tags: %s\n#\n", p->zBranch); |
| 858 | }else{ |
| 859 | char *zTags = info_tags_of_checkin(parent_rid, 1); |
| 860 | if( zTags || p->azTag ){ |
| 861 | blob_append(&prompt, "# tags: ", 8); |
| 862 | if(zTags){ |
| 863 | blob_appendf(&prompt, "%z%s", zTags, p->azTag ? ", " : ""); |
| 864 | } |
| 865 | if(p->azTag){ |
| 866 | int i = 0; |
| 867 | for( ; p->azTag[i]; ++i ){ |
| 868 | blob_appendf(&prompt, "%s%s", p->azTag[i], |
| 869 | p->azTag[i+1] ? ", " : ""); |
| 870 | } |
| 871 | } |
| 872 | blob_appendf(&prompt, "\n#\n"); |
| 873 | } |
| 874 | } |
| 875 | status_report(&prompt, "# ", 1, 0); |
| 876 | if( g.markPrivate ){ |
| 877 | blob_append(&prompt, |
| 878 | "# PRIVATE BRANCH: This check-in will be private and will not sync to\n" |
| 879 |