Fossil SCM
Fixed mis-quoting of wiki page changes in the timeline CLI (/timeline was unaffected). They were including the (user: X) bit in the quotes for the page name.
Commit
336d83e3437e8d867bacaa4bb17f491714f26e69a56548411312b6863c9d6468
Parent
5b4273708cf4492…
1 file changed
+10
-3
+10
-3
| --- src/timeline.c | ||
| +++ src/timeline.c | ||
| @@ -2871,16 +2871,23 @@ | ||
| 2871 | 2871 | } |
| 2872 | 2872 | if( zType && zType[0]=='w' |
| 2873 | 2873 | && (zCom[0]=='+' || zCom[0]=='-' || zCom[0]==':') |
| 2874 | 2874 | ){ |
| 2875 | 2875 | /* Special processing for Wiki comments */ |
| 2876 | + if(!zComShort || !*zComShort){ | |
| 2877 | + /* Shouldn't be possible, but just in case... */ | |
| 2878 | + zComShort = " "; | |
| 2879 | + } | |
| 2876 | 2880 | if( zCom[0]=='+' ){ |
| 2877 | - zFree = mprintf("[%S] Add wiki page \"%s\"", zId, zCom+1); | |
| 2881 | + zFree = mprintf("[%S] Add wiki page \"%s\" (user: %s)", | |
| 2882 | + zId, zComShort+1, zUserShort); | |
| 2878 | 2883 | }else if( zCom[0]=='-' ){ |
| 2879 | - zFree = mprintf("[%S] Delete wiki page \"%s\"", zId, zCom+1); | |
| 2884 | + zFree = mprintf("[%S] Delete wiki page \"%s\" (user: %s)", | |
| 2885 | + zId, zComShort+1, zUserShort); | |
| 2880 | 2886 | }else{ |
| 2881 | - zFree = mprintf("[%S] Edit to wiki page \"%s\"", zId, zCom+1); | |
| 2887 | + zFree = mprintf("[%S] Edit to wiki page \"%s\" (user: %s)", | |
| 2888 | + zId, zComShort+1, zUserShort); | |
| 2882 | 2889 | } |
| 2883 | 2890 | }else{ |
| 2884 | 2891 | zFree = mprintf("[%S] %s%s", zId, zPrefix, zCom); |
| 2885 | 2892 | } |
| 2886 | 2893 | |
| 2887 | 2894 |
| --- src/timeline.c | |
| +++ src/timeline.c | |
| @@ -2871,16 +2871,23 @@ | |
| 2871 | } |
| 2872 | if( zType && zType[0]=='w' |
| 2873 | && (zCom[0]=='+' || zCom[0]=='-' || zCom[0]==':') |
| 2874 | ){ |
| 2875 | /* Special processing for Wiki comments */ |
| 2876 | if( zCom[0]=='+' ){ |
| 2877 | zFree = mprintf("[%S] Add wiki page \"%s\"", zId, zCom+1); |
| 2878 | }else if( zCom[0]=='-' ){ |
| 2879 | zFree = mprintf("[%S] Delete wiki page \"%s\"", zId, zCom+1); |
| 2880 | }else{ |
| 2881 | zFree = mprintf("[%S] Edit to wiki page \"%s\"", zId, zCom+1); |
| 2882 | } |
| 2883 | }else{ |
| 2884 | zFree = mprintf("[%S] %s%s", zId, zPrefix, zCom); |
| 2885 | } |
| 2886 | |
| 2887 |
| --- src/timeline.c | |
| +++ src/timeline.c | |
| @@ -2871,16 +2871,23 @@ | |
| 2871 | } |
| 2872 | if( zType && zType[0]=='w' |
| 2873 | && (zCom[0]=='+' || zCom[0]=='-' || zCom[0]==':') |
| 2874 | ){ |
| 2875 | /* Special processing for Wiki comments */ |
| 2876 | if(!zComShort || !*zComShort){ |
| 2877 | /* Shouldn't be possible, but just in case... */ |
| 2878 | zComShort = " "; |
| 2879 | } |
| 2880 | if( zCom[0]=='+' ){ |
| 2881 | zFree = mprintf("[%S] Add wiki page \"%s\" (user: %s)", |
| 2882 | zId, zComShort+1, zUserShort); |
| 2883 | }else if( zCom[0]=='-' ){ |
| 2884 | zFree = mprintf("[%S] Delete wiki page \"%s\" (user: %s)", |
| 2885 | zId, zComShort+1, zUserShort); |
| 2886 | }else{ |
| 2887 | zFree = mprintf("[%S] Edit to wiki page \"%s\" (user: %s)", |
| 2888 | zId, zComShort+1, zUserShort); |
| 2889 | } |
| 2890 | }else{ |
| 2891 | zFree = mprintf("[%S] %s%s", zId, zPrefix, zCom); |
| 2892 | } |
| 2893 | |
| 2894 |