C++ (Cpp) git_path_check_mergeの例

コード例 #1

ファイル: ll-merge.c プロジェクト: qmx/git

int ll_merge(mmbuffer_t *result_buf,
             const char *path,
             mmfile_t *ancestor, const char *ancestor_label,
             mmfile_t *ours, const char *our_label,
             mmfile_t *theirs, const char *their_label,
             int flag)
{
    static struct git_attr_check check[2];
    const char *ll_driver_name = NULL;
    int marker_size = DEFAULT_CONFLICT_MARKER_SIZE;
    const struct ll_merge_driver *driver;
    int virtual_ancestor = flag & LL_OPT_VIRTUAL_ANCESTOR;

    if (flag & LL_OPT_RENORMALIZE) {
        normalize_file(ancestor, path);
        normalize_file(ours, path);
        normalize_file(theirs, path);
    }
    if (!git_path_check_merge(path, check)) {
        ll_driver_name = check[0].value;
        if (check[1].value) {
            marker_size = atoi(check[1].value);
            if (marker_size <= 0)
                marker_size = DEFAULT_CONFLICT_MARKER_SIZE;
        }
    }
    driver = find_ll_merge_driver(ll_driver_name);
    if (virtual_ancestor && driver->recursive)
        driver = find_ll_merge_driver(driver->recursive);
    return driver->fn(driver, result_buf, path, ancestor, ancestor_label,
                      ours, our_label, theirs, their_label,
                      flag, marker_size);
}

コード例 #2

ファイル: ll-merge.c プロジェクト: Pistos/git

int ll_merge(mmbuffer_t *result_buf,
	     const char *path,
	     mmfile_t *ancestor,
	     mmfile_t *ours, const char *our_label,
	     mmfile_t *theirs, const char *their_label,
	     int virtual_ancestor)
{
	const char *ll_driver_name;
	const struct ll_merge_driver *driver;

	ll_driver_name = git_path_check_merge(path);
	driver = find_ll_merge_driver(ll_driver_name);

	if (virtual_ancestor && driver->recursive)
		driver = find_ll_merge_driver(driver->recursive);
	return driver->fn(driver, result_buf, path,
			  ancestor,
			  ours, our_label,
			  theirs, their_label, virtual_ancestor);
}

コード例 #3

ファイル: ll-merge.c プロジェクト: UndefinedBehaviour/git

int ll_merge(mmbuffer_t *result_buf,
	     const char *path,
	     mmfile_t *ancestor, const char *ancestor_label,
	     mmfile_t *ours, const char *our_label,
	     mmfile_t *theirs, const char *their_label,
	     const struct ll_merge_options *opts)
{
	static struct git_attr_check check[2];
	static const struct ll_merge_options default_opts;
	const char *ll_driver_name = NULL;
	int marker_size = DEFAULT_CONFLICT_MARKER_SIZE;
	const struct ll_merge_driver *driver;

	if (!opts)
		opts = &default_opts;

	if (opts->renormalize) {
		normalize_file(ancestor, path);
		normalize_file(ours, path);
		normalize_file(theirs, path);
	}
	if (!git_path_check_merge(path, check)) {
		ll_driver_name = check[0].value;
		if (check[1].value) {
			marker_size = atoi(check[1].value);
			if (marker_size <= 0)
				marker_size = DEFAULT_CONFLICT_MARKER_SIZE;
		}
	}
	driver = find_ll_merge_driver(ll_driver_name);
	if (opts->virtual_ancestor && driver->recursive)
		driver = find_ll_merge_driver(driver->recursive);
	return driver->fn(driver, result_buf, path, ancestor, ancestor_label,
			  ours, our_label, theirs, their_label,
			  opts, marker_size);
}