Fossil

Check-in [f62c2470]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:On diff/gdiff command, override "diff-binary" setting when argument "--diff-binary off" command line option is specified, not only with "--diff-binary on".
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:f62c2470834c421d5f29714c6879ea67c56c9d0b
User & Date: mgagnon 2017-02-03 15:13:41
Context
2017-02-04
19:58
Improve help text for the pull/push/sync commands. check-in: 04c6e7ee user: mistachkin tags: trunk
2017-02-03
15:13
On diff/gdiff command, override "diff-binary" setting when argument "--diff-binary off" command line option is specified, not only with "--diff-binary on". check-in: f62c2470 user: mgagnon tags: trunk
2017-01-28
19:48
Changing the password requires a 'real' login. check-in: 8b562b90 user: mistachkin tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/diffcmd.c.

747
748
749
750
751
752
753
754
755
756




757
758
759
760
761
762
763
764
765
766
767
}

/*
** Returns non-zero if files that may be binary should be used with external
** diff programs.
*/
int diff_include_binary_files(void){
  if( is_truth(find_option("diff-binary", 0, 1)) ){
    return 1;
  }




  if( db_get_boolean("diff-binary", 1) ){
    return 1;
  }
  return 0;
}

/*
** Returns the GLOB pattern for file names that should be treated as binary
** by the diff subsystem, if any.
*/
const char *diff_get_binary_glob(void){







|
<
|
>
>
>
>
|
<

<







747
748
749
750
751
752
753
754

755
756
757
758
759
760

761

762
763
764
765
766
767
768
}

/*
** Returns non-zero if files that may be binary should be used with external
** diff programs.
*/
int diff_include_binary_files(void){
  const char* zArgIncludeBinary = find_option("diff-binary", 0, 1);

  
  /* Command line argument have priority on settings */
  if( zArgIncludeBinary ){
    return is_truth(zArgIncludeBinary);
  }else{
    return db_get_boolean("diff-binary", 1);

  }

}

/*
** Returns the GLOB pattern for file names that should be treated as binary
** by the diff subsystem, if any.
*/
const char *diff_get_binary_glob(void){