Fossil SCM
Allow editing a comment that may be empty.
Commit
5c5d33a9d6378815104113846e59a2589582b17c
Parent
7d2ee2c7bb239f4…
1 file changed
+3
-8
+3
-8
| --- src/info.c | ||
| +++ src/info.c | ||
| @@ -2810,11 +2810,10 @@ | ||
| 2810 | 2810 | if( g.argc<3 || g.argc>=4 ) usage(AMEND_USAGE_STMT); |
| 2811 | 2811 | rid = name_to_typed_rid(g.argv[2], "ci"); |
| 2812 | 2812 | zUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", rid); |
| 2813 | 2813 | zComment = db_text(0, "SELECT coalesce(ecomment,comment)" |
| 2814 | 2814 | " FROM event WHERE objid=%d", rid); |
| 2815 | - if( zComment==0 || zComment[0]==0 ) fossil_fatal("No comment on rid %d", rid); | |
| 2816 | 2815 | zUser = db_text(0, "SELECT coalesce(euser,user)" |
| 2817 | 2816 | " FROM event WHERE objid=%d", rid); |
| 2818 | 2817 | if( zUser==0 || zUser[0]==0 ) fossil_fatal("No user on rid %d", rid); |
| 2819 | 2818 | zDate = db_text(0, "SELECT datetime(mtime)" |
| 2820 | 2819 | " FROM event WHERE objid=%d", rid); |
| @@ -2844,19 +2843,15 @@ | ||
| 2844 | 2843 | ); |
| 2845 | 2844 | } |
| 2846 | 2845 | if( (zNewColor!=0 && zNewColor[0]==0) && (zColor && zColor[0] ) ){ |
| 2847 | 2846 | cancel_color(); |
| 2848 | 2847 | } |
| 2849 | - if( fEditComment && zComment && zComment[0] ){ | |
| 2848 | + if( fEditComment ){ | |
| 2850 | 2849 | prepare_amend_comment(&comment, zComment, zUuid); |
| 2851 | 2850 | zNewComment = blob_str(&comment); |
| 2852 | - if( comment_compare(zComment, zNewComment)==0 ){ | |
| 2853 | - add_comment(zNewComment); | |
| 2854 | - }else{ | |
| 2855 | - fossil_warning("Comment is unchanged."); | |
| 2856 | - } | |
| 2857 | - }else if( zNewComment && zNewComment[0] | |
| 2851 | + } | |
| 2852 | + if( zNewComment && zNewComment[0] | |
| 2858 | 2853 | && comment_compare(zComment,zNewComment)==0 ) add_comment(zNewComment); |
| 2859 | 2854 | if( zNewDate && zNewDate[0] && fossil_strcmp(zDate,zNewDate)!=0 ){ |
| 2860 | 2855 | add_date(zNewDate); |
| 2861 | 2856 | } |
| 2862 | 2857 | if( zNewUser && zNewUser[0] && fossil_strcmp(zUser,zNewUser)!=0 ){ |
| 2863 | 2858 |
| --- src/info.c | |
| +++ src/info.c | |
| @@ -2810,11 +2810,10 @@ | |
| 2810 | if( g.argc<3 || g.argc>=4 ) usage(AMEND_USAGE_STMT); |
| 2811 | rid = name_to_typed_rid(g.argv[2], "ci"); |
| 2812 | zUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", rid); |
| 2813 | zComment = db_text(0, "SELECT coalesce(ecomment,comment)" |
| 2814 | " FROM event WHERE objid=%d", rid); |
| 2815 | if( zComment==0 || zComment[0]==0 ) fossil_fatal("No comment on rid %d", rid); |
| 2816 | zUser = db_text(0, "SELECT coalesce(euser,user)" |
| 2817 | " FROM event WHERE objid=%d", rid); |
| 2818 | if( zUser==0 || zUser[0]==0 ) fossil_fatal("No user on rid %d", rid); |
| 2819 | zDate = db_text(0, "SELECT datetime(mtime)" |
| 2820 | " FROM event WHERE objid=%d", rid); |
| @@ -2844,19 +2843,15 @@ | |
| 2844 | ); |
| 2845 | } |
| 2846 | if( (zNewColor!=0 && zNewColor[0]==0) && (zColor && zColor[0] ) ){ |
| 2847 | cancel_color(); |
| 2848 | } |
| 2849 | if( fEditComment && zComment && zComment[0] ){ |
| 2850 | prepare_amend_comment(&comment, zComment, zUuid); |
| 2851 | zNewComment = blob_str(&comment); |
| 2852 | if( comment_compare(zComment, zNewComment)==0 ){ |
| 2853 | add_comment(zNewComment); |
| 2854 | }else{ |
| 2855 | fossil_warning("Comment is unchanged."); |
| 2856 | } |
| 2857 | }else if( zNewComment && zNewComment[0] |
| 2858 | && comment_compare(zComment,zNewComment)==0 ) add_comment(zNewComment); |
| 2859 | if( zNewDate && zNewDate[0] && fossil_strcmp(zDate,zNewDate)!=0 ){ |
| 2860 | add_date(zNewDate); |
| 2861 | } |
| 2862 | if( zNewUser && zNewUser[0] && fossil_strcmp(zUser,zNewUser)!=0 ){ |
| 2863 |
| --- src/info.c | |
| +++ src/info.c | |
| @@ -2810,11 +2810,10 @@ | |
| 2810 | if( g.argc<3 || g.argc>=4 ) usage(AMEND_USAGE_STMT); |
| 2811 | rid = name_to_typed_rid(g.argv[2], "ci"); |
| 2812 | zUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", rid); |
| 2813 | zComment = db_text(0, "SELECT coalesce(ecomment,comment)" |
| 2814 | " FROM event WHERE objid=%d", rid); |
| 2815 | zUser = db_text(0, "SELECT coalesce(euser,user)" |
| 2816 | " FROM event WHERE objid=%d", rid); |
| 2817 | if( zUser==0 || zUser[0]==0 ) fossil_fatal("No user on rid %d", rid); |
| 2818 | zDate = db_text(0, "SELECT datetime(mtime)" |
| 2819 | " FROM event WHERE objid=%d", rid); |
| @@ -2844,19 +2843,15 @@ | |
| 2843 | ); |
| 2844 | } |
| 2845 | if( (zNewColor!=0 && zNewColor[0]==0) && (zColor && zColor[0] ) ){ |
| 2846 | cancel_color(); |
| 2847 | } |
| 2848 | if( fEditComment ){ |
| 2849 | prepare_amend_comment(&comment, zComment, zUuid); |
| 2850 | zNewComment = blob_str(&comment); |
| 2851 | } |
| 2852 | if( zNewComment && zNewComment[0] |
| 2853 | && comment_compare(zComment,zNewComment)==0 ) add_comment(zNewComment); |
| 2854 | if( zNewDate && zNewDate[0] && fossil_strcmp(zDate,zNewDate)!=0 ){ |
| 2855 | add_date(zNewDate); |
| 2856 | } |
| 2857 | if( zNewUser && zNewUser[0] && fossil_strcmp(zUser,zNewUser)!=0 ){ |
| 2858 |