int
diff_merge (SeafCommit *merge, GList **results)
{
SeafCommit *parent1, *parent2;
struct tree_desc t[3];
struct unpack_trees_options opts;
struct index_state istate;
g_assert (*results == NULL);
g_assert (merge->parent_id != NULL && merge->second_parent_id != NULL);
parent1 = seaf_commit_manager_get_commit (seaf->commit_mgr,
merge->parent_id);
if (!parent1) {
seaf_warning ("failed to find commit %s.\n", merge->parent_id);
return -1;
}
parent2 = seaf_commit_manager_get_commit (seaf->commit_mgr,
merge->second_parent_id);
if (!parent2) {
seaf_warning ("failed to find commit %s.\n", merge->second_parent_id);
seaf_commit_unref (parent1);
return -1;
}
fill_tree_descriptor(&t[0], merge->root_id);
fill_tree_descriptor(&t[1], parent1->root_id);
fill_tree_descriptor(&t[2], parent2->root_id);
seaf_commit_unref (parent1);
seaf_commit_unref (parent2);
/* Empty index */
memset(&istate, 0, sizeof(istate));
memset(&opts, 0, sizeof(opts));
opts.head_idx = -1;
opts.index_only = 1;
opts.merge = 1;
opts.fn = threeway_diff;
opts.unpack_data = results;
opts.src_index = &istate;
opts.dst_index = NULL;
if (unpack_trees(3, t, &opts) < 0) {
seaf_warning ("failed to unpack trees.\n");
return -1;
}
if (*results != NULL)
diff_resolve_renames (results);
tree_desc_free (&t[0]);
tree_desc_free (&t[1]);
tree_desc_free (&t[2]);
return 0;
}
int
diff_commits (SeafCommit *commit1, SeafCommit *commit2, GList **results)
{
struct tree_desc t[2];
struct unpack_trees_options opts;
struct index_state istate;
g_assert (*results == NULL);
if (strcmp (commit1->commit_id, commit2->commit_id) == 0)
return 0;
if (strcmp (commit1->root_id, EMPTY_SHA1) != 0) {
fill_tree_descriptor(&t[0], commit1->root_id);
} else {
fill_tree_descriptor(&t[0], NULL);
}
if (strcmp (commit2->root_id, EMPTY_SHA1) != 0) {
fill_tree_descriptor(&t[1], commit2->root_id);
} else {
fill_tree_descriptor(&t[1], NULL);
}
/* Empty index */
memset(&istate, 0, sizeof(istate));
memset(&opts, 0, sizeof(opts));
opts.head_idx = -1;
opts.index_only = 1;
opts.merge = 1;
opts.fn = twoway_diff;
opts.unpack_data = results;
opts.src_index = &istate;
opts.dst_index = NULL;
if (unpack_trees(2, t, &opts) < 0) {
seaf_warning ("failed to unpack trees.\n");
return -1;
}
if (results != NULL)
diff_resolve_empty_dirs (results);
if (*results != NULL)
diff_resolve_renames (results);
tree_desc_free (&t[0]);
tree_desc_free (&t[1]);
return 0;
}
