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" |
| 5 | |
Miklos Vajna | 8a2fce1 | 2008-08-25 16:25:57 +0200 | [diff] [blame] | 6 | struct merge_options { |
Jonathan Nieder | 4c5868f | 2010-03-20 19:41:38 -0500 | [diff] [blame] | 7 | const char *ancestor; |
Miklos Vajna | 8a2fce1 | 2008-08-25 16:25:57 +0200 | [diff] [blame] | 8 | const char *branch1; |
| 9 | const char *branch2; |
Avery Pennarun | 8cc5b29 | 2009-11-25 21:23:55 -0500 | [diff] [blame] | 10 | enum { |
Junio C Hamano | 85e51b7 | 2008-06-30 22:18:57 -0700 | [diff] [blame] | 11 | MERGE_RECURSIVE_NORMAL = 0, |
Avery Pennarun | 8cc5b29 | 2009-11-25 21:23:55 -0500 | [diff] [blame] | 12 | MERGE_RECURSIVE_OURS, |
Gary V. Vaughan | 4b05548 | 2010-05-14 09:31:35 +0000 | [diff] [blame] | 13 | MERGE_RECURSIVE_THEIRS |
Avery Pennarun | 8cc5b29 | 2009-11-25 21:23:55 -0500 | [diff] [blame] | 14 | } recursive_variant; |
Junio C Hamano | 85e51b7 | 2008-06-30 22:18:57 -0700 | [diff] [blame] | 15 | const char *subtree_shift; |
Miklos Vajna | 8a2fce1 | 2008-08-25 16:25:57 +0200 | [diff] [blame] | 16 | unsigned buffer_output : 1; |
Jonathan Nieder | 1bc0ab7 | 2010-08-05 06:15:32 -0500 | [diff] [blame] | 17 | unsigned renormalize : 1; |
Justin Frankel | 58a1ece | 2010-08-26 00:50:45 -0500 | [diff] [blame] | 18 | long xdl_opts; |
Miklos Vajna | 8a2fce1 | 2008-08-25 16:25:57 +0200 | [diff] [blame] | 19 | int verbosity; |
| 20 | int diff_rename_limit; |
| 21 | int merge_rename_limit; |
Kevin Ballard | 10ae752 | 2010-09-27 16:58:25 -0700 | [diff] [blame] | 22 | int rename_score; |
Jeff King | bf0ab10 | 2011-02-19 05:20:51 -0500 | [diff] [blame] | 23 | int needed_rename_limit; |
Jeff King | 99bfc66 | 2011-02-20 04:53:21 -0500 | [diff] [blame] | 24 | int show_rename_progress; |
Miklos Vajna | 5033639 | 2008-09-02 23:30:09 +0200 | [diff] [blame] | 25 | int call_depth; |
Miklos Vajna | c7d8492 | 2008-09-03 02:30:03 +0200 | [diff] [blame] | 26 | struct strbuf obuf; |
Miklos Vajna | 696ee23 | 2008-09-03 19:08:56 +0200 | [diff] [blame] | 27 | struct string_list current_file_set; |
| 28 | struct string_list current_directory_set; |
Elijah Newren | 70cc3d3 | 2011-08-11 23:19:58 -0600 | [diff] [blame] | 29 | struct string_list df_conflict_file_set; |
Miklos Vajna | 8a2fce1 | 2008-08-25 16:25:57 +0200 | [diff] [blame] | 30 | }; |
| 31 | |
| 32 | /* merge_trees() but with recursive ancestor consolidation */ |
| 33 | int merge_recursive(struct merge_options *o, |
| 34 | struct commit *h1, |
Daniel Barkalow | e1b3a2c | 2008-02-07 11:40:05 -0500 | [diff] [blame] | 35 | struct commit *h2, |
Daniel Barkalow | e1b3a2c | 2008-02-07 11:40:05 -0500 | [diff] [blame] | 36 | struct commit_list *ancestors, |
| 37 | struct commit **result); |
| 38 | |
Miklos Vajna | 8a2fce1 | 2008-08-25 16:25:57 +0200 | [diff] [blame] | 39 | /* rename-detecting three-way merge, no recursion */ |
| 40 | int merge_trees(struct merge_options *o, |
| 41 | struct tree *head, |
Daniel Barkalow | e1b3a2c | 2008-02-07 11:40:05 -0500 | [diff] [blame] | 42 | struct tree *merge, |
| 43 | struct tree *common, |
Daniel Barkalow | e1b3a2c | 2008-02-07 11:40:05 -0500 | [diff] [blame] | 44 | struct tree **result); |
Daniel Barkalow | e1b3a2c | 2008-02-07 11:40:05 -0500 | [diff] [blame] | 45 | |
Miklos Vajna | 8a2fce1 | 2008-08-25 16:25:57 +0200 | [diff] [blame] | 46 | /* |
| 47 | * "git-merge-recursive" can be fed trees; wrap them into |
| 48 | * virtual commits and call merge_recursive() proper. |
| 49 | */ |
| 50 | int merge_recursive_generic(struct merge_options *o, |
| 51 | const unsigned char *head, |
| 52 | const unsigned char *merge, |
| 53 | int num_ca, |
| 54 | const unsigned char **ca, |
| 55 | struct commit **result); |
| 56 | |
| 57 | void init_merge_options(struct merge_options *o); |
| 58 | struct tree *write_tree_from_memory(struct merge_options *o); |
Miklos Vajna | 9047ebb | 2008-08-12 18:45:14 +0200 | [diff] [blame] | 59 | |
Jonathan Nieder | 635a7bb | 2010-08-26 00:47:58 -0500 | [diff] [blame] | 60 | int parse_merge_opt(struct merge_options *out, const char *s); |
| 61 | |
Christian Couder | c674d05 | 2010-03-31 21:22:07 +0200 | [diff] [blame] | 62 | /* builtin/merge.c */ |
Jonathan Nieder | 67ac1e1 | 2010-12-10 18:51:44 -0600 | [diff] [blame] | 63 | int try_merge_command(const char *strategy, size_t xopts_nr, |
| 64 | const char **xopts, struct commit_list *common, |
| 65 | const char *head_arg, struct commit_list *remotes); |
Christian Couder | c674d05 | 2010-03-31 21:22:07 +0200 | [diff] [blame] | 66 | |
Daniel Barkalow | e1b3a2c | 2008-02-07 11:40:05 -0500 | [diff] [blame] | 67 | #endif |