Add missing includes and forward declarations
[git/git.git] / unpack-trees.h
CommitLineData
16da134b
JS
1#ifndef UNPACK_TREES_H
2#define UNPACK_TREES_H
3
ef3ca954 4#include "cache.h"
1c41d280 5#include "argv-array.h"
ef3ca954
EN
6#include "string-list.h"
7#include "tree-walk.h"
7980872d 8
ca885a4f
JH
9#define MAX_UNPACK_TREES 8
10
ef3ca954 11struct cache_entry;
16da134b 12struct unpack_trees_options;
08aefc9e 13struct exclude_list;
16da134b 14
5828e835 15typedef int (*merge_fn_t)(const struct cache_entry * const *src,
34110cd4 16 struct unpack_trees_options *options);
16da134b 17
08353ebb
MM
18enum unpack_trees_error_types {
19 ERROR_WOULD_OVERWRITE = 0,
20 ERROR_NOT_UPTODATE_FILE,
21 ERROR_NOT_UPTODATE_DIR,
08402b04
MM
22 ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN,
23 ERROR_WOULD_LOSE_UNTRACKED_REMOVED,
08353ebb
MM
24 ERROR_BIND_OVERLAP,
25 ERROR_SPARSE_NOT_UPTODATE_FILE,
08402b04
MM
26 ERROR_WOULD_LOSE_ORPHANED_OVERWRITTEN,
27 ERROR_WOULD_LOSE_ORPHANED_REMOVED,
a7bc845a 28 ERROR_WOULD_LOSE_SUBMODULE,
08353ebb 29 NB_UNPACK_TREES_ERROR_TYPES
8ccba008
JH
30};
31
dc1166e6
MM
32/*
33 * Sets the list of user-friendly error messages to be used by the
5e65ee35 34 * command "cmd" (either merge or checkout), and show_all_errors to 1.
dc1166e6 35 */
e294030f
MM
36void setup_unpack_trees_porcelain(struct unpack_trees_options *opts,
37 const char *cmd);
dc1166e6 38
1c41d280
39/*
40 * Frees resources allocated by setup_unpack_trees_porcelain().
41 */
42void clear_unpack_trees_porcelain(struct unpack_trees_options *opts);
43
16da134b 44struct unpack_trees_options {
5a56da58
SB
45 unsigned int reset,
46 merge,
47 update,
48 index_only,
49 nontrivial_merge,
50 trivial_merges_only,
51 verbose_update,
52 aggressive,
53 skip_unmerged,
54 initial_checkout,
55 diff_index_cached,
ba655da5 56 debug_unpack,
08aefc9e 57 skip_sparse_checkout,
e6c111b4 58 gently,
b4194828 59 exiting_early,
2c9078d0
JL
60 show_all_errors,
61 dry_run;
16da134b 62 const char *prefix;
da165f47 63 int cache_bottom;
f8a9d428 64 struct dir_struct *dir;
40e37256 65 struct pathspec *pathspec;
16da134b 66 merge_fn_t fn;
08353ebb 67 const char *msgs[NB_UNPACK_TREES_ERROR_TYPES];
1c41d280 68 struct argv_array msgs_to_free;
e6c111b4
MM
69 /*
70 * Store error messages in an array, each case
71 * corresponding to a error message type
72 */
7980872d 73 struct string_list unpack_rejects[NB_UNPACK_TREES_ERROR_TYPES];
16da134b
JS
74
75 int head_idx;
76 int merge_size;
77
78 struct cache_entry *df_conflict_entry;
d1f2d7e8 79 void *unpack_data;
34110cd4
LT
80
81 struct index_state *dst_index;
32260ad5 82 struct index_state *src_index;
34110cd4 83 struct index_state result;
08aefc9e
NTND
84
85 struct exclude_list *el; /* for internal use */
16da134b
JS
86};
87
933bf40a 88extern int unpack_trees(unsigned n, struct tree_desc *t,
16da134b
JS
89 struct unpack_trees_options *options);
90
64b1abe9
EN
91int verify_uptodate(const struct cache_entry *ce,
92 struct unpack_trees_options *o);
93
5828e835
RS
94int threeway_merge(const struct cache_entry * const *stages,
95 struct unpack_trees_options *o);
96int twoway_merge(const struct cache_entry * const *src,
97 struct unpack_trees_options *o);
98int bind_merge(const struct cache_entry * const *src,
99 struct unpack_trees_options *o);
100int oneway_merge(const struct cache_entry * const *src,
101 struct unpack_trees_options *o);
076b0adc 102
16da134b 103#endif