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         revs->combined_all_paths = 0;
  12         revs->combined_imply_patch = 0;
  13 }
  14
  15 static void set_separate(struct rev_info *revs)
  16 {
  17         suppress(revs);
  18         revs->separate_merges = 1;
  19 }
  20
  21 static void set_first_parent(struct rev_info *revs)
  22 {
  23         set_separate(revs);
  24         revs->first_parent_merges = 1;
  25 }
  26
  27 static void set_m(struct rev_info *revs)
  28 {
  29         /*
  30          * To "diff-index", "-m" means "match missing", and to the "log"
  31          * family of commands, it means "show full diff for merges". Set
  32          * both fields appropriately.
  33          */
  34         set_separate(revs);
  35         revs->match_missing = 1;
  36 }
  37
  38 static void set_combined(struct rev_info *revs)
  39 {
  40         suppress(revs);
  41         revs->combine_merges = 1;
  42         revs->dense_combined_merges = 0;
  43 }
  44
  45 static void set_dense_combined(struct rev_info *revs)
  46 {
  47         suppress(revs);
  48         revs->combine_merges = 1;
  49         revs->dense_combined_merges = 1;
  50 }
  51
  52 static void set_diff_merges(struct rev_info *revs, const char *optarg)
  53 {
  54         if (!strcmp(optarg, "off") || !strcmp(optarg, "none"))
  55                 suppress(revs);
  56         else if (!strcmp(optarg, "first-parent"))
  57                 set_first_parent(revs);
  58         else if (!strcmp(optarg, "separate"))
  59                 set_separate(revs);
  60         else if (!strcmp(optarg, "combined"))
  61                 set_combined(revs);
  62         else if (!strcmp(optarg, "dense-combined"))
  63                 set_dense_combined(revs);
  64         else
  65                 die(_("unknown value for --diff-merges: %s"), optarg);
  66 }
  67
  68 /*
  69  * Public functions. They are in the order they are called.
  70  */
  71
  72 int diff_merges_parse_opts(struct rev_info *revs, const char **argv)
  73 {
  74         int argcount = 1;
  75         const char *optarg;
  76         const char *arg = argv[0];
  77
  78         if (!strcmp(arg, "-m")) {
  79                 set_m(revs);
  80         } else if (!strcmp(arg, "-c")) {
  81                 set_combined(revs);
  82                 revs->combined_imply_patch = 1;
  83         } else if (!strcmp(arg, "--cc")) {
  84                 set_dense_combined(revs);
  85                 revs->combined_imply_patch = 1;
  86         } else if (!strcmp(arg, "--no-diff-merges")) {
  87                 suppress(revs);
  88         } else if (!strcmp(arg, "--combined-all-paths")) {
  89                 revs->combined_all_paths = 1;
  90         } else if ((argcount = parse_long_opt("diff-merges", argv, &optarg))) {
  91                 set_diff_merges(revs, optarg);
  92         } else
  93                 return 0;
  94
  95         revs->explicit_diff_merges = 1;
  96         return argcount;
  97 }
  98
  99 void diff_merges_suppress(struct rev_info *revs)
 100 {
 101         suppress(revs);
 102 }
 103
 104 void diff_merges_default_to_first_parent(struct rev_info *revs)
 105 {
 106         if (!revs->explicit_diff_merges)
 107                 revs->separate_merges = 1;
 108         if (revs->separate_merges)
 109                 revs->first_parent_merges = 1;
 110 }
 111
 112 void diff_merges_default_to_dense_combined(struct rev_info *revs)
 113 {
 114         if (!revs->explicit_diff_merges)
 115                 set_dense_combined(revs);
 116 }
 117
 118 void diff_merges_set_dense_combined_if_unset(struct rev_info *revs)
 119 {
 120         if (!revs->combine_merges)
 121                 set_dense_combined(revs);
 122 }
 123
 124 void diff_merges_setup_revs(struct rev_info *revs)
 125 {
 126         if (revs->combine_merges == 0)
 127                 revs->dense_combined_merges = 0;
 128         if (revs->separate_merges == 0)
 129                 revs->first_parent_merges = 0;
 130         if (revs->combined_all_paths && !revs->combine_merges)
 131                 die("--combined-all-paths makes no sense without -c or --cc");
 132         if (revs->combine_merges)
 133                 revs->diff = 1;
 134         if (revs->combined_imply_patch) {
 135                 /* Turn --cc/-c into -p --cc/-c when -p was not given */
 136                 if (!revs->diffopt.output_format)
 137                         revs->diffopt.output_format = DIFF_FORMAT_PATCH;
 138         }
 139 }