Blame src/merge_driver.h

Packit Service 20376f
/*
Packit Service 20376f
 * Copyright (C) the libgit2 contributors. All rights reserved.
Packit Service 20376f
 *
Packit Service 20376f
 * This file is part of libgit2, distributed under the GNU GPL v2 with
Packit Service 20376f
 * a Linking Exception. For full terms see the included COPYING file.
Packit Service 20376f
 */
Packit Service 20376f
#ifndef INCLUDE_merge_driver_h__
Packit Service 20376f
#define INCLUDE_merge_driver_h__
Packit Service 20376f
Packit Service 20376f
#include "git2/merge.h"
Packit Service 20376f
#include "git2/index.h"
Packit Service 20376f
#include "git2/sys/merge.h"
Packit Service 20376f
Packit Service 20376f
struct git_merge_driver_source {
Packit Service 20376f
	git_repository *repo;
Packit Service 20376f
	const char *default_driver;
Packit Service 20376f
	const git_merge_file_options *file_opts;
Packit Service 20376f
Packit Service 20376f
	const git_index_entry *ancestor;
Packit Service 20376f
	const git_index_entry *ours;
Packit Service 20376f
	const git_index_entry *theirs;
Packit Service 20376f
};
Packit Service 20376f
Packit Service 20376f
typedef struct git_merge_driver__builtin {
Packit Service 20376f
	git_merge_driver base;
Packit Service 20376f
	git_merge_file_favor_t favor;
Packit Service 20376f
} git_merge_driver__builtin;
Packit Service 20376f
Packit Service 20376f
extern int git_merge_driver_global_init(void);
Packit Service 20376f
Packit Service 20376f
extern int git_merge_driver_for_path(
Packit Service 20376f
	char **name_out,
Packit Service 20376f
	git_merge_driver **driver_out,
Packit Service 20376f
	git_repository *repo,
Packit Service 20376f
	const char *path);
Packit Service 20376f
Packit Service 20376f
/* Merge driver configuration */
Packit Service 20376f
extern int git_merge_driver_for_source(
Packit Service 20376f
	const char **name_out,
Packit Service 20376f
	git_merge_driver **driver_out,
Packit Service 20376f
	const git_merge_driver_source *src);
Packit Service 20376f
Packit Service 20376f
extern int git_merge_driver__builtin_apply(
Packit Service 20376f
	git_merge_driver *self,
Packit Service 20376f
	const char **path_out,
Packit Service 20376f
	uint32_t *mode_out,
Packit Service 20376f
	git_buf *merged_out,
Packit Service 20376f
	const char *filter_name,
Packit Service 20376f
	const git_merge_driver_source *src);
Packit Service 20376f
Packit Service 20376f
/* Merge driver for text files, performs a standard three-way merge */
Packit Service 20376f
extern git_merge_driver__builtin git_merge_driver__text;
Packit Service 20376f
Packit Service 20376f
/* Merge driver for union-style merging */
Packit Service 20376f
extern git_merge_driver__builtin git_merge_driver__union;
Packit Service 20376f
Packit Service 20376f
/* Merge driver for unmergeable (binary) files: always produces conflicts */
Packit Service 20376f
extern git_merge_driver git_merge_driver__binary;
Packit Service 20376f
Packit Service 20376f
#endif