Fossil SCM
Mention skip in bisect options list
Commit
79499fc4742376fbb642846661872868cd65cd5626eb99aeb2128f44979ba201
Parent
6e45212a5bea960…
1 file changed
+4
-3
+4
-3
| --- src/bisect.c | ||
| +++ src/bisect.c | ||
| @@ -75,11 +75,12 @@ | ||
| 75 | 75 | const char *zName; |
| 76 | 76 | const char *zDefault; |
| 77 | 77 | const char *zDesc; |
| 78 | 78 | } aBisectOption[] = { |
| 79 | 79 | { "auto-next", "on", "Automatically run \"bisect next\" after each " |
| 80 | - "\"bisect good\" or \"bisect bad\"" }, | |
| 80 | + "\"bisect good\", \"bisect bad\", or \"bisect " | |
| 81 | + "skip\"" }, | |
| 81 | 82 | { "direct-only", "on", "Follow only primary parent-child links, not " |
| 82 | 83 | "merges\n" }, |
| 83 | 84 | { "display", "chart", "Command to run after \"next\". \"chart\", " |
| 84 | 85 | "\"log\", \"status\", or \"none\"" }, |
| 85 | 86 | }; |
| @@ -228,11 +229,11 @@ | ||
| 228 | 229 | if( blob_size(&log) ) blob_append(&log, " ", 1); |
| 229 | 230 | if( zDesc[0]=='n' ) blob_append(&log, "-", 1); |
| 230 | 231 | if( zDesc[0]=='s' ) blob_append(&log, "s", 1); |
| 231 | 232 | for(i=1; ((c = zDesc[i])>='0' && c<='9') || (c>='a' && c<='f'); i++){} |
| 232 | 233 | if( i==1 ) break; |
| 233 | - rid = db_int(0, | |
| 234 | + rid = db_int(0, | |
| 234 | 235 | "SELECT rid FROM blob" |
| 235 | 236 | " WHERE uuid LIKE '%.*q%%'" |
| 236 | 237 | " AND EXISTS(SELECT 1 FROM plink WHERE cid=rid)", |
| 237 | 238 | i-1, zDesc+1 |
| 238 | 239 | ); |
| @@ -487,11 +488,11 @@ | ||
| 487 | 488 | }else{ |
| 488 | 489 | ridSkip = name_to_typed_rid(g.argv[3], "ci"); |
| 489 | 490 | } |
| 490 | 491 | if( ridSkip>0 ){ |
| 491 | 492 | bisect_append_skip(ridSkip); |
| 492 | - if( bisect_option("auto-next") | |
| 493 | + if( bisect_option("auto-next") | |
| 493 | 494 | && db_lget_int("bisect-bad",0)>0 |
| 494 | 495 | && db_lget_int("bisect-good",0)>0 |
| 495 | 496 | ){ |
| 496 | 497 | zCmd = "next"; |
| 497 | 498 | n = 4; |
| 498 | 499 |
| --- src/bisect.c | |
| +++ src/bisect.c | |
| @@ -75,11 +75,12 @@ | |
| 75 | const char *zName; |
| 76 | const char *zDefault; |
| 77 | const char *zDesc; |
| 78 | } aBisectOption[] = { |
| 79 | { "auto-next", "on", "Automatically run \"bisect next\" after each " |
| 80 | "\"bisect good\" or \"bisect bad\"" }, |
| 81 | { "direct-only", "on", "Follow only primary parent-child links, not " |
| 82 | "merges\n" }, |
| 83 | { "display", "chart", "Command to run after \"next\". \"chart\", " |
| 84 | "\"log\", \"status\", or \"none\"" }, |
| 85 | }; |
| @@ -228,11 +229,11 @@ | |
| 228 | if( blob_size(&log) ) blob_append(&log, " ", 1); |
| 229 | if( zDesc[0]=='n' ) blob_append(&log, "-", 1); |
| 230 | if( zDesc[0]=='s' ) blob_append(&log, "s", 1); |
| 231 | for(i=1; ((c = zDesc[i])>='0' && c<='9') || (c>='a' && c<='f'); i++){} |
| 232 | if( i==1 ) break; |
| 233 | rid = db_int(0, |
| 234 | "SELECT rid FROM blob" |
| 235 | " WHERE uuid LIKE '%.*q%%'" |
| 236 | " AND EXISTS(SELECT 1 FROM plink WHERE cid=rid)", |
| 237 | i-1, zDesc+1 |
| 238 | ); |
| @@ -487,11 +488,11 @@ | |
| 487 | }else{ |
| 488 | ridSkip = name_to_typed_rid(g.argv[3], "ci"); |
| 489 | } |
| 490 | if( ridSkip>0 ){ |
| 491 | bisect_append_skip(ridSkip); |
| 492 | if( bisect_option("auto-next") |
| 493 | && db_lget_int("bisect-bad",0)>0 |
| 494 | && db_lget_int("bisect-good",0)>0 |
| 495 | ){ |
| 496 | zCmd = "next"; |
| 497 | n = 4; |
| 498 |
| --- src/bisect.c | |
| +++ src/bisect.c | |
| @@ -75,11 +75,12 @@ | |
| 75 | const char *zName; |
| 76 | const char *zDefault; |
| 77 | const char *zDesc; |
| 78 | } aBisectOption[] = { |
| 79 | { "auto-next", "on", "Automatically run \"bisect next\" after each " |
| 80 | "\"bisect good\", \"bisect bad\", or \"bisect " |
| 81 | "skip\"" }, |
| 82 | { "direct-only", "on", "Follow only primary parent-child links, not " |
| 83 | "merges\n" }, |
| 84 | { "display", "chart", "Command to run after \"next\". \"chart\", " |
| 85 | "\"log\", \"status\", or \"none\"" }, |
| 86 | }; |
| @@ -228,11 +229,11 @@ | |
| 229 | if( blob_size(&log) ) blob_append(&log, " ", 1); |
| 230 | if( zDesc[0]=='n' ) blob_append(&log, "-", 1); |
| 231 | if( zDesc[0]=='s' ) blob_append(&log, "s", 1); |
| 232 | for(i=1; ((c = zDesc[i])>='0' && c<='9') || (c>='a' && c<='f'); i++){} |
| 233 | if( i==1 ) break; |
| 234 | rid = db_int(0, |
| 235 | "SELECT rid FROM blob" |
| 236 | " WHERE uuid LIKE '%.*q%%'" |
| 237 | " AND EXISTS(SELECT 1 FROM plink WHERE cid=rid)", |
| 238 | i-1, zDesc+1 |
| 239 | ); |
| @@ -487,11 +488,11 @@ | |
| 488 | }else{ |
| 489 | ridSkip = name_to_typed_rid(g.argv[3], "ci"); |
| 490 | } |
| 491 | if( ridSkip>0 ){ |
| 492 | bisect_append_skip(ridSkip); |
| 493 | if( bisect_option("auto-next") |
| 494 | && db_lget_int("bisect-bad",0)>0 |
| 495 | && db_lget_int("bisect-good",0)>0 |
| 496 | ){ |
| 497 | zCmd = "next"; |
| 498 | n = 4; |
| 499 |