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