]>
Commit | Line | Data |
---|---|---|
a37eec63 SO |
1 | #include "diff-merges.h" |
2 | ||
3 | #include "revision.h" | |
4 | ||
4320815e SO |
5 | typedef void (*diff_merges_setup_func_t)(struct rev_info *); |
6 | static void set_separate(struct rev_info *revs); | |
7 | ||
8 | static diff_merges_setup_func_t set_to_default = set_separate; | |
5acffd34 | 9 | static int suppress_m_parsing; |
4320815e | 10 | |
09322b1d SO |
11 | static void suppress(struct rev_info *revs) |
12 | { | |
1a2c4d80 | 13 | revs->separate_merges = 0; |
09322b1d SO |
14 | revs->first_parent_merges = 0; |
15 | revs->combine_merges = 0; | |
16 | revs->dense_combined_merges = 0; | |
255a4dac | 17 | revs->combined_all_paths = 0; |
fd16a399 | 18 | revs->merges_imply_patch = 0; |
a6d19ecc | 19 | revs->merges_need_diff = 0; |
db757e8b | 20 | revs->remerge_diff = 0; |
09322b1d SO |
21 | } |
22 | ||
3d2b5f2f SO |
23 | static void set_separate(struct rev_info *revs) |
24 | { | |
25 | suppress(revs); | |
26 | revs->separate_merges = 1; | |
0dec322d | 27 | revs->simplify_history = 0; |
3d2b5f2f SO |
28 | } |
29 | ||
8c0ba528 SO |
30 | static void set_first_parent(struct rev_info *revs) |
31 | { | |
32 | set_separate(revs); | |
33 | revs->first_parent_merges = 1; | |
34 | } | |
35 | ||
3d2b5f2f SO |
36 | static void set_combined(struct rev_info *revs) |
37 | { | |
255a4dac | 38 | suppress(revs); |
3d2b5f2f SO |
39 | revs->combine_merges = 1; |
40 | revs->dense_combined_merges = 0; | |
41 | } | |
42 | ||
3b6c17b5 SO |
43 | static void set_dense_combined(struct rev_info *revs) |
44 | { | |
255a4dac | 45 | suppress(revs); |
3b6c17b5 SO |
46 | revs->combine_merges = 1; |
47 | revs->dense_combined_merges = 1; | |
48 | } | |
49 | ||
db757e8b EN |
50 | static void set_remerge_diff(struct rev_info *revs) |
51 | { | |
52 | suppress(revs); | |
53 | revs->remerge_diff = 1; | |
0dec322d | 54 | revs->simplify_history = 0; |
db757e8b EN |
55 | } |
56 | ||
26a0f58d | 57 | static diff_merges_setup_func_t func_by_opt(const char *optarg) |
3d2b5f2f | 58 | { |
26a0f58d SO |
59 | if (!strcmp(optarg, "off") || !strcmp(optarg, "none")) |
60 | return suppress; | |
388091fe | 61 | if (!strcmp(optarg, "1") || !strcmp(optarg, "first-parent")) |
26a0f58d | 62 | return set_first_parent; |
38fc4dbb | 63 | else if (!strcmp(optarg, "separate")) |
26a0f58d | 64 | return set_separate; |
5071c753 | 65 | else if (!strcmp(optarg, "c") || !strcmp(optarg, "combined")) |
26a0f58d | 66 | return set_combined; |
5071c753 | 67 | else if (!strcmp(optarg, "cc") || !strcmp(optarg, "dense-combined")) |
26a0f58d | 68 | return set_dense_combined; |
db757e8b EN |
69 | else if (!strcmp(optarg, "r") || !strcmp(optarg, "remerge")) |
70 | return set_remerge_diff; | |
38fc4dbb | 71 | else if (!strcmp(optarg, "m") || !strcmp(optarg, "on")) |
26a0f58d SO |
72 | return set_to_default; |
73 | return NULL; | |
74 | } | |
75 | ||
76 | static void set_diff_merges(struct rev_info *revs, const char *optarg) | |
77 | { | |
78 | diff_merges_setup_func_t func = func_by_opt(optarg); | |
79 | ||
80 | if (!func) | |
1a8aea85 | 81 | die(_("invalid value for '%s': '%s'"), "--diff-merges", optarg); |
a6d19ecc | 82 | |
26a0f58d SO |
83 | func(revs); |
84 | ||
85 | /* NOTE: the merges_need_diff flag is cleared by func() call */ | |
86 | if (func != suppress) | |
87 | revs->merges_need_diff = 1; | |
3d2b5f2f | 88 | } |
3b6c17b5 | 89 | |
564a4fc8 SO |
90 | /* |
91 | * Public functions. They are in the order they are called. | |
92 | */ | |
93 | ||
17c13e60 SO |
94 | int diff_merges_config(const char *value) |
95 | { | |
96 | diff_merges_setup_func_t func = func_by_opt(value); | |
97 | ||
98 | if (!func) | |
99 | return -1; | |
100 | ||
101 | set_to_default = func; | |
102 | return 0; | |
103 | } | |
104 | ||
5acffd34 | 105 | void diff_merges_suppress_m_parsing(void) |
19b2517f | 106 | { |
5acffd34 | 107 | suppress_m_parsing = 1; |
19b2517f SO |
108 | } |
109 | ||
18f09473 | 110 | int diff_merges_parse_opts(struct rev_info *revs, const char **argv) |
a37eec63 SO |
111 | { |
112 | int argcount = 1; | |
113 | const char *optarg; | |
114 | const char *arg = argv[0]; | |
115 | ||
5acffd34 | 116 | if (!suppress_m_parsing && !strcmp(arg, "-m")) { |
19b2517f | 117 | set_to_default(revs); |
5733b20f | 118 | } else if (!strcmp(arg, "-c")) { |
3d2b5f2f | 119 | set_combined(revs); |
fd16a399 | 120 | revs->merges_imply_patch = 1; |
5733b20f | 121 | } else if (!strcmp(arg, "--cc")) { |
3b6c17b5 | 122 | set_dense_combined(revs); |
fd16a399 | 123 | revs->merges_imply_patch = 1; |
db757e8b EN |
124 | } else if (!strcmp(arg, "--remerge-diff")) { |
125 | set_remerge_diff(revs); | |
126 | revs->merges_imply_patch = 1; | |
5733b20f | 127 | } else if (!strcmp(arg, "--no-diff-merges")) { |
09322b1d | 128 | suppress(revs); |
5733b20f | 129 | } else if (!strcmp(arg, "--combined-all-paths")) { |
a37eec63 | 130 | revs->combined_all_paths = 1; |
5733b20f | 131 | } else if ((argcount = parse_long_opt("diff-merges", argv, &optarg))) { |
3d2b5f2f | 132 | set_diff_merges(revs, optarg); |
5733b20f | 133 | } else |
1a2c4d80 | 134 | return 0; |
a37eec63 | 135 | |
1a2c4d80 | 136 | revs->explicit_diff_merges = 1; |
a37eec63 SO |
137 | return argcount; |
138 | } | |
139 | ||
09322b1d SO |
140 | void diff_merges_suppress(struct rev_info *revs) |
141 | { | |
142 | suppress(revs); | |
143 | } | |
144 | ||
4f54544d | 145 | void diff_merges_default_to_first_parent(struct rev_info *revs) |
a37eec63 | 146 | { |
1a2c4d80 SO |
147 | if (!revs->explicit_diff_merges) |
148 | revs->separate_merges = 1; | |
149 | if (revs->separate_merges) | |
3291eea3 | 150 | revs->first_parent_merges = 1; |
a37eec63 SO |
151 | } |
152 | ||
18f09473 | 153 | void diff_merges_default_to_dense_combined(struct rev_info *revs) |
a37eec63 | 154 | { |
1a2c4d80 SO |
155 | if (!revs->explicit_diff_merges) |
156 | set_dense_combined(revs); | |
a37eec63 | 157 | } |
564a4fc8 | 158 | |
3b6c17b5 SO |
159 | void diff_merges_set_dense_combined_if_unset(struct rev_info *revs) |
160 | { | |
161 | if (!revs->combine_merges) | |
162 | set_dense_combined(revs); | |
163 | } | |
164 | ||
564a4fc8 SO |
165 | void diff_merges_setup_revs(struct rev_info *revs) |
166 | { | |
1a2c4d80 SO |
167 | if (revs->combine_merges == 0) |
168 | revs->dense_combined_merges = 0; | |
169 | if (revs->separate_merges == 0) | |
170 | revs->first_parent_merges = 0; | |
564a4fc8 SO |
171 | if (revs->combined_all_paths && !revs->combine_merges) |
172 | die("--combined-all-paths makes no sense without -c or --cc"); | |
fd16a399 | 173 | if (revs->merges_imply_patch) |
e121b4b8 | 174 | revs->diff = 1; |
fd16a399 | 175 | if (revs->merges_imply_patch || revs->merges_need_diff) { |
0c627f5d SO |
176 | if (!revs->diffopt.output_format) |
177 | revs->diffopt.output_format = DIFF_FORMAT_PATCH; | |
178 | } | |
564a4fc8 | 179 | } |