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

#ifndef UNPACK_TREES_H
#define UNPACK_TREES_H

#include "string-list.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 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,
		     exiting_early,
		     show_all_errors,
		     dry_run;
	const char *prefix;
	int cache_bottom;
	struct dir_struct *dir;
	struct pathspec *pathspec;
	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 string_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
7980872d CB	4	#include "string-list.h"
7980872d CB	5
ca885a4f JH	6	#define MAX_UNPACK_TREES 8
ca885a4f JH	7
16da134b	8	struct unpack_trees_options;
08aefc9e	9	struct exclude_list;
16da134b JS	10
16da134b JS	11	typedef int (merge_fn_t)(struct cache_entry *src,
34110cd4	12	struct unpack_trees_options *options);
16da134b	13
08353ebb MM	14	enum unpack_trees_error_types {
	15	ERROR_WOULD_OVERWRITE = 0,
	16	ERROR_NOT_UPTODATE_FILE,
	17	ERROR_NOT_UPTODATE_DIR,
08402b04 MM	18	ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN,
08402b04 MM	19	ERROR_WOULD_LOSE_UNTRACKED_REMOVED,
08353ebb MM	20	ERROR_BIND_OVERLAP,
08353ebb MM	21	ERROR_SPARSE_NOT_UPTODATE_FILE,
08402b04 MM	22	ERROR_WOULD_LOSE_ORPHANED_OVERWRITTEN,
08402b04 MM	23	ERROR_WOULD_LOSE_ORPHANED_REMOVED,
08353ebb	24	NB_UNPACK_TREES_ERROR_TYPES
8ccba008 JH	25	};
8ccba008 JH	26
dc1166e6 MM	27	/*
dc1166e6 MM	28	* Sets the list of user-friendly error messages to be used by the
5e65ee35	29	* command "cmd" (either merge or checkout), and show_all_errors to 1.
dc1166e6	30	*/
e294030f MM	31	void setup_unpack_trees_porcelain(struct unpack_trees_options *opts,
e294030f MM	32	const char *cmd);
dc1166e6	33
16da134b	34	struct unpack_trees_options {
5a56da58 SB	35	unsigned int reset,
	36	merge,
	37	update,
	38	index_only,
	39	nontrivial_merge,
	40	trivial_merges_only,
	41	verbose_update,
	42	aggressive,
	43	skip_unmerged,
	44	initial_checkout,
	45	diff_index_cached,
ba655da5	46	debug_unpack,
08aefc9e	47	skip_sparse_checkout,
e6c111b4	48	gently,
b4194828	49	exiting_early,
2c9078d0 JL	50	show_all_errors,
2c9078d0 JL	51	dry_run;
16da134b	52	const char *prefix;
da165f47	53	int cache_bottom;
f8a9d428	54	struct dir_struct *dir;
40e37256	55	struct pathspec *pathspec;
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	*/
7980872d	62	struct string_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