mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cmd_diff(): use an object_array for holding trees

Browse Source 
Change cmd_diff() to use a (struct object_array) for holding the trees
that it accumulates, rather than rolling its own equivalent.

Incidentally, this change removes a hard-coded limit of 100 trees in
combined diff, not that it matters in practice.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Michael Haggerty
2013-05-25 11:08:04 +02:00
committed by Junio C Hamano
parent 91de344d76
commit 33055fa823
1 changed files with 18 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
builtin/diff.c
View File

@ -253,8 +253,8 @@ int cmd_diff(int argc, const char **argv, const char *prefix)
{ {
int i; int i;
struct rev_info rev; struct rev_info rev;
struct object_array_entry ent[100]; struct object_array ent = OBJECT_ARRAY_INIT;
int ents = 0, blobs = 0, paths = 0; int blobs = 0, paths = 0;
const char *path = NULL; const char *path = NULL;
struct blobinfo blob[2]; struct blobinfo blob[2];
int nongit; int nongit;
@ -351,13 +351,8 @@ int cmd_diff(int argc, const char **argv, const char *prefix)
if (obj->type == OBJ_COMMIT) if (obj->type == OBJ_COMMIT)
obj = &((struct commit *)obj)->tree->object; obj = &((struct commit *)obj)->tree->object;
if (obj->type == OBJ_TREE) { if (obj->type == OBJ_TREE) {
if (ARRAY_SIZE(ent) <= ents)
die(_("more than %d trees given: '%s'"),
(int) ARRAY_SIZE(ent), name);
obj->flags |= flags; obj->flags |= flags;
ent[ents].item = obj; add_object_array(obj, name, &ent);
ent[ents].name = name;
ents++;
continue; continue;
} }
if (obj->type == OBJ_BLOB) { if (obj->type == OBJ_BLOB) {
@ -381,7 +376,7 @@ int cmd_diff(int argc, const char **argv, const char *prefix)
/* /*
* Now, do the arguments look reasonable? * Now, do the arguments look reasonable?
*/ */
if (!ents) { if (!ent.nr) {
switch (blobs) { switch (blobs) {
case 0: case 0:
result = builtin_diff_files(&rev, argc, argv); result = builtin_diff_files(&rev, argc, argv);
@ -402,22 +397,26 @@ int cmd_diff(int argc, const char **argv, const char *prefix)
} }
else if (blobs) else if (blobs)
usage(builtin_diff_usage); usage(builtin_diff_usage);
else if (ents == 1) else if (ent.nr == 1)
result = builtin_diff_index(&rev, argc, argv); result = builtin_diff_index(&rev, argc, argv);
else if (ents == 2) else if (ent.nr == 2)
result = builtin_diff_tree(&rev, argc, argv, &ent[0], &ent[1]); result = builtin_diff_tree(&rev, argc, argv,
else if (ent[0].item->flags & UNINTERESTING) { &ent.objects[0], &ent.objects[1]);
else if (ent.objects[0].item->flags & UNINTERESTING) {
/* /*
* diff A...B where there is at least one merge base * diff A...B where there is at least one merge base
* between A and B. We have ent[0] == merge-base, * between A and B. We have ent.objects[0] ==
* ent[ents-2] == A, and ent[ents-1] == B. Show diff * merge-base, ent.objects[ents-2] == A, and
* between the base and B. Note that we pick one * ent.objects[ents-1] == B. Show diff between the
* merge base at random if there are more than one. * base and B. Note that we pick one merge base at
* random if there are more than one.
*/ */
result = builtin_diff_tree(&rev, argc, argv, &ent[0], &ent[ents-1]); result = builtin_diff_tree(&rev, argc, argv,
&ent.objects[0],
&ent.objects[ent.nr-1]);
} else } else
result = builtin_diff_combined(&rev, argc, argv, result = builtin_diff_combined(&rev, argc, argv,
ent, ents); ent.objects, ent.nr);
result = diff_result_code(&rev.diffopt, result); result = diff_result_code(&rev.diffopt, result);
if (1 < rev.diffopt.skip_stat_unmatch) if (1 < rev.diffopt.skip_stat_unmatch)
refresh_index_quietly(); refresh_index_quietly();