Differences From Artifact [f85babc617]:

• File src/patch.c — part of check-in [83feccc291] at 2021-08-27 00:33:15 on branch trunk — Do not use an external diff command to generate HTML for --tk or --webpage or --browser. (user: drh size: 32203)

To Artifact [af1e2bc30b]:

• File src/patch.c — part of check-in [8601fb13d6] at 2021-09-06 18:14:00 on branch diff-config — Create the new DiffConfig object used to pass around information about a file difference computation. Begin integrating this new object into various interfaces. Lots more work to be done. (user: drh size: 32229)

950
951
952
953
954
955
956

957
958
959
960
961
962
963
964
965
966
967
968
969
970

  if( strncmp(zCmd, "diff", n)==0 ){
    const char *zDiffCmd = 0;
    const char *zBinGlob = 0;
    int fIncludeBinary = 0;
    u64 diffFlags;
    char *zIn;
    unsigned flags = 0;


    if( find_option("tk",0,0)!=0 ){
      db_close(0);
      diff_tk("patch diff", 3);
      return;
    }
    diffFlags = diff_options();
    if( find_option("internal","i",0)==0
     && (diffFlags & DIFF_HTML)==0
    ){
      zDiffCmd = diff_command_external(zCmd[0]=='g');
    }
    if( find_option("verbose","v",0)!=0 ) diffFlags |= DIFF_VERBOSE;
    if( zDiffCmd ){

>






|

950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971

  if( strncmp(zCmd, "diff", n)==0 ){
    const char *zDiffCmd = 0;
    const char *zBinGlob = 0;
    int fIncludeBinary = 0;
    u64 diffFlags;
    char *zIn;
    unsigned flags = 0;
    DiffConfig DCfg;

    if( find_option("tk",0,0)!=0 ){
      db_close(0);
      diff_tk("patch diff", 3);
      return;
    }
    diffFlags = diff_options(&DCfg);
    if( find_option("internal","i",0)==0
     && (diffFlags & DIFF_HTML)==0
    ){
      zDiffCmd = diff_command_external(zCmd[0]=='g');
    }
    if( find_option("verbose","v",0)!=0 ) diffFlags |= DIFF_VERBOSE;
    if( zDiffCmd ){