Rework cvsexportcommit to handle binary files for all cases.

diff --git a/diff.h b/diff.h
index 2cced530fa60ad7206b2cdb1b2509f42469e8f73..b48c9914e7e3802d17870bbc0fd68c454fded61c 100644 (file)
--- a/diff.h
+++ b/diff.h
@@ -8,6 +8,7 @@
 
 struct rev_info;
 struct diff_options;
+struct diff_queue_struct;
 
 typedef void (*change_fn_t)(struct diff_options *options,
                 unsigned old_mode, unsigned new_mode,
@@ -20,6 +21,9 @@ typedef void (*add_remove_fn_t)(struct diff_options *options,
                    const unsigned char *sha1,
                    const char *base, const char *path);
 
+typedef void (*diff_format_fn_t)(struct diff_queue_struct *q,
+               struct diff_options *options, void *data);
+
 #define DIFF_FORMAT_RAW                0x0001
 #define DIFF_FORMAT_DIFFSTAT   0x0002
 #define DIFF_FORMAT_SUMMARY    0x0004
@@ -35,6 +39,8 @@ typedef void (*add_remove_fn_t)(struct diff_options *options,
  */
 #define DIFF_FORMAT_NO_OUTPUT  0x0080
 
+#define DIFF_FORMAT_CALLBACK   0x0100
+
 struct diff_options {
        const char *filter;
        const char *orderfile;
@@ -46,7 +52,8 @@ struct diff_options {
                 full_index:1,
                 silent_on_remove:1,
                 find_copies_harder:1,
-                color_diff:1;
+                color_diff:1,
+                color_diff_words:1;
        int context;
        int break_opt;
        int detect_rename;
@@ -62,11 +69,16 @@ struct diff_options {
        const char *stat_sep;
        long xdl_opts;
 
+       int stat_width;
+       int stat_name_width;
+
        int nr_paths;
        const char **paths;
        int *pathlens;
        change_fn_t change;
        add_remove_fn_t add_remove;
+       diff_format_fn_t format_callback;
+       void *format_callback_data;
 };
 
 enum color_diff {
@@ -77,6 +89,7 @@ enum color_diff {
        DIFF_FILE_OLD = 4,
        DIFF_FILE_NEW = 5,
        DIFF_COMMIT = 6,
+       DIFF_WHITESPACE = 7,
 };
 const char *diff_get_color(int diff_use_color, enum color_diff ix);