mirror of
https://github.com/git/git
synced 2024-07-17 11:07:55 +00:00
5290d45134
The unpack-trees API depends on the tree-walk API. But we've recently
introduced a dependency in tree-walk.c on MAX_UNPACK_TREES, which
doesn't otherwise care about unpack-trees at all.
Let's break that dependency by reversing the constants: we'll introduce
a new MAX_TRAVERSE_TREES which belongs to the tree-walk API. And then we
can define MAX_UNPACK_TREES in terms of that (since unpack-trees cannot
possibly work with more trees than it can traverse at once via
tree-walk).
The value for both will remain at 8. This is somewhat arbitrary and
probably more than is necessary, per ca885a4fe6 (read-tree() and
unpack_trees(): use consistent limit, 2008-03-13), but there's not
really any pressing need to reduce it.
Suggested-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Jeff King <peff@peff.net>
Acked-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
106 lines
2.7 KiB
C
106 lines
2.7 KiB
C
#ifndef UNPACK_TREES_H
|
|
#define UNPACK_TREES_H
|
|
|
|
#include "cache.h"
|
|
#include "argv-array.h"
|
|
#include "string-list.h"
|
|
#include "tree-walk.h"
|
|
|
|
#define MAX_UNPACK_TREES MAX_TRAVERSE_TREES
|
|
|
|
struct cache_entry;
|
|
struct unpack_trees_options;
|
|
struct pattern_list;
|
|
|
|
typedef int (*merge_fn_t)(const struct cache_entry * const *src,
|
|
struct unpack_trees_options *options);
|
|
|
|
enum unpack_trees_error_types {
|
|
ERROR_WOULD_OVERWRITE = 0,
|
|
ERROR_NOT_UPTODATE_FILE,
|
|
ERROR_NOT_UPTODATE_DIR,
|
|
ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN,
|
|
ERROR_WOULD_LOSE_UNTRACKED_REMOVED,
|
|
ERROR_BIND_OVERLAP,
|
|
ERROR_SPARSE_NOT_UPTODATE_FILE,
|
|
ERROR_WOULD_LOSE_ORPHANED_OVERWRITTEN,
|
|
ERROR_WOULD_LOSE_ORPHANED_REMOVED,
|
|
ERROR_WOULD_LOSE_SUBMODULE,
|
|
NB_UNPACK_TREES_ERROR_TYPES
|
|
};
|
|
|
|
/*
|
|
* Sets the list of user-friendly error messages to be used by the
|
|
* command "cmd" (either merge or checkout), and show_all_errors to 1.
|
|
*/
|
|
void setup_unpack_trees_porcelain(struct unpack_trees_options *opts,
|
|
const char *cmd);
|
|
|
|
/*
|
|
* Frees resources allocated by setup_unpack_trees_porcelain().
|
|
*/
|
|
void clear_unpack_trees_porcelain(struct unpack_trees_options *opts);
|
|
|
|
struct unpack_trees_options {
|
|
unsigned int reset,
|
|
merge,
|
|
update,
|
|
clone,
|
|
index_only,
|
|
nontrivial_merge,
|
|
trivial_merges_only,
|
|
verbose_update,
|
|
aggressive,
|
|
skip_unmerged,
|
|
initial_checkout,
|
|
diff_index_cached,
|
|
debug_unpack,
|
|
skip_sparse_checkout,
|
|
quiet,
|
|
exiting_early,
|
|
show_all_errors,
|
|
dry_run,
|
|
keep_pattern_list;
|
|
const char *prefix;
|
|
int cache_bottom;
|
|
struct dir_struct *dir;
|
|
struct pathspec *pathspec;
|
|
merge_fn_t fn;
|
|
const char *msgs[NB_UNPACK_TREES_ERROR_TYPES];
|
|
struct argv_array msgs_to_free;
|
|
/*
|
|
* Store error messages in an array, each case
|
|
* corresponding to a error message type
|
|
*/
|
|
struct string_list unpack_rejects[NB_UNPACK_TREES_ERROR_TYPES];
|
|
|
|
int head_idx;
|
|
int merge_size;
|
|
|
|
struct cache_entry *df_conflict_entry;
|
|
void *unpack_data;
|
|
|
|
struct index_state *dst_index;
|
|
struct index_state *src_index;
|
|
struct index_state result;
|
|
|
|
struct pattern_list *pl; /* for internal use */
|
|
};
|
|
|
|
int unpack_trees(unsigned n, struct tree_desc *t,
|
|
struct unpack_trees_options *options);
|
|
|
|
int verify_uptodate(const struct cache_entry *ce,
|
|
struct unpack_trees_options *o);
|
|
|
|
int threeway_merge(const struct cache_entry * const *stages,
|
|
struct unpack_trees_options *o);
|
|
int twoway_merge(const struct cache_entry * const *src,
|
|
struct unpack_trees_options *o);
|
|
int bind_merge(const struct cache_entry * const *src,
|
|
struct unpack_trees_options *o);
|
|
int oneway_merge(const struct cache_entry * const *src,
|
|
struct unpack_trees_options *o);
|
|
|
|
#endif
|