merge_helpers.h 1.96 KB
Newer Older
Edward Thomson committed
1 2 3 4 5 6 7 8
#ifndef INCLUDE_cl_merge_helpers_h__
#define INCLUDE_cl_merge_helpers_h__

#include "merge.h"
#include "git2/merge.h"

struct merge_index_entry {
	uint16_t mode;
9
	char oid_str[GIT_OID_HEXSZ+1];
Edward Thomson committed
10 11 12 13 14 15 16 17 18 19 20
	int stage;
	char path[128];
};

struct merge_name_entry {
	char ancestor_path[128];
	char our_path[128];
	char their_path[128];
};

struct merge_index_with_status {
21 22
	struct merge_index_entry entry;
	unsigned int status;
Edward Thomson committed
23 24 25 26 27 28 29
};

struct merge_reuc_entry {
	char path[128];
	unsigned int ancestor_mode;
	unsigned int our_mode;
	unsigned int their_mode;
30 31 32
	char ancestor_oid_str[GIT_OID_HEXSZ+1];
	char our_oid_str[GIT_OID_HEXSZ+1];
	char their_oid_str[GIT_OID_HEXSZ+1];
Edward Thomson committed
33 34 35 36 37 38 39 40 41 42 43 44
};

struct merge_index_conflict_data {
	struct merge_index_with_status ancestor;
	struct merge_index_with_status ours;
	struct merge_index_with_status theirs;
	git_merge_diff_type_t change_type;
};

int merge_trees_from_branches(
	git_index **index, git_repository *repo,
	const char *ours_name, const char *theirs_name,
45
	git_merge_options *opts);
Edward Thomson committed
46

47 48 49
int merge_commits_from_branches(
	git_index **index, git_repository *repo,
	const char *ours_name, const char *theirs_name,
50
	git_merge_options *opts);
51

52
int merge_branches(git_repository *repo,
53
	const char *ours_branch, const char *theirs_branch,
54
	git_merge_options *merge_opts, git_checkout_options *checkout_opts);
55

Edward Thomson committed
56 57 58 59 60 61 62 63 64 65 66 67 68
int merge_test_diff_list(git_merge_diff_list *diff_list, const struct merge_index_entry expected[], size_t expected_len);

int merge_test_merge_conflicts(git_vector *conflicts, const struct merge_index_conflict_data expected[], size_t expected_len);

int merge_test_index(git_index *index, const struct merge_index_entry expected[], size_t expected_len);

int merge_test_names(git_index *index, const struct merge_name_entry expected[], size_t expected_len);

int merge_test_reuc(git_index *index, const struct merge_reuc_entry expected[], size_t expected_len);

int merge_test_workdir(git_repository *repo, const struct merge_index_entry expected[], size_t expected_len);

#endif