Fossil SCM
Make sure the new command line options are always processed; however, wait until after the settings are available.
Commit
064afb225a7e7cb376eedda98b508e0e7c3a420d
Parent
c50eb50718dbea9…
1 file changed
+6
-12
+6
-12
| --- src/diffcmd.c | ||
| +++ src/diffcmd.c | ||
| @@ -778,19 +778,16 @@ | ||
| 778 | 778 | zTo = zBranch; |
| 779 | 779 | zFrom = mprintf("root:%s", zBranch); |
| 780 | 780 | } |
| 781 | 781 | if( zTo==0 ){ |
| 782 | 782 | db_must_be_within_tree(); |
| 783 | - verify_all_options(); | |
| 784 | 783 | if( !isInternDiff ){ |
| 785 | 784 | zDiffCmd = diff_command_external(isGDiff); |
| 786 | 785 | } |
| 787 | - if( zDiffCmd ){ | |
| 788 | - db_open_config(0); | |
| 789 | - zBinGlob = diff_get_binary_glob(); | |
| 790 | - fIncludeBinary = diff_include_binary_files(); | |
| 791 | - } | |
| 786 | + zBinGlob = diff_get_binary_glob(); | |
| 787 | + fIncludeBinary = diff_include_binary_files(); | |
| 788 | + verify_all_options(); | |
| 792 | 789 | if( g.argc>=3 ){ |
| 793 | 790 | for(f=2; f<g.argc; ++f){ |
| 794 | 791 | diff_one_against_disk(zFrom, zDiffCmd, zBinGlob, fIncludeBinary, |
| 795 | 792 | diffFlags, g.argv[f]); |
| 796 | 793 | } |
| @@ -800,19 +797,16 @@ | ||
| 800 | 797 | } |
| 801 | 798 | }else if( zFrom==0 ){ |
| 802 | 799 | fossil_fatal("must use --from if --to is present"); |
| 803 | 800 | }else{ |
| 804 | 801 | db_find_and_open_repository(0, 0); |
| 805 | - verify_all_options(); | |
| 806 | 802 | if( !isInternDiff ){ |
| 807 | 803 | zDiffCmd = diff_command_external(isGDiff); |
| 808 | 804 | } |
| 809 | - if( zDiffCmd ){ | |
| 810 | - db_open_config(0); | |
| 811 | - zBinGlob = diff_get_binary_glob(); | |
| 812 | - fIncludeBinary = diff_include_binary_files(); | |
| 813 | - } | |
| 805 | + zBinGlob = diff_get_binary_glob(); | |
| 806 | + fIncludeBinary = diff_include_binary_files(); | |
| 807 | + verify_all_options(); | |
| 814 | 808 | if( g.argc>=3 ){ |
| 815 | 809 | for(f=2; f<g.argc; ++f){ |
| 816 | 810 | diff_one_two_versions(zFrom, zTo, zDiffCmd, zBinGlob, fIncludeBinary, |
| 817 | 811 | diffFlags, g.argv[f]); |
| 818 | 812 | } |
| 819 | 813 |
| --- src/diffcmd.c | |
| +++ src/diffcmd.c | |
| @@ -778,19 +778,16 @@ | |
| 778 | zTo = zBranch; |
| 779 | zFrom = mprintf("root:%s", zBranch); |
| 780 | } |
| 781 | if( zTo==0 ){ |
| 782 | db_must_be_within_tree(); |
| 783 | verify_all_options(); |
| 784 | if( !isInternDiff ){ |
| 785 | zDiffCmd = diff_command_external(isGDiff); |
| 786 | } |
| 787 | if( zDiffCmd ){ |
| 788 | db_open_config(0); |
| 789 | zBinGlob = diff_get_binary_glob(); |
| 790 | fIncludeBinary = diff_include_binary_files(); |
| 791 | } |
| 792 | if( g.argc>=3 ){ |
| 793 | for(f=2; f<g.argc; ++f){ |
| 794 | diff_one_against_disk(zFrom, zDiffCmd, zBinGlob, fIncludeBinary, |
| 795 | diffFlags, g.argv[f]); |
| 796 | } |
| @@ -800,19 +797,16 @@ | |
| 800 | } |
| 801 | }else if( zFrom==0 ){ |
| 802 | fossil_fatal("must use --from if --to is present"); |
| 803 | }else{ |
| 804 | db_find_and_open_repository(0, 0); |
| 805 | verify_all_options(); |
| 806 | if( !isInternDiff ){ |
| 807 | zDiffCmd = diff_command_external(isGDiff); |
| 808 | } |
| 809 | if( zDiffCmd ){ |
| 810 | db_open_config(0); |
| 811 | zBinGlob = diff_get_binary_glob(); |
| 812 | fIncludeBinary = diff_include_binary_files(); |
| 813 | } |
| 814 | if( g.argc>=3 ){ |
| 815 | for(f=2; f<g.argc; ++f){ |
| 816 | diff_one_two_versions(zFrom, zTo, zDiffCmd, zBinGlob, fIncludeBinary, |
| 817 | diffFlags, g.argv[f]); |
| 818 | } |
| 819 |
| --- src/diffcmd.c | |
| +++ src/diffcmd.c | |
| @@ -778,19 +778,16 @@ | |
| 778 | zTo = zBranch; |
| 779 | zFrom = mprintf("root:%s", zBranch); |
| 780 | } |
| 781 | if( zTo==0 ){ |
| 782 | db_must_be_within_tree(); |
| 783 | if( !isInternDiff ){ |
| 784 | zDiffCmd = diff_command_external(isGDiff); |
| 785 | } |
| 786 | zBinGlob = diff_get_binary_glob(); |
| 787 | fIncludeBinary = diff_include_binary_files(); |
| 788 | verify_all_options(); |
| 789 | if( g.argc>=3 ){ |
| 790 | for(f=2; f<g.argc; ++f){ |
| 791 | diff_one_against_disk(zFrom, zDiffCmd, zBinGlob, fIncludeBinary, |
| 792 | diffFlags, g.argv[f]); |
| 793 | } |
| @@ -800,19 +797,16 @@ | |
| 797 | } |
| 798 | }else if( zFrom==0 ){ |
| 799 | fossil_fatal("must use --from if --to is present"); |
| 800 | }else{ |
| 801 | db_find_and_open_repository(0, 0); |
| 802 | if( !isInternDiff ){ |
| 803 | zDiffCmd = diff_command_external(isGDiff); |
| 804 | } |
| 805 | zBinGlob = diff_get_binary_glob(); |
| 806 | fIncludeBinary = diff_include_binary_files(); |
| 807 | verify_all_options(); |
| 808 | if( g.argc>=3 ){ |
| 809 | for(f=2; f<g.argc; ++f){ |
| 810 | diff_one_two_versions(zFrom, zTo, zDiffCmd, zBinGlob, fIncludeBinary, |
| 811 | diffFlags, g.argv[f]); |
| 812 | } |
| 813 |