Merge branch 'js/read-tree' into js/c-merge-recursive

[git.git] / combine-diff.c

diff --git a/combine-diff.c b/combine-diff.c
index 22542217ee6aeba5058d02d99b27e20ca894af7f..919112bba9271a8e3903b06946cf91036411f1a4 100644 (file)
--- a/combine-diff.c
+++ b/combine-diff.c
@@ -320,7 +320,7 @@ static int give_context(struct sline *sline, unsigned long cnt, int num_parent)
        unsigned long i;
 
        /* Two groups of interesting lines may have a short gap of
-        * unintersting lines.  Connect such groups to give them a
+        * uninteresting lines.  Connect such groups to give them a
         * bit of context.
         *
         * We first start from what the interesting() function says,
@@ -639,8 +639,7 @@ static int show_patch_diff(struct combine_diff_path *elem, int num_parent,
                        /* deleted file */
                        result_size = 0;
                        elem->mode = 0;
-                       result = xmalloc(1);
-                       result[0] = 0;
+                       result = xcalloc(1, 1);
                }
                if (0 <= fd)
                        close(fd);
@@ -702,7 +701,7 @@ static int show_patch_diff(struct combine_diff_path *elem, int num_parent,
                const char *abb;
 
                if (rev->loginfo)
-                       show_log(rev, rev->loginfo, "\n");
+                       show_log(rev, opt->msg_sep);
                dump_quoted_path(dense ? "diff --cc " : "diff --combined ", elem->path);
                printf("index ");
                for (i = 0; i < num_parent; i++) {
@@ -770,9 +769,9 @@ static void show_raw_diff(struct combine_diff_path *p, int num_parent, struct re
                inter_name_termination = 0;
 
        if (rev->loginfo)
-               show_log(rev, rev->loginfo, "\n");
+               show_log(rev, opt->msg_sep);
 
-       if (opt->output_format == DIFF_FORMAT_RAW) {
+       if (opt->output_format & DIFF_FORMAT_RAW) {
                offset = strlen(COLONS) - num_parent;
                if (offset < 0)
                        offset = 0;
@@ -792,8 +791,7 @@ static void show_raw_diff(struct combine_diff_path *p, int num_parent, struct re
                printf(" %s ", diff_unique_abbrev(p->sha1, opt->abbrev));
        }
 
-       if (opt->output_format == DIFF_FORMAT_RAW ||
-           opt->output_format == DIFF_FORMAT_NAME_STATUS) {
+       if (opt->output_format & (DIFF_FORMAT_RAW | DIFF_FORMAT_NAME_STATUS)) {
                for (i = 0; i < num_parent; i++)
                        putchar(p->parent[i].status);
                putchar(inter_name_termination);
@@ -819,17 +817,12 @@ void show_combined_diff(struct combine_diff_path *p,
        struct diff_options *opt = &rev->diffopt;
        if (!p->len)
                return;
-       switch (opt->output_format) {
-       case DIFF_FORMAT_RAW:
-       case DIFF_FORMAT_NAME_STATUS:
-       case DIFF_FORMAT_NAME:
+       if (opt->output_format & (DIFF_FORMAT_RAW |
+                                 DIFF_FORMAT_NAME |
+                                 DIFF_FORMAT_NAME_STATUS)) {
                show_raw_diff(p, num_parent, rev);
-               return;
-       case DIFF_FORMAT_PATCH:
+       } else if (opt->output_format & DIFF_FORMAT_PATCH) {
                show_patch_diff(p, num_parent, dense, rev);
-               return;
-       default:
-               return;
        }
 }
 
@@ -842,22 +835,20 @@ void diff_tree_combined(const unsigned char *sha1,
        struct diff_options *opt = &rev->diffopt;
        struct diff_options diffopts;
        struct combine_diff_path *p, *paths = NULL;
-       int i, num_paths;
-       int do_diffstat;
+       int i, num_paths, needsep, show_log_first;
 
-       do_diffstat = (opt->output_format == DIFF_FORMAT_DIFFSTAT ||
-                      opt->with_stat);
        diffopts = *opt;
-       diffopts.with_raw = 0;
-       diffopts.with_stat = 0;
+       diffopts.output_format = DIFF_FORMAT_NO_OUTPUT;
        diffopts.recursive = 1;
 
+       show_log_first = !!rev->loginfo;
+       needsep = 0;
        /* find set of paths that everybody touches */
        for (i = 0; i < num_parent; i++) {
                /* show stat against the first parent even
                 * when doing combined diff.
                 */
-               if (i == 0 && do_diffstat)
+               if (i == 0 && opt->output_format & DIFF_FORMAT_DIFFSTAT)
                        diffopts.output_format = DIFF_FORMAT_DIFFSTAT;
                else
                        diffopts.output_format = DIFF_FORMAT_NO_OUTPUT;
@@ -865,12 +856,12 @@ void diff_tree_combined(const unsigned char *sha1,
                diffcore_std(&diffopts);
                paths = intersect_paths(paths, i, num_parent);
 
-               if (do_diffstat && rev->loginfo)
-                       show_log(rev, rev->loginfo,
-                                opt->with_stat ? "---\n" : "\n");
+               if (show_log_first && i == 0) {
+                       show_log(rev, opt->msg_sep);
+                       if (rev->verbose_header && opt->output_format)
+                               putchar(opt->line_termination);
+               }
                diff_flush(&diffopts);
-               if (opt->with_stat)
-                       putchar('\n');
        }
 
        /* find out surviving paths */
@@ -879,17 +870,25 @@ void diff_tree_combined(const unsigned char *sha1,
                        num_paths++;
        }
        if (num_paths) {
-               if (opt->with_raw) {
-                       int saved_format = opt->output_format;
-                       opt->output_format = DIFF_FORMAT_RAW;
+               if (opt->output_format & (DIFF_FORMAT_RAW |
+                                         DIFF_FORMAT_NAME |
+                                         DIFF_FORMAT_NAME_STATUS)) {
                        for (p = paths; p; p = p->next) {
-                               show_combined_diff(p, num_parent, dense, rev);
+                               if (p->len)
+                                       show_raw_diff(p, num_parent, rev);
                        }
-                       opt->output_format = saved_format;
-                       putchar(opt->line_termination);
+                       needsep = 1;
                }
-               for (p = paths; p; p = p->next) {
-                       show_combined_diff(p, num_parent, dense, rev);
+               else if (opt->output_format & DIFF_FORMAT_DIFFSTAT)
+                       needsep = 1;
+               if (opt->output_format & DIFF_FORMAT_PATCH) {
+                       if (needsep)
+                               putchar(opt->line_termination);
+                       for (p = paths; p; p = p->next) {
+                               if (p->len)
+                                       show_patch_diff(p, num_parent, dense,
+                                                       rev);
+                       }
                }
        }