Merge branch 'jc/combine' into next

diff --git a/diff.h b/diff.h
index 5696f2aff0644f331507679e0a58d7fcdc3501ec..236095fc9a1a6ffc056be8616c0f83e4e8c7ec2f 100644 (file)
--- a/diff.h
+++ b/diff.h
@@ -4,14 +4,7 @@
 #ifndef DIFF_H
 #define DIFF_H
 
-#define DIFF_FILE_CANON_MODE(mode) \
-       (S_ISREG(mode) ? (S_IFREG | ce_permissions(mode)) : \
-       S_ISLNK(mode) ? S_IFLNK : S_IFDIR)
-
-struct tree_desc {
-       void *buf;
-       unsigned long size;
-};
+#include "tree-walk.h"
 
 struct diff_options;
 
@@ -27,11 +20,11 @@ typedef void (*add_remove_fn_t)(struct diff_options *options,
                    const char *base, const char *path);
 
 struct diff_options {
-       const char **paths;
        const char *filter;
        const char *orderfile;
        const char *pickaxe;
        unsigned recursive:1,
+                with_raw:1,
                 tree_in_recursive:1,
                 full_index:1;
        int break_opt;
@@ -46,16 +39,42 @@ struct diff_options {
        int setup;
        int abbrev;
 
+       int nr_paths;
+       const char **paths;
+       int *pathlens;
        change_fn_t change;
        add_remove_fn_t add_remove;
 };
 
-extern void diff_tree_setup_paths(const char **paths);
+extern void diff_tree_setup_paths(const char **paths, struct diff_options *);
+extern void diff_tree_release_paths(struct diff_options *);
 extern int diff_tree(struct tree_desc *t1, struct tree_desc *t2,
                     const char *base, struct diff_options *opt);
 extern int diff_tree_sha1(const unsigned char *old, const unsigned char *new,
                          const char *base, struct diff_options *opt);
 
+struct combine_diff_path {
+       struct combine_diff_path *next;
+       int len;
+       char *path;
+       unsigned int mode;
+       unsigned char sha1[20];
+       struct combine_diff_parent {
+               char status;
+               unsigned int mode;
+               unsigned char sha1[20];
+       } parent[FLEX_ARRAY];
+};
+#define combine_diff_path_size(n, l) \
+       (sizeof(struct combine_diff_path) + \
+        sizeof(struct combine_diff_parent) * (n) + (l) + 1)
+
+extern int show_combined_diff(struct combine_diff_path *elem, int num_parent,
+                             int dense, const char *header,
+                             struct diff_options *);
+
+extern const char *diff_tree_combined_merge(const unsigned char *sha1, const char *, int, struct diff_options *opt);
+
 extern void diff_addremove(struct diff_options *,
                           int addremove,
                           unsigned mode,
@@ -87,9 +106,7 @@ extern int diff_setup_done(struct diff_options *);
 #define DIFF_DETECT_COPY       2
 
 #define DIFF_PICKAXE_ALL       1
-
-#define DIFF_DEFAULT_INDEX_ABBREV      7 /* hex digits */
-#define DIFF_DEFAULT_ABBREV    7 /* hex digits */
+#define DIFF_PICKAXE_REGEX     2
 
 extern void diffcore_std(struct diff_options *);
 
@@ -100,6 +117,8 @@ extern void diffcore_std_no_resolve(struct diff_options *);
 "  -z            output diff-raw with lines terminated with NUL.\n" \
 "  -p            output patch format.\n" \
 "  -u            synonym for -p.\n" \
+"  --patch-with-raw\n" \
+"                output both a patch and the diff-raw format.\n" \
 "  --name-only   show only names of changed files.\n" \
 "  --name-status show names and status of changed files.\n" \
 "  --full-index  show full object name on index lines.\n" \