Differences From Artifact [98c71fad88]:

• File src/diffcmd.c — part of check-in [e933d5d731] at 2021-09-02 09:19:31 on branch diff-color-enhancements — Add the --tcl format option to the diff commands. The plan is to use this to implement --tk (in place of --html -y) but that part is not yet implemented. (user: drh size: 39327)

To Artifact [39e30d173b]:

• File src/diffcmd.c — part of check-in [63610f3f27] at 2021-09-02 10:09:12 on branch diff-color-enhancements — Get the --tk option working with the new --tcl format. (user: drh size: 39348)

935
936
937
938
939
940
941
942
943

944
945
946
947
948
949
950

void diff_tk(const char *zSubCmd, int firstArg){
  int i;
  Blob script;
  const char *zTempFile = 0;
  char *zCmd;
  const char *zTclsh;
  blob_zero(&script);
  blob_appendf(&script, "set fossilcmd {| \"%/\" %s --html -y -i -v",
               g.nameOfExe, zSubCmd);

  find_option("html",0,0);
  find_option("side-by-side","y",0);
  find_option("internal","i",0);
  find_option("verbose","v",0);
  zTclsh = find_option("tclsh",0,1);
  if( zTclsh==0 ){
    zTclsh = db_get("tclsh",0);

|

>

935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951

void diff_tk(const char *zSubCmd, int firstArg){
  int i;
  Blob script;
  const char *zTempFile = 0;
  char *zCmd;
  const char *zTclsh;
  blob_zero(&script);
  blob_appendf(&script, "set fossilcmd {| \"%/\" %s -tcl -i -v",
               g.nameOfExe, zSubCmd);
  find_option("tcl",0,0);
  find_option("html",0,0);
  find_option("side-by-side","y",0);
  find_option("internal","i",0);
  find_option("verbose","v",0);
  zTclsh = find_option("tclsh",0,1);
  if( zTclsh==0 ){
    zTclsh = db_get("tclsh",0);