Fossil

Check-in [eb67f09c]
Login

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

Overview
Comment:Add the --command option to "fossil diff".
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:eb67f09c9ad28228cbf977d04ede2eaf4d6a3cc2
User & Date: drh 2016-10-25 20:25:30
Context
2016-10-26
19:58
Update fedora version, being used for Docker image. Minor fix in changelog check-in: f014e83b user: jan.nijtmans tags: trunk
02:07
Merge trunk check-in: b5edfa3b user: andygoth tags: andygoth-timeline-ms
2016-10-25
22:06
Merge updates from trunk. Closed-Leaf check-in: 66c5bc56 user: mistachkin tags: experimental
20:25
Add the --command option to "fossil diff". check-in: eb67f09c user: drh tags: trunk
20:12
Fix the download hyperlink on the homepage. check-in: be88817f user: drh tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to src/diffcmd.c.

   795    795   ** This option overrides the "binary-glob" setting.
   796    796   **
   797    797   ** Options:
   798    798   **   --binary PATTERN           Treat files that match the glob PATTERN as binary
   799    799   **   --branch BRANCH            Show diff of all changes on BRANCH
   800    800   **   --brief                    Show filenames only
   801    801   **   --checkin VERSION          Show diff of all changes in VERSION
          802  +**   --command PROG             External diff program - overrides "diff-command"
   802    803   **   --context|-c N             Use N lines of context
   803    804   **   --diff-binary BOOL         Include binary files when using external commands
   804    805   **   --exec-abs-paths           Force absolute path names with external commands.
   805    806   **   --exec-rel-paths           Force relative path names with external commands.
   806    807   **   --from|-r VERSION          Select VERSION as source for the diff
   807    808   **   --internal|-i              Use internal diff logic
   808    809   **   --side-by-side|-y          Side-by-side diff
................................................................................
   866    867       db_must_be_within_tree();
   867    868     }else if( zFrom==0 ){
   868    869       fossil_fatal("must use --from if --to is present");
   869    870     }else{
   870    871       db_find_and_open_repository(0, 0);
   871    872     }
   872    873     if( !isInternDiff ){
   873         -    zDiffCmd = diff_command_external(isGDiff);
          874  +    zDiffCmd = find_option("command", 0, 1);
          875  +    if( zDiffCmd==0 ) zDiffCmd = diff_command_external(isGDiff);
   874    876     }
   875    877     zBinGlob = diff_get_binary_glob();
   876    878     fIncludeBinary = diff_include_binary_files();
   877    879     determine_exec_relative_option(1);
   878    880     verify_all_options();
   879    881     if( g.argc>=3 ){
   880    882       int i;