[thirdparty/git.git] / unpack-trees.h

#ifndef UNPACK_TREES_H
#define UNPACK_TREES_H

#define MAX_UNPACK_TREES 8

struct unpack_trees_options;
struct exclude_list;

typedef int (*merge_fn_t)(struct cache_entry **src,
		struct unpack_trees_options *options);

enum unpack_trees_error_types {
	ERROR_WOULD_OVERWRITE = 0,
	ERROR_NOT_UPTODATE_FILE,
	ERROR_NOT_UPTODATE_DIR,
	ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN,
	ERROR_WOULD_LOSE_UNTRACKED_REMOVED,
	ERROR_BIND_OVERLAP,
	ERROR_SPARSE_NOT_UPTODATE_FILE,
	ERROR_WOULD_LOSE_ORPHANED_OVERWRITTEN,
	ERROR_WOULD_LOSE_ORPHANED_REMOVED,
	NB_UNPACK_TREES_ERROR_TYPES
};

/*
 * Sets the list of user-friendly error messages to be used by the
 * command "cmd" (either merge or checkout), and show_all_errors to 1.
 */
void setup_unpack_trees_porcelain(struct unpack_trees_options *opts,
				  const char *cmd);

struct rejected_paths_list {
	char *path;
	struct rejected_paths_list *next;
};

struct unpack_trees_options {
	unsigned int reset,
		     merge,
		     update,
		     index_only,
		     nontrivial_merge,
		     trivial_merges_only,
		     verbose_update,
		     aggressive,
		     skip_unmerged,
		     initial_checkout,
		     diff_index_cached,
		     debug_unpack,
		     skip_sparse_checkout,
		     gently,
		     show_all_errors;
	const char *prefix;
	int cache_bottom;
	struct dir_struct *dir;
	merge_fn_t fn;
	const char *msgs[NB_UNPACK_TREES_ERROR_TYPES];
	/*
	 * Store error messages in an array, each case
	 * corresponding to a error message type
	 */
	struct rejected_paths_list *unpack_rejects[NB_UNPACK_TREES_ERROR_TYPES];

	int head_idx;
	int merge_size;

	struct cache_entry *df_conflict_entry;
	void *unpack_data;

	struct index_state *dst_index;
	struct index_state *src_index;
	struct index_state result;

	struct exclude_list *el; /* for internal use */
};

extern int unpack_trees(unsigned n, struct tree_desc *t,
		struct unpack_trees_options *options);

int threeway_merge(struct cache_entry **stages, struct unpack_trees_options *o);
int twoway_merge(struct cache_entry **src, struct unpack_trees_options *o);
int bind_merge(struct cache_entry **src, struct unpack_trees_options *o);
int oneway_merge(struct cache_entry **src, struct unpack_trees_options *o);

#endif
Commit	Line	Data
16da134b JS	1	#ifndef UNPACK_TREES_H
	2	#define UNPACK_TREES_H
	3
ca885a4f JH	4	#define MAX_UNPACK_TREES 8
ca885a4f JH	5
16da134b	6	struct unpack_trees_options;
08aefc9e	7	struct exclude_list;
16da134b JS	8
16da134b JS	9	typedef int (merge_fn_t)(struct cache_entry *src,
34110cd4	10	struct unpack_trees_options *options);
16da134b	11
08353ebb MM	12	enum unpack_trees_error_types {
	13	ERROR_WOULD_OVERWRITE = 0,
	14	ERROR_NOT_UPTODATE_FILE,
	15	ERROR_NOT_UPTODATE_DIR,
08402b04 MM	16	ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN,
08402b04 MM	17	ERROR_WOULD_LOSE_UNTRACKED_REMOVED,
08353ebb MM	18	ERROR_BIND_OVERLAP,
08353ebb MM	19	ERROR_SPARSE_NOT_UPTODATE_FILE,
08402b04 MM	20	ERROR_WOULD_LOSE_ORPHANED_OVERWRITTEN,
08402b04 MM	21	ERROR_WOULD_LOSE_ORPHANED_REMOVED,
08353ebb	22	NB_UNPACK_TREES_ERROR_TYPES
8ccba008 JH	23	};
8ccba008 JH	24
dc1166e6 MM	25	/*
dc1166e6 MM	26	* Sets the list of user-friendly error messages to be used by the
5e65ee35	27	* command "cmd" (either merge or checkout), and show_all_errors to 1.
dc1166e6	28	*/
e294030f MM	29	void setup_unpack_trees_porcelain(struct unpack_trees_options *opts,
e294030f MM	30	const char *cmd);
dc1166e6	31
e6c111b4 MM	32	struct rejected_paths_list {
	33	char *path;
	34	struct rejected_paths_list *next;
	35	};
	36
16da134b	37	struct unpack_trees_options {
5a56da58 SB	38	unsigned int reset,
	39	merge,
	40	update,
	41	index_only,
	42	nontrivial_merge,
	43	trivial_merges_only,
	44	verbose_update,
	45	aggressive,
	46	skip_unmerged,
	47	initial_checkout,
	48	diff_index_cached,
ba655da5	49	debug_unpack,
08aefc9e	50	skip_sparse_checkout,
e6c111b4 MM	51	gently,
e6c111b4 MM	52	show_all_errors;
16da134b	53	const char *prefix;
da165f47	54	int cache_bottom;
f8a9d428	55	struct dir_struct *dir;
16da134b	56	merge_fn_t fn;
08353ebb	57	const char *msgs[NB_UNPACK_TREES_ERROR_TYPES];
e6c111b4 MM	58	/*
	59	* Store error messages in an array, each case
	60	* corresponding to a error message type
	61	*/
	62	struct rejected_paths_list *unpack_rejects[NB_UNPACK_TREES_ERROR_TYPES];
16da134b JS	63
	64	int head_idx;
	65	int merge_size;
	66
	67	struct cache_entry *df_conflict_entry;
d1f2d7e8	68	void *unpack_data;
34110cd4 LT	69
34110cd4 LT	70	struct index_state *dst_index;
32260ad5	71	struct index_state *src_index;
34110cd4	72	struct index_state result;
08aefc9e NTND	73
08aefc9e NTND	74	struct exclude_list el; / for internal use */
16da134b JS	75	};
16da134b JS	76
933bf40a	77	extern int unpack_trees(unsigned n, struct tree_desc *t,
16da134b JS	78	struct unpack_trees_options *options);
16da134b JS	79
34110cd4 LT	80	int threeway_merge(struct cache_entry *stages, struct unpack_trees_options o);
	81	int twoway_merge(struct cache_entry *src, struct unpack_trees_options o);
	82	int bind_merge(struct cache_entry *src, struct unpack_trees_options o);
	83	int oneway_merge(struct cache_entry *src, struct unpack_trees_options o);
076b0adc	84
16da134b	85	#endif