Fossil SCM
Error message changes: Omit the executable name at the beginning of error messages to the console, and try to make sure new error messages begin on a fresh line and do not overwrite prior status text.
Commit
871a949296b6325c70fb1c9a229749f713278102
Parent
bb0cedb15ad9958…
1 file changed
+6
-4
+6
-4
| --- src/printf.c | ||
| +++ src/printf.c | ||
| @@ -925,11 +925,12 @@ | ||
| 925 | 925 | if( g.cgiOutput && once ){ |
| 926 | 926 | once = 0; |
| 927 | 927 | cgi_printf("<p class=\"generalError\">%h</p>", z); |
| 928 | 928 | cgi_reply(); |
| 929 | 929 | }else if( !g.fQuiet ){ |
| 930 | - fossil_trace("%s: %s\n", g.argv[0], z); | |
| 930 | + fossil_force_newline(); | |
| 931 | + fossil_trace("Fossil internal error: %s\n", z); | |
| 931 | 932 | } |
| 932 | 933 | } |
| 933 | 934 | free(z); |
| 934 | 935 | db_force_rollback(); |
| 935 | 936 | fossil_exit(rc); |
| @@ -956,11 +957,12 @@ | ||
| 956 | 957 | if( g.cgiOutput ){ |
| 957 | 958 | g.cgiOutput = 0; |
| 958 | 959 | cgi_printf("<p class=\"generalError\">\n%h\n</p>\n", z); |
| 959 | 960 | cgi_reply(); |
| 960 | 961 | }else if( !g.fQuiet ){ |
| 961 | - fossil_trace("%s: %s\n", g.argv[0], z); | |
| 962 | + fossil_force_newline(); | |
| 963 | + fossil_trace("%s\n", z); | |
| 962 | 964 | } |
| 963 | 965 | } |
| 964 | 966 | free(z); |
| 965 | 967 | db_force_rollback(); |
| 966 | 968 | fossil_exit(rc); |
| @@ -996,11 +998,11 @@ | ||
| 996 | 998 | if( g.cgiOutput ){ |
| 997 | 999 | g.cgiOutput = 0; |
| 998 | 1000 | cgi_printf("<p class=\"generalError\">\n%h\n</p>\n", z); |
| 999 | 1001 | cgi_reply(); |
| 1000 | 1002 | }else{ |
| 1001 | - fossil_trace("%s: %s\n", g.argv[0], z); | |
| 1003 | + fossil_trace("%s\n", z); | |
| 1002 | 1004 | } |
| 1003 | 1005 | } |
| 1004 | 1006 | db_force_rollback(); |
| 1005 | 1007 | fossil_exit(rc); |
| 1006 | 1008 | } |
| @@ -1020,11 +1022,11 @@ | ||
| 1020 | 1022 | #endif |
| 1021 | 1023 | { |
| 1022 | 1024 | if( g.cgiOutput ){ |
| 1023 | 1025 | cgi_printf("<p class=\"generalError\">\n%h\n</p>\n", z); |
| 1024 | 1026 | }else{ |
| 1025 | - fossil_trace("%s: %s\n", g.argv[0], z); | |
| 1027 | + fossil_trace("%s\n", z); | |
| 1026 | 1028 | } |
| 1027 | 1029 | } |
| 1028 | 1030 | free(z); |
| 1029 | 1031 | } |
| 1030 | 1032 | |
| 1031 | 1033 |
| --- src/printf.c | |
| +++ src/printf.c | |
| @@ -925,11 +925,12 @@ | |
| 925 | if( g.cgiOutput && once ){ |
| 926 | once = 0; |
| 927 | cgi_printf("<p class=\"generalError\">%h</p>", z); |
| 928 | cgi_reply(); |
| 929 | }else if( !g.fQuiet ){ |
| 930 | fossil_trace("%s: %s\n", g.argv[0], z); |
| 931 | } |
| 932 | } |
| 933 | free(z); |
| 934 | db_force_rollback(); |
| 935 | fossil_exit(rc); |
| @@ -956,11 +957,12 @@ | |
| 956 | if( g.cgiOutput ){ |
| 957 | g.cgiOutput = 0; |
| 958 | cgi_printf("<p class=\"generalError\">\n%h\n</p>\n", z); |
| 959 | cgi_reply(); |
| 960 | }else if( !g.fQuiet ){ |
| 961 | fossil_trace("%s: %s\n", g.argv[0], z); |
| 962 | } |
| 963 | } |
| 964 | free(z); |
| 965 | db_force_rollback(); |
| 966 | fossil_exit(rc); |
| @@ -996,11 +998,11 @@ | |
| 996 | if( g.cgiOutput ){ |
| 997 | g.cgiOutput = 0; |
| 998 | cgi_printf("<p class=\"generalError\">\n%h\n</p>\n", z); |
| 999 | cgi_reply(); |
| 1000 | }else{ |
| 1001 | fossil_trace("%s: %s\n", g.argv[0], z); |
| 1002 | } |
| 1003 | } |
| 1004 | db_force_rollback(); |
| 1005 | fossil_exit(rc); |
| 1006 | } |
| @@ -1020,11 +1022,11 @@ | |
| 1020 | #endif |
| 1021 | { |
| 1022 | if( g.cgiOutput ){ |
| 1023 | cgi_printf("<p class=\"generalError\">\n%h\n</p>\n", z); |
| 1024 | }else{ |
| 1025 | fossil_trace("%s: %s\n", g.argv[0], z); |
| 1026 | } |
| 1027 | } |
| 1028 | free(z); |
| 1029 | } |
| 1030 | |
| 1031 |
| --- src/printf.c | |
| +++ src/printf.c | |
| @@ -925,11 +925,12 @@ | |
| 925 | if( g.cgiOutput && once ){ |
| 926 | once = 0; |
| 927 | cgi_printf("<p class=\"generalError\">%h</p>", z); |
| 928 | cgi_reply(); |
| 929 | }else if( !g.fQuiet ){ |
| 930 | fossil_force_newline(); |
| 931 | fossil_trace("Fossil internal error: %s\n", z); |
| 932 | } |
| 933 | } |
| 934 | free(z); |
| 935 | db_force_rollback(); |
| 936 | fossil_exit(rc); |
| @@ -956,11 +957,12 @@ | |
| 957 | if( g.cgiOutput ){ |
| 958 | g.cgiOutput = 0; |
| 959 | cgi_printf("<p class=\"generalError\">\n%h\n</p>\n", z); |
| 960 | cgi_reply(); |
| 961 | }else if( !g.fQuiet ){ |
| 962 | fossil_force_newline(); |
| 963 | fossil_trace("%s\n", z); |
| 964 | } |
| 965 | } |
| 966 | free(z); |
| 967 | db_force_rollback(); |
| 968 | fossil_exit(rc); |
| @@ -996,11 +998,11 @@ | |
| 998 | if( g.cgiOutput ){ |
| 999 | g.cgiOutput = 0; |
| 1000 | cgi_printf("<p class=\"generalError\">\n%h\n</p>\n", z); |
| 1001 | cgi_reply(); |
| 1002 | }else{ |
| 1003 | fossil_trace("%s\n", z); |
| 1004 | } |
| 1005 | } |
| 1006 | db_force_rollback(); |
| 1007 | fossil_exit(rc); |
| 1008 | } |
| @@ -1020,11 +1022,11 @@ | |
| 1022 | #endif |
| 1023 | { |
| 1024 | if( g.cgiOutput ){ |
| 1025 | cgi_printf("<p class=\"generalError\">\n%h\n</p>\n", z); |
| 1026 | }else{ |
| 1027 | fossil_trace("%s\n", z); |
| 1028 | } |
| 1029 | } |
| 1030 | free(z); |
| 1031 | } |
| 1032 | |
| 1033 |