combined-diff: use diffcore before intersecting paths.

[git.git] / combine-diff.c

diff --git a/combine-diff.c b/combine-diff.c
index 506c095..6d78305 100644 (file)
--- a/combine-diff.c
+++ b/combine-diff.c
@@ -8,8 +8,6 @@ static int uninteresting(struct diff_filepair *p)
 {
        if (diff_unmodified_pair(p))
                return 1;
-       if (!S_ISREG(p->one->mode) || !S_ISREG(p->two->mode))
-               return 1;
        return 0;
 }
 
@@ -226,6 +224,9 @@ static void combine_diff(const unsigned char *parent, const char *ourtmp,
        unsigned long nmask = (1UL << n);
        struct sline *lost_bucket = NULL;
 
+       if (!cnt)
+               return; /* result deleted */
+
        write_temp_blob(parent_tmp, parent);
        sprintf(cmd, "diff --unified=0 -La/x -Lb/x '%s' '%s'",
                parent_tmp, ourtmp);
@@ -542,6 +543,9 @@ static void dump_sline(struct sline *sline, unsigned long cnt, int num_parent)
        int i;
        unsigned long lno = 0;
 
+       if (!cnt)
+               return; /* result deleted */
+
        while (1) {
                struct sline *sl = &sline[lno];
                int hunk_end;
@@ -610,6 +614,8 @@ static void reuse_combine_diff(struct sline *sline, unsigned long cnt,
                        sline->flag |= imask;
                sline++;
        }
+       /* the overall size of the file (sline[cnt]) */
+       sline->p_lno[i] = sline->p_lno[j];
 }
 
 int show_combined_diff(struct combine_diff_path *elem, int num_parent,
@@ -665,27 +671,26 @@ int show_combined_diff(struct combine_diff_path *elem, int num_parent,
                if (*cp == '\n')
                        cnt++;
        }
-       if (result[size-1] != '\n')
+       if (size && result[size-1] != '\n')
                cnt++; /* incomplete line */
 
        sline = xcalloc(cnt+1, sizeof(*sline));
        ep = result;
        sline[0].bol = result;
+       for (lno = 0; lno <= cnt; lno++) {
+               sline[lno].lost_tail = &sline[lno].lost_head;
+               sline[lno].flag = 0;
+       }
        for (lno = 0, cp = result; cp - result < size; cp++) {
                if (*cp == '\n') {
-                       sline[lno].lost_tail = &sline[lno].lost_head;
                        sline[lno].len = cp - sline[lno].bol;
-                       sline[lno].flag = 0;
                        lno++;
                        if (lno < cnt)
                                sline[lno].bol = cp + 1;
                }
        }
-       if (result[size-1] != '\n') {
-               sline[cnt-1].lost_tail = &sline[cnt-1].lost_head;
+       if (size && result[size-1] != '\n')
                sline[cnt-1].len = size - (sline[cnt-1].bol - result);
-               sline[cnt-1].flag = 0;
-       }
 
        sline[0].p_lno = xcalloc((cnt+1) * num_parent, sizeof(unsigned long));
        for (lno = 0; lno < cnt; lno++)
@@ -750,7 +755,6 @@ int show_combined_diff(struct combine_diff_path *elem, int num_parent,
                        }
                        printf("..%06o\n", elem->mode);
                }
-               /* if (show_hunks) perhaps */
                dump_sline(sline, cnt, num_parent);
        }
        if (ourtmp == ourtmp_buf)
@@ -772,8 +776,52 @@ int show_combined_diff(struct combine_diff_path *elem, int num_parent,
        return shown_header;
 }
 
-int diff_tree_combined_merge(const unsigned char *sha1,
-                            const char *header, int dense)
+#define COLONS "::::::::::::::::::::::::::::::::"
+
+static void show_raw_diff(struct combine_diff_path *p, int num_parent, const char *header, struct diff_options *opt)
+{
+       int i, offset, mod_type = 'A';
+       const char *prefix;
+       int line_termination, inter_name_termination;
+
+       line_termination = opt->line_termination;
+       inter_name_termination = '\t';
+       if (!line_termination)
+               inter_name_termination = 0;
+
+       if (header)
+               puts(header);
+       offset = strlen(COLONS) - num_parent;
+       if (offset < 0)
+               offset = 0;
+       prefix = COLONS + offset;
+
+       /* Show the modes */
+       for (i = 0; i < num_parent; i++) {
+               int mode = p->parent[i].mode;
+               if (mode)
+                       mod_type = 'M';
+               printf("%s%06o", prefix, mode);
+               prefix = " ";
+       }
+       printf("%s%06o", prefix, p->mode);
+       if (!p->mode)
+               mod_type = 'D';
+
+       /* Show sha1's */
+       for (i = 0; i < num_parent; i++) {
+               printf("%s%s", prefix, diff_unique_abbrev(p->parent[i].sha1, opt->abbrev));
+               prefix = " ";
+       }
+       printf("%s%s", prefix, diff_unique_abbrev(p->sha1, opt->abbrev));
+
+       /* Modification type, terminations, filename */
+       printf(" %c%c%s%c", mod_type, inter_name_termination, p->path, line_termination);
+}
+
+const char *diff_tree_combined_merge(const unsigned char *sha1,
+                            const char *header, int dense,
+                            struct diff_options *opt)
 {
        struct commit *commit = lookup_commit(sha1);
        struct diff_options diffopts;
@@ -781,7 +829,7 @@ int diff_tree_combined_merge(const unsigned char *sha1,
        struct combine_diff_path *p, *paths = NULL;
        int num_parent, i, num_paths;
 
-       diff_setup(&diffopts);
+       diffopts = *opt;
        diffopts.output_format = DIFF_FORMAT_NO_OUTPUT;
        diffopts.recursive = 1;
 
@@ -798,6 +846,7 @@ int diff_tree_combined_merge(const unsigned char *sha1,
                struct commit *parent = parents->item;
                diff_tree_sha1(parent->object.sha1, commit->object.sha1, "",
                               &diffopts);
+               diffcore_std(&diffopts);
                paths = intersect_paths(paths, i, num_parent);
                diff_flush(&diffopts);
        }
@@ -811,6 +860,11 @@ int diff_tree_combined_merge(const unsigned char *sha1,
                for (p = paths; p; p = p->next) {
                        if (!p->len)
                                continue;
+                       if (opt->output_format == DIFF_FORMAT_RAW) {
+                               show_raw_diff(p, num_parent, header, opt);
+                               header = NULL;
+                               continue;
+                       }
                        if (show_combined_diff(p, num_parent, dense, header))
                                header = NULL;
                }
@@ -822,5 +876,5 @@ int diff_tree_combined_merge(const unsigned char *sha1,
                paths = paths->next;
                free(tmp);
        }
-       return 0;
+       return header;
 }