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