[thirdparty/git.git] / merge-recursive.h

#ifndef MERGE_RECURSIVE_H
#define MERGE_RECURSIVE_H

#include "unpack-trees.h"
#include "string-list.h"

struct merge_options {
	const char *ancestor;
	const char *branch1;
	const char *branch2;
	enum {
		MERGE_RECURSIVE_NORMAL = 0,
		MERGE_RECURSIVE_OURS,
		MERGE_RECURSIVE_THEIRS
	} recursive_variant;
	const char *subtree_shift;
	unsigned buffer_output; /* 1: output at end, 2: keep buffered */
	unsigned renormalize : 1;
	long xdl_opts;
	int verbosity;
	int detect_rename;
	int diff_rename_limit;
	int merge_rename_limit;
	int rename_score;
	int needed_rename_limit;
	int show_rename_progress;
	int call_depth;
	struct strbuf obuf;
	struct hashmap current_file_dir_set;
	struct string_list df_conflict_file_set;
	struct unpack_trees_options unpack_opts;
};

/*
 * 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;
};

struct collision_entry {
	struct hashmap_entry ent; /* must be the first member! */
	char *target_file;
	struct string_list source_files;
	unsigned reported_already:1;
};

/* merge_trees() but with recursive ancestor consolidation */
int merge_recursive(struct merge_options *o,
		    struct commit *h1,
		    struct commit *h2,
		    struct commit_list *ancestors,
		    struct commit **result);

/* rename-detecting three-way merge, no recursion */
int merge_trees(struct merge_options *o,
		struct tree *head,
		struct tree *merge,
		struct tree *common,
		struct tree **result);

/*
 * "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,
			    const struct object_id *head,
			    const struct object_id *merge,
			    int num_ca,
			    const struct object_id **ca,
			    struct commit **result);

void init_merge_options(struct merge_options *o);
struct tree *write_tree_from_memory(struct merge_options *o);

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

#endif
Commit	Line	Data
e1b3a2ca DB	1	#ifndef MERGE_RECURSIVE_H
	2	#define MERGE_RECURSIVE_H
	3
e0052f46	4	#include "unpack-trees.h"
696ee23c MV	5	#include "string-list.h"
696ee23c MV	6
8a2fce18	7	struct merge_options {
4c5868f4	8	const char *ancestor;
8a2fce18 MV	9	const char *branch1;
8a2fce18 MV	10	const char *branch2;
8cc5b290	11	enum {
85e51b78	12	MERGE_RECURSIVE_NORMAL = 0,
8cc5b290	13	MERGE_RECURSIVE_OURS,
4b05548f	14	MERGE_RECURSIVE_THEIRS
8cc5b290	15	} recursive_variant;
85e51b78	16	const char *subtree_shift;
f1e2426b	17	unsigned buffer_output; /* 1: output at end, 2: keep buffered */
1bc0ab7c	18	unsigned renormalize : 1;
58a1ece4	19	long xdl_opts;
8a2fce18	20	int verbosity;
d2b11eca	21	int detect_rename;
8a2fce18 MV	22	int diff_rename_limit;
8a2fce18 MV	23	int merge_rename_limit;
10ae7526	24	int rename_score;
bf0ab10f	25	int needed_rename_limit;
99bfc669	26	int show_rename_progress;
5033639c	27	int call_depth;
c7d84924	28	struct strbuf obuf;
fc65b00d	29	struct hashmap current_file_dir_set;
70cc3d36	30	struct string_list df_conflict_file_set;
e0052f46	31	struct unpack_trees_options unpack_opts;
8a2fce18 MV	32	};
8a2fce18 MV	33
8383408d EN	34	/*
	35	* For dir_rename_entry, directory names are stored as a full path from the
	36	* toplevel of the repository and do not include a trailing '/'. Also:
	37	*
	38	* dir: original name of directory being renamed
	39	* non_unique_new_dir: if true, could not determine new_dir
	40	* new_dir: final name of directory being renamed
	41	* possible_new_dirs: temporary used to help determine new_dir; see comments
	42	* in get_directory_renames() for details
	43	*/
	44	struct dir_rename_entry {
	45	struct hashmap_entry ent; /* must be the first member! */
	46	char *dir;
	47	unsigned non_unique_new_dir:1;
	48	struct strbuf new_dir;
	49	struct string_list possible_new_dirs;
	50	};
	51
ea625cb0 EN	52	struct collision_entry {
	53	struct hashmap_entry ent; /* must be the first member! */
	54	char *target_file;
	55	struct string_list source_files;
	56	unsigned reported_already:1;
	57	};
	58
8a2fce18 MV	59	/* merge_trees() but with recursive ancestor consolidation */
	60	int merge_recursive(struct merge_options *o,
	61	struct commit *h1,
e1b3a2ca	62	struct commit *h2,
e1b3a2ca DB	63	struct commit_list *ancestors,
	64	struct commit **result);
	65
8a2fce18 MV	66	/* rename-detecting three-way merge, no recursion */
	67	int merge_trees(struct merge_options *o,
	68	struct tree *head,
e1b3a2ca DB	69	struct tree *merge,
e1b3a2ca DB	70	struct tree *common,
e1b3a2ca	71	struct tree **result);
e1b3a2ca	72
8a2fce18 MV	73	/*
	74	* "git-merge-recursive" can be fed trees; wrap them into
	75	* virtual commits and call merge_recursive() proper.
	76	*/
	77	int merge_recursive_generic(struct merge_options *o,
4e8161a8	78	const struct object_id *head,
4e8161a8	79	const struct object_id *merge,
8a2fce18	80	int num_ca,
4e8161a8	81	const struct object_id **ca,
8a2fce18 MV	82	struct commit **result);
	83
	84	void init_merge_options(struct merge_options *o);
	85	struct tree write_tree_from_memory(struct merge_options o);
9047ebbc	86
635a7bb1 JN	87	int parse_merge_opt(struct merge_options out, const char s);
635a7bb1 JN	88
e1b3a2ca	89	#endif