Fossil SCM
[/help/stash|stash gdiff] now honors the "g" in gdiff.
Commit
cd5a7e12907fca09f41c89f9c633a18689edacac
Parent
0c9b1fb41288d0d…
1 file changed
+1
-3
+1
-3
| --- src/stash.c | ||
| +++ src/stash.c | ||
| @@ -476,11 +476,10 @@ | ||
| 476 | 476 | void stash_cmd(void){ |
| 477 | 477 | const char *zDb; |
| 478 | 478 | const char *zCmd; |
| 479 | 479 | int nCmd; |
| 480 | 480 | int stashid = 0; |
| 481 | - | |
| 482 | 481 | undo_capture_command_line(); |
| 483 | 482 | db_must_be_within_tree(); |
| 484 | 483 | db_open_config(0); |
| 485 | 484 | db_begin_transaction(); |
| 486 | 485 | zDb = db_name("localdb"); |
| @@ -624,11 +623,10 @@ | ||
| 624 | 623 | undo_finish(); |
| 625 | 624 | }else |
| 626 | 625 | if( memcmp(zCmd, "goto", nCmd)==0 ){ |
| 627 | 626 | int nConflict; |
| 628 | 627 | int vid; |
| 629 | - | |
| 630 | 628 | if( g.argc>4 ) usage("apply STASHID"); |
| 631 | 629 | stashid = stash_get_id(g.argc==4 ? g.argv[3] : 0); |
| 632 | 630 | undo_begin(); |
| 633 | 631 | vid = db_int(0, "SELECT vid FROM stash WHERE stashid=%d", stashid); |
| 634 | 632 | nConflict = update_to(vid); |
| @@ -651,11 +649,11 @@ | ||
| 651 | 649 | db_close(0); |
| 652 | 650 | diff_tk((zCmd[0]=='s' ? "stash show" : "stash diff"), 3); |
| 653 | 651 | return; |
| 654 | 652 | } |
| 655 | 653 | if( find_option("internal","i",0)==0 ){ |
| 656 | - zDiffCmd = diff_command_external(0); | |
| 654 | + zDiffCmd = diff_command_external(memcmp(zCmd, "gdiff", nCmd)==0); | |
| 657 | 655 | } |
| 658 | 656 | diffFlags = diff_options(); |
| 659 | 657 | if( find_option("verbose","v",0)!=0 ) diffFlags |= DIFF_VERBOSE; |
| 660 | 658 | if( g.argc>4 ) usage(mprintf("%s STASHID", zCmd)); |
| 661 | 659 | if( zDiffCmd ){ |
| 662 | 660 |
| --- src/stash.c | |
| +++ src/stash.c | |
| @@ -476,11 +476,10 @@ | |
| 476 | void stash_cmd(void){ |
| 477 | const char *zDb; |
| 478 | const char *zCmd; |
| 479 | int nCmd; |
| 480 | int stashid = 0; |
| 481 | |
| 482 | undo_capture_command_line(); |
| 483 | db_must_be_within_tree(); |
| 484 | db_open_config(0); |
| 485 | db_begin_transaction(); |
| 486 | zDb = db_name("localdb"); |
| @@ -624,11 +623,10 @@ | |
| 624 | undo_finish(); |
| 625 | }else |
| 626 | if( memcmp(zCmd, "goto", nCmd)==0 ){ |
| 627 | int nConflict; |
| 628 | int vid; |
| 629 | |
| 630 | if( g.argc>4 ) usage("apply STASHID"); |
| 631 | stashid = stash_get_id(g.argc==4 ? g.argv[3] : 0); |
| 632 | undo_begin(); |
| 633 | vid = db_int(0, "SELECT vid FROM stash WHERE stashid=%d", stashid); |
| 634 | nConflict = update_to(vid); |
| @@ -651,11 +649,11 @@ | |
| 651 | db_close(0); |
| 652 | diff_tk((zCmd[0]=='s' ? "stash show" : "stash diff"), 3); |
| 653 | return; |
| 654 | } |
| 655 | if( find_option("internal","i",0)==0 ){ |
| 656 | zDiffCmd = diff_command_external(0); |
| 657 | } |
| 658 | diffFlags = diff_options(); |
| 659 | if( find_option("verbose","v",0)!=0 ) diffFlags |= DIFF_VERBOSE; |
| 660 | if( g.argc>4 ) usage(mprintf("%s STASHID", zCmd)); |
| 661 | if( zDiffCmd ){ |
| 662 |
| --- src/stash.c | |
| +++ src/stash.c | |
| @@ -476,11 +476,10 @@ | |
| 476 | void stash_cmd(void){ |
| 477 | const char *zDb; |
| 478 | const char *zCmd; |
| 479 | int nCmd; |
| 480 | int stashid = 0; |
| 481 | undo_capture_command_line(); |
| 482 | db_must_be_within_tree(); |
| 483 | db_open_config(0); |
| 484 | db_begin_transaction(); |
| 485 | zDb = db_name("localdb"); |
| @@ -624,11 +623,10 @@ | |
| 623 | undo_finish(); |
| 624 | }else |
| 625 | if( memcmp(zCmd, "goto", nCmd)==0 ){ |
| 626 | int nConflict; |
| 627 | int vid; |
| 628 | if( g.argc>4 ) usage("apply STASHID"); |
| 629 | stashid = stash_get_id(g.argc==4 ? g.argv[3] : 0); |
| 630 | undo_begin(); |
| 631 | vid = db_int(0, "SELECT vid FROM stash WHERE stashid=%d", stashid); |
| 632 | nConflict = update_to(vid); |
| @@ -651,11 +649,11 @@ | |
| 649 | db_close(0); |
| 650 | diff_tk((zCmd[0]=='s' ? "stash show" : "stash diff"), 3); |
| 651 | return; |
| 652 | } |
| 653 | if( find_option("internal","i",0)==0 ){ |
| 654 | zDiffCmd = diff_command_external(memcmp(zCmd, "gdiff", nCmd)==0); |
| 655 | } |
| 656 | diffFlags = diff_options(); |
| 657 | if( find_option("verbose","v",0)!=0 ) diffFlags |= DIFF_VERBOSE; |
| 658 | if( g.argc>4 ) usage(mprintf("%s STASHID", zCmd)); |
| 659 | if( zDiffCmd ){ |
| 660 |