merge-recursive: check for directory level conflicts
[git/git.git] / merge-recursive.h
1 #ifndef MERGE_RECURSIVE_H
2 #define MERGE_RECURSIVE_H
3
4 #include "string-list.h"
5
6 struct merge_options {
7 const char *ancestor;
8 const char *branch1;
9 const char *branch2;
10 enum {
11 MERGE_RECURSIVE_NORMAL = 0,
12 MERGE_RECURSIVE_OURS,
13 MERGE_RECURSIVE_THEIRS
14 } recursive_variant;
15 const char *subtree_shift;
16 unsigned buffer_output; /* 1: output at end, 2: keep buffered */
17 unsigned renormalize : 1;
18 long xdl_opts;
19 int verbosity;
20 int detect_rename;
21 int diff_rename_limit;
22 int merge_rename_limit;
23 int rename_score;
24 int needed_rename_limit;
25 int show_rename_progress;
26 int call_depth;
27 struct strbuf obuf;
28 struct hashmap current_file_dir_set;
29 struct string_list df_conflict_file_set;
30 };
31
32 /*
33 * For dir_rename_entry, directory names are stored as a full path from the
34 * toplevel of the repository and do not include a trailing '/'. Also:
35 *
36 * dir: original name of directory being renamed
37 * non_unique_new_dir: if true, could not determine new_dir
38 * new_dir: final name of directory being renamed
39 * possible_new_dirs: temporary used to help determine new_dir; see comments
40 * in get_directory_renames() for details
41 */
42 struct dir_rename_entry {
43 struct hashmap_entry ent; /* must be the first member! */
44 char *dir;
45 unsigned non_unique_new_dir:1;
46 struct strbuf new_dir;
47 struct string_list possible_new_dirs;
48 };
49
50 /* merge_trees() but with recursive ancestor consolidation */
51 int merge_recursive(struct merge_options *o,
52 struct commit *h1,
53 struct commit *h2,
54 struct commit_list *ancestors,
55 struct commit **result);
56
57 /* rename-detecting three-way merge, no recursion */
58 int merge_trees(struct merge_options *o,
59 struct tree *head,
60 struct tree *merge,
61 struct tree *common,
62 struct tree **result);
63
64 /*
65 * "git-merge-recursive" can be fed trees; wrap them into
66 * virtual commits and call merge_recursive() proper.
67 */
68 int merge_recursive_generic(struct merge_options *o,
69 const struct object_id *head,
70 const struct object_id *merge,
71 int num_ca,
72 const struct object_id **ca,
73 struct commit **result);
74
75 void init_merge_options(struct merge_options *o);
76 struct tree *write_tree_from_memory(struct merge_options *o);
77
78 int parse_merge_opt(struct merge_options *out, const char *s);
79
80 #endif