2008-02-07 17:40:05 +01:00
|
|
|
#ifndef MERGE_RECURSIVE_H
|
|
|
|
#define MERGE_RECURSIVE_H
|
|
|
|
|
2008-09-03 19:08:56 +02:00
|
|
|
#include "string-list.h"
|
2018-08-15 19:54:05 +02:00
|
|
|
#include "unpack-trees.h"
|
|
|
|
|
|
|
|
struct commit;
|
2008-09-03 19:08:56 +02:00
|
|
|
|
2019-01-12 03:13:29 +01:00
|
|
|
struct repository;
|
|
|
|
|
2008-08-25 16:25:57 +02:00
|
|
|
struct merge_options {
|
2010-03-21 01:41:38 +01:00
|
|
|
const char *ancestor;
|
2008-08-25 16:25:57 +02:00
|
|
|
const char *branch1;
|
|
|
|
const char *branch2;
|
2009-11-26 03:23:55 +01:00
|
|
|
enum {
|
2008-07-01 07:18:57 +02:00
|
|
|
MERGE_RECURSIVE_NORMAL = 0,
|
2009-11-26 03:23:55 +01:00
|
|
|
MERGE_RECURSIVE_OURS,
|
2010-05-14 11:31:35 +02:00
|
|
|
MERGE_RECURSIVE_THEIRS
|
2009-11-26 03:23:55 +01:00
|
|
|
} recursive_variant;
|
2008-07-01 07:18:57 +02:00
|
|
|
const char *subtree_shift;
|
2016-08-01 13:44:50 +02:00
|
|
|
unsigned buffer_output; /* 1: output at end, 2: keep buffered */
|
2010-08-05 13:15:32 +02:00
|
|
|
unsigned renormalize : 1;
|
2010-08-26 07:50:45 +02:00
|
|
|
long xdl_opts;
|
2008-08-25 16:25:57 +02:00
|
|
|
int verbosity;
|
2019-08-17 20:41:25 +02:00
|
|
|
enum {
|
|
|
|
MERGE_DIRECTORY_RENAMES_NONE = 0,
|
|
|
|
MERGE_DIRECTORY_RENAMES_CONFLICT = 1,
|
|
|
|
MERGE_DIRECTORY_RENAMES_TRUE = 2
|
|
|
|
} detect_directory_renames;
|
2019-08-17 20:41:38 +02:00
|
|
|
int detect_renames;
|
|
|
|
int rename_limit;
|
2010-09-28 01:58:25 +02:00
|
|
|
int rename_score;
|
2011-02-19 11:20:51 +01:00
|
|
|
int needed_rename_limit;
|
2011-02-20 10:53:21 +01:00
|
|
|
int show_rename_progress;
|
2008-09-02 23:30:09 +02:00
|
|
|
int call_depth;
|
2008-09-03 02:30:03 +02:00
|
|
|
struct strbuf obuf;
|
2017-09-07 18:25:56 +02:00
|
|
|
struct hashmap current_file_dir_set;
|
2011-08-12 07:19:58 +02:00
|
|
|
struct string_list df_conflict_file_set;
|
2018-04-19 19:58:12 +02:00
|
|
|
struct unpack_trees_options unpack_opts;
|
2018-04-19 19:58:20 +02:00
|
|
|
struct index_state orig_index;
|
2019-01-12 03:13:29 +01:00
|
|
|
struct repository *repo;
|
2018-02-14 19:51:57 +01:00
|
|
|
};
|
|
|
|
|
2019-08-17 20:41:37 +02:00
|
|
|
void init_merge_options(struct merge_options *opt, struct repository *repo);
|
|
|
|
|
|
|
|
/* parse the option in s and update the relevant field of opt */
|
|
|
|
int parse_merge_opt(struct merge_options *opt, const char *s);
|
|
|
|
|
2018-04-19 19:58:05 +02:00
|
|
|
/*
|
2019-08-17 20:41:37 +02:00
|
|
|
* RETURN VALUES: All the merge_* functions below return a value as follows:
|
|
|
|
* > 0 Merge was clean
|
|
|
|
* = 0 Merge had conflicts
|
|
|
|
* < 0 Merge hit an unexpected and unrecoverable problem (e.g. disk
|
|
|
|
* full) and aborted merge part-way through.
|
2018-04-19 19:58:05 +02:00
|
|
|
*/
|
2018-04-19 19:58:07 +02:00
|
|
|
|
2019-08-17 20:41:37 +02:00
|
|
|
/*
|
|
|
|
* rename-detecting three-way merge, no recursion.
|
|
|
|
*
|
|
|
|
* Outputs:
|
|
|
|
* - See RETURN VALUES above
|
|
|
|
* - No commit is created
|
|
|
|
* - opt->repo->index has the new index
|
|
|
|
* - $GIT_INDEX_FILE is not updated
|
|
|
|
* - The working tree is updated with results of the merge
|
|
|
|
*/
|
|
|
|
int merge_trees(struct merge_options *opt,
|
|
|
|
struct tree *head,
|
|
|
|
struct tree *merge,
|
|
|
|
struct tree *merge_base);
|
2018-05-02 18:01:14 +02:00
|
|
|
|
2019-08-17 20:41:30 +02:00
|
|
|
/*
|
|
|
|
* merge_recursive is like merge_trees() but with recursive ancestor
|
2019-08-17 20:41:37 +02:00
|
|
|
* consolidation and, if the commit is clean, creation of a commit.
|
2019-08-17 20:41:30 +02:00
|
|
|
*
|
|
|
|
* NOTE: empirically, about a decade ago it was determined that with more
|
|
|
|
* than two merge bases, optimal behavior was found when the
|
2019-08-17 20:41:34 +02:00
|
|
|
* merge_bases were passed in the order of oldest commit to newest
|
|
|
|
* commit. Also, merge_bases will be consumed (emptied) so make a
|
|
|
|
* copy if you need it.
|
2019-08-17 20:41:37 +02:00
|
|
|
*
|
|
|
|
* Outputs:
|
|
|
|
* - See RETURN VALUES above
|
|
|
|
* - If merge is clean, a commit is created and its address written to *result
|
|
|
|
* - opt->repo->index has the new index
|
|
|
|
* - $GIT_INDEX_FILE is not updated
|
|
|
|
* - The working tree is updated with results of the merge
|
2019-08-17 20:41:30 +02:00
|
|
|
*/
|
2019-08-17 20:41:36 +02:00
|
|
|
int merge_recursive(struct merge_options *opt,
|
2008-08-25 16:25:57 +02:00
|
|
|
struct commit *h1,
|
2008-02-07 17:40:05 +01:00
|
|
|
struct commit *h2,
|
2019-08-17 20:41:34 +02:00
|
|
|
struct commit_list *merge_bases,
|
2008-02-07 17:40:05 +01:00
|
|
|
struct commit **result);
|
|
|
|
|
2019-08-17 20:41:30 +02:00
|
|
|
/*
|
2019-08-17 20:41:37 +02:00
|
|
|
* merge_recursive_generic can operate on trees instead of commits, by
|
|
|
|
* wrapping the trees into virtual commits, and calling merge_recursive().
|
|
|
|
* It also writes out the in-memory index to disk if the merge is successful.
|
|
|
|
*
|
|
|
|
* Outputs:
|
|
|
|
* - See RETURN VALUES above
|
|
|
|
* - If merge is clean, a commit is created and its address written to *result
|
|
|
|
* - opt->repo->index has the new index
|
|
|
|
* - $GIT_INDEX_FILE is updated
|
|
|
|
* - The working tree is updated with results of the merge
|
2008-08-25 16:25:57 +02:00
|
|
|
*/
|
2019-08-17 20:41:36 +02:00
|
|
|
int merge_recursive_generic(struct merge_options *opt,
|
2016-06-25 01:09:28 +02:00
|
|
|
const struct object_id *head,
|
|
|
|
const struct object_id *merge,
|
2019-08-17 20:41:34 +02:00
|
|
|
int num_merge_bases,
|
|
|
|
const struct object_id **merge_bases,
|
2008-08-25 16:25:57 +02:00
|
|
|
struct commit **result);
|
|
|
|
|
2008-02-07 17:40:05 +01:00
|
|
|
#endif
|