#include "interpolate.h"
#include "attr.h"
#include "merge-recursive.h"
-
-static int subtree_merge;
+#include "dir.h"
static struct tree *shift_tree_object(struct tree *one, struct tree *two)
{
}
/*
- * A virtual commit has
- * - (const char *)commit->util set to the name, and
- * - *(int *)commit->object.sha1 set to the virtual id.
+ * A virtual commit has (const char *)commit->util set to the name.
*/
struct commit *make_virtual_commit(struct tree *tree, const char *comment)
{
struct commit *commit = xcalloc(1, sizeof(struct commit));
- static unsigned virtual_id = 1;
commit->tree = tree;
commit->util = (void*)comment;
- *(int*)commit->object.sha1 = virtual_id++;
/* avoid warnings */
commit->object.parsed = 1;
return commit;
unsigned processed:1;
};
-static struct string_list current_file_set = {NULL, 0, 0, 1};
-static struct string_list current_directory_set = {NULL, 0, 0, 1};
-
-static int call_depth = 0;
-int merge_recursive_verbosity = 2;
-static int diff_rename_limit = -1;
-static int merge_rename_limit = -1;
-static int buffer_output = 1;
-static struct strbuf obuf = STRBUF_INIT;
-
-static int show(int v)
+static int show(struct merge_options *o, int v)
{
- return (!call_depth && merge_recursive_verbosity >= v) ||
- merge_recursive_verbosity >= 5;
+ return (!o->call_depth && o->verbosity >= v) || o->verbosity >= 5;
}
-static void flush_output(void)
+static void flush_output(struct merge_options *o)
{
- if (obuf.len) {
- fputs(obuf.buf, stdout);
- strbuf_reset(&obuf);
+ if (o->obuf.len) {
+ fputs(o->obuf.buf, stdout);
+ strbuf_reset(&o->obuf);
}
}
-static void output(int v, const char *fmt, ...)
+static void output(struct merge_options *o, int v, const char *fmt, ...)
{
int len;
va_list ap;
- if (!show(v))
+ if (!show(o, v))
return;
- strbuf_grow(&obuf, call_depth * 2 + 2);
- memset(obuf.buf + obuf.len, ' ', call_depth * 2);
- strbuf_setlen(&obuf, obuf.len + call_depth * 2);
+ strbuf_grow(&o->obuf, o->call_depth * 2 + 2);
+ memset(o->obuf.buf + o->obuf.len, ' ', o->call_depth * 2);
+ strbuf_setlen(&o->obuf, o->obuf.len + o->call_depth * 2);
va_start(ap, fmt);
- len = vsnprintf(obuf.buf + obuf.len, strbuf_avail(&obuf), fmt, ap);
+ len = vsnprintf(o->obuf.buf + o->obuf.len, strbuf_avail(&o->obuf), fmt, ap);
va_end(ap);
if (len < 0)
len = 0;
- if (len >= strbuf_avail(&obuf)) {
- strbuf_grow(&obuf, len + 2);
+ if (len >= strbuf_avail(&o->obuf)) {
+ strbuf_grow(&o->obuf, len + 2);
va_start(ap, fmt);
- len = vsnprintf(obuf.buf + obuf.len, strbuf_avail(&obuf), fmt, ap);
+ len = vsnprintf(o->obuf.buf + o->obuf.len, strbuf_avail(&o->obuf), fmt, ap);
va_end(ap);
- if (len >= strbuf_avail(&obuf)) {
+ if (len >= strbuf_avail(&o->obuf)) {
die("this should not happen, your snprintf is broken");
}
}
- strbuf_setlen(&obuf, obuf.len + len);
- strbuf_add(&obuf, "\n", 1);
- if (!buffer_output)
- flush_output();
+ strbuf_setlen(&o->obuf, o->obuf.len + len);
+ strbuf_add(&o->obuf, "\n", 1);
+ if (!o->buffer_output)
+ flush_output(o);
}
-static void output_commit_title(struct commit *commit)
+static void output_commit_title(struct merge_options *o, struct commit *commit)
{
int i;
- flush_output();
- for (i = call_depth; i--;)
+ flush_output(o);
+ for (i = o->call_depth; i--;)
fputs(" ", stdout);
if (commit->util)
printf("virtual %s\n", (char *)commit->util);
return add_cache_entry(ce, options);
}
-/*
- * This is a global variable which is used in a number of places but
- * only written to in the 'merge' function.
- *
- * index_only == 1 => Don't leave any non-stage 0 entries in the cache and
- * don't update the working directory.
- * 0 => Leave unmerged entries in the cache and update
- * the working directory.
- */
-static int index_only = 0;
-
static void init_tree_desc_from_tree(struct tree_desc *desc, struct tree *tree)
{
parse_tree(tree);
return rc;
}
-struct tree *write_tree_from_memory(void)
+struct tree *write_tree_from_memory(struct merge_options *o)
{
struct tree *result = NULL;
if (unmerged_cache()) {
int i;
- output(0, "There are unmerged index entries:");
+ output(o, 0, "There are unmerged index entries:");
for (i = 0; i < active_nr; i++) {
struct cache_entry *ce = active_cache[i];
if (ce_stage(ce))
- output(0, "%d %.*s", ce_stage(ce), ce_namelen(ce), ce->name);
+ output(o, 0, "%d %.*s", ce_stage(ce), ce_namelen(ce), ce->name);
}
return NULL;
}
{
int len = strlen(path);
char *newpath = xmalloc(baselen + len + 1);
+ struct merge_options *o = context;
+
memcpy(newpath, base, baselen);
memcpy(newpath + baselen, path, len);
newpath[baselen + len] = '\0';
if (S_ISDIR(mode))
- string_list_insert(newpath, ¤t_directory_set);
+ string_list_insert(newpath, &o->current_directory_set);
else
- string_list_insert(newpath, ¤t_file_set);
+ string_list_insert(newpath, &o->current_file_set);
free(newpath);
return READ_TREE_RECURSIVE;
}
-static int get_files_dirs(struct tree *tree)
+static int get_files_dirs(struct merge_options *o, struct tree *tree)
{
int n;
- if (read_tree_recursive(tree, "", 0, 0, NULL, save_files_dirs, NULL))
+ if (read_tree_recursive(tree, "", 0, 0, NULL, save_files_dirs, o))
return 0;
- n = current_file_set.nr + current_directory_set.nr;
+ n = o->current_file_set.nr + o->current_directory_set.nr;
return n;
}
* 'b_tree') to be able to associate the correct cache entries with
* the rename information. 'tree' is always equal to either a_tree or b_tree.
*/
-static struct string_list *get_renames(struct tree *tree,
- struct tree *o_tree,
- struct tree *a_tree,
- struct tree *b_tree,
- struct string_list *entries)
+static struct string_list *get_renames(struct merge_options *o,
+ struct tree *tree,
+ struct tree *o_tree,
+ struct tree *a_tree,
+ struct tree *b_tree,
+ struct string_list *entries)
{
int i;
struct string_list *renames;
diff_setup(&opts);
DIFF_OPT_SET(&opts, RECURSIVE);
opts.detect_rename = DIFF_DETECT_RENAME;
- opts.rename_limit = merge_rename_limit >= 0 ? merge_rename_limit :
- diff_rename_limit >= 0 ? diff_rename_limit :
+ opts.rename_limit = o->merge_rename_limit >= 0 ? o->merge_rename_limit :
+ o->diff_rename_limit >= 0 ? o->diff_rename_limit :
500;
opts.warn_on_too_large_rename = 1;
opts.output_format = DIFF_FORMAT_NO_OUTPUT;
return 0;
}
-static int remove_path(const char *name)
+static int remove_file(struct merge_options *o, int clean,
+ const char *path, int no_wd)
{
- int ret;
- char *slash, *dirs;
-
- ret = unlink(name);
- if (ret)
- return ret;
- dirs = xstrdup(name);
- while ((slash = strrchr(name, '/'))) {
- *slash = '\0';
- if (rmdir(name) != 0)
- break;
- }
- free(dirs);
- return ret;
-}
-
-static int remove_file(int clean, const char *path, int no_wd)
-{
- int update_cache = index_only || clean;
- int update_working_directory = !index_only && !no_wd;
+ int update_cache = o->call_depth || clean;
+ int update_working_directory = !o->call_depth && !no_wd;
if (update_cache) {
if (remove_file_from_cache(path))
return -1;
}
if (update_working_directory) {
- unlink(path);
- if (errno != ENOENT || errno != EISDIR)
+ if (remove_path(path) && errno != ENOENT)
return -1;
- remove_path(path);
}
return 0;
}
-static char *unique_path(const char *path, const char *branch)
+static char *unique_path(struct merge_options *o, const char *path, const char *branch)
{
char *newpath = xmalloc(strlen(path) + 1 + strlen(branch) + 8 + 1);
int suffix = 0;
for (; *p; ++p)
if ('/' == *p)
*p = '_';
- while (string_list_has_string(¤t_file_set, newpath) ||
- string_list_has_string(¤t_directory_set, newpath) ||
+ while (string_list_has_string(&o->current_file_set, newpath) ||
+ string_list_has_string(&o->current_directory_set, newpath) ||
lstat(newpath, &st) == 0)
sprintf(p, "_%d", suffix++);
- string_list_insert(newpath, ¤t_file_set);
+ string_list_insert(newpath, &o->current_file_set);
return newpath;
}
return error(msg, path, ": perhaps a D/F conflict?");
}
-static void update_file_flags(const unsigned char *sha,
+static void update_file_flags(struct merge_options *o,
+ const unsigned char *sha,
unsigned mode,
const char *path,
int update_cache,
int update_wd)
{
- if (index_only)
+ if (o->call_depth)
update_wd = 0;
if (update_wd) {
add_cacheinfo(mode, sha, path, 0, update_wd, ADD_CACHE_OK_TO_ADD);
}
-static void update_file(int clean,
+static void update_file(struct merge_options *o,
+ int clean,
const unsigned char *sha,
unsigned mode,
const char *path)
{
- update_file_flags(sha, mode, path, index_only || clean, !index_only);
+ update_file_flags(o, sha, mode, path, o->call_depth || clean, !o->call_depth);
}
/* Low level file merging, update and removal */
mm->size = size;
}
-static int merge_3way(mmbuffer_t *result_buf,
- struct diff_filespec *o,
+static int merge_3way(struct merge_options *o,
+ mmbuffer_t *result_buf,
+ struct diff_filespec *one,
struct diff_filespec *a,
struct diff_filespec *b,
const char *branch1,
name1 = xstrdup(mkpath("%s:%s", branch1, a->path));
name2 = xstrdup(mkpath("%s:%s", branch2, b->path));
- fill_mm(o->sha1, &orig);
+ fill_mm(one->sha1, &orig);
fill_mm(a->sha1, &src1);
fill_mm(b->sha1, &src2);
merge_status = ll_merge(result_buf, a->path, &orig,
&src1, name1, &src2, name2,
- index_only);
+ o->call_depth);
free(name1);
free(name2);
return merge_status;
}
-static struct merge_file_info merge_file(struct diff_filespec *o,
- struct diff_filespec *a, struct diff_filespec *b,
- const char *branch1, const char *branch2)
+static struct merge_file_info merge_file(struct merge_options *o,
+ struct diff_filespec *one,
+ struct diff_filespec *a,
+ struct diff_filespec *b,
+ const char *branch1,
+ const char *branch2)
{
struct merge_file_info result;
result.merge = 0;
hashcpy(result.sha, b->sha1);
}
} else {
- if (!sha_eq(a->sha1, o->sha1) && !sha_eq(b->sha1, o->sha1))
+ if (!sha_eq(a->sha1, one->sha1) && !sha_eq(b->sha1, one->sha1))
result.merge = 1;
/*
* Merge modes
*/
- if (a->mode == b->mode || a->mode == o->mode)
+ if (a->mode == b->mode || a->mode == one->mode)
result.mode = b->mode;
else {
result.mode = a->mode;
- if (b->mode != o->mode) {
+ if (b->mode != one->mode) {
result.clean = 0;
result.merge = 1;
}
}
- if (sha_eq(a->sha1, b->sha1) || sha_eq(a->sha1, o->sha1))
+ if (sha_eq(a->sha1, b->sha1) || sha_eq(a->sha1, one->sha1))
hashcpy(result.sha, b->sha1);
- else if (sha_eq(b->sha1, o->sha1))
+ else if (sha_eq(b->sha1, one->sha1))
hashcpy(result.sha, a->sha1);
else if (S_ISREG(a->mode)) {
mmbuffer_t result_buf;
int merge_status;
- merge_status = merge_3way(&result_buf, o, a, b,
+ merge_status = merge_3way(o, &result_buf, one, a, b,
branch1, branch2);
if ((merge_status < 0) || !result_buf.ptr)
return result;
}
-static void conflict_rename_rename(struct rename *ren1,
+static void conflict_rename_rename(struct merge_options *o,
+ struct rename *ren1,
const char *branch1,
struct rename *ren2,
const char *branch2)
const char *ren2_dst = ren2->pair->two->path;
const char *dst_name1 = ren1_dst;
const char *dst_name2 = ren2_dst;
- if (string_list_has_string(¤t_directory_set, ren1_dst)) {
- dst_name1 = del[delp++] = unique_path(ren1_dst, branch1);
- output(1, "%s is a directory in %s adding as %s instead",
+ if (string_list_has_string(&o->current_directory_set, ren1_dst)) {
+ dst_name1 = del[delp++] = unique_path(o, ren1_dst, branch1);
+ output(o, 1, "%s is a directory in %s adding as %s instead",
ren1_dst, branch2, dst_name1);
- remove_file(0, ren1_dst, 0);
+ remove_file(o, 0, ren1_dst, 0);
}
- if (string_list_has_string(¤t_directory_set, ren2_dst)) {
- dst_name2 = del[delp++] = unique_path(ren2_dst, branch2);
- output(1, "%s is a directory in %s adding as %s instead",
+ if (string_list_has_string(&o->current_directory_set, ren2_dst)) {
+ dst_name2 = del[delp++] = unique_path(o, ren2_dst, branch2);
+ output(o, 1, "%s is a directory in %s adding as %s instead",
ren2_dst, branch1, dst_name2);
- remove_file(0, ren2_dst, 0);
+ remove_file(o, 0, ren2_dst, 0);
}
- if (index_only) {
+ if (o->call_depth) {
remove_file_from_cache(dst_name1);
remove_file_from_cache(dst_name2);
/*
* Uncomment to leave the conflicting names in the resulting tree
*
- * update_file(0, ren1->pair->two->sha1, ren1->pair->two->mode, dst_name1);
- * update_file(0, ren2->pair->two->sha1, ren2->pair->two->mode, dst_name2);
+ * update_file(o, 0, ren1->pair->two->sha1, ren1->pair->two->mode, dst_name1);
+ * update_file(o, 0, ren2->pair->two->sha1, ren2->pair->two->mode, dst_name2);
*/
} else {
update_stages(dst_name1, NULL, ren1->pair->two, NULL, 1);
free(del[delp]);
}
-static void conflict_rename_dir(struct rename *ren1,
+static void conflict_rename_dir(struct merge_options *o,
+ struct rename *ren1,
const char *branch1)
{
- char *new_path = unique_path(ren1->pair->two->path, branch1);
- output(1, "Renaming %s to %s instead", ren1->pair->one->path, new_path);
- remove_file(0, ren1->pair->two->path, 0);
- update_file(0, ren1->pair->two->sha1, ren1->pair->two->mode, new_path);
+ char *new_path = unique_path(o, ren1->pair->two->path, branch1);
+ output(o, 1, "Renaming %s to %s instead", ren1->pair->one->path, new_path);
+ remove_file(o, 0, ren1->pair->two->path, 0);
+ update_file(o, 0, ren1->pair->two->sha1, ren1->pair->two->mode, new_path);
free(new_path);
}
-static void conflict_rename_rename_2(struct rename *ren1,
+static void conflict_rename_rename_2(struct merge_options *o,
+ struct rename *ren1,
const char *branch1,
struct rename *ren2,
const char *branch2)
{
- char *new_path1 = unique_path(ren1->pair->two->path, branch1);
- char *new_path2 = unique_path(ren2->pair->two->path, branch2);
- output(1, "Renaming %s to %s and %s to %s instead",
+ char *new_path1 = unique_path(o, ren1->pair->two->path, branch1);
+ char *new_path2 = unique_path(o, ren2->pair->two->path, branch2);
+ output(o, 1, "Renaming %s to %s and %s to %s instead",
ren1->pair->one->path, new_path1,
ren2->pair->one->path, new_path2);
- remove_file(0, ren1->pair->two->path, 0);
- update_file(0, ren1->pair->two->sha1, ren1->pair->two->mode, new_path1);
- update_file(0, ren2->pair->two->sha1, ren2->pair->two->mode, new_path2);
+ remove_file(o, 0, ren1->pair->two->path, 0);
+ update_file(o, 0, ren1->pair->two->sha1, ren1->pair->two->mode, new_path1);
+ update_file(o, 0, ren2->pair->two->sha1, ren2->pair->two->mode, new_path2);
free(new_path2);
free(new_path1);
}
-static int process_renames(struct string_list *a_renames,
- struct string_list *b_renames,
- const char *a_branch,
- const char *b_branch)
+static int process_renames(struct merge_options *o,
+ struct string_list *a_renames,
+ struct string_list *b_renames)
{
int clean_merge = 1, i, j;
struct string_list a_by_dst = {NULL, 0, 0, 0}, b_by_dst = {NULL, 0, 0, 0};
renames1 = a_renames;
renames2 = b_renames;
renames2Dst = &b_by_dst;
- branch1 = a_branch;
- branch2 = b_branch;
+ branch1 = o->branch1;
+ branch2 = o->branch2;
} else {
struct rename *tmp;
renames1 = b_renames;
renames2 = a_renames;
renames2Dst = &a_by_dst;
- branch1 = b_branch;
- branch2 = a_branch;
+ branch1 = o->branch2;
+ branch2 = o->branch1;
tmp = ren2;
ren2 = ren1;
ren1 = tmp;
ren2->processed = 1;
if (strcmp(ren1_dst, ren2_dst) != 0) {
clean_merge = 0;
- output(1, "CONFLICT (rename/rename): "
+ output(o, 1, "CONFLICT (rename/rename): "
"Rename \"%s\"->\"%s\" in branch \"%s\" "
"rename \"%s\"->\"%s\" in \"%s\"%s",
src, ren1_dst, branch1,
src, ren2_dst, branch2,
- index_only ? " (left unresolved)": "");
- if (index_only) {
+ o->call_depth ? " (left unresolved)": "");
+ if (o->call_depth) {
remove_file_from_cache(src);
- update_file(0, ren1->pair->one->sha1,
+ update_file(o, 0, ren1->pair->one->sha1,
ren1->pair->one->mode, src);
}
- conflict_rename_rename(ren1, branch1, ren2, branch2);
+ conflict_rename_rename(o, ren1, branch1, ren2, branch2);
} else {
struct merge_file_info mfi;
- remove_file(1, ren1_src, 1);
- mfi = merge_file(ren1->pair->one,
+ remove_file(o, 1, ren1_src, 1);
+ mfi = merge_file(o,
+ ren1->pair->one,
ren1->pair->two,
ren2->pair->two,
branch1,
branch2);
if (mfi.merge || !mfi.clean)
- output(1, "Renaming %s->%s", src, ren1_dst);
+ output(o, 1, "Renaming %s->%s", src, ren1_dst);
if (mfi.merge)
- output(2, "Auto-merging %s", ren1_dst);
+ output(o, 2, "Auto-merging %s", ren1_dst);
if (!mfi.clean) {
- output(1, "CONFLICT (content): merge conflict in %s",
+ output(o, 1, "CONFLICT (content): merge conflict in %s",
ren1_dst);
clean_merge = 0;
- if (!index_only)
+ if (!o->call_depth)
update_stages(ren1_dst,
ren1->pair->one,
ren1->pair->two,
ren2->pair->two,
1 /* clear */);
}
- update_file(mfi.clean, mfi.sha, mfi.mode, ren1_dst);
+ update_file(o, mfi.clean, mfi.sha, mfi.mode, ren1_dst);
}
} else {
/* Renamed in 1, maybe changed in 2 */
struct diff_filespec src_other, dst_other;
int try_merge, stage = a_renames == renames1 ? 3: 2;
- remove_file(1, ren1_src, index_only || stage == 3);
+ remove_file(o, 1, ren1_src, o->call_depth || stage == 3);
hashcpy(src_other.sha1, ren1->src_entry->stages[stage].sha);
src_other.mode = ren1->src_entry->stages[stage].mode;
try_merge = 0;
- if (string_list_has_string(¤t_directory_set, ren1_dst)) {
+ if (string_list_has_string(&o->current_directory_set, ren1_dst)) {
clean_merge = 0;
- output(1, "CONFLICT (rename/directory): Rename %s->%s in %s "
+ output(o, 1, "CONFLICT (rename/directory): Rename %s->%s in %s "
" directory %s added in %s",
ren1_src, ren1_dst, branch1,
ren1_dst, branch2);
- conflict_rename_dir(ren1, branch1);
+ conflict_rename_dir(o, ren1, branch1);
} else if (sha_eq(src_other.sha1, null_sha1)) {
clean_merge = 0;
- output(1, "CONFLICT (rename/delete): Rename %s->%s in %s "
+ output(o, 1, "CONFLICT (rename/delete): Rename %s->%s in %s "
"and deleted in %s",
ren1_src, ren1_dst, branch1,
branch2);
- update_file(0, ren1->pair->two->sha1, ren1->pair->two->mode, ren1_dst);
+ update_file(o, 0, ren1->pair->two->sha1, ren1->pair->two->mode, ren1_dst);
} else if (!sha_eq(dst_other.sha1, null_sha1)) {
const char *new_path;
clean_merge = 0;
try_merge = 1;
- output(1, "CONFLICT (rename/add): Rename %s->%s in %s. "
+ output(o, 1, "CONFLICT (rename/add): Rename %s->%s in %s. "
"%s added in %s",
ren1_src, ren1_dst, branch1,
ren1_dst, branch2);
- new_path = unique_path(ren1_dst, branch2);
- output(1, "Adding as %s instead", new_path);
- update_file(0, dst_other.sha1, dst_other.mode, new_path);
+ new_path = unique_path(o, ren1_dst, branch2);
+ output(o, 1, "Adding as %s instead", new_path);
+ update_file(o, 0, dst_other.sha1, dst_other.mode, new_path);
} else if ((item = string_list_lookup(ren1_dst, renames2Dst))) {
ren2 = item->util;
clean_merge = 0;
ren2->processed = 1;
- output(1, "CONFLICT (rename/rename): Rename %s->%s in %s. "
+ output(o, 1, "CONFLICT (rename/rename): "
+ "Rename %s->%s in %s. "
"Rename %s->%s in %s",
ren1_src, ren1_dst, branch1,
ren2->pair->one->path, ren2->pair->two->path, branch2);
- conflict_rename_rename_2(ren1, branch1, ren2, branch2);
+ conflict_rename_rename_2(o, ren1, branch1, ren2, branch2);
} else
try_merge = 1;
if (try_merge) {
- struct diff_filespec *o, *a, *b;
+ struct diff_filespec *one, *a, *b;
struct merge_file_info mfi;
src_other.path = (char *)ren1_src;
- o = ren1->pair->one;
+ one = ren1->pair->one;
if (a_renames == renames1) {
a = ren1->pair->two;
b = &src_other;
b = ren1->pair->two;
a = &src_other;
}
- mfi = merge_file(o, a, b,
- a_branch, b_branch);
+ mfi = merge_file(o, one, a, b,
+ o->branch1, o->branch2);
if (mfi.clean &&
sha_eq(mfi.sha, ren1->pair->two->sha1) &&
* t6022 test. If you change
* it update the test too.
*/
- output(3, "Skipped %s (merged same as existing)", ren1_dst);
+ output(o, 3, "Skipped %s (merged same as existing)", ren1_dst);
else {
if (mfi.merge || !mfi.clean)
- output(1, "Renaming %s => %s", ren1_src, ren1_dst);
+ output(o, 1, "Renaming %s => %s", ren1_src, ren1_dst);
if (mfi.merge)
- output(2, "Auto-merging %s", ren1_dst);
+ output(o, 2, "Auto-merging %s", ren1_dst);
if (!mfi.clean) {
- output(1, "CONFLICT (rename/modify): Merge conflict in %s",
+ output(o, 1, "CONFLICT (rename/modify): Merge conflict in %s",
ren1_dst);
clean_merge = 0;
- if (!index_only)
+ if (!o->call_depth)
update_stages(ren1_dst,
- o, a, b, 1);
+ one, a, b, 1);
}
- update_file(mfi.clean, mfi.sha, mfi.mode, ren1_dst);
+ update_file(o, mfi.clean, mfi.sha, mfi.mode, ren1_dst);
}
}
}
}
/* Per entry merge function */
-static int process_entry(const char *path, struct stage_data *entry,
- const char *branch1,
- const char *branch2)
+static int process_entry(struct merge_options *o,
+ const char *path, struct stage_data *entry)
{
/*
printf("processing entry, clean cache: %s\n", index_only ? "yes": "no");
/* Deleted in both or deleted in one and
* unchanged in the other */
if (a_sha)
- output(2, "Removing %s", path);
+ output(o, 2, "Removing %s", path);
/* do not touch working file if it did not exist */
- remove_file(1, path, !a_sha);
+ remove_file(o, 1, path, !a_sha);
} else {
/* Deleted in one and changed in the other */
clean_merge = 0;
if (!a_sha) {
- output(1, "CONFLICT (delete/modify): %s deleted in %s "
+ output(o, 1, "CONFLICT (delete/modify): %s deleted in %s "
"and modified in %s. Version %s of %s left in tree.",
- path, branch1,
- branch2, branch2, path);
- update_file(0, b_sha, b_mode, path);
+ path, o->branch1,
+ o->branch2, o->branch2, path);
+ update_file(o, 0, b_sha, b_mode, path);
} else {
- output(1, "CONFLICT (delete/modify): %s deleted in %s "
+ output(o, 1, "CONFLICT (delete/modify): %s deleted in %s "
"and modified in %s. Version %s of %s left in tree.",
- path, branch2,
- branch1, branch1, path);
- update_file(0, a_sha, a_mode, path);
+ path, o->branch2,
+ o->branch1, o->branch1, path);
+ update_file(o, 0, a_sha, a_mode, path);
}
}
const char *conf;
if (a_sha) {
- add_branch = branch1;
- other_branch = branch2;
+ add_branch = o->branch1;
+ other_branch = o->branch2;
mode = a_mode;
sha = a_sha;
conf = "file/directory";
} else {
- add_branch = branch2;
- other_branch = branch1;
+ add_branch = o->branch2;
+ other_branch = o->branch1;
mode = b_mode;
sha = b_sha;
conf = "directory/file";
}
- if (string_list_has_string(¤t_directory_set, path)) {
- const char *new_path = unique_path(path, add_branch);
+ if (string_list_has_string(&o->current_directory_set, path)) {
+ const char *new_path = unique_path(o, path, add_branch);
clean_merge = 0;
- output(1, "CONFLICT (%s): There is a directory with name %s in %s. "
+ output(o, 1, "CONFLICT (%s): There is a directory with name %s in %s. "
"Adding %s as %s",
conf, path, other_branch, path, new_path);
- remove_file(0, path, 0);
- update_file(0, sha, mode, new_path);
+ remove_file(o, 0, path, 0);
+ update_file(o, 0, sha, mode, new_path);
} else {
- output(2, "Adding %s", path);
- update_file(1, sha, mode, path);
+ output(o, 2, "Adding %s", path);
+ update_file(o, 1, sha, mode, path);
}
} else if (a_sha && b_sha) {
/* Case C: Added in both (check for same permissions) and */
/* case D: Modified in both, but differently. */
const char *reason = "content";
struct merge_file_info mfi;
- struct diff_filespec o, a, b;
+ struct diff_filespec one, a, b;
if (!o_sha) {
reason = "add/add";
o_sha = (unsigned char *)null_sha1;
}
- output(2, "Auto-merging %s", path);
- o.path = a.path = b.path = (char *)path;
- hashcpy(o.sha1, o_sha);
- o.mode = o_mode;
+ output(o, 2, "Auto-merging %s", path);
+ one.path = a.path = b.path = (char *)path;
+ hashcpy(one.sha1, o_sha);
+ one.mode = o_mode;
hashcpy(a.sha1, a_sha);
a.mode = a_mode;
hashcpy(b.sha1, b_sha);
b.mode = b_mode;
- mfi = merge_file(&o, &a, &b,
- branch1, branch2);
+ mfi = merge_file(o, &one, &a, &b,
+ o->branch1, o->branch2);
clean_merge = mfi.clean;
if (mfi.clean)
- update_file(1, mfi.sha, mfi.mode, path);
+ update_file(o, 1, mfi.sha, mfi.mode, path);
else if (S_ISGITLINK(mfi.mode))
- output(1, "CONFLICT (submodule): Merge conflict in %s "
+ output(o, 1, "CONFLICT (submodule): Merge conflict in %s "
"- needs %s", path, sha1_to_hex(b.sha1));
else {
- output(1, "CONFLICT (%s): Merge conflict in %s",
+ output(o, 1, "CONFLICT (%s): Merge conflict in %s",
reason, path);
- if (index_only)
- update_file(0, mfi.sha, mfi.mode, path);
+ if (o->call_depth)
+ update_file(o, 0, mfi.sha, mfi.mode, path);
else
- update_file_flags(mfi.sha, mfi.mode, path,
+ update_file_flags(o, mfi.sha, mfi.mode, path,
0 /* update_cache */, 1 /* update_working_directory */);
}
} else if (!o_sha && !a_sha && !b_sha) {
* this entry was deleted altogether. a_mode == 0 means
* we had that path and want to actively remove it.
*/
- remove_file(1, path, !a_mode);
+ remove_file(o, 1, path, !a_mode);
} else
die("Fatal merge failure, shouldn't happen.");
return clean_merge;
}
-int merge_trees(struct tree *head,
+int merge_trees(struct merge_options *o,
+ struct tree *head,
struct tree *merge,
struct tree *common,
- const char *branch1,
- const char *branch2,
struct tree **result)
{
int code, clean;
- if (subtree_merge) {
+ if (o->subtree_merge) {
merge = shift_tree_object(head, merge);
common = shift_tree_object(head, common);
}
if (sha_eq(common->object.sha1, merge->object.sha1)) {
- output(0, "Already uptodate!");
+ output(o, 0, "Already uptodate!");
*result = head;
return 1;
}
- code = git_merge_trees(index_only, common, head, merge);
+ code = git_merge_trees(o->call_depth, common, head, merge);
if (code != 0)
die("merging of trees %s and %s failed",
if (unmerged_cache()) {
struct string_list *entries, *re_head, *re_merge;
int i;
- string_list_clear(¤t_file_set, 1);
- string_list_clear(¤t_directory_set, 1);
- get_files_dirs(head);
- get_files_dirs(merge);
+ string_list_clear(&o->current_file_set, 1);
+ string_list_clear(&o->current_directory_set, 1);
+ get_files_dirs(o, head);
+ get_files_dirs(o, merge);
entries = get_unmerged();
- re_head = get_renames(head, common, head, merge, entries);
- re_merge = get_renames(merge, common, head, merge, entries);
- clean = process_renames(re_head, re_merge,
- branch1, branch2);
+ re_head = get_renames(o, head, common, head, merge, entries);
+ re_merge = get_renames(o, merge, common, head, merge, entries);
+ clean = process_renames(o, re_head, re_merge);
for (i = 0; i < entries->nr; i++) {
const char *path = entries->items[i].string;
struct stage_data *e = entries->items[i].util;
if (!e->processed
- && !process_entry(path, e, branch1, branch2))
+ && !process_entry(o, path, e))
clean = 0;
}
else
clean = 1;
- if (index_only)
- *result = write_tree_from_memory();
+ if (o->call_depth)
+ *result = write_tree_from_memory(o);
return clean;
}
* Merge the commits h1 and h2, return the resulting virtual
* commit object and a flag indicating the cleanness of the merge.
*/
-int merge_recursive(struct commit *h1,
+int merge_recursive(struct merge_options *o,
+ struct commit *h1,
struct commit *h2,
- const char *branch1,
- const char *branch2,
struct commit_list *ca,
struct commit **result)
{
struct tree *mrtree = mrtree;
int clean;
- if (show(4)) {
- output(4, "Merging:");
- output_commit_title(h1);
- output_commit_title(h2);
+ if (show(o, 4)) {
+ output(o, 4, "Merging:");
+ output_commit_title(o, h1);
+ output_commit_title(o, h2);
}
if (!ca) {
ca = reverse_commit_list(ca);
}
- if (show(5)) {
- output(5, "found %u common ancestor(s):", commit_list_count(ca));
+ if (show(o, 5)) {
+ output(o, 5, "found %u common ancestor(s):", commit_list_count(ca));
for (iter = ca; iter; iter = iter->next)
- output_commit_title(iter->item);
+ output_commit_title(o, iter->item);
}
merged_common_ancestors = pop_commit(&ca);
}
for (iter = ca; iter; iter = iter->next) {
- call_depth++;
+ const char *saved_b1, *saved_b2;
+ o->call_depth++;
/*
* When the merge fails, the result contains files
* with conflict markers. The cleanness flag is
* "conflicts" were already resolved.
*/
discard_cache();
- merge_recursive(merged_common_ancestors, iter->item,
- "Temporary merge branch 1",
- "Temporary merge branch 2",
- NULL,
- &merged_common_ancestors);
- call_depth--;
+ saved_b1 = o->branch1;
+ saved_b2 = o->branch2;
+ o->branch1 = "Temporary merge branch 1";
+ o->branch2 = "Temporary merge branch 2";
+ merge_recursive(o, merged_common_ancestors, iter->item,
+ NULL, &merged_common_ancestors);
+ o->branch1 = saved_b1;
+ o->branch2 = saved_b2;
+ o->call_depth--;
if (!merged_common_ancestors)
die("merge returned no commit");
}
discard_cache();
- if (!call_depth) {
+ if (!o->call_depth)
read_cache();
- index_only = 0;
- } else
- index_only = 1;
- clean = merge_trees(h1->tree, h2->tree, merged_common_ancestors->tree,
- branch1, branch2, &mrtree);
+ clean = merge_trees(o, h1->tree, h2->tree, merged_common_ancestors->tree,
+ &mrtree);
- if (index_only) {
+ if (o->call_depth) {
*result = make_virtual_commit(mrtree, "merged tree");
commit_list_insert(h1, &(*result)->parents);
commit_list_insert(h2, &(*result)->parents->next);
}
- flush_output();
+ flush_output(o);
return clean;
}
-int merge_recursive_config(const char *var, const char *value, void *cb)
+static struct commit *get_ref(const unsigned char *sha1, const char *name)
+{
+ struct object *object;
+
+ object = deref_tag(parse_object(sha1), name, strlen(name));
+ if (!object)
+ return NULL;
+ if (object->type == OBJ_TREE)
+ return make_virtual_commit((struct tree*)object, name);
+ if (object->type != OBJ_COMMIT)
+ return NULL;
+ if (parse_commit((struct commit *)object))
+ return NULL;
+ return (struct commit *)object;
+}
+
+int merge_recursive_generic(struct merge_options *o,
+ const unsigned char *head,
+ const unsigned char *merge,
+ int num_base_list,
+ const unsigned char **base_list,
+ struct commit **result)
+{
+ int clean, index_fd;
+ struct lock_file *lock = xcalloc(1, sizeof(struct lock_file));
+ struct commit *head_commit = get_ref(head, o->branch1);
+ struct commit *next_commit = get_ref(merge, o->branch2);
+ struct commit_list *ca = NULL;
+
+ if (base_list) {
+ int i;
+ for (i = 0; i < num_base_list; ++i) {
+ struct commit *base;
+ if (!(base = get_ref(base_list[i], sha1_to_hex(base_list[i]))))
+ return error("Could not parse object '%s'",
+ sha1_to_hex(base_list[i]));
+ commit_list_insert(base, &ca);
+ }
+ }
+
+ index_fd = hold_locked_index(lock, 1);
+ clean = merge_recursive(o, head_commit, next_commit, ca,
+ result);
+ if (active_cache_changed &&
+ (write_cache(index_fd, active_cache, active_nr) ||
+ commit_locked_index(lock)))
+ return error("Unable to write index.");
+
+ return clean ? 0 : 1;
+}
+
+static int merge_recursive_config(const char *var, const char *value, void *cb)
{
+ struct merge_options *o = cb;
if (!strcasecmp(var, "merge.verbosity")) {
- merge_recursive_verbosity = git_config_int(var, value);
+ o->verbosity = git_config_int(var, value);
return 0;
}
if (!strcasecmp(var, "diff.renamelimit")) {
- diff_rename_limit = git_config_int(var, value);
+ o->diff_rename_limit = git_config_int(var, value);
return 0;
}
if (!strcasecmp(var, "merge.renamelimit")) {
- merge_rename_limit = git_config_int(var, value);
+ o->merge_rename_limit = git_config_int(var, value);
return 0;
}
return git_default_config(var, value, cb);
}
-void merge_recursive_setup(int is_subtree_merge)
+void init_merge_options(struct merge_options *o)
{
+ memset(o, 0, sizeof(struct merge_options));
+ o->verbosity = 2;
+ o->buffer_output = 1;
+ o->diff_rename_limit = -1;
+ o->merge_rename_limit = -1;
+ git_config(merge_recursive_config, o);
if (getenv("GIT_MERGE_VERBOSITY"))
- merge_recursive_verbosity =
+ o->verbosity =
strtol(getenv("GIT_MERGE_VERBOSITY"), NULL, 10);
- if (merge_recursive_verbosity >= 5)
- buffer_output = 0;
- subtree_merge = is_subtree_merge;
+ if (o->verbosity >= 5)
+ o->buffer_output = 0;
+ strbuf_init(&o->obuf, 0);
+ memset(&o->current_file_set, 0, sizeof(struct string_list));
+ o->current_file_set.strdup_strings = 1;
+ memset(&o->current_directory_set, 0, sizeof(struct string_list));
+ o->current_directory_set.strdup_strings = 1;
}