Commit 00f8f97d authored by Junio C Hamano's avatar Junio C Hamano

xdl_merge(): introduce xmparam_t for merge specific parameters

So far we have only needed to be able to pass an option that is generic to
xdiff family of functions to this function.  Extend the interface so that
we can give it merge specific parameters.
Signed-off-by: default avatarJunio C Hamano <[email protected]>
parent 7fb0eaa2
......@@ -25,7 +25,7 @@ int cmd_merge_file(int argc, const char **argv, const char *prefix)
const char *names[3] = { NULL, NULL, NULL };
mmfile_t mmfs[3];
mmbuffer_t result = {NULL, 0};
xpparam_t xpp = {XDF_NEED_MINIMAL};
xmparam_t xmp = {{XDF_NEED_MINIMAL}};
int ret = 0, i = 0, to_stdout = 0;
int merge_level = XDL_MERGE_ZEALOUS_ALNUM;
int merge_style = 0, quiet = 0;
......@@ -68,7 +68,7 @@ int cmd_merge_file(int argc, const char **argv, const char *prefix)
}
ret = xdl_merge(mmfs + 1, mmfs + 0, names[0], mmfs + 2, names[2],
&xpp, merge_level | merge_style, &result);
&xmp, merge_level | merge_style, &result);
for (i = 0; i < 3; i++)
free(mmfs[i].ptr);
......
......@@ -61,7 +61,7 @@ static int ll_xdl_merge(const struct ll_merge_driver *drv_unused,
mmfile_t *src2, const char *name2,
int virtual_ancestor)
{
xpparam_t xpp;
xmparam_t xmp;
int style = 0;
if (buffer_is_binary(orig->ptr, orig->size) ||
......@@ -76,13 +76,13 @@ static int ll_xdl_merge(const struct ll_merge_driver *drv_unused,
virtual_ancestor);
}
memset(&xpp, 0, sizeof(xpp));
memset(&xmp, 0, sizeof(xmp));
if (git_xmerge_style >= 0)
style = git_xmerge_style;
return xdl_merge(orig,
src1, name1,
src2, name2,
&xpp, XDL_MERGE_ZEALOUS | style,
&xmp, XDL_MERGE_ZEALOUS | style,
result);
}
......
......@@ -27,12 +27,12 @@ static void free_mmfile(mmfile_t *f)
static void *three_way_filemerge(mmfile_t *base, mmfile_t *our, mmfile_t *their, unsigned long *size)
{
mmbuffer_t res;
xpparam_t xpp;
xmparam_t xmp;
int merge_status;
memset(&xpp, 0, sizeof(xpp));
memset(&xmp, 0, sizeof(xmp));
merge_status = xdl_merge(base, our, ".our", their, ".their",
&xpp, XDL_MERGE_ZEALOUS, &res);
&xmp, XDL_MERGE_ZEALOUS, &res);
if (merge_status < 0)
return NULL;
......
......@@ -332,7 +332,7 @@ static int merge(const char *name, const char *path)
int ret;
mmfile_t cur, base, other;
mmbuffer_t result = {NULL, 0};
xpparam_t xpp = {XDF_NEED_MINIMAL};
xmparam_t xmp = {{XDF_NEED_MINIMAL}};
if (handle_file(path, NULL, rerere_path(name, "thisimage")) < 0)
return 1;
......@@ -342,7 +342,7 @@ static int merge(const char *name, const char *path)
read_mmfile(&other, rerere_path(name, "postimage")))
return 1;
ret = xdl_merge(&base, &cur, "", &other, "",
&xpp, XDL_MERGE_ZEALOUS, &result);
&xmp, XDL_MERGE_ZEALOUS, &result);
if (!ret) {
FILE *f = fopen(path, "w");
if (!f)
......
......@@ -108,9 +108,13 @@ long xdl_mmfile_size(mmfile_t *mmf);
int xdl_diff(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp,
xdemitconf_t const *xecfg, xdemitcb_t *ecb);
typedef struct s_xmparam {
xpparam_t xpp;
} xmparam_t;
int xdl_merge(mmfile_t *orig, mmfile_t *mf1, const char *name1,
mmfile_t *mf2, const char *name2,
xpparam_t const *xpp, int level, mmbuffer_t *result);
xmparam_t const *xmp, int level, mmbuffer_t *result);
#ifdef __cplusplus
}
......
......@@ -538,10 +538,11 @@ static int xdl_do_merge(xdfenv_t *xe1, xdchange_t *xscr1, const char *name1,
int xdl_merge(mmfile_t *orig, mmfile_t *mf1, const char *name1,
mmfile_t *mf2, const char *name2,
xpparam_t const *xpp, int flags, mmbuffer_t *result) {
xmparam_t const *xmp, int flags, mmbuffer_t *result) {
xdchange_t *xscr1, *xscr2;
xdfenv_t xe1, xe2;
int status;
xpparam_t const *xpp = &xmp->xpp;
result->ptr = NULL;
result->size = 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment