]> git.ipfire.org Git - thirdparty/git.git/blame - unpack-trees.h
refs: print error message in debug output
[thirdparty/git.git] / unpack-trees.h
CommitLineData
16da134b
JS
1#ifndef UNPACK_TREES_H
2#define UNPACK_TREES_H
3
ef3ca954 4#include "cache.h"
dbbcd44f 5#include "strvec.h"
ef3ca954
EN
6#include "string-list.h"
7#include "tree-walk.h"
7980872d 8
5290d451 9#define MAX_UNPACK_TREES MAX_TRAVERSE_TREES
ca885a4f 10
ef3ca954 11struct cache_entry;
16da134b 12struct unpack_trees_options;
caa3d554 13struct pattern_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 24 ERROR_BIND_OVERLAP,
a7bc845a 25 ERROR_WOULD_LOSE_SUBMODULE,
1ac83f42 26
6271d77c
EN
27 NB_UNPACK_TREES_ERROR_TYPES,
28
1ac83f42 29 WARNING_SPARSE_NOT_UPTODATE_FILE,
ebb568b9 30 WARNING_SPARSE_UNMERGED_FILE,
1ac83f42
EN
31 WARNING_SPARSE_ORPHANED_NOT_OVERWRITTEN,
32
6271d77c 33 NB_UNPACK_TREES_WARNING_TYPES,
8ccba008
JH
34};
35
dc1166e6
MM
36/*
37 * Sets the list of user-friendly error messages to be used by the
5e65ee35 38 * command "cmd" (either merge or checkout), and show_all_errors to 1.
dc1166e6 39 */
e294030f
MM
40void setup_unpack_trees_porcelain(struct unpack_trees_options *opts,
41 const char *cmd);
dc1166e6 42
1c41d280
43/*
44 * Frees resources allocated by setup_unpack_trees_porcelain().
45 */
46void clear_unpack_trees_porcelain(struct unpack_trees_options *opts);
47
480d3d6b
EN
48enum unpack_trees_reset_type {
49 UNPACK_RESET_NONE = 0, /* traditional "false" value; still valid */
50 UNPACK_RESET_INVALID = 1, /* "true" no longer valid; use below values */
51 UNPACK_RESET_PROTECT_UNTRACKED,
52 UNPACK_RESET_OVERWRITE_UNTRACKED
53};
54
16da134b 55struct unpack_trees_options {
480d3d6b 56 unsigned int merge,
5a56da58 57 update,
04988c8d 58 preserve_ignored,
b878579a 59 clone,
5a56da58
SB
60 index_only,
61 nontrivial_merge,
62 trivial_merges_only,
63 verbose_update,
64 aggressive,
65 skip_unmerged,
66 initial_checkout,
67 diff_index_cached,
ba655da5 68 debug_unpack,
08aefc9e 69 skip_sparse_checkout,
b165fac8 70 quiet,
b4194828 71 exiting_early,
2c9078d0 72 show_all_errors,
fa0bde45 73 dry_run;
480d3d6b 74 enum unpack_trees_reset_type reset;
16da134b 75 const char *prefix;
da165f47 76 int cache_bottom;
40e37256 77 struct pathspec *pathspec;
16da134b 78 merge_fn_t fn;
6271d77c 79 const char *msgs[NB_UNPACK_TREES_WARNING_TYPES];
c972bf4c 80 struct strvec msgs_to_free;
e6c111b4
MM
81 /*
82 * Store error messages in an array, each case
83 * corresponding to a error message type
84 */
6271d77c 85 struct string_list unpack_rejects[NB_UNPACK_TREES_WARNING_TYPES];
16da134b
JS
86
87 int head_idx;
88 int merge_size;
89
90 struct cache_entry *df_conflict_entry;
d1f2d7e8 91 void *unpack_data;
34110cd4
LT
92
93 struct index_state *dst_index;
32260ad5 94 struct index_state *src_index;
34110cd4 95 struct index_state result;
08aefc9e 96
caa3d554 97 struct pattern_list *pl; /* for internal use */
c42e0b64 98 struct dir_struct *dir; /* for internal use only */
13e7ed6a 99 struct checkout_metadata meta;
16da134b
JS
100};
101
340f4bc9
NTND
102int unpack_trees(unsigned n, struct tree_desc *t,
103 struct unpack_trees_options *options);
16da134b 104
7af7a258
EN
105enum update_sparsity_result {
106 UPDATE_SPARSITY_SUCCESS = 0,
107 UPDATE_SPARSITY_WARNINGS = 1,
108 UPDATE_SPARSITY_INDEX_UPDATE_FAILURES = -1,
109 UPDATE_SPARSITY_WORKTREE_UPDATE_FAILURES = -2
110};
111
112enum update_sparsity_result update_sparsity(struct unpack_trees_options *options);
113
64b1abe9
EN
114int verify_uptodate(const struct cache_entry *ce,
115 struct unpack_trees_options *o);
116
5828e835
RS
117int threeway_merge(const struct cache_entry * const *stages,
118 struct unpack_trees_options *o);
119int twoway_merge(const struct cache_entry * const *src,
120 struct unpack_trees_options *o);
121int bind_merge(const struct cache_entry * const *src,
122 struct unpack_trees_options *o);
123int oneway_merge(const struct cache_entry * const *src,
124 struct unpack_trees_options *o);
d3c7bf73
DL
125int stash_worktree_untracked_merge(const struct cache_entry * const *src,
126 struct unpack_trees_options *o);
076b0adc 127
16da134b 128#endif