diff-merges.c

   1 #include "diff-merges.h"
   2
   3 #include "revision.h"
   4
   5 static void suppress(struct rev_info *revs)
   6 {
   7         revs->separate_merges = 0;
   8         revs->first_parent_merges = 0;
   9         revs->combine_merges = 0;
  10         revs->dense_combined_merges = 0;
  11 }
  12
  13 static void set_dense_combined(struct rev_info *revs)
  14 {
  15         revs->combine_merges = 1;
  16         revs->dense_combined_merges = 1;
  17 }
  18
  19
  20 /*
  21  * Public functions. They are in the order they are called.
  22  */
  23
  24 int diff_merges_parse_opts(struct rev_info *revs, const char **argv)
  25 {
  26         int argcount = 1;
  27         const char *optarg;
  28         const char *arg = argv[0];
  29
  30         if (!strcmp(arg, "-m")) {
  31                 suppress(revs);
  32                 /*
  33                  * To "diff-index", "-m" means "match missing", and to the "log"
  34                  * family of commands, it means "show full diff for merges". Set
  35                  * both fields appropriately.
  36                  */
  37                 revs->separate_merges = 1;
  38                 revs->match_missing = 1;
  39         } else if (!strcmp(arg, "-c")) {
  40                 revs->dense_combined_merges = 0;
  41                 revs->combine_merges = 1;
  42         } else if (!strcmp(arg, "--cc")) {
  43                 set_dense_combined(revs);
  44         } else if (!strcmp(arg, "--no-diff-merges")) {
  45                 suppress(revs);
  46         } else if (!strcmp(arg, "--combined-all-paths")) {
  47                 revs->combined_all_paths = 1;
  48         } else if ((argcount = parse_long_opt("diff-merges", argv, &optarg))) {
  49                 if (!strcmp(optarg, "off")) {
  50                         suppress(revs);
  51                 } else {
  52                         die(_("unknown value for --diff-merges: %s"), optarg);
  53                 }
  54         } else
  55                 return 0;
  56
  57         revs->explicit_diff_merges = 1;
  58         return argcount;
  59 }
  60
  61 void diff_merges_suppress(struct rev_info *revs)
  62 {
  63         suppress(revs);
  64 }
  65
  66 void diff_merges_default_to_first_parent(struct rev_info *revs)
  67 {
  68         if (!revs->explicit_diff_merges)
  69                 revs->separate_merges = 1;
  70         if (revs->separate_merges)
  71                 revs->first_parent_merges = 1;
  72 }
  73
  74 void diff_merges_default_to_dense_combined(struct rev_info *revs)
  75 {
  76         if (!revs->explicit_diff_merges)
  77                 set_dense_combined(revs);
  78 }
  79
  80 void diff_merges_set_dense_combined_if_unset(struct rev_info *revs)
  81 {
  82         if (!revs->combine_merges)
  83                 set_dense_combined(revs);
  84 }
  85
  86 void diff_merges_setup_revs(struct rev_info *revs)
  87 {
  88         if (revs->combine_merges == 0)
  89                 revs->dense_combined_merges = 0;
  90         if (revs->separate_merges == 0)
  91                 revs->first_parent_merges = 0;
  92         if (revs->combined_all_paths && !revs->combine_merges)
  93                 die("--combined-all-paths makes no sense without -c or --cc");
  94         if (revs->combine_merges) {
  95                 revs->diff = 1;
  96                 /* Turn --cc/-c into -p --cc/-c when -p was not given */
  97                 if (!revs->diffopt.output_format)
  98                         revs->diffopt.output_format = DIFF_FORMAT_PATCH;
  99         }
 100 }