Merge git-gui into ml/git-gui-exec-path-fix

[thirdparty/git.git] / diff-merges.c

diff --git a/diff-merges.c b/diff-merges.c
index 5060ccd890bd307b1276e367e3b70872718e3af7..ec97616db1dfaa0673945bb08a9f364b2d570db1 100644 (file)
--- a/diff-merges.c
+++ b/diff-merges.c
@@ -1,5 +1,7 @@
+#include "git-compat-util.h"
 #include "diff-merges.h"
 
+#include "gettext.h"
 #include "revision.h"
 
 typedef void (*diff_merges_setup_func_t)(struct rev_info *);
@@ -17,12 +19,25 @@ static void suppress(struct rev_info *revs)
        revs->combined_all_paths = 0;
        revs->merges_imply_patch = 0;
        revs->merges_need_diff = 0;
+       revs->remerge_diff = 0;
 }
 
-static void set_separate(struct rev_info *revs)
+static void common_setup(struct rev_info *revs)
+{
+       suppress(revs);
+       revs->merges_need_diff = 1;
+}
+
+static void set_none(struct rev_info *revs)
 {
        suppress(revs);
+}
+
+static void set_separate(struct rev_info *revs)
+{
+       common_setup(revs);
        revs->separate_merges = 1;
+       revs->simplify_history = 0;
 }
 
 static void set_first_parent(struct rev_info *revs)
@@ -33,31 +48,40 @@ static void set_first_parent(struct rev_info *revs)
 
 static void set_combined(struct rev_info *revs)
 {
-       suppress(revs);
+       common_setup(revs);
        revs->combine_merges = 1;
        revs->dense_combined_merges = 0;
 }
 
 static void set_dense_combined(struct rev_info *revs)
 {
-       suppress(revs);
+       common_setup(revs);
        revs->combine_merges = 1;
        revs->dense_combined_merges = 1;
 }
 
+static void set_remerge_diff(struct rev_info *revs)
+{
+       common_setup(revs);
+       revs->remerge_diff = 1;
+       revs->simplify_history = 0;
+}
+
 static diff_merges_setup_func_t func_by_opt(const char *optarg)
 {
        if (!strcmp(optarg, "off") || !strcmp(optarg, "none"))
-               return suppress;
+               return set_none;
        if (!strcmp(optarg, "1") || !strcmp(optarg, "first-parent"))
                return set_first_parent;
-       else if (!strcmp(optarg, "separate"))
+       if (!strcmp(optarg, "separate"))
                return set_separate;
-       else if (!strcmp(optarg, "c") || !strcmp(optarg, "combined"))
+       if (!strcmp(optarg, "c") || !strcmp(optarg, "combined"))
                return set_combined;
-       else if (!strcmp(optarg, "cc") || !strcmp(optarg, "dense-combined"))
+       if (!strcmp(optarg, "cc") || !strcmp(optarg, "dense-combined"))
                return set_dense_combined;
-       else if (!strcmp(optarg, "m") || !strcmp(optarg, "on"))
+       if (!strcmp(optarg, "r") || !strcmp(optarg, "remerge"))
+               return set_remerge_diff;
+       if (!strcmp(optarg, "m") || !strcmp(optarg, "on"))
                return set_to_default;
        return NULL;
 }
@@ -67,13 +91,9 @@ static void set_diff_merges(struct rev_info *revs, const char *optarg)
        diff_merges_setup_func_t func = func_by_opt(optarg);
 
        if (!func)
-               die(_("unknown value for --diff-merges: %s"), optarg);
+               die(_("invalid value for '%s': '%s'"), "--diff-merges", optarg);
 
        func(revs);
-
-       /* NOTE: the merges_need_diff flag is cleared by func() call */
-       if (func != suppress)
-               revs->merges_need_diff = 1;
 }
 
 /*
@@ -104,14 +124,18 @@ int diff_merges_parse_opts(struct rev_info *revs, const char **argv)
 
        if (!suppress_m_parsing && !strcmp(arg, "-m")) {
                set_to_default(revs);
+               revs->merges_need_diff = 0;
        } else if (!strcmp(arg, "-c")) {
                set_combined(revs);
                revs->merges_imply_patch = 1;
        } else if (!strcmp(arg, "--cc")) {
                set_dense_combined(revs);
                revs->merges_imply_patch = 1;
+       } else if (!strcmp(arg, "--remerge-diff")) {
+               set_remerge_diff(revs);
+               revs->merges_imply_patch = 1;
        } else if (!strcmp(arg, "--no-diff-merges")) {
-               suppress(revs);
+               set_none(revs);
        } else if (!strcmp(arg, "--combined-all-paths")) {
                revs->combined_all_paths = 1;
        } else if ((argcount = parse_long_opt("diff-merges", argv, &optarg))) {
@@ -125,7 +149,7 @@ int diff_merges_parse_opts(struct rev_info *revs, const char **argv)
 
 void diff_merges_suppress(struct rev_info *revs)
 {
-       suppress(revs);
+       set_none(revs);
 }
 
 void diff_merges_default_to_first_parent(struct rev_info *revs)