Fossil SCM
Prepend # to color specified if it looks like a hexadecimal color and does not already have #.
Commit
7d2ee2c7bb239f4fa4785ea2131eddd18aeed004
Parent
9a677b7bf69cd97…
1 file changed
+10
-1
+10
-1
| --- src/info.c | ||
| +++ src/info.c | ||
| @@ -2831,11 +2831,20 @@ | ||
| 2831 | 2831 | blob_appendf(&ctrl, "D %s\n", zNow); |
| 2832 | 2832 | init_newtags(); |
| 2833 | 2833 | if( zNewColor && zNewColor[0] |
| 2834 | 2834 | && (fPropagateColor!=fNewPropagateColor |
| 2835 | 2835 | || fossil_strcmp(zColor,zNewColor)!=0) |
| 2836 | - ) add_color(zNewColor,fNewPropagateColor); | |
| 2836 | + ){ | |
| 2837 | + add_color( | |
| 2838 | + mprintf("%s%s", (zNewColor[0]!='#' && | |
| 2839 | + validate16(zNewColor,strlen(zNewColor)) && | |
| 2840 | + (strlen(zNewColor)==6 || strlen(zNewColor)==3)) ? "#" : "", | |
| 2841 | + zNewColor | |
| 2842 | + ), | |
| 2843 | + fNewPropagateColor | |
| 2844 | + ); | |
| 2845 | + } | |
| 2837 | 2846 | if( (zNewColor!=0 && zNewColor[0]==0) && (zColor && zColor[0] ) ){ |
| 2838 | 2847 | cancel_color(); |
| 2839 | 2848 | } |
| 2840 | 2849 | if( fEditComment && zComment && zComment[0] ){ |
| 2841 | 2850 | prepare_amend_comment(&comment, zComment, zUuid); |
| 2842 | 2851 |
| --- src/info.c | |
| +++ src/info.c | |
| @@ -2831,11 +2831,20 @@ | |
| 2831 | blob_appendf(&ctrl, "D %s\n", zNow); |
| 2832 | init_newtags(); |
| 2833 | if( zNewColor && zNewColor[0] |
| 2834 | && (fPropagateColor!=fNewPropagateColor |
| 2835 | || fossil_strcmp(zColor,zNewColor)!=0) |
| 2836 | ) add_color(zNewColor,fNewPropagateColor); |
| 2837 | if( (zNewColor!=0 && zNewColor[0]==0) && (zColor && zColor[0] ) ){ |
| 2838 | cancel_color(); |
| 2839 | } |
| 2840 | if( fEditComment && zComment && zComment[0] ){ |
| 2841 | prepare_amend_comment(&comment, zComment, zUuid); |
| 2842 |
| --- src/info.c | |
| +++ src/info.c | |
| @@ -2831,11 +2831,20 @@ | |
| 2831 | blob_appendf(&ctrl, "D %s\n", zNow); |
| 2832 | init_newtags(); |
| 2833 | if( zNewColor && zNewColor[0] |
| 2834 | && (fPropagateColor!=fNewPropagateColor |
| 2835 | || fossil_strcmp(zColor,zNewColor)!=0) |
| 2836 | ){ |
| 2837 | add_color( |
| 2838 | mprintf("%s%s", (zNewColor[0]!='#' && |
| 2839 | validate16(zNewColor,strlen(zNewColor)) && |
| 2840 | (strlen(zNewColor)==6 || strlen(zNewColor)==3)) ? "#" : "", |
| 2841 | zNewColor |
| 2842 | ), |
| 2843 | fNewPropagateColor |
| 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 |