revision: move diff merges functions to its own diff-merges.c
Create separate diff-merges.c and diff-merges.h files, and move all the code related to handling of diff merges there. Signed-off-by: Sergey Organov <sorganov@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Sergey Organov
Junio C Hamano
parent
3d4fd94363
commit
a37eec6333
1
Makefile
1
Makefile
@ -872,6 +872,7 @@ LIB_OBJS += date.o
|
||||
LIB_OBJS += decorate.o
|
||||
LIB_OBJS += delta-islands.o
|
||||
LIB_OBJS += diff-delta.o
|
||||
LIB_OBJS += diff-merges.o
|
||||
LIB_OBJS += diff-lib.o
|
||||
LIB_OBJS += diff-no-index.o
|
||||
LIB_OBJS += diff.o
|
||||
|
||||
@ -12,6 +12,7 @@
|
||||
#include "color.h"
|
||||
#include "commit.h"
|
||||
#include "diff.h"
|
||||
#include "diff-merges.h"
|
||||
#include "revision.h"
|
||||
#include "log-tree.h"
|
||||
#include "builtin.h"
|
||||
|
||||
76
diff-merges.c
Normal file
76
diff-merges.c
Normal file
@ -0,0 +1,76 @@
|
||||
#include "diff-merges.h"
|
||||
|
||||
#include "revision.h"
|
||||
|
||||
void init_diff_merge_revs(struct rev_info *revs)
|
||||
{
|
||||
revs->ignore_merges = -1;
|
||||
}
|
||||
|
||||
int parse_diff_merge_opts(struct rev_info *revs, const char **argv)
|
||||
{
|
||||
int argcount = 1;
|
||||
const char *optarg;
|
||||
const char *arg = argv[0];
|
||||
|
||||
if (!strcmp(arg, "-m")) {
|
||||
/*
|
||||
* To "diff-index", "-m" means "match missing", and to the "log"
|
||||
* family of commands, it means "show full diff for merges". Set
|
||||
* both fields appropriately.
|
||||
*/
|
||||
revs->ignore_merges = 0;
|
||||
revs->match_missing = 1;
|
||||
} else if (!strcmp(arg, "-c")) {
|
||||
revs->diff = 1;
|
||||
revs->dense_combined_merges = 0;
|
||||
revs->combine_merges = 1;
|
||||
} else if (!strcmp(arg, "--cc")) {
|
||||
revs->diff = 1;
|
||||
revs->dense_combined_merges = 1;
|
||||
revs->combine_merges = 1;
|
||||
} else if (!strcmp(arg, "--no-diff-merges")) {
|
||||
revs->ignore_merges = 1;
|
||||
} else if (!strcmp(arg, "--combined-all-paths")) {
|
||||
revs->diff = 1;
|
||||
revs->combined_all_paths = 1;
|
||||
} else if ((argcount = parse_long_opt("diff-merges", argv, &optarg))) {
|
||||
if (!strcmp(optarg, "off")) {
|
||||
revs->ignore_merges = 1;
|
||||
} else {
|
||||
die(_("unknown value for --diff-merges: %s"), optarg);
|
||||
}
|
||||
} else
|
||||
argcount = 0;
|
||||
|
||||
return argcount;
|
||||
}
|
||||
|
||||
void setup_diff_merges_revs(struct rev_info *revs)
|
||||
{
|
||||
if (revs->combine_merges && revs->ignore_merges < 0)
|
||||
revs->ignore_merges = 0;
|
||||
if (revs->ignore_merges < 0)
|
||||
revs->ignore_merges = 1;
|
||||
if (revs->combined_all_paths && !revs->combine_merges)
|
||||
die("--combined-all-paths makes no sense without -c or --cc");
|
||||
}
|
||||
|
||||
void rev_diff_merges_first_parent_defaults_to_enable(struct rev_info *revs)
|
||||
{
|
||||
if (revs->first_parent_only && revs->ignore_merges < 0)
|
||||
revs->ignore_merges = 0;
|
||||
}
|
||||
|
||||
void rev_diff_merges_default_to_dense_combined(struct rev_info *revs)
|
||||
{
|
||||
if (revs->ignore_merges < 0) {
|
||||
/* There was no "-m" variant on the command line */
|
||||
revs->ignore_merges = 0;
|
||||
if (!revs->first_parent_only && !revs->combine_merges) {
|
||||
/* No "--first-parent", "-c", or "--cc" */
|
||||
revs->combine_merges = 1;
|
||||
revs->dense_combined_merges = 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
18
diff-merges.h
Normal file
18
diff-merges.h
Normal file
@ -0,0 +1,18 @@
|
||||
#ifndef DIFF_MERGES_H
|
||||
#define DIFF_MERGES_H
|
||||
|
||||
/*
|
||||
* diff-merges - utility module to handle command-line options for
|
||||
* selection of particular diff format of merge commits
|
||||
* representation.
|
||||
*/
|
||||
|
||||
struct rev_info;
|
||||
|
||||
void init_diff_merge_revs(struct rev_info *revs);
|
||||
int parse_diff_merge_opts(struct rev_info *revs, const char **argv);
|
||||
void setup_diff_merges_revs(struct rev_info *revs);
|
||||
void rev_diff_merges_default_to_dense_combined(struct rev_info *revs);
|
||||
void rev_diff_merges_first_parent_defaults_to_enable(struct rev_info *revs);
|
||||
|
||||
#endif
|
||||
76
revision.c
76
revision.c
@ -5,6 +5,7 @@
|
||||
#include "tree.h"
|
||||
#include "commit.h"
|
||||
#include "diff.h"
|
||||
#include "diff-merges.h"
|
||||
#include "refs.h"
|
||||
#include "revision.h"
|
||||
#include "repository.h"
|
||||
@ -1805,8 +1806,6 @@ static int add_parents_only(struct rev_info *revs, const char *arg_, int flags,
|
||||
return 1;
|
||||
}
|
||||
|
||||
static void init_diff_merge_revs(struct rev_info *revs);
|
||||
|
||||
void repo_init_revisions(struct repository *r,
|
||||
struct rev_info *revs,
|
||||
const char *prefix)
|
||||
@ -2155,79 +2154,6 @@ static void add_message_grep(struct rev_info *revs, const char *pattern)
|
||||
add_grep(revs, pattern, GREP_PATTERN_BODY);
|
||||
}
|
||||
|
||||
static void init_diff_merge_revs(struct rev_info *revs)
|
||||
{
|
||||
revs->ignore_merges = -1;
|
||||
}
|
||||
|
||||
static int parse_diff_merge_opts(struct rev_info *revs, const char **argv)
|
||||
{
|
||||
int argcount = 1;
|
||||
const char *optarg;
|
||||
const char *arg = argv[0];
|
||||
|
||||
if (!strcmp(arg, "-m")) {
|
||||
/*
|
||||
* To "diff-index", "-m" means "match missing", and to the "log"
|
||||
* family of commands, it means "show full diff for merges". Set
|
||||
* both fields appropriately.
|
||||
*/
|
||||
revs->ignore_merges = 0;
|
||||
revs->match_missing = 1;
|
||||
} else if (!strcmp(arg, "-c")) {
|
||||
revs->diff = 1;
|
||||
revs->dense_combined_merges = 0;
|
||||
revs->combine_merges = 1;
|
||||
} else if (!strcmp(arg, "--cc")) {
|
||||
revs->diff = 1;
|
||||
revs->dense_combined_merges = 1;
|
||||
revs->combine_merges = 1;
|
||||
} else if (!strcmp(arg, "--no-diff-merges")) {
|
||||
revs->ignore_merges = 1;
|
||||
} else if (!strcmp(arg, "--combined-all-paths")) {
|
||||
revs->diff = 1;
|
||||
revs->combined_all_paths = 1;
|
||||
} else if ((argcount = parse_long_opt("diff-merges", argv, &optarg))) {
|
||||
if (!strcmp(optarg, "off")) {
|
||||
revs->ignore_merges = 1;
|
||||
} else {
|
||||
die(_("unknown value for --diff-merges: %s"), optarg);
|
||||
}
|
||||
} else
|
||||
argcount = 0;
|
||||
|
||||
return argcount;
|
||||
}
|
||||
|
||||
static void setup_diff_merges_revs(struct rev_info *revs)
|
||||
{
|
||||
if (revs->combine_merges && revs->ignore_merges < 0)
|
||||
revs->ignore_merges = 0;
|
||||
if (revs->ignore_merges < 0)
|
||||
revs->ignore_merges = 1;
|
||||
if (revs->combined_all_paths && !revs->combine_merges)
|
||||
die("--combined-all-paths makes no sense without -c or --cc");
|
||||
}
|
||||
|
||||
void rev_diff_merges_first_parent_defaults_to_enable(struct rev_info *revs)
|
||||
{
|
||||
if (revs->first_parent_only && revs->ignore_merges < 0)
|
||||
revs->ignore_merges = 0;
|
||||
}
|
||||
|
||||
void rev_diff_merges_default_to_dense_combined(struct rev_info *revs)
|
||||
{
|
||||
if (revs->ignore_merges < 0) {
|
||||
/* There was no "-m" variant on the command line */
|
||||
revs->ignore_merges = 0;
|
||||
if (!revs->first_parent_only && !revs->combine_merges) {
|
||||
/* No "--first-parent", "-c", or "--cc" */
|
||||
revs->combine_merges = 1;
|
||||
revs->dense_combined_merges = 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static int handle_revision_opt(struct rev_info *revs, int argc, const char **argv,
|
||||
int *unkc, const char **unkv,
|
||||
const struct setup_revision_opt* opt)
|
||||
|
||||
@ -456,7 +456,4 @@ int rewrite_parents(struct rev_info *revs,
|
||||
*/
|
||||
struct commit_list *get_saved_parents(struct rev_info *revs, const struct commit *commit);
|
||||
|
||||
void rev_diff_merges_default_to_dense_combined(struct rev_info *revs);
|
||||
void rev_diff_merges_first_parent_defaults_to_enable(struct rev_info *revs);
|
||||
|
||||
#endif
|
||||
|
||||
Loading…
Reference in New Issue
Block a user