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

#ifndef MERGE_RECURSIVE_H
#define MERGE_RECURSIVE_H

#include "string-list.h"

struct merge_options {
	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;
	int verbosity;
	int diff_rename_limit;
	int merge_rename_limit;
	int call_depth;
	struct strbuf obuf;
	struct string_list current_file_set;
	struct string_list current_directory_set;
};

/* Return a list of user-friendly error messages to be used by merge */
struct unpack_trees_error_msgs get_porcelain_error_msgs(void);

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

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

#endif
Commit	Line	Data
e1b3a2ca DB	1	#ifndef MERGE_RECURSIVE_H
	2	#define MERGE_RECURSIVE_H
	3
696ee23c MV	4	#include "string-list.h"
696ee23c MV	5
8a2fce18 MV	6	struct merge_options {
	7	const char *branch1;
	8	const char *branch2;
8cc5b290	9	enum {
85e51b78	10	MERGE_RECURSIVE_NORMAL = 0,
8cc5b290 AP	11	MERGE_RECURSIVE_OURS,
	12	MERGE_RECURSIVE_THEIRS,
	13	} recursive_variant;
85e51b78	14	const char *subtree_shift;
8a2fce18 MV	15	unsigned buffer_output : 1;
	16	int verbosity;
	17	int diff_rename_limit;
	18	int merge_rename_limit;
5033639c	19	int call_depth;
c7d84924	20	struct strbuf obuf;
696ee23c MV	21	struct string_list current_file_set;
696ee23c MV	22	struct string_list current_directory_set;
8a2fce18 MV	23	};
8a2fce18 MV	24
264b774b MM	25	/* Return a list of user-friendly error messages to be used by merge */
	26	struct unpack_trees_error_msgs get_porcelain_error_msgs(void);
	27
8a2fce18 MV	28	/* merge_trees() but with recursive ancestor consolidation */
	29	int merge_recursive(struct merge_options *o,
	30	struct commit *h1,
e1b3a2ca	31	struct commit *h2,
e1b3a2ca DB	32	struct commit_list *ancestors,
	33	struct commit **result);
	34
8a2fce18 MV	35	/* rename-detecting three-way merge, no recursion */
	36	int merge_trees(struct merge_options *o,
	37	struct tree *head,
e1b3a2ca DB	38	struct tree *merge,
e1b3a2ca DB	39	struct tree *common,
e1b3a2ca	40	struct tree **result);
e1b3a2ca	41
8a2fce18 MV	42	/*
	43	* "git-merge-recursive" can be fed trees; wrap them into
	44	* virtual commits and call merge_recursive() proper.
	45	*/
	46	int merge_recursive_generic(struct merge_options *o,
	47	const unsigned char *head,
	48	const unsigned char *merge,
	49	int num_ca,
	50	const unsigned char **ca,
	51	struct commit **result);
	52
	53	void init_merge_options(struct merge_options *o);
	54	struct tree write_tree_from_memory(struct merge_options o);
9047ebbc	55
e1b3a2ca	56	#endif