diff-merges.c

   1 #include "diff-merges.h"
   2
   3 #include "revision.h"
   4
   5 /*
   6  * Public functions. They are in the order they are called.
   7  */
   8
   9 void diff_merges_init_revs(struct rev_info *revs)
  10 {
  11         revs->ignore_merges = -1;
  12 }
  13
  14 int diff_merges_parse_opts(struct rev_info *revs, const char **argv)
  15 {
  16         int argcount = 1;
  17         const char *optarg;
  18         const char *arg = argv[0];
  19
  20         if (!strcmp(arg, "-m")) {
  21                 /*
  22                  * To "diff-index", "-m" means "match missing", and to the "log"
  23                  * family of commands, it means "show full diff for merges". Set
  24                  * both fields appropriately.
  25                  */
  26                 revs->ignore_merges = 0;
  27                 revs->match_missing = 1;
  28         } else if (!strcmp(arg, "-c")) {
  29                 revs->diff = 1;
  30                 revs->dense_combined_merges = 0;
  31                 revs->combine_merges = 1;
  32         } else if (!strcmp(arg, "--cc")) {
  33                 revs->diff = 1;
  34                 revs->dense_combined_merges = 1;
  35                 revs->combine_merges = 1;
  36         } else if (!strcmp(arg, "--no-diff-merges")) {
  37                 revs->ignore_merges = 1;
  38         } else if (!strcmp(arg, "--combined-all-paths")) {
  39                 revs->diff = 1;
  40                 revs->combined_all_paths = 1;
  41         } else if ((argcount = parse_long_opt("diff-merges", argv, &optarg))) {
  42                 if (!strcmp(optarg, "off")) {
  43                         revs->ignore_merges = 1;
  44                 } else {
  45                         die(_("unknown value for --diff-merges: %s"), optarg);
  46                 }
  47         } else
  48                 argcount = 0;
  49
  50         return argcount;
  51 }
  52
  53 void diff_merges_default_to_first_parent(struct rev_info *revs)
  54 {
  55         if (revs->ignore_merges < 0)            /* No -m */
  56                 revs->ignore_merges = 0;
  57 }
  58
  59 void diff_merges_default_to_dense_combined(struct rev_info *revs)
  60 {
  61         if (revs->ignore_merges < 0) {          /* No -m */
  62                 revs->ignore_merges = 0;
  63                 if (!revs->combine_merges) {    /* No -c/--cc" */
  64                         revs->combine_merges = 1;
  65                         revs->dense_combined_merges = 1;
  66                 }
  67         }
  68 }
  69
  70 void diff_merges_setup_revs(struct rev_info *revs)
  71 {
  72         if (revs->combine_merges && revs->ignore_merges < 0)
  73                 revs->ignore_merges = 0;
  74         if (revs->ignore_merges < 0)
  75                 revs->ignore_merges = 1;
  76         if (revs->combined_all_paths && !revs->combine_merges)
  77                 die("--combined-all-paths makes no sense without -c or --cc");
  78 }