diff-merges: rename all functions to have common prefix
Use the same "diff_merges" prefix for all the diff merges function names. Signed-off-by: Sergey Organov <sorganov@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Sergey Organov committed
Dec 21, 2020 at 18:19 UTC
18f09473bf8685a1f8db254cff915d4c31e86406
4 files changed
+20
-15
builtin/log.c
+2
-2
@@ -599,7 +599,7 @@ static int show_tree_object(const struct object_id *oid,
599
static void show_setup_revisions_tweak(struct rev_info *rev,
600
struct setup_revision_opt *opt)
601
{
602
- rev_diff_merges_default_to_dense_combined(rev);
602
+ diff_merges_default_to_dense_combined(rev);
603
if (!rev->diffopt.output_format)
604
rev->diffopt.output_format = DIFF_FORMAT_PATCH;
605
}
@@ -724,7 +724,7 @@ static void log_setup_revisions_tweak(struct rev_info *rev,
724
if (!rev->diffopt.output_format && rev->combine_merges)
725
rev->diffopt.output_format = DIFF_FORMAT_PATCH;
726
727
- rev_diff_merges_first_parent_defaults_to_enable(rev);
727
+ diff_merges_first_parent_defaults_to_enable(rev);
728
}
729
730
int cmd_log(int argc, const char **argv, const char *prefix)
diff-merges.c
+5
-5
@@ -2,12 +2,12 @@
2
3
#include "revision.h"
4
5
-void init_diff_merge_revs(struct rev_info *revs)
5
+void diff_merges_init_revs(struct rev_info *revs)
6
{
7
revs->ignore_merges = -1;
8
}
9
10
-int parse_diff_merge_opts(struct rev_info *revs, const char **argv)
10
+int diff_merges_parse_opts(struct rev_info *revs, const char **argv)
11
{
12
int argcount = 1;
13
const char *optarg;
@@ -46,7 +46,7 @@ int parse_diff_merge_opts(struct rev_info *revs, const char **argv)
46
return argcount;
47
}
48
49
-void setup_diff_merges_revs(struct rev_info *revs)
49
+void diff_merges_setup_revs(struct rev_info *revs)
50
{
51
if (revs->combine_merges && revs->ignore_merges < 0)
52
revs->ignore_merges = 0;
@@ -56,13 +56,13 @@ void setup_diff_merges_revs(struct rev_info *revs)
56
die("--combined-all-paths makes no sense without -c or --cc");
57
}
58
59
-void rev_diff_merges_first_parent_defaults_to_enable(struct rev_info *revs)
59
+void diff_merges_first_parent_defaults_to_enable(struct rev_info *revs)
60
{
61
if (revs->first_parent_only && revs->ignore_merges < 0)
62
revs->ignore_merges = 0;
63
}
64
65
-void rev_diff_merges_default_to_dense_combined(struct rev_info *revs)
65
+void diff_merges_default_to_dense_combined(struct rev_info *revs)
66
{
67
if (revs->ignore_merges < 0) {
68
/* There was no "-m" variant on the command line */
diff-merges.h
+10
-5
@@ -9,10 +9,15 @@
9
10
struct rev_info;
11
12
-void init_diff_merge_revs(struct rev_info *revs);
13
-int parse_diff_merge_opts(struct rev_info *revs, const char **argv);
14
-void setup_diff_merges_revs(struct rev_info *revs);
15
-void rev_diff_merges_default_to_dense_combined(struct rev_info *revs);
16
-void rev_diff_merges_first_parent_defaults_to_enable(struct rev_info *revs);
12
+void diff_merges_init_revs(struct rev_info *revs);
13
+
14
+int diff_merges_parse_opts(struct rev_info *revs, const char **argv);
15
+
16
+void diff_merges_setup_revs(struct rev_info *revs);
17
+
18
+void diff_merges_default_to_dense_combined(struct rev_info *revs);
19
+
20
+void diff_merges_first_parent_defaults_to_enable(struct rev_info *revs);
21
+
22
23
#endif
revision.c
+3
-3
@@ -1814,7 +1814,7 @@ void repo_init_revisions(struct repository *r,
1814
1815
revs->repo = r;
1816
revs->abbrev = DEFAULT_ABBREV;
1817
- init_diff_merge_revs(revs);
1817
+ diff_merges_init_revs(revs);
1818
revs->simplify_history = 1;
1819
revs->pruning.repo = r;
1820
revs->pruning.flags.recursive = 1;
@@ -2350,7 +2350,7 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg
2350
revs->diff = 1;
2351
revs->diffopt.flags.recursive = 1;
2352
revs->diffopt.flags.tree_in_recursive = 1;
2353
- } else if ((argcount = parse_diff_merge_opts(revs, argv))) {
2353
+ } else if ((argcount = diff_merges_parse_opts(revs, argv))) {
2354
return argcount;
2355
} else if (!strcmp(arg, "-v")) {
2356
revs->verbose_header = 1;
@@ -2849,7 +2849,7 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct s
2849
&revs->prune_data);
2850
}
2851
2852
- setup_diff_merges_revs(revs);
2852
+ diff_merges_setup_revs(revs);
2853
2854
revs->diffopt.abbrev = revs->abbrev;
2855