Fossil SCM
Fix commands supporting the --quiet option to use the global option state initialized on program startup, so that their --quiet option really works. Make -q an alias of --quiet, as documented by many commands, and fix two resulting conflicts with the short form. IMPORTANT COMPATIBILITY NOTE: For the `test-integrity' command, the -q option is changed from --quick to --quiet, and for the `ticket' command family, the -q option is changed from --quote to --quiet!
Commit
74d5ce39ea9f6850e7cfe4fb48f8c68b33bef3bd40208f83112561dd25f1f278
Parent
13c221af37242a5…
10 files changed
+1
-1
+4
-4
+1
-1
+2
-1
+1
-1
+1
-1
+1
-1
+1
-1
+1
-1
+5
-5
+1
-1
| --- src/checkout.c | ||
| +++ src/checkout.c | ||
| @@ -467,11 +467,11 @@ | ||
| 467 | 467 | ** -v|--verbose Show all files as they are extracted |
| 468 | 468 | */ |
| 469 | 469 | void get_cmd(void){ |
| 470 | 470 | int forceFlag = find_option("force","f",0)!=0; |
| 471 | 471 | int bVerbose = find_option("verbose","v",0)!=0; |
| 472 | - int bQuiet = find_option("quiet","q",0)!=0; | |
| 472 | + int bQuiet = g.fQuiet; | |
| 473 | 473 | int bDebug = find_option("debug",0,0)!=0; |
| 474 | 474 | int bList = find_option("list",0,0)!=0; |
| 475 | 475 | const char *zSqlArchive = find_option("sqlar",0,1); |
| 476 | 476 | const char *z; |
| 477 | 477 | char *zDest = 0; /* Where to store results */ |
| 478 | 478 |
| --- src/checkout.c | |
| +++ src/checkout.c | |
| @@ -467,11 +467,11 @@ | |
| 467 | ** -v|--verbose Show all files as they are extracted |
| 468 | */ |
| 469 | void get_cmd(void){ |
| 470 | int forceFlag = find_option("force","f",0)!=0; |
| 471 | int bVerbose = find_option("verbose","v",0)!=0; |
| 472 | int bQuiet = find_option("quiet","q",0)!=0; |
| 473 | int bDebug = find_option("debug",0,0)!=0; |
| 474 | int bList = find_option("list",0,0)!=0; |
| 475 | const char *zSqlArchive = find_option("sqlar",0,1); |
| 476 | const char *z; |
| 477 | char *zDest = 0; /* Where to store results */ |
| 478 |
| --- src/checkout.c | |
| +++ src/checkout.c | |
| @@ -467,11 +467,11 @@ | |
| 467 | ** -v|--verbose Show all files as they are extracted |
| 468 | */ |
| 469 | void get_cmd(void){ |
| 470 | int forceFlag = find_option("force","f",0)!=0; |
| 471 | int bVerbose = find_option("verbose","v",0)!=0; |
| 472 | int bQuiet = g.fQuiet; |
| 473 | int bDebug = find_option("debug",0,0)!=0; |
| 474 | int bList = find_option("list",0,0)!=0; |
| 475 | const char *zSqlArchive = find_option("sqlar",0,1); |
| 476 | const char *z; |
| 477 | char *zDest = 0; /* Where to store results */ |
| 478 |
+4
-4
| --- src/content.c | ||
| +++ src/content.c | ||
| @@ -965,11 +965,11 @@ | ||
| 965 | 965 | ** Options: |
| 966 | 966 | ** -d|--db-only Run "PRAGMA integrity_check" on the database only. |
| 967 | 967 | ** No other validation is performed. |
| 968 | 968 | ** --parse Parse all manifests, wikis, tickets, events, and |
| 969 | 969 | ** so forth, reporting any errors found. |
| 970 | -** -q|--quick Run "PRAGMA quick_check" on the database only. | |
| 970 | +** --quick Run "PRAGMA quick_check" on the database only. | |
| 971 | 971 | ** No other validation is performed. |
| 972 | 972 | */ |
| 973 | 973 | void test_integrity(void){ |
| 974 | 974 | Stmt q; |
| 975 | 975 | Blob content; |
| @@ -979,11 +979,11 @@ | ||
| 979 | 979 | int total; |
| 980 | 980 | int nCA = 0; |
| 981 | 981 | int anCA[10]; |
| 982 | 982 | int bParse = find_option("parse",0,0)!=0; |
| 983 | 983 | int bDbOnly = find_option("db-only","d",0)!=0; |
| 984 | - int bQuick = find_option("quick","q",0)!=0; | |
| 984 | + int bQuick = find_option("quick",0,0)!=0; | |
| 985 | 985 | db_find_and_open_repository(OPEN_ANY_SCHEMA, 2); |
| 986 | 986 | if( bDbOnly || bQuick ){ |
| 987 | 987 | const char *zType = bQuick ? "quick" : "integrity"; |
| 988 | 988 | char *zRes; |
| 989 | 989 | zRes = db_text(0,"PRAGMA repository.%s_check", zType/*safe-for-%s*/); |
| @@ -1199,11 +1199,11 @@ | ||
| 1199 | 1199 | ** all references are satisfied. Report any referenced artifacts |
| 1200 | 1200 | ** that are missing or shunned. |
| 1201 | 1201 | ** |
| 1202 | 1202 | ** Options: |
| 1203 | 1203 | ** --notshunned Do not report shunned artifacts |
| 1204 | -** --quiet Only show output if there are errors | |
| 1204 | +** -q|--quiet Only show output if there are errors | |
| 1205 | 1205 | */ |
| 1206 | 1206 | void test_missing(void){ |
| 1207 | 1207 | Stmt q; |
| 1208 | 1208 | Blob content; |
| 1209 | 1209 | int nErr = 0; |
| @@ -1212,11 +1212,11 @@ | ||
| 1212 | 1212 | Manifest *p; |
| 1213 | 1213 | unsigned flags = 0; |
| 1214 | 1214 | int quietFlag; |
| 1215 | 1215 | |
| 1216 | 1216 | if( find_option("notshunned", 0, 0)!=0 ) flags |= MISSING_SHUNNED; |
| 1217 | - quietFlag = find_option("quiet","q",0)!=0; | |
| 1217 | + quietFlag = g.fQuiet; | |
| 1218 | 1218 | db_find_and_open_repository(OPEN_ANY_SCHEMA, 0); |
| 1219 | 1219 | db_prepare(&q, |
| 1220 | 1220 | "SELECT mid FROM mlink UNION " |
| 1221 | 1221 | "SELECT srcid FROM tagxref WHERE srcid>0 UNION " |
| 1222 | 1222 | "SELECT rid FROM tagxref UNION " |
| 1223 | 1223 |
| --- src/content.c | |
| +++ src/content.c | |
| @@ -965,11 +965,11 @@ | |
| 965 | ** Options: |
| 966 | ** -d|--db-only Run "PRAGMA integrity_check" on the database only. |
| 967 | ** No other validation is performed. |
| 968 | ** --parse Parse all manifests, wikis, tickets, events, and |
| 969 | ** so forth, reporting any errors found. |
| 970 | ** -q|--quick Run "PRAGMA quick_check" on the database only. |
| 971 | ** No other validation is performed. |
| 972 | */ |
| 973 | void test_integrity(void){ |
| 974 | Stmt q; |
| 975 | Blob content; |
| @@ -979,11 +979,11 @@ | |
| 979 | int total; |
| 980 | int nCA = 0; |
| 981 | int anCA[10]; |
| 982 | int bParse = find_option("parse",0,0)!=0; |
| 983 | int bDbOnly = find_option("db-only","d",0)!=0; |
| 984 | int bQuick = find_option("quick","q",0)!=0; |
| 985 | db_find_and_open_repository(OPEN_ANY_SCHEMA, 2); |
| 986 | if( bDbOnly || bQuick ){ |
| 987 | const char *zType = bQuick ? "quick" : "integrity"; |
| 988 | char *zRes; |
| 989 | zRes = db_text(0,"PRAGMA repository.%s_check", zType/*safe-for-%s*/); |
| @@ -1199,11 +1199,11 @@ | |
| 1199 | ** all references are satisfied. Report any referenced artifacts |
| 1200 | ** that are missing or shunned. |
| 1201 | ** |
| 1202 | ** Options: |
| 1203 | ** --notshunned Do not report shunned artifacts |
| 1204 | ** --quiet Only show output if there are errors |
| 1205 | */ |
| 1206 | void test_missing(void){ |
| 1207 | Stmt q; |
| 1208 | Blob content; |
| 1209 | int nErr = 0; |
| @@ -1212,11 +1212,11 @@ | |
| 1212 | Manifest *p; |
| 1213 | unsigned flags = 0; |
| 1214 | int quietFlag; |
| 1215 | |
| 1216 | if( find_option("notshunned", 0, 0)!=0 ) flags |= MISSING_SHUNNED; |
| 1217 | quietFlag = find_option("quiet","q",0)!=0; |
| 1218 | db_find_and_open_repository(OPEN_ANY_SCHEMA, 0); |
| 1219 | db_prepare(&q, |
| 1220 | "SELECT mid FROM mlink UNION " |
| 1221 | "SELECT srcid FROM tagxref WHERE srcid>0 UNION " |
| 1222 | "SELECT rid FROM tagxref UNION " |
| 1223 |
| --- src/content.c | |
| +++ src/content.c | |
| @@ -965,11 +965,11 @@ | |
| 965 | ** Options: |
| 966 | ** -d|--db-only Run "PRAGMA integrity_check" on the database only. |
| 967 | ** No other validation is performed. |
| 968 | ** --parse Parse all manifests, wikis, tickets, events, and |
| 969 | ** so forth, reporting any errors found. |
| 970 | ** --quick Run "PRAGMA quick_check" on the database only. |
| 971 | ** No other validation is performed. |
| 972 | */ |
| 973 | void test_integrity(void){ |
| 974 | Stmt q; |
| 975 | Blob content; |
| @@ -979,11 +979,11 @@ | |
| 979 | int total; |
| 980 | int nCA = 0; |
| 981 | int anCA[10]; |
| 982 | int bParse = find_option("parse",0,0)!=0; |
| 983 | int bDbOnly = find_option("db-only","d",0)!=0; |
| 984 | int bQuick = find_option("quick",0,0)!=0; |
| 985 | db_find_and_open_repository(OPEN_ANY_SCHEMA, 2); |
| 986 | if( bDbOnly || bQuick ){ |
| 987 | const char *zType = bQuick ? "quick" : "integrity"; |
| 988 | char *zRes; |
| 989 | zRes = db_text(0,"PRAGMA repository.%s_check", zType/*safe-for-%s*/); |
| @@ -1199,11 +1199,11 @@ | |
| 1199 | ** all references are satisfied. Report any referenced artifacts |
| 1200 | ** that are missing or shunned. |
| 1201 | ** |
| 1202 | ** Options: |
| 1203 | ** --notshunned Do not report shunned artifacts |
| 1204 | ** -q|--quiet Only show output if there are errors |
| 1205 | */ |
| 1206 | void test_missing(void){ |
| 1207 | Stmt q; |
| 1208 | Blob content; |
| 1209 | int nErr = 0; |
| @@ -1212,11 +1212,11 @@ | |
| 1212 | Manifest *p; |
| 1213 | unsigned flags = 0; |
| 1214 | int quietFlag; |
| 1215 | |
| 1216 | if( find_option("notshunned", 0, 0)!=0 ) flags |= MISSING_SHUNNED; |
| 1217 | quietFlag = g.fQuiet; |
| 1218 | db_find_and_open_repository(OPEN_ANY_SCHEMA, 0); |
| 1219 | db_prepare(&q, |
| 1220 | "SELECT mid FROM mlink UNION " |
| 1221 | "SELECT srcid FROM tagxref WHERE srcid>0 UNION " |
| 1222 | "SELECT rid FROM tagxref UNION " |
| 1223 |
+1
-1
| --- src/dispatch.c | ||
| +++ src/dispatch.c | ||
| @@ -1439,11 +1439,11 @@ | ||
| 1439 | 1439 | ** -?|--help Show help on the command rather than running it |
| 1440 | 1440 | ** --httptrace Trace outbound HTTP requests |
| 1441 | 1441 | ** --localtime Display times using the local timezone |
| 1442 | 1442 | ** --nocgi Do not act as CGI |
| 1443 | 1443 | ** --no-th-hook Do not run TH1 hooks |
| 1444 | -** --quiet Reduce the amount of output | |
| 1444 | +** -q|--quiet Reduce the amount of output | |
| 1445 | 1445 | ** --sqlstats Show SQL usage statistics when done |
| 1446 | 1446 | ** --sqltrace Trace all SQL commands |
| 1447 | 1447 | ** --sshtrace Trace SSH activity |
| 1448 | 1448 | ** --ssl-identity NAME Set the SSL identity to NAME |
| 1449 | 1449 | ** --systemtrace Trace calls to system() |
| 1450 | 1450 |
| --- src/dispatch.c | |
| +++ src/dispatch.c | |
| @@ -1439,11 +1439,11 @@ | |
| 1439 | ** -?|--help Show help on the command rather than running it |
| 1440 | ** --httptrace Trace outbound HTTP requests |
| 1441 | ** --localtime Display times using the local timezone |
| 1442 | ** --nocgi Do not act as CGI |
| 1443 | ** --no-th-hook Do not run TH1 hooks |
| 1444 | ** --quiet Reduce the amount of output |
| 1445 | ** --sqlstats Show SQL usage statistics when done |
| 1446 | ** --sqltrace Trace all SQL commands |
| 1447 | ** --sshtrace Trace SSH activity |
| 1448 | ** --ssl-identity NAME Set the SSL identity to NAME |
| 1449 | ** --systemtrace Trace calls to system() |
| 1450 |
| --- src/dispatch.c | |
| +++ src/dispatch.c | |
| @@ -1439,11 +1439,11 @@ | |
| 1439 | ** -?|--help Show help on the command rather than running it |
| 1440 | ** --httptrace Trace outbound HTTP requests |
| 1441 | ** --localtime Display times using the local timezone |
| 1442 | ** --nocgi Do not act as CGI |
| 1443 | ** --no-th-hook Do not run TH1 hooks |
| 1444 | ** -q|--quiet Reduce the amount of output |
| 1445 | ** --sqlstats Show SQL usage statistics when done |
| 1446 | ** --sqltrace Trace all SQL commands |
| 1447 | ** --sshtrace Trace SSH activity |
| 1448 | ** --ssl-identity NAME Set the SSL identity to NAME |
| 1449 | ** --systemtrace Trace calls to system() |
| 1450 |
+2
-1
| --- src/export.c | ||
| +++ src/export.c | ||
| @@ -1413,10 +1413,11 @@ | ||
| 1413 | 1413 | zAutoPush = find_option("autopush",0,1); |
| 1414 | 1414 | zMainBr = (char*)find_option("mainbranch",0,1); |
| 1415 | 1415 | bForce = find_option("force","f",0)!=0; |
| 1416 | 1416 | bIfExists = find_option("if-mirrored",0,0)!=0; |
| 1417 | 1417 | gitmirror_verbosity = VERB_NORMAL; |
| 1418 | + if( g.fQuiet ){ gitmirror_verbosity--; } /* Global option not repeatable. */ | |
| 1418 | 1419 | while( find_option("quiet","q",0)!=0 ){ gitmirror_verbosity--; } |
| 1419 | 1420 | while( find_option("verbose","v",0)!=0 ){ gitmirror_verbosity++; } |
| 1420 | 1421 | verify_all_options(); |
| 1421 | 1422 | if( g.argc!=4 && g.argc!=3 ){ usage("export ?MIRROR?"); } |
| 1422 | 1423 | if( g.argc==4 ){ |
| @@ -1752,11 +1753,11 @@ | ||
| 1752 | 1753 | int bQuiet = 0; |
| 1753 | 1754 | int bByAll = 0; /* Undocumented option meaning this command was invoked |
| 1754 | 1755 | ** from "fossil all" and should modify output accordingly */ |
| 1755 | 1756 | |
| 1756 | 1757 | db_find_and_open_repository(0, 0); |
| 1757 | - bQuiet = find_option("quiet","q",0)!=0; | |
| 1758 | + bQuiet = g.fQuiet; | |
| 1758 | 1759 | bByAll = find_option("by-all",0,0)!=0; |
| 1759 | 1760 | verify_all_options(); |
| 1760 | 1761 | zMirror = db_get("last-git-export-repo", 0); |
| 1761 | 1762 | if( zMirror==0 ){ |
| 1762 | 1763 | if( bQuiet ) return; |
| 1763 | 1764 |
| --- src/export.c | |
| +++ src/export.c | |
| @@ -1413,10 +1413,11 @@ | |
| 1413 | zAutoPush = find_option("autopush",0,1); |
| 1414 | zMainBr = (char*)find_option("mainbranch",0,1); |
| 1415 | bForce = find_option("force","f",0)!=0; |
| 1416 | bIfExists = find_option("if-mirrored",0,0)!=0; |
| 1417 | gitmirror_verbosity = VERB_NORMAL; |
| 1418 | while( find_option("quiet","q",0)!=0 ){ gitmirror_verbosity--; } |
| 1419 | while( find_option("verbose","v",0)!=0 ){ gitmirror_verbosity++; } |
| 1420 | verify_all_options(); |
| 1421 | if( g.argc!=4 && g.argc!=3 ){ usage("export ?MIRROR?"); } |
| 1422 | if( g.argc==4 ){ |
| @@ -1752,11 +1753,11 @@ | |
| 1752 | int bQuiet = 0; |
| 1753 | int bByAll = 0; /* Undocumented option meaning this command was invoked |
| 1754 | ** from "fossil all" and should modify output accordingly */ |
| 1755 | |
| 1756 | db_find_and_open_repository(0, 0); |
| 1757 | bQuiet = find_option("quiet","q",0)!=0; |
| 1758 | bByAll = find_option("by-all",0,0)!=0; |
| 1759 | verify_all_options(); |
| 1760 | zMirror = db_get("last-git-export-repo", 0); |
| 1761 | if( zMirror==0 ){ |
| 1762 | if( bQuiet ) return; |
| 1763 |
| --- src/export.c | |
| +++ src/export.c | |
| @@ -1413,10 +1413,11 @@ | |
| 1413 | zAutoPush = find_option("autopush",0,1); |
| 1414 | zMainBr = (char*)find_option("mainbranch",0,1); |
| 1415 | bForce = find_option("force","f",0)!=0; |
| 1416 | bIfExists = find_option("if-mirrored",0,0)!=0; |
| 1417 | gitmirror_verbosity = VERB_NORMAL; |
| 1418 | if( g.fQuiet ){ gitmirror_verbosity--; } /* Global option not repeatable. */ |
| 1419 | while( find_option("quiet","q",0)!=0 ){ gitmirror_verbosity--; } |
| 1420 | while( find_option("verbose","v",0)!=0 ){ gitmirror_verbosity++; } |
| 1421 | verify_all_options(); |
| 1422 | if( g.argc!=4 && g.argc!=3 ){ usage("export ?MIRROR?"); } |
| 1423 | if( g.argc==4 ){ |
| @@ -1752,11 +1753,11 @@ | |
| 1753 | int bQuiet = 0; |
| 1754 | int bByAll = 0; /* Undocumented option meaning this command was invoked |
| 1755 | ** from "fossil all" and should modify output accordingly */ |
| 1756 | |
| 1757 | db_find_and_open_repository(0, 0); |
| 1758 | bQuiet = g.fQuiet; |
| 1759 | bByAll = find_option("by-all",0,0)!=0; |
| 1760 | verify_all_options(); |
| 1761 | zMirror = db_get("last-git-export-repo", 0); |
| 1762 | if( zMirror==0 ){ |
| 1763 | if( bQuiet ) return; |
| 1764 |
+1
-1
| --- src/file.c | ||
| +++ src/file.c | ||
| @@ -2818,11 +2818,11 @@ | ||
| 2818 | 2818 | i64 nowTime = 0; /* Timestamp of --now or --checkout */ |
| 2819 | 2819 | Stmt q; |
| 2820 | 2820 | Blob absBuffer = empty_blob; /* Absolute filename buffer */ |
| 2821 | 2821 | |
| 2822 | 2822 | verboseFlag = find_option("verbose","v",0)!=0; |
| 2823 | - quietFlag = find_option("quiet","q",0)!=0 || g.fQuiet; | |
| 2823 | + quietFlag = g.fQuiet; | |
| 2824 | 2824 | dryRunFlag = find_option("dry-run","n",0)!=0; |
| 2825 | 2825 | zGlobList = find_option("glob", "g",1); |
| 2826 | 2826 | zGlobFile = find_option("globfile", "G",1); |
| 2827 | 2827 | |
| 2828 | 2828 | if(zGlobList && zGlobFile){ |
| 2829 | 2829 |
| --- src/file.c | |
| +++ src/file.c | |
| @@ -2818,11 +2818,11 @@ | |
| 2818 | i64 nowTime = 0; /* Timestamp of --now or --checkout */ |
| 2819 | Stmt q; |
| 2820 | Blob absBuffer = empty_blob; /* Absolute filename buffer */ |
| 2821 | |
| 2822 | verboseFlag = find_option("verbose","v",0)!=0; |
| 2823 | quietFlag = find_option("quiet","q",0)!=0 || g.fQuiet; |
| 2824 | dryRunFlag = find_option("dry-run","n",0)!=0; |
| 2825 | zGlobList = find_option("glob", "g",1); |
| 2826 | zGlobFile = find_option("globfile", "G",1); |
| 2827 | |
| 2828 | if(zGlobList && zGlobFile){ |
| 2829 |
| --- src/file.c | |
| +++ src/file.c | |
| @@ -2818,11 +2818,11 @@ | |
| 2818 | i64 nowTime = 0; /* Timestamp of --now or --checkout */ |
| 2819 | Stmt q; |
| 2820 | Blob absBuffer = empty_blob; /* Absolute filename buffer */ |
| 2821 | |
| 2822 | verboseFlag = find_option("verbose","v",0)!=0; |
| 2823 | quietFlag = g.fQuiet; |
| 2824 | dryRunFlag = find_option("dry-run","n",0)!=0; |
| 2825 | zGlobList = find_option("glob", "g",1); |
| 2826 | zGlobFile = find_option("globfile", "G",1); |
| 2827 | |
| 2828 | if(zGlobList && zGlobFile){ |
| 2829 |
+1
-1
| --- src/main.c | ||
| +++ src/main.c | ||
| @@ -831,11 +831,11 @@ | ||
| 831 | 831 | fossil_exit(1); |
| 832 | 832 | }else{ |
| 833 | 833 | const char *zChdir = find_option("chdir",0,1); |
| 834 | 834 | g.isHTTP = 0; |
| 835 | 835 | g.rcvid = 0; |
| 836 | - g.fQuiet = find_option("quiet", 0, 0)!=0; | |
| 836 | + g.fQuiet = find_option("quiet", "q", 0)!=0; | |
| 837 | 837 | g.fSqlTrace = find_option("sqltrace", 0, 0)!=0; |
| 838 | 838 | g.fSqlStats = find_option("sqlstats", 0, 0)!=0; |
| 839 | 839 | g.fSystemTrace = find_option("systemtrace", 0, 0)!=0; |
| 840 | 840 | g.fSshTrace = find_option("sshtrace", 0, 0)!=0; |
| 841 | 841 | g.fCgiTrace = find_option("cgitrace", 0, 0)!=0; |
| 842 | 842 |
| --- src/main.c | |
| +++ src/main.c | |
| @@ -831,11 +831,11 @@ | |
| 831 | fossil_exit(1); |
| 832 | }else{ |
| 833 | const char *zChdir = find_option("chdir",0,1); |
| 834 | g.isHTTP = 0; |
| 835 | g.rcvid = 0; |
| 836 | g.fQuiet = find_option("quiet", 0, 0)!=0; |
| 837 | g.fSqlTrace = find_option("sqltrace", 0, 0)!=0; |
| 838 | g.fSqlStats = find_option("sqlstats", 0, 0)!=0; |
| 839 | g.fSystemTrace = find_option("systemtrace", 0, 0)!=0; |
| 840 | g.fSshTrace = find_option("sshtrace", 0, 0)!=0; |
| 841 | g.fCgiTrace = find_option("cgitrace", 0, 0)!=0; |
| 842 |
| --- src/main.c | |
| +++ src/main.c | |
| @@ -831,11 +831,11 @@ | |
| 831 | fossil_exit(1); |
| 832 | }else{ |
| 833 | const char *zChdir = find_option("chdir",0,1); |
| 834 | g.isHTTP = 0; |
| 835 | g.rcvid = 0; |
| 836 | g.fQuiet = find_option("quiet", "q", 0)!=0; |
| 837 | g.fSqlTrace = find_option("sqltrace", 0, 0)!=0; |
| 838 | g.fSqlStats = find_option("sqlstats", 0, 0)!=0; |
| 839 | g.fSystemTrace = find_option("systemtrace", 0, 0)!=0; |
| 840 | g.fSshTrace = find_option("sshtrace", 0, 0)!=0; |
| 841 | g.fCgiTrace = find_option("cgitrace", 0, 0)!=0; |
| 842 |
+1
-1
| --- src/name.c | ||
| +++ src/name.c | ||
| @@ -1375,11 +1375,11 @@ | ||
| 1375 | 1375 | const char *zType = 0; |
| 1376 | 1376 | db_find_and_open_repository(0,0); |
| 1377 | 1377 | if( find_option("verbose","v",0)!=0 ){ |
| 1378 | 1378 | mFlags |= WHATIS_VERBOSE; |
| 1379 | 1379 | } |
| 1380 | - if( find_option("quiet","q",0)!=0 ){ | |
| 1380 | + if( g.fQuiet ){ | |
| 1381 | 1381 | mFlags |= WHATIS_OMIT_UNK | WHATIS_REPO; |
| 1382 | 1382 | } |
| 1383 | 1383 | fileFlag = find_option("file","f",0)!=0; |
| 1384 | 1384 | zType = find_option("type",0,1); |
| 1385 | 1385 | |
| 1386 | 1386 |
| --- src/name.c | |
| +++ src/name.c | |
| @@ -1375,11 +1375,11 @@ | |
| 1375 | const char *zType = 0; |
| 1376 | db_find_and_open_repository(0,0); |
| 1377 | if( find_option("verbose","v",0)!=0 ){ |
| 1378 | mFlags |= WHATIS_VERBOSE; |
| 1379 | } |
| 1380 | if( find_option("quiet","q",0)!=0 ){ |
| 1381 | mFlags |= WHATIS_OMIT_UNK | WHATIS_REPO; |
| 1382 | } |
| 1383 | fileFlag = find_option("file","f",0)!=0; |
| 1384 | zType = find_option("type",0,1); |
| 1385 | |
| 1386 |
| --- src/name.c | |
| +++ src/name.c | |
| @@ -1375,11 +1375,11 @@ | |
| 1375 | const char *zType = 0; |
| 1376 | db_find_and_open_repository(0,0); |
| 1377 | if( find_option("verbose","v",0)!=0 ){ |
| 1378 | mFlags |= WHATIS_VERBOSE; |
| 1379 | } |
| 1380 | if( g.fQuiet ){ |
| 1381 | mFlags |= WHATIS_OMIT_UNK | WHATIS_REPO; |
| 1382 | } |
| 1383 | fileFlag = find_option("file","f",0)!=0; |
| 1384 | zType = find_option("type",0,1); |
| 1385 | |
| 1386 |
+1
-1
| --- src/regexp.c | ||
| +++ src/regexp.c | ||
| @@ -993,11 +993,11 @@ | ||
| 993 | 993 | |
| 994 | 994 | |
| 995 | 995 | if( find_option("ignore-case","i",0)!=0 ) ignoreCase = 1; |
| 996 | 996 | if( find_option("files-with-matches","l",0)!=0 ) flags |= GREP_EXISTS; |
| 997 | 997 | if( find_option("verbose",0,0)!=0 ) bVerbose = 1; |
| 998 | - if( find_option("quiet","q",0) ) flags |= GREP_QUIET|GREP_EXISTS; | |
| 998 | + if( g.fQuiet ) flags |= GREP_QUIET|GREP_EXISTS; | |
| 999 | 999 | bNoMsg = find_option("no-messages","s",0)!=0; |
| 1000 | 1000 | bOnce = find_option("once",0,0)!=0; |
| 1001 | 1001 | bInvert = find_option("invert-match","v",0)!=0; |
| 1002 | 1002 | if( bInvert ){ |
| 1003 | 1003 | flags |= GREP_QUIET|GREP_EXISTS; |
| 1004 | 1004 |
| --- src/regexp.c | |
| +++ src/regexp.c | |
| @@ -993,11 +993,11 @@ | |
| 993 | |
| 994 | |
| 995 | if( find_option("ignore-case","i",0)!=0 ) ignoreCase = 1; |
| 996 | if( find_option("files-with-matches","l",0)!=0 ) flags |= GREP_EXISTS; |
| 997 | if( find_option("verbose",0,0)!=0 ) bVerbose = 1; |
| 998 | if( find_option("quiet","q",0) ) flags |= GREP_QUIET|GREP_EXISTS; |
| 999 | bNoMsg = find_option("no-messages","s",0)!=0; |
| 1000 | bOnce = find_option("once",0,0)!=0; |
| 1001 | bInvert = find_option("invert-match","v",0)!=0; |
| 1002 | if( bInvert ){ |
| 1003 | flags |= GREP_QUIET|GREP_EXISTS; |
| 1004 |
| --- src/regexp.c | |
| +++ src/regexp.c | |
| @@ -993,11 +993,11 @@ | |
| 993 | |
| 994 | |
| 995 | if( find_option("ignore-case","i",0)!=0 ) ignoreCase = 1; |
| 996 | if( find_option("files-with-matches","l",0)!=0 ) flags |= GREP_EXISTS; |
| 997 | if( find_option("verbose",0,0)!=0 ) bVerbose = 1; |
| 998 | if( g.fQuiet ) flags |= GREP_QUIET|GREP_EXISTS; |
| 999 | bNoMsg = find_option("no-messages","s",0)!=0; |
| 1000 | bOnce = find_option("once",0,0)!=0; |
| 1001 | bInvert = find_option("invert-match","v",0)!=0; |
| 1002 | if( bInvert ){ |
| 1003 | flags |= GREP_QUIET|GREP_EXISTS; |
| 1004 |
+1
-1
| --- src/sync.c | ||
| +++ src/sync.c | ||
| @@ -510,11 +510,11 @@ | ||
| 510 | 510 | syncFlags |= SYNC_UNVERSIONED; |
| 511 | 511 | } |
| 512 | 512 | if( find_option("ping",0,0)!=0 ){ |
| 513 | 513 | syncFlags = SYNC_PING; |
| 514 | 514 | } |
| 515 | - if( find_option("quiet","q",0)!=0 ){ | |
| 515 | + if( g.fQuiet ){ | |
| 516 | 516 | syncFlags |= SYNC_QUIET; |
| 517 | 517 | } |
| 518 | 518 | process_sync_args(&configFlags, &syncFlags, 0, 0); |
| 519 | 519 | |
| 520 | 520 | /* We should be done with options.. */ |
| 521 | 521 |
| --- src/sync.c | |
| +++ src/sync.c | |
| @@ -510,11 +510,11 @@ | |
| 510 | syncFlags |= SYNC_UNVERSIONED; |
| 511 | } |
| 512 | if( find_option("ping",0,0)!=0 ){ |
| 513 | syncFlags = SYNC_PING; |
| 514 | } |
| 515 | if( find_option("quiet","q",0)!=0 ){ |
| 516 | syncFlags |= SYNC_QUIET; |
| 517 | } |
| 518 | process_sync_args(&configFlags, &syncFlags, 0, 0); |
| 519 | |
| 520 | /* We should be done with options.. */ |
| 521 |
| --- src/sync.c | |
| +++ src/sync.c | |
| @@ -510,11 +510,11 @@ | |
| 510 | syncFlags |= SYNC_UNVERSIONED; |
| 511 | } |
| 512 | if( find_option("ping",0,0)!=0 ){ |
| 513 | syncFlags = SYNC_PING; |
| 514 | } |
| 515 | if( g.fQuiet ){ |
| 516 | syncFlags |= SYNC_QUIET; |
| 517 | } |
| 518 | process_sync_args(&configFlags, &syncFlags, 0, 0); |
| 519 | |
| 520 | /* We should be done with options.. */ |
| 521 |
+5
-5
| --- src/tkt.c | ||
| +++ src/tkt.c | ||
| @@ -1520,11 +1520,11 @@ | ||
| 1520 | 1520 | ** |
| 1521 | 1521 | ** > fossil ticket show (REPORTTITLE|REPORTNR) ?TICKETFILTER? ?OPTIONS? |
| 1522 | 1522 | ** |
| 1523 | 1523 | ** Options: |
| 1524 | 1524 | ** -l|--limit LIMITCHAR |
| 1525 | -** -q|--quote | |
| 1525 | +** --quote | |
| 1526 | 1526 | ** -R|--repository REPO |
| 1527 | 1527 | ** |
| 1528 | 1528 | ** Run the ticket report, identified by the report format title |
| 1529 | 1529 | ** used in the GUI. The data is written as flat file on stdout, |
| 1530 | 1530 | ** using TAB as separator. The separator can be changed using |
| @@ -1555,12 +1555,12 @@ | ||
| 1555 | 1555 | ** > fossil ticket list reports |
| 1556 | 1556 | ** > fossil ticket ls reports |
| 1557 | 1557 | ** |
| 1558 | 1558 | ** List all ticket reports defined in the fossil repository. |
| 1559 | 1559 | ** |
| 1560 | -** > fossil ticket set TICKETUUID (FIELD VALUE)+ ?-q|--quote? | |
| 1561 | -** > fossil ticket change TICKETUUID (FIELD VALUE)+ ?-q|--quote? | |
| 1560 | +** > fossil ticket set TICKETUUID (FIELD VALUE)+ ?--quote? | |
| 1561 | +** > fossil ticket change TICKETUUID (FIELD VALUE)+ ?--quote? | |
| 1562 | 1562 | ** |
| 1563 | 1563 | ** Change ticket identified by TICKETUUID to set the values of |
| 1564 | 1564 | ** each field FIELD to VALUE. |
| 1565 | 1565 | ** |
| 1566 | 1566 | ** Field names as defined in the TICKET table. By default, these |
| @@ -1572,11 +1572,11 @@ | ||
| 1572 | 1572 | ** can use more than one field/value pair on the command line. Using |
| 1573 | 1573 | ** --quote enables the special character decoding as in "ticket |
| 1574 | 1574 | ** show", which allows setting multiline text or text with special |
| 1575 | 1575 | ** characters. |
| 1576 | 1576 | ** |
| 1577 | -** > fossil ticket add FIELD VALUE ?FIELD VALUE .. ? ?-q|--quote? | |
| 1577 | +** > fossil ticket add FIELD VALUE ?FIELD VALUE .. ? ?--quote? | |
| 1578 | 1578 | ** |
| 1579 | 1579 | ** Like set, but create a new ticket with the given values. |
| 1580 | 1580 | ** |
| 1581 | 1581 | ** > fossil ticket history TICKETUUID |
| 1582 | 1582 | ** |
| @@ -1642,11 +1642,11 @@ | ||
| 1642 | 1642 | } |
| 1643 | 1643 | }else{ |
| 1644 | 1644 | /* add a new ticket or set fields on existing tickets */ |
| 1645 | 1645 | tTktShowEncoding tktEncoding; |
| 1646 | 1646 | |
| 1647 | - tktEncoding = find_option("quote","q",0) ? tktFossilize : tktNoTab; | |
| 1647 | + tktEncoding = find_option("quote",0,0) ? tktFossilize : tktNoTab; | |
| 1648 | 1648 | |
| 1649 | 1649 | if( strncmp(g.argv[2],"show",n)==0 ){ |
| 1650 | 1650 | if( g.argc==3 ){ |
| 1651 | 1651 | usage("show REPORTNR"); |
| 1652 | 1652 | }else{ |
| 1653 | 1653 |
| --- src/tkt.c | |
| +++ src/tkt.c | |
| @@ -1520,11 +1520,11 @@ | |
| 1520 | ** |
| 1521 | ** > fossil ticket show (REPORTTITLE|REPORTNR) ?TICKETFILTER? ?OPTIONS? |
| 1522 | ** |
| 1523 | ** Options: |
| 1524 | ** -l|--limit LIMITCHAR |
| 1525 | ** -q|--quote |
| 1526 | ** -R|--repository REPO |
| 1527 | ** |
| 1528 | ** Run the ticket report, identified by the report format title |
| 1529 | ** used in the GUI. The data is written as flat file on stdout, |
| 1530 | ** using TAB as separator. The separator can be changed using |
| @@ -1555,12 +1555,12 @@ | |
| 1555 | ** > fossil ticket list reports |
| 1556 | ** > fossil ticket ls reports |
| 1557 | ** |
| 1558 | ** List all ticket reports defined in the fossil repository. |
| 1559 | ** |
| 1560 | ** > fossil ticket set TICKETUUID (FIELD VALUE)+ ?-q|--quote? |
| 1561 | ** > fossil ticket change TICKETUUID (FIELD VALUE)+ ?-q|--quote? |
| 1562 | ** |
| 1563 | ** Change ticket identified by TICKETUUID to set the values of |
| 1564 | ** each field FIELD to VALUE. |
| 1565 | ** |
| 1566 | ** Field names as defined in the TICKET table. By default, these |
| @@ -1572,11 +1572,11 @@ | |
| 1572 | ** can use more than one field/value pair on the command line. Using |
| 1573 | ** --quote enables the special character decoding as in "ticket |
| 1574 | ** show", which allows setting multiline text or text with special |
| 1575 | ** characters. |
| 1576 | ** |
| 1577 | ** > fossil ticket add FIELD VALUE ?FIELD VALUE .. ? ?-q|--quote? |
| 1578 | ** |
| 1579 | ** Like set, but create a new ticket with the given values. |
| 1580 | ** |
| 1581 | ** > fossil ticket history TICKETUUID |
| 1582 | ** |
| @@ -1642,11 +1642,11 @@ | |
| 1642 | } |
| 1643 | }else{ |
| 1644 | /* add a new ticket or set fields on existing tickets */ |
| 1645 | tTktShowEncoding tktEncoding; |
| 1646 | |
| 1647 | tktEncoding = find_option("quote","q",0) ? tktFossilize : tktNoTab; |
| 1648 | |
| 1649 | if( strncmp(g.argv[2],"show",n)==0 ){ |
| 1650 | if( g.argc==3 ){ |
| 1651 | usage("show REPORTNR"); |
| 1652 | }else{ |
| 1653 |
| --- src/tkt.c | |
| +++ src/tkt.c | |
| @@ -1520,11 +1520,11 @@ | |
| 1520 | ** |
| 1521 | ** > fossil ticket show (REPORTTITLE|REPORTNR) ?TICKETFILTER? ?OPTIONS? |
| 1522 | ** |
| 1523 | ** Options: |
| 1524 | ** -l|--limit LIMITCHAR |
| 1525 | ** --quote |
| 1526 | ** -R|--repository REPO |
| 1527 | ** |
| 1528 | ** Run the ticket report, identified by the report format title |
| 1529 | ** used in the GUI. The data is written as flat file on stdout, |
| 1530 | ** using TAB as separator. The separator can be changed using |
| @@ -1555,12 +1555,12 @@ | |
| 1555 | ** > fossil ticket list reports |
| 1556 | ** > fossil ticket ls reports |
| 1557 | ** |
| 1558 | ** List all ticket reports defined in the fossil repository. |
| 1559 | ** |
| 1560 | ** > fossil ticket set TICKETUUID (FIELD VALUE)+ ?--quote? |
| 1561 | ** > fossil ticket change TICKETUUID (FIELD VALUE)+ ?--quote? |
| 1562 | ** |
| 1563 | ** Change ticket identified by TICKETUUID to set the values of |
| 1564 | ** each field FIELD to VALUE. |
| 1565 | ** |
| 1566 | ** Field names as defined in the TICKET table. By default, these |
| @@ -1572,11 +1572,11 @@ | |
| 1572 | ** can use more than one field/value pair on the command line. Using |
| 1573 | ** --quote enables the special character decoding as in "ticket |
| 1574 | ** show", which allows setting multiline text or text with special |
| 1575 | ** characters. |
| 1576 | ** |
| 1577 | ** > fossil ticket add FIELD VALUE ?FIELD VALUE .. ? ?--quote? |
| 1578 | ** |
| 1579 | ** Like set, but create a new ticket with the given values. |
| 1580 | ** |
| 1581 | ** > fossil ticket history TICKETUUID |
| 1582 | ** |
| @@ -1642,11 +1642,11 @@ | |
| 1642 | } |
| 1643 | }else{ |
| 1644 | /* add a new ticket or set fields on existing tickets */ |
| 1645 | tTktShowEncoding tktEncoding; |
| 1646 | |
| 1647 | tktEncoding = find_option("quote",0,0) ? tktFossilize : tktNoTab; |
| 1648 | |
| 1649 | if( strncmp(g.argv[2],"show",n)==0 ){ |
| 1650 | if( g.argc==3 ){ |
| 1651 | usage("show REPORTNR"); |
| 1652 | }else{ |
| 1653 |