strmap: enable allocations to come from a mem_pool

[thirdparty/git.git] / diff.c

diff --git a/diff.c b/diff.c
index e3a5ee3bee8c93f1480747891cadaa824f259262..8e0e59f5cf793ebd06e8a029d295689273b19d48 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -482,14 +482,14 @@ int git_diff_basic_config(const char *var, const char *value, void *cb)
 
 static char *quote_two(const char *one, const char *two)
 {
-       int need_one = quote_c_style(one, NULL, NULL, 1);
-       int need_two = quote_c_style(two, NULL, NULL, 1);
+       int need_one = quote_c_style(one, NULL, NULL, CQUOTE_NODQ);
+       int need_two = quote_c_style(two, NULL, NULL, CQUOTE_NODQ);
        struct strbuf res = STRBUF_INIT;
 
        if (need_one + need_two) {
                strbuf_addch(&res, '"');
-               quote_c_style(one, &res, NULL, 1);
-               quote_c_style(two, &res, NULL, 1);
+               quote_c_style(one, &res, NULL, CQUOTE_NODQ);
+               quote_c_style(two, &res, NULL, CQUOTE_NODQ);
                strbuf_addch(&res, '"');
        } else {
                strbuf_addstr(&res, one);
@@ -3153,16 +3153,19 @@ static void show_dirstat_by_line(struct diffstat_t *data, struct diff_options *o
        gather_dirstat(options, &dir, changed, "", 0);
 }
 
+static void free_diffstat_file(struct diffstat_file *f)
+{
+       free(f->print_name);
+       free(f->name);
+       free(f->from_name);
+       free(f);
+}
+
 void free_diffstat_info(struct diffstat_t *diffstat)
 {
        int i;
-       for (i = 0; i < diffstat->nr; i++) {
-               struct diffstat_file *f = diffstat->files[i];
-               free(f->print_name);
-               free(f->name);
-               free(f->from_name);
-               free(f);
-       }
+       for (i = 0; i < diffstat->nr; i++)
+               free_diffstat_file(diffstat->files[i]);
        free(diffstat->files);
 }
 
@@ -3429,7 +3432,7 @@ static void builtin_diff(const char *name_a,
        if (o->submodule_format == DIFF_SUBMODULE_LOG &&
            (!one->mode || S_ISGITLINK(one->mode)) &&
            (!two->mode || S_ISGITLINK(two->mode))) {
-               show_submodule_summary(o, one->path ? one->path : two->path,
+               show_submodule_diff_summary(o, one->path ? one->path : two->path,
                                &one->oid, &two->oid,
                                two->dirty_submodule);
                return;
@@ -3660,7 +3663,7 @@ static void builtin_diffstat(const char *name_a, const char *name_b,
 {
        mmfile_t mf1, mf2;
        struct diffstat_file *data;
-       int same_contents;
+       int may_differ;
        int complete_rewrite = 0;
 
        if (!DIFF_PAIR_UNMERGED(p)) {
@@ -3678,12 +3681,14 @@ static void builtin_diffstat(const char *name_a, const char *name_b,
                return;
        }
 
-       same_contents = oideq(&one->oid, &two->oid);
+       /* saves some reads if true, not a guarantee of diff outcome */
+       may_differ = !(one->oid_valid && two->oid_valid &&
+                       oideq(&one->oid, &two->oid));
 
        if (diff_filespec_is_binary(o->repo, one) ||
            diff_filespec_is_binary(o->repo, two)) {
                data->is_binary = 1;
-               if (same_contents) {
+               if (!may_differ) {
                        data->added = 0;
                        data->deleted = 0;
                } else {
@@ -3699,7 +3704,7 @@ static void builtin_diffstat(const char *name_a, const char *name_b,
                data->added = count_lines(two->data, two->size);
        }
 
-       else if (!same_contents) {
+       else if (may_differ) {
                /* Crazy xdl interfaces.. */
                xpparam_t xpp;
                xdemitconf_t xecfg;
@@ -3718,6 +3723,27 @@ static void builtin_diffstat(const char *name_a, const char *name_b,
                if (xdi_diff_outf(&mf1, &mf2, discard_hunk_line,
                                  diffstat_consume, diffstat, &xpp, &xecfg))
                        die("unable to generate diffstat for %s", one->path);
+
+               if (DIFF_FILE_VALID(one) && DIFF_FILE_VALID(two)) {
+                       struct diffstat_file *file =
+                               diffstat->files[diffstat->nr - 1];
+                       /*
+                        * Omit diffstats of modified files where nothing changed.
+                        * Even if may_differ, this might be the case due to
+                        * ignoring whitespace changes, etc.
+                        *
+                        * But note that we special-case additions, deletions,
+                        * renames, and mode changes as adding an empty file,
+                        * for example is still of interest.
+                        */
+                       if ((p->status == DIFF_STATUS_MODIFIED)
+                               && !file->added
+                               && !file->deleted
+                               && one->mode == two->mode) {
+                               free_diffstat_file(file);
+                               diffstat->nr--;
+                       }
+               }
        }
 
        diff_free_filespec_data(one);
@@ -6263,9 +6289,9 @@ static void diff_flush_patch_all_file_pairs(struct diff_options *o)
                        if (o->color_moved == COLOR_MOVED_ZEBRA_DIM)
                                dim_moved_lines(o);
 
-                       hashmap_free_entries(&add_lines, struct moved_entry,
+                       hashmap_clear_and_free(&add_lines, struct moved_entry,
                                                ent);
-                       hashmap_free_entries(&del_lines, struct moved_entry,
+                       hashmap_clear_and_free(&del_lines, struct moved_entry,
                                                ent);
                }