kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity
Browse Source

merge-recursive.c: Add more generic merge_recursive_generic() 

merge_recursive_generic() takes, in comparison to to merge_recursive(),
no commit ("struct commit *") arguments but SHA ids ("unsigned char *"),
and no commit list of bases but an array of refs ("const char **").

This makes it more generic in the case that it can also take the SHA
of a tree to merge trees without commits, for the bases, the head
and the remote.

merge_recursive_generic() also handles locking and updating of the
index, which is a common use case of merge_recursive().

This patch also rewrites builtin-merge-recursive.c to make use of
merge_recursive_generic().  By doing this, I stumbled over the
limitation of 20 bases and I've added a warning if this limitation
is exceeded.

This patch qualifies make_virtual_commit() as static again because
this function is not needed anymore outside merge-recursive.c.

Signed-off-by: Stephan Beyer <s-beyer@gmx.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Stephan Beyer 17 years ago committed by Junio C Hamano
parent
9047ebbc22
commit
73118f89b8
3 changed files with 75 additions and 46 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 64
      builtin-merge-recursive.c
  2. 53
      merge-recursive.c
  3. 4
      merge-recursive.h

64
builtin-merge-recursive.c
Unescape View File

@ -15,36 +15,13 @@ static const char *better_branch_name(const char *branch) @@ -15,36 +15,13 @@ static const char *better_branch_name(const char *branch)
return name ? name : branch;
}

static struct commit *get_ref(const char *ref)
{
unsigned char sha1[20];
struct object *object;

if (get_sha1(ref, sha1))
die("Could not resolve ref '%s'", ref);
object = deref_tag(parse_object(sha1), ref, strlen(ref));
if (!object)
return NULL;
if (object->type == OBJ_TREE)
return make_virtual_commit((struct tree*)object,
better_branch_name(ref));
if (object->type != OBJ_COMMIT)
return NULL;
if (parse_commit((struct commit *)object))
die("Could not parse commit '%s'", sha1_to_hex(object->sha1));
return (struct commit *)object;
}

int cmd_merge_recursive(int argc, const char **argv, const char *prefix)
{
static const char *bases[20];
static unsigned bases_count = 0;
int i, clean;
const char *bases[21];
unsigned bases_count = 0;
int i, failed;
const char *branch1, *branch2;
struct commit *result, *h1, *h2;
struct commit_list *ca = NULL;
struct lock_file *lock = xcalloc(1, sizeof(struct lock_file));
int index_fd;
unsigned char h1[20], h2[20];
int subtree_merge = 0;

if (argv[0]) {
@ -60,10 +37,15 @@ int cmd_merge_recursive(int argc, const char **argv, const char *prefix) @@ -60,10 +37,15 @@ int cmd_merge_recursive(int argc, const char **argv, const char *prefix)
die("Usage: %s <base>... -- <head> <remote> ...\n", argv[0]);

for (i = 1; i < argc; ++i) {
if (!strcmp(argv[i], "--"))
if (!strcmp(argv[i], "--")) {
bases[bases_count] = NULL;
break;
if (bases_count < sizeof(bases)/sizeof(*bases))
}
if (bases_count < ARRAY_SIZE(bases)-1)
bases[bases_count++] = argv[i];
else
warning("Cannot handle more than %zu bases. "
"Ignoring %s.", ARRAY_SIZE(bases)-1, argv[i]);
}
if (argc - i != 3) /* "--" "<head>" "<remote>" */
die("Not handling anything other than two heads merge.");
@ -71,8 +53,10 @@ int cmd_merge_recursive(int argc, const char **argv, const char *prefix) @@ -71,8 +53,10 @@ int cmd_merge_recursive(int argc, const char **argv, const char *prefix)
branch1 = argv[++i];
branch2 = argv[++i];

h1 = get_ref(branch1);
h2 = get_ref(branch2);
if (get_sha1(branch1, h1))
die("Could not resolve ref '%s'", branch1);
if (get_sha1(branch2, h2))
die("Could not resolve ref '%s'", branch2);

branch1 = better_branch_name(branch1);
branch2 = better_branch_name(branch2);
@ -80,18 +64,8 @@ int cmd_merge_recursive(int argc, const char **argv, const char *prefix) @@ -80,18 +64,8 @@ int cmd_merge_recursive(int argc, const char **argv, const char *prefix)
if (merge_recursive_verbosity >= 3)
printf("Merging %s with %s\n", branch1, branch2);

index_fd = hold_locked_index(lock, 1);

for (i = 0; i < bases_count; i++) {
struct commit *ancestor = get_ref(bases[i]);
ca = commit_list_insert(ancestor, &ca);
}
clean = merge_recursive(h1, h2, branch1, branch2, ca, &result);

if (active_cache_changed &&
(write_cache(index_fd, active_cache, active_nr) ||
commit_locked_index(lock)))
die ("unable to write %s", get_index_file());

return clean ? 0: 1;
failed = merge_recursive_generic(bases, h1, branch1, h2, branch2);
if (failed < 0)
return 128; /* die() error code */
return failed;
}

53
merge-recursive.c
Unescape View File

@ -1303,6 +1303,59 @@ int merge_recursive(struct commit *h1, @@ -1303,6 +1303,59 @@ int merge_recursive(struct commit *h1,
return clean;
}

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(const char **base_list,
const unsigned char *head_sha1, const char *head_name,
const unsigned char *next_sha1, const char *next_name)
{
int clean, index_fd;
struct lock_file *lock = xcalloc(1, sizeof(struct lock_file));
struct commit *result;
struct commit *head_commit = get_ref(head_sha1, head_name);
struct commit *next_commit = get_ref(next_sha1, next_name);
struct commit_list *ca = NULL;

if (base_list) {
int i;
for (i = 0; base_list[i]; ++i) {
unsigned char sha[20];
struct commit *base;
if (get_sha1(base_list[i], sha))
return error("Could not resolve ref '%s'",
base_list[i]);
if (!(base = get_ref(sha, base_list[i])))
return error("Could not parse object '%s'",
base_list[i]);
commit_list_insert(base, &ca);
}
}

index_fd = hold_locked_index(lock, 1);
clean = merge_recursive(head_commit, next_commit,
head_name, next_name, 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;
}

int merge_recursive_config(const char *var, const char *value, void *cb)
{
if (!strcasecmp(var, "merge.verbosity")) {

4
merge-recursive.h
Unescape View File

@ -14,7 +14,9 @@ int merge_trees(struct tree *head, @@ -14,7 +14,9 @@ int merge_trees(struct tree *head,
const char *branch1,
const char *branch2,
struct tree **result);
struct commit *make_virtual_commit(struct tree *tree, const char *comment);
extern int merge_recursive_generic(const char **base_list,
const unsigned char *head_sha1, const char *head_name,
const unsigned char *next_sha1, const char *next_name);
int merge_recursive_config(const char *var, const char *value, void *cb);
void merge_recursive_setup(int is_subtree_merge);
struct tree *write_tree_from_memory(void);

Write Preview
Loading…
Cancel
Save