bisect: automatically sort sha1_array if needed when looking it up

This makes sha1_array easier to use, so later patches will be simpler.

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Christian Couder
2009-05-09 17:55:44 +02:00
committed by Junio C Hamano
parent aaaff9e2d2
commit 1da8c4fc2c

View File

@ -13,6 +13,7 @@ struct sha1_array {
unsigned char (*sha1)[20]; unsigned char (*sha1)[20];
int sha1_nr; int sha1_nr;
int sha1_alloc; int sha1_alloc;
int sorted;
}; };
static struct sha1_array good_revs; static struct sha1_array good_revs;
@ -487,6 +488,8 @@ static int array_cmp(const void *a, const void *b)
static void sort_sha1_array(struct sha1_array *array) static void sort_sha1_array(struct sha1_array *array)
{ {
qsort(array->sha1, array->sha1_nr, sizeof(*array->sha1), array_cmp); qsort(array->sha1, array->sha1_nr, sizeof(*array->sha1), array_cmp);
array->sorted = 1;
} }
static const unsigned char *sha1_access(size_t index, void *table) static const unsigned char *sha1_access(size_t index, void *table)
@ -498,6 +501,9 @@ static const unsigned char *sha1_access(size_t index, void *table)
static int lookup_sha1_array(struct sha1_array *array, static int lookup_sha1_array(struct sha1_array *array,
const unsigned char *sha1) const unsigned char *sha1)
{ {
if (!array->sorted)
sort_sha1_array(array);
return sha1_pos(sha1, array->sha1, array->sha1_nr, sha1_access); return sha1_pos(sha1, array->sha1, array->sha1_nr, sha1_access);
} }
@ -512,8 +518,6 @@ struct commit_list *filter_skipped(struct commit_list *list,
if (!skipped_revs.sha1_nr) if (!skipped_revs.sha1_nr)
return list; return list;
sort_sha1_array(&skipped_revs);
while (list) { while (list) {
struct commit_list *next = list->next; struct commit_list *next = list->next;
list->next = NULL; list->next = NULL;