]>
Commit | Line | Data |
---|---|---|
e1b3a2ca DB |
1 | #ifndef MERGE_RECURSIVE_H |
2 | #define MERGE_RECURSIVE_H | |
3 | ||
696ee23c | 4 | #include "string-list.h" |
ef3ca954 EN |
5 | #include "unpack-trees.h" |
6 | ||
7 | struct commit; | |
696ee23c | 8 | |
8a2fce18 | 9 | struct merge_options { |
4c5868f4 | 10 | const char *ancestor; |
8a2fce18 MV |
11 | const char *branch1; |
12 | const char *branch2; | |
8cc5b290 | 13 | enum { |
85e51b78 | 14 | MERGE_RECURSIVE_NORMAL = 0, |
8cc5b290 | 15 | MERGE_RECURSIVE_OURS, |
4b05548f | 16 | MERGE_RECURSIVE_THEIRS |
8cc5b290 | 17 | } recursive_variant; |
85e51b78 | 18 | const char *subtree_shift; |
f1e2426b | 19 | unsigned buffer_output; /* 1: output at end, 2: keep buffered */ |
1bc0ab7c | 20 | unsigned renormalize : 1; |
58a1ece4 | 21 | long xdl_opts; |
8a2fce18 | 22 | int verbosity; |
5fdddd9b | 23 | int detect_directory_renames; |
85b46030 BP |
24 | int diff_detect_rename; |
25 | int merge_detect_rename; | |
8a2fce18 MV |
26 | int diff_rename_limit; |
27 | int merge_rename_limit; | |
10ae7526 | 28 | int rename_score; |
bf0ab10f | 29 | int needed_rename_limit; |
99bfc669 | 30 | int show_rename_progress; |
5033639c | 31 | int call_depth; |
c7d84924 | 32 | struct strbuf obuf; |
fc65b00d | 33 | struct hashmap current_file_dir_set; |
70cc3d36 | 34 | struct string_list df_conflict_file_set; |
64b1abe9 | 35 | struct unpack_trees_options unpack_opts; |
a35edc84 | 36 | struct index_state orig_index; |
ea625cb0 EN |
37 | }; |
38 | ||
7fe40b88 EN |
39 | /* |
40 | * For dir_rename_entry, directory names are stored as a full path from the | |
41 | * toplevel of the repository and do not include a trailing '/'. Also: | |
42 | * | |
43 | * dir: original name of directory being renamed | |
44 | * non_unique_new_dir: if true, could not determine new_dir | |
45 | * new_dir: final name of directory being renamed | |
46 | * possible_new_dirs: temporary used to help determine new_dir; see comments | |
47 | * in get_directory_renames() for details | |
48 | */ | |
49 | struct dir_rename_entry { | |
50 | struct hashmap_entry ent; /* must be the first member! */ | |
51 | char *dir; | |
52 | unsigned non_unique_new_dir:1; | |
53 | struct strbuf new_dir; | |
54 | struct string_list possible_new_dirs; | |
55 | }; | |
56 | ||
e95ab70a EN |
57 | struct collision_entry { |
58 | struct hashmap_entry ent; /* must be the first member! */ | |
59 | char *target_file; | |
60 | struct string_list source_files; | |
61 | unsigned reported_already:1; | |
62 | }; | |
63 | ||
85b46030 BP |
64 | static inline int merge_detect_rename(struct merge_options *o) |
65 | { | |
66 | return o->merge_detect_rename >= 0 ? o->merge_detect_rename : | |
67 | o->diff_detect_rename >= 0 ? o->diff_detect_rename : 1; | |
68 | } | |
69 | ||
8a2fce18 MV |
70 | /* merge_trees() but with recursive ancestor consolidation */ |
71 | int merge_recursive(struct merge_options *o, | |
72 | struct commit *h1, | |
e1b3a2ca | 73 | struct commit *h2, |
e1b3a2ca DB |
74 | struct commit_list *ancestors, |
75 | struct commit **result); | |
76 | ||
8a2fce18 MV |
77 | /* rename-detecting three-way merge, no recursion */ |
78 | int merge_trees(struct merge_options *o, | |
79 | struct tree *head, | |
e1b3a2ca DB |
80 | struct tree *merge, |
81 | struct tree *common, | |
e1b3a2ca | 82 | struct tree **result); |
e1b3a2ca | 83 | |
8a2fce18 MV |
84 | /* |
85 | * "git-merge-recursive" can be fed trees; wrap them into | |
86 | * virtual commits and call merge_recursive() proper. | |
87 | */ | |
88 | int merge_recursive_generic(struct merge_options *o, | |
4e8161a8 | 89 | const struct object_id *head, |
90 | const struct object_id *merge, | |
8a2fce18 | 91 | int num_ca, |
4e8161a8 | 92 | const struct object_id **ca, |
8a2fce18 MV |
93 | struct commit **result); |
94 | ||
95 | void init_merge_options(struct merge_options *o); | |
96 | struct tree *write_tree_from_memory(struct merge_options *o); | |
9047ebbc | 97 | |
635a7bb1 JN |
98 | int parse_merge_opt(struct merge_options *out, const char *s); |
99 | ||
e1b3a2ca | 100 | #endif |