Daniel Barkalow | e1b3a2c | 2008-02-07 11:40:05 -0500 | [diff] [blame] | 1 | #ifndef MERGE_RECURSIVE_H |
| 2 | #define MERGE_RECURSIVE_H |
| 3 | |
Miklos Vajna | 696ee23 | 2008-09-03 19:08:56 +0200 | [diff] [blame] | 4 | #include "string-list.h" |
Elijah Newren | ef3ca95 | 2018-08-15 10:54:05 -0700 | [diff] [blame] | 5 | #include "unpack-trees.h" |
| 6 | |
| 7 | struct commit; |
Miklos Vajna | 696ee23 | 2008-09-03 19:08:56 +0200 | [diff] [blame] | 8 | |
Nguyễn Thái Ngọc Duy | 0d6caa2 | 2019-01-12 09:13:29 +0700 | [diff] [blame] | 9 | struct repository; |
| 10 | |
Miklos Vajna | 8a2fce1 | 2008-08-25 16:25:57 +0200 | [diff] [blame] | 11 | struct merge_options { |
Jonathan Nieder | 4c5868f | 2010-03-20 19:41:38 -0500 | [diff] [blame] | 12 | const char *ancestor; |
Miklos Vajna | 8a2fce1 | 2008-08-25 16:25:57 +0200 | [diff] [blame] | 13 | const char *branch1; |
| 14 | const char *branch2; |
Avery Pennarun | 8cc5b29 | 2009-11-25 21:23:55 -0500 | [diff] [blame] | 15 | enum { |
Junio C Hamano | 85e51b7 | 2008-06-30 22:18:57 -0700 | [diff] [blame] | 16 | MERGE_RECURSIVE_NORMAL = 0, |
Avery Pennarun | 8cc5b29 | 2009-11-25 21:23:55 -0500 | [diff] [blame] | 17 | MERGE_RECURSIVE_OURS, |
Gary V. Vaughan | 4b05548 | 2010-05-14 09:31:35 +0000 | [diff] [blame] | 18 | MERGE_RECURSIVE_THEIRS |
Avery Pennarun | 8cc5b29 | 2009-11-25 21:23:55 -0500 | [diff] [blame] | 19 | } recursive_variant; |
Junio C Hamano | 85e51b7 | 2008-06-30 22:18:57 -0700 | [diff] [blame] | 20 | const char *subtree_shift; |
Johannes Schindelin | f1e2426 | 2016-08-01 13:44:50 +0200 | [diff] [blame] | 21 | unsigned buffer_output; /* 1: output at end, 2: keep buffered */ |
Jonathan Nieder | 1bc0ab7 | 2010-08-05 06:15:32 -0500 | [diff] [blame] | 22 | unsigned renormalize : 1; |
Justin Frankel | 58a1ece | 2010-08-26 00:50:45 -0500 | [diff] [blame] | 23 | long xdl_opts; |
Miklos Vajna | 8a2fce1 | 2008-08-25 16:25:57 +0200 | [diff] [blame] | 24 | int verbosity; |
Elijah Newren | 5fdddd9 | 2018-08-29 00:06:12 -0700 | [diff] [blame] | 25 | int detect_directory_renames; |
Ben Peart | 85b4603 | 2018-05-02 16:01:14 +0000 | [diff] [blame] | 26 | int diff_detect_rename; |
| 27 | int merge_detect_rename; |
Miklos Vajna | 8a2fce1 | 2008-08-25 16:25:57 +0200 | [diff] [blame] | 28 | int diff_rename_limit; |
| 29 | int merge_rename_limit; |
Kevin Ballard | 10ae752 | 2010-09-27 16:58:25 -0700 | [diff] [blame] | 30 | int rename_score; |
Jeff King | bf0ab10 | 2011-02-19 05:20:51 -0500 | [diff] [blame] | 31 | int needed_rename_limit; |
Jeff King | 99bfc66 | 2011-02-20 04:53:21 -0500 | [diff] [blame] | 32 | int show_rename_progress; |
Miklos Vajna | 5033639 | 2008-09-02 23:30:09 +0200 | [diff] [blame] | 33 | int call_depth; |
Miklos Vajna | c7d8492 | 2008-09-03 02:30:03 +0200 | [diff] [blame] | 34 | struct strbuf obuf; |
Kevin Willford | fc65b00 | 2017-09-07 10:25:56 -0600 | [diff] [blame] | 35 | struct hashmap current_file_dir_set; |
Elijah Newren | 70cc3d3 | 2011-08-11 23:19:58 -0600 | [diff] [blame] | 36 | struct string_list df_conflict_file_set; |
Elijah Newren | 64b1abe | 2018-04-19 10:58:12 -0700 | [diff] [blame] | 37 | struct unpack_trees_options unpack_opts; |
Elijah Newren | a35edc8 | 2018-04-19 10:58:20 -0700 | [diff] [blame] | 38 | struct index_state orig_index; |
Nguyễn Thái Ngọc Duy | 0d6caa2 | 2019-01-12 09:13:29 +0700 | [diff] [blame] | 39 | struct repository *repo; |
Elijah Newren | ea625cb | 2018-02-14 10:51:57 -0800 | [diff] [blame] | 40 | }; |
| 41 | |
Elijah Newren | 7fe40b8 | 2018-04-19 10:58:05 -0700 | [diff] [blame] | 42 | /* |
| 43 | * For dir_rename_entry, directory names are stored as a full path from the |
| 44 | * toplevel of the repository and do not include a trailing '/'. Also: |
| 45 | * |
| 46 | * dir: original name of directory being renamed |
| 47 | * non_unique_new_dir: if true, could not determine new_dir |
| 48 | * new_dir: final name of directory being renamed |
| 49 | * possible_new_dirs: temporary used to help determine new_dir; see comments |
| 50 | * in get_directory_renames() for details |
| 51 | */ |
| 52 | struct dir_rename_entry { |
| 53 | struct hashmap_entry ent; /* must be the first member! */ |
| 54 | char *dir; |
| 55 | unsigned non_unique_new_dir:1; |
| 56 | struct strbuf new_dir; |
| 57 | struct string_list possible_new_dirs; |
| 58 | }; |
| 59 | |
Elijah Newren | e95ab70 | 2018-04-19 10:58:07 -0700 | [diff] [blame] | 60 | struct collision_entry { |
| 61 | struct hashmap_entry ent; /* must be the first member! */ |
| 62 | char *target_file; |
| 63 | struct string_list source_files; |
| 64 | unsigned reported_already:1; |
| 65 | }; |
| 66 | |
Ben Peart | 85b4603 | 2018-05-02 16:01:14 +0000 | [diff] [blame] | 67 | static inline int merge_detect_rename(struct merge_options *o) |
| 68 | { |
| 69 | return o->merge_detect_rename >= 0 ? o->merge_detect_rename : |
| 70 | o->diff_detect_rename >= 0 ? o->diff_detect_rename : 1; |
| 71 | } |
| 72 | |
Miklos Vajna | 8a2fce1 | 2008-08-25 16:25:57 +0200 | [diff] [blame] | 73 | /* merge_trees() but with recursive ancestor consolidation */ |
| 74 | int merge_recursive(struct merge_options *o, |
| 75 | struct commit *h1, |
Daniel Barkalow | e1b3a2c | 2008-02-07 11:40:05 -0500 | [diff] [blame] | 76 | struct commit *h2, |
Daniel Barkalow | e1b3a2c | 2008-02-07 11:40:05 -0500 | [diff] [blame] | 77 | struct commit_list *ancestors, |
| 78 | struct commit **result); |
| 79 | |
Miklos Vajna | 8a2fce1 | 2008-08-25 16:25:57 +0200 | [diff] [blame] | 80 | /* rename-detecting three-way merge, no recursion */ |
| 81 | int merge_trees(struct merge_options *o, |
| 82 | struct tree *head, |
Daniel Barkalow | e1b3a2c | 2008-02-07 11:40:05 -0500 | [diff] [blame] | 83 | struct tree *merge, |
| 84 | struct tree *common, |
Daniel Barkalow | e1b3a2c | 2008-02-07 11:40:05 -0500 | [diff] [blame] | 85 | struct tree **result); |
Daniel Barkalow | e1b3a2c | 2008-02-07 11:40:05 -0500 | [diff] [blame] | 86 | |
Miklos Vajna | 8a2fce1 | 2008-08-25 16:25:57 +0200 | [diff] [blame] | 87 | /* |
| 88 | * "git-merge-recursive" can be fed trees; wrap them into |
| 89 | * virtual commits and call merge_recursive() proper. |
| 90 | */ |
| 91 | int merge_recursive_generic(struct merge_options *o, |
brian m. carlson | 4e8161a | 2016-06-24 23:09:28 +0000 | [diff] [blame] | 92 | const struct object_id *head, |
| 93 | const struct object_id *merge, |
Miklos Vajna | 8a2fce1 | 2008-08-25 16:25:57 +0200 | [diff] [blame] | 94 | int num_ca, |
brian m. carlson | 4e8161a | 2016-06-24 23:09:28 +0000 | [diff] [blame] | 95 | const struct object_id **ca, |
Miklos Vajna | 8a2fce1 | 2008-08-25 16:25:57 +0200 | [diff] [blame] | 96 | struct commit **result); |
| 97 | |
Nguyễn Thái Ngọc Duy | 0d6caa2 | 2019-01-12 09:13:29 +0700 | [diff] [blame] | 98 | void init_merge_options(struct merge_options *o, |
| 99 | struct repository *repo); |
Miklos Vajna | 8a2fce1 | 2008-08-25 16:25:57 +0200 | [diff] [blame] | 100 | struct tree *write_tree_from_memory(struct merge_options *o); |
Miklos Vajna | 9047ebb | 2008-08-12 18:45:14 +0200 | [diff] [blame] | 101 | |
Jonathan Nieder | 635a7bb | 2010-08-26 00:47:58 -0500 | [diff] [blame] | 102 | int parse_merge_opt(struct merge_options *out, const char *s); |
| 103 | |
Daniel Barkalow | e1b3a2c | 2008-02-07 11:40:05 -0500 | [diff] [blame] | 104 | #endif |