Fossil

Check-in [b789df4b]
Login

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

Overview
Comment:Minor fix to the previous "fossil diff" enhancement to avoid unnecessary warnings about directories not being found if the directory does not contain any files that were changed.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: b789df4bb6dd4d57b5f608956704b6e8d8a51be7
User & Date: drh 2015-12-15 20:18:26
Context
2015-12-15
20:51
Update the version number to 1.35. Begin writing the change log for version 1.35. check-in: f998a1bf user: drh tags: trunk
20:18
Minor fix to the previous "fossil diff" enhancement to avoid unnecessary warnings about directories not being found if the directory does not contain any files that were changed. check-in: b789df4b user: drh tags: trunk
20:07
Enhance the "fossil diff" command so that it accepts directories as arguments and shows diffs on all files contained within those directories. check-in: c46f9805 user: drh tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/diffcmd.c.

941
942
943
944
945
946
947

948


949
950
951
952
953
954
955
  }else{
    diff_two_versions(zFrom, zTo, zDiffCmd, zBinGlob, fIncludeBinary,
                      diffFlags, pFileDir);
  }
  if( pFileDir ){
    int i;
    for(i=0; pFileDir[i].zName; i++){

      if( pFileDir[i].nUsed==0 && strcmp(pFileDir[0].zName,".")!=0 ){


        fossil_fatal("not found: '%s'", g.argv[i+2]);
      }
      fossil_free(pFileDir[i].zName);
    }
    fossil_free(pFileDir);
  }
}







>
|
>
>







941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
  }else{
    diff_two_versions(zFrom, zTo, zDiffCmd, zBinGlob, fIncludeBinary,
                      diffFlags, pFileDir);
  }
  if( pFileDir ){
    int i;
    for(i=0; pFileDir[i].zName; i++){
      if( pFileDir[i].nUsed==0
       && strcmp(pFileDir[0].zName,".")!=0
       && !file_isdir(g.argv[i+2])
      ){
        fossil_fatal("not found: '%s'", g.argv[i+2]);
      }
      fossil_free(pFileDir[i].zName);
    }
    fossil_free(pFileDir);
  }
}