@ -153,7 +153,8 @@ static int builtin_diff_index(struct rev_info *revs,
static int builtin_diff_tree(struct rev_info *revs,static int builtin_diff_tree(struct rev_info *revs,
int argc, const char **argv, int argc, const char **argv,
struct object_array_entry *ent) struct object_array_entry *ent0,
struct object_array_entry *ent1)
{{
const unsigned char *(sha1[2]); const unsigned char *(sha1[2]);
int swap = 0; int swap = 0;
@ -161,13 +162,14 @@ static int builtin_diff_tree(struct rev_info *revs,
if (argc > 1) if (argc > 1)
usage(builtin_diff_usage); usage(builtin_diff_usage);
/* We saw two trees, ent[0] and ent[1]. /*
* if ent[1] is uninteresting, they are swapped * We saw two trees, ent0 and ent1. If ent1 is uninteresting,
* swap them.
*/ */
if (ent[1].item->flags & UNINTERESTING) if (ent1->item->flags & UNINTERESTING)
swap = 1; swap = 1;
sha1[swap] = ent[0].item->sha1; sha1[swap] = ent0->item->sha1;
sha1[1-swap] = ent[1].item->sha1; sha1[1-swap] = ent1->item->sha1;
diff_tree_sha1(sha1[0], sha1[1], "", &revs->diffopt); diff_tree_sha1(sha1[0], sha1[1], "", &revs->diffopt);
log_tree_diff_flush(revs); log_tree_diff_flush(revs);
return 0; return 0;
@ -251,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;
@ -337,9 +339,9 @@ int cmd_diff(int argc, const char **argv, const char *prefix)
} }
for (i = 0; i < rev.pending.nr; i++) { for (i = 0; i < rev.pending.nr; i++) {
struct object_array_entry *list = rev.pending.objects+i; struct object_array_entry *entry = &rev.pending.objects[i];
struct object *obj = list->item; struct object *obj = entry->item;
const char *name = list->name; const char *name = entry->name;
int flags = (obj->flags & UNINTERESTING); int flags = (obj->flags & UNINTERESTING);
if (!obj->parsed) if (!obj->parsed)
obj = parse_object(obj->sha1); obj = parse_object(obj->sha1);
@ -348,27 +350,21 @@ int cmd_diff(int argc, const char **argv, const char *prefix)
die(_("invalid object '%s' given."), name); die(_("invalid object '%s' given."), name);
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; } else if (obj->type == OBJ_BLOB) {
ents++;
continue;
}
if (obj->type == OBJ_BLOB) {
if (2 <= blobs) if (2 <= blobs)
die(_("more than two blobs given: '%s'"), name); die(_("more than two blobs given: '%s'"), name);
hashcpy(blob[blobs].sha1, obj->sha1); hashcpy(blob[blobs].sha1, obj->sha1);
blob[blobs].name = name; blob[blobs].name = name;
blob[blobs].mode = list->mode; blob[blobs].mode = entry->mode;
blobs++; blobs++;
continue;
} else {
die(_("unhandled object '%s' given."), name);
} }
die(_("unhandled object '%s' given."), name);
} }
if (rev.prune_data.nr) { if (rev.prune_data.nr) {
if (!path) if (!path)
@ -379,7 +375,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);
@ -400,23 +396,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); 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.
*/ */
ent[1] = ent[ents-1]; result = builtin_diff_tree(&rev, argc, argv,
result = builtin_diff_tree(&rev, argc, argv, ent); &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();
Junio C Hamano
12 years ago