5 #include "argv-array.h"
6 #include "string-list.h"
9 #define MAX_UNPACK_TREES MAX_TRAVERSE_TREES
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_WOULD_LOSE_SUBMODULE
,
27 WARNING_SPARSE_NOT_UPTODATE_FILE
,
28 WARNING_SPARSE_ORPHANED_NOT_OVERWRITTEN
,
30 NB_UNPACK_TREES_ERROR_TYPES
,
34 * Sets the list of user-friendly error messages to be used by the
35 * command "cmd" (either merge or checkout), and show_all_errors to 1.
37 void setup_unpack_trees_porcelain(struct unpack_trees_options
*opts
,
41 * Frees resources allocated by setup_unpack_trees_porcelain().
43 void clear_unpack_trees_porcelain(struct unpack_trees_options
*opts
);
45 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 enum update_sparsity_result
{
94 UPDATE_SPARSITY_SUCCESS
= 0,
95 UPDATE_SPARSITY_WARNINGS
= 1,
96 UPDATE_SPARSITY_INDEX_UPDATE_FAILURES
= -1,
97 UPDATE_SPARSITY_WORKTREE_UPDATE_FAILURES
= -2
100 enum update_sparsity_result
update_sparsity(struct unpack_trees_options
*options
);
102 int verify_uptodate(const struct cache_entry
*ce
,
103 struct unpack_trees_options
*o
);
105 int threeway_merge(const struct cache_entry
* const *stages
,
106 struct unpack_trees_options
*o
);
107 int twoway_merge(const struct cache_entry
* const *src
,
108 struct unpack_trees_options
*o
);
109 int bind_merge(const struct cache_entry
* const *src
,
110 struct unpack_trees_options
*o
);
111 int oneway_merge(const struct cache_entry
* const *src
,
112 struct unpack_trees_options
*o
);