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->ignore_merges = 1;
   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 void diff_merges_init_revs(struct rev_info *revs)
  25 {
  26         revs->ignore_merges = -1;
  27 }
  28
  29 int diff_merges_parse_opts(struct rev_info *revs, const char **argv)
  30 {
  31         int argcount = 1;
  32         const char *optarg;
  33         const char *arg = argv[0];
  34
  35         if (!strcmp(arg, "-m")) {
  36                 suppress(revs);
  37                 /*
  38                  * To "diff-index", "-m" means "match missing", and to the "log"
  39                  * family of commands, it means "show full diff for merges". Set
  40                  * both fields appropriately.
  41                  */
  42                 revs->ignore_merges = 0;
  43                 revs->match_missing = 1;
  44         } else if (!strcmp(arg, "-c")) {
  45                 revs->dense_combined_merges = 0;
  46                 revs->combine_merges = 1;
  47         } else if (!strcmp(arg, "--cc")) {
  48                 set_dense_combined(revs);
  49         } else if (!strcmp(arg, "--no-diff-merges")) {
  50                 suppress(revs);
  51         } else if (!strcmp(arg, "--combined-all-paths")) {
  52                 revs->combined_all_paths = 1;
  53         } else if ((argcount = parse_long_opt("diff-merges", argv, &optarg))) {
  54                 if (!strcmp(optarg, "off")) {
  55                         suppress(revs);
  56                 } else {
  57                         die(_("unknown value for --diff-merges: %s"), optarg);
  58                 }
  59         } else
  60                 argcount = 0;
  61
  62         return argcount;
  63 }
  64
  65 void diff_merges_suppress(struct rev_info *revs)
  66 {
  67         suppress(revs);
  68 }
  69
  70 void diff_merges_default_to_first_parent(struct rev_info *revs)
  71 {
  72         if (revs->ignore_merges < 0)            /* No -m */
  73                 revs->ignore_merges = 0;
  74         if (!revs->combine_merges)              /* No -c/--cc" */
  75                 revs->first_parent_merges = 1;
  76 }
  77
  78 void diff_merges_default_to_dense_combined(struct rev_info *revs)
  79 {
  80         if (revs->ignore_merges < 0) {          /* No -m */
  81                 revs->ignore_merges = 0;
  82                 if (!revs->combine_merges) {    /* No -c/--cc" */
  83                         revs->combine_merges = 1;
  84                         revs->dense_combined_merges = 1;
  85                 }
  86         }
  87 }
  88
  89 void diff_merges_set_dense_combined_if_unset(struct rev_info *revs)
  90 {
  91         if (!revs->combine_merges)
  92                 set_dense_combined(revs);
  93 }
  94
  95 void diff_merges_setup_revs(struct rev_info *revs)
  96 {
  97         if (revs->combine_merges && revs->ignore_merges < 0)
  98                 revs->ignore_merges = 0;
  99         if (revs->ignore_merges < 0)
 100                 revs->ignore_merges = 1;
 101         if (revs->combined_all_paths && !revs->combine_merges)
 102                 die("--combined-all-paths makes no sense without -c or --cc");
 103         if (revs->combine_merges) {
 104                 revs->diff = 1;
 105                 /* Turn --cc/-c into -p --cc/-c when -p was not given */
 106                 if (!revs->diffopt.output_format)
 107                         revs->diffopt.output_format = DIFF_FORMAT_PATCH;
 108         }
 109 }