5 #include "argv-array.h"
6 #include "string-list.h"
9 #define MAX_UNPACK_TREES 8
12 struct unpack_trees_options;
15 typedef int (*merge_fn_t)(const struct cache_entry * const *src,
16 struct unpack_trees_options *options);
18 enum unpack_trees_error_types {
19 ERROR_WOULD_OVERWRITE = 0,
20 ERROR_NOT_UPTODATE_FILE,
21 ERROR_NOT_UPTODATE_DIR,
22 ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN,
23 ERROR_WOULD_LOSE_UNTRACKED_REMOVED,
25 ERROR_SPARSE_NOT_UPTODATE_FILE,
26 ERROR_WOULD_LOSE_ORPHANED_OVERWRITTEN,
27 ERROR_WOULD_LOSE_ORPHANED_REMOVED,
28 ERROR_WOULD_LOSE_SUBMODULE,
29 NB_UNPACK_TREES_ERROR_TYPES
33 * Sets the list of user-friendly error messages to be used by the
34 * command "cmd" (either merge or checkout), and show_all_errors to 1.
36 void setup_unpack_trees_porcelain(struct unpack_trees_options *opts,
40 * Frees resources allocated by setup_unpack_trees_porcelain().
42 void clear_unpack_trees_porcelain(struct unpack_trees_options *opts);
44 struct unpack_trees_options {
66 struct dir_struct *dir;
67 struct pathspec *pathspec;
69 const char *msgs[NB_UNPACK_TREES_ERROR_TYPES];
70 struct argv_array msgs_to_free;
72 * Store error messages in an array, each case
73 * corresponding to a error message type
75 struct string_list unpack_rejects[NB_UNPACK_TREES_ERROR_TYPES];
80 struct cache_entry *df_conflict_entry;
83 struct index_state *dst_index;
84 struct index_state *src_index;
85 struct index_state result;
87 struct pattern_list *pl; /* for internal use */
90 int unpack_trees(unsigned n, struct tree_desc *t,
91 struct unpack_trees_options *options);
93 int verify_uptodate(const struct cache_entry *ce,
94 struct unpack_trees_options *o);
96 int threeway_merge(const struct cache_entry * const *stages,
97 struct unpack_trees_options *o);
98 int twoway_merge(const struct cache_entry * const *src,
99 struct unpack_trees_options *o);
100 int bind_merge(const struct cache_entry * const *src,
101 struct unpack_trees_options *o);
102 int oneway_merge(const struct cache_entry * const *src,
103 struct unpack_trees_options *o);