merge-recursive.h 2.86 KB
Newer Older
1 2 3
#ifndef MERGE_RECURSIVE_H
#define MERGE_RECURSIVE_H

4
#include "string-list.h"
5 6 7
#include "unpack-trees.h"

struct commit;
8

9 10
struct repository;

11
struct merge_options {
12
	const char *ancestor;
13 14
	const char *branch1;
	const char *branch2;
Avery Pennarun's avatar
Avery Pennarun committed
15
	enum {
16
		MERGE_RECURSIVE_NORMAL = 0,
Avery Pennarun's avatar
Avery Pennarun committed
17
		MERGE_RECURSIVE_OURS,
18
		MERGE_RECURSIVE_THEIRS
Avery Pennarun's avatar
Avery Pennarun committed
19
	} recursive_variant;
20
	const char *subtree_shift;
21
	unsigned buffer_output; /* 1: output at end, 2: keep buffered */
22
	unsigned renormalize : 1;
23
	long xdl_opts;
24
	int verbosity;
25
	int detect_directory_renames;
26 27
	int diff_detect_rename;
	int merge_detect_rename;
28 29
	int diff_rename_limit;
	int merge_rename_limit;
30
	int rename_score;
31
	int needed_rename_limit;
32
	int show_rename_progress;
33
	int call_depth;
34
	struct strbuf obuf;
35
	struct hashmap current_file_dir_set;
36
	struct string_list df_conflict_file_set;
37
	struct unpack_trees_options unpack_opts;
38
	struct index_state orig_index;
39
	struct repository *repo;
40 41
};

42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59
/*
 * For dir_rename_entry, directory names are stored as a full path from the
 * toplevel of the repository and do not include a trailing '/'.  Also:
 *
 *   dir:                original name of directory being renamed
 *   non_unique_new_dir: if true, could not determine new_dir
 *   new_dir:            final name of directory being renamed
 *   possible_new_dirs:  temporary used to help determine new_dir; see comments
 *                       in get_directory_renames() for details
 */
struct dir_rename_entry {
	struct hashmap_entry ent; /* must be the first member! */
	char *dir;
	unsigned non_unique_new_dir:1;
	struct strbuf new_dir;
	struct string_list possible_new_dirs;
};

60 61 62 63 64 65 66
struct collision_entry {
	struct hashmap_entry ent; /* must be the first member! */
	char *target_file;
	struct string_list source_files;
	unsigned reported_already:1;
};

67 68 69 70 71 72
static inline int merge_detect_rename(struct merge_options *o)
{
	return o->merge_detect_rename >= 0 ? o->merge_detect_rename :
		o->diff_detect_rename >= 0 ? o->diff_detect_rename : 1;
}

73 74 75
/* merge_trees() but with recursive ancestor consolidation */
int merge_recursive(struct merge_options *o,
		    struct commit *h1,
76 77 78 79
		    struct commit *h2,
		    struct commit_list *ancestors,
		    struct commit **result);

80 81 82
/* rename-detecting three-way merge, no recursion */
int merge_trees(struct merge_options *o,
		struct tree *head,
83 84 85 86
		struct tree *merge,
		struct tree *common,
		struct tree **result);

87 88 89 90 91
/*
 * "git-merge-recursive" can be fed trees; wrap them into
 * virtual commits and call merge_recursive() proper.
 */
int merge_recursive_generic(struct merge_options *o,
92 93
			    const struct object_id *head,
			    const struct object_id *merge,
94
			    int num_ca,
95
			    const struct object_id **ca,
96 97
			    struct commit **result);

98 99
void init_merge_options(struct merge_options *o,
			struct repository *repo);
100
struct tree *write_tree_from_memory(struct merge_options *o);
101

102 103
int parse_merge_opt(struct merge_options *out, const char *s);

104
#endif