merge.h 4.51 KB
Newer Older
Edward Thomson committed
1
/*
Edward Thomson committed
2
 * Copyright (C) the libgit2 contributors. All rights reserved.
Edward Thomson committed
3 4 5 6 7 8 9
 *
 * This file is part of libgit2, distributed under the GNU GPL v2 with
 * a Linking Exception. For full terms see the included COPYING file.
 */
#ifndef INCLUDE_merge_h__
#define INCLUDE_merge_h__

10
#include "vector.h"
Edward Thomson committed
11 12
#include "commit_list.h"
#include "pool.h"
13
#include "iterator.h"
Edward Thomson committed
14 15 16

#include "git2/merge.h"
#include "git2/types.h"
Edward Thomson committed
17 18 19

#define GIT_MERGE_MSG_FILE		"MERGE_MSG"
#define GIT_MERGE_MODE_FILE		"MERGE_MODE"
20
#define GIT_MERGE_FILE_MODE		0666
Edward Thomson committed
21

22 23
#define GIT_MERGE_DEFAULT_RENAME_THRESHOLD	50
#define GIT_MERGE_DEFAULT_TARGET_LIMIT		1000
Edward Thomson committed
24 25 26 27 28

/** Types of changes when files are merged from branch to branch. */
typedef enum {
	/* No conflict - a change only occurs in one branch. */
	GIT_MERGE_DIFF_NONE = 0,
nulltoken committed
29

Edward Thomson committed
30 31
	/* Occurs when a file is modified in both branches. */
	GIT_MERGE_DIFF_BOTH_MODIFIED = (1 << 0),
nulltoken committed
32

Edward Thomson committed
33 34
	/* Occurs when a file is added in both branches. */
	GIT_MERGE_DIFF_BOTH_ADDED = (1 << 1),
nulltoken committed
35

Edward Thomson committed
36 37
	/* Occurs when a file is deleted in both branches. */
	GIT_MERGE_DIFF_BOTH_DELETED = (1 << 2),
nulltoken committed
38

Edward Thomson committed
39 40
	/* Occurs when a file is modified in one branch and deleted in the other. */
	GIT_MERGE_DIFF_MODIFIED_DELETED = (1 << 3),
nulltoken committed
41

Edward Thomson committed
42 43
	/* Occurs when a file is renamed in one branch and modified in the other. */
	GIT_MERGE_DIFF_RENAMED_MODIFIED = (1 << 4),
nulltoken committed
44

Edward Thomson committed
45 46
	/* Occurs when a file is renamed in one branch and deleted in the other. */
	GIT_MERGE_DIFF_RENAMED_DELETED = (1 << 5),
nulltoken committed
47

Edward Thomson committed
48 49 50 51
	/* Occurs when a file is renamed in one branch and a file with the same
	 * name is added in the other.  Eg, A->B and new file B.  Core git calls
	 * this a "rename/delete". */
	GIT_MERGE_DIFF_RENAMED_ADDED = (1 << 6),
nulltoken committed
52

Edward Thomson committed
53 54 55
	/* Occurs when both a file is renamed to the same name in the ours and
	 * theirs branches.  Eg, A->B and A->B in both.  Automergeable. */
	GIT_MERGE_DIFF_BOTH_RENAMED = (1 << 7),
nulltoken committed
56

Edward Thomson committed
57 58 59
	/* Occurs when a file is renamed to different names in the ours and theirs
	 * branches.  Eg, A->B and A->C. */
	GIT_MERGE_DIFF_BOTH_RENAMED_1_TO_2 = (1 << 8),
nulltoken committed
60

Edward Thomson committed
61 62 63
	/* Occurs when two files are renamed to the same name in the ours and
	 * theirs branches.  Eg, A->C and B->C. */
	GIT_MERGE_DIFF_BOTH_RENAMED_2_TO_1 = (1 << 9),
nulltoken committed
64

Edward Thomson committed
65 66 67
	/* Occurs when an item at a path in one branch is a directory, and an
	 * item at the same path in a different branch is a file. */
	GIT_MERGE_DIFF_DIRECTORY_FILE = (1 << 10),
nulltoken committed
68

Edward Thomson committed
69 70 71 72 73 74
	/* The child of a folder that is in a directory/file conflict. */
	GIT_MERGE_DIFF_DF_CHILD = (1 << 11),
} git_merge_diff_type_t;


typedef struct {
Linquize committed
75 76
	git_repository *repo;
	git_pool pool;
nulltoken committed
77

Linquize committed
78
	/* Vector of git_index_entry that represent the merged items that
Edward Thomson committed
79 80 81 82
	 * have been staged, either because only one side changed, or because
	 * the two changes were non-conflicting and mergeable.  These items
	 * will be written as staged entries in the main index.
	 */
Linquize committed
83
	git_vector staged;
nulltoken committed
84

Linquize committed
85
	/* Vector of git_merge_diff entries that represent the conflicts that
Edward Thomson committed
86 87 88
	 * have not been automerged.  These items will be written to high-stage
	 * entries in the main index.
	 */
Linquize committed
89
	git_vector conflicts;
nulltoken committed
90

Linquize committed
91
	/* Vector of git_merge_diff that have been automerged.  These items
Edward Thomson committed
92 93
	 * will be written to the REUC when the index is produced.
	 */
Linquize committed
94
	git_vector resolved;
Edward Thomson committed
95 96 97 98 99 100
} git_merge_diff_list;

/**
 * Description of changes to one file across three trees.
 */
typedef struct {
Linquize committed
101
	git_merge_diff_type_t type;
nulltoken committed
102

Linquize committed
103
	git_index_entry ancestor_entry;
nulltoken committed
104

Linquize committed
105 106
	git_index_entry our_entry;
	git_delta_t our_status;
nulltoken committed
107

Linquize committed
108 109
	git_index_entry their_entry;
	git_delta_t their_status;
110

Edward Thomson committed
111 112 113 114 115 116 117 118
} git_merge_diff;

int git_merge__bases_many(
	git_commit_list **out,
	git_revwalk *walk,
	git_commit_list_node *one,
	git_vector *twos);

Edward Thomson committed
119 120 121 122
/*
 * Three-way tree differencing
 */

Edward Thomson committed
123 124
git_merge_diff_list *git_merge_diff_list__alloc(git_repository *repo);

125 126 127 128 129
int git_merge_diff_list__find_differences(
	git_merge_diff_list *merge_diff_list,
	git_iterator *ancestor_iterator,
	git_iterator *ours_iter,
	git_iterator *theirs_iter);
Edward Thomson committed
130

131
int git_merge_diff_list__find_renames(git_repository *repo, git_merge_diff_list *merge_diff_list, const git_merge_options *opts);
Edward Thomson committed
132

Edward Thomson committed
133
void git_merge_diff_list__free(git_merge_diff_list *diff_list);
Edward Thomson committed
134

Edward Thomson committed
135 136 137 138
/* Merge metadata setup */

int git_merge__setup(
	git_repository *repo,
139 140
	const git_annotated_commit *our_head,
	const git_annotated_commit *heads[],
141
	size_t heads_len);
Edward Thomson committed
142

143 144 145 146 147 148 149 150
int git_merge__iterators(
	git_index **out,
	git_repository *repo,
	git_iterator *ancestor_iter,
	git_iterator *our_iter,
	git_iterator *their_iter,
	const git_merge_options *given_opts);

151
int git_merge__check_result(git_repository *repo, git_index *index_new);
152

153 154
int git_merge__append_conflicts_to_merge_msg(git_repository *repo, git_index *index);

Edward Thomson committed
155
#endif