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

Merge branch 'cc/bisect' (early part) 

* 'cc/bisect' (early part):
  bisect: check ancestors without forking a "git rev-list" process
  commit: add function to unparse a commit and its parents
  bisect: rework some rev related functions to make them more reusable
maint
Junio C Hamano 2009-05-31 16:16:48 -07:00
parent 6e4f981ffb 2d938fc7bc
commit 1136e2c642
4 changed files with 59 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
bisect.c
View File

@ -553,7 +553,9 @@ struct commit_list *filter_skipped(struct commit_list *list,
return filtered; return filtered;
} }


static void bisect_rev_setup(struct rev_info *revs, const char *prefix) static void bisect_rev_setup(struct rev_info *revs, const char *prefix,
const char *bad_format, const char *good_format,
int read_paths)
{ {
struct argv_array rev_argv = { NULL, 0, 0 }; struct argv_array rev_argv = { NULL, 0, 0 };
int i; int i;
@ -564,26 +566,24 @@ static void bisect_rev_setup(struct rev_info *revs, const char *prefix)


/* rev_argv.argv[0] will be ignored by setup_revisions */ /* rev_argv.argv[0] will be ignored by setup_revisions */
argv_array_push(&rev_argv, xstrdup("bisect_rev_setup")); argv_array_push(&rev_argv, xstrdup("bisect_rev_setup"));
argv_array_push_sha1(&rev_argv, current_bad_sha1, "%s"); argv_array_push_sha1(&rev_argv, current_bad_sha1, bad_format);
for (i = 0; i < good_revs.sha1_nr; i++) for (i = 0; i < good_revs.sha1_nr; i++)
argv_array_push_sha1(&rev_argv, good_revs.sha1[i], "^%s"); argv_array_push_sha1(&rev_argv, good_revs.sha1[i],
good_format);
argv_array_push(&rev_argv, xstrdup("--")); argv_array_push(&rev_argv, xstrdup("--"));
if (read_paths)
read_bisect_paths(&rev_argv); read_bisect_paths(&rev_argv);
argv_array_push(&rev_argv, NULL); argv_array_push(&rev_argv, NULL);


setup_revisions(rev_argv.argv_nr, rev_argv.argv, revs, NULL); setup_revisions(rev_argv.argv_nr, rev_argv.argv, revs, NULL);
revs->limited = 1;
} }


static void bisect_common(struct rev_info *revs, int *reaches, int *all) static void bisect_common(struct rev_info *revs)
{ {
if (prepare_revision_walk(revs)) if (prepare_revision_walk(revs))
die("revision walk setup failed"); die("revision walk setup failed");
if (revs->tree_objects) if (revs->tree_objects)
mark_edges_uninteresting(revs->commits, revs, NULL); mark_edges_uninteresting(revs->commits, revs, NULL);

revs->commits = find_bisection(revs->commits, reaches, all,
!!skipped_revs.sha1_nr);
} }


static void exit_if_skipped_commits(struct commit_list *tried, static void exit_if_skipped_commits(struct commit_list *tried,
@ -750,42 +750,31 @@ static void check_merge_bases(void)
free_commit_list(result); free_commit_list(result);
} }


/* static int check_ancestors(const char *prefix)
* This function runs the command "git rev-list $_good ^$_bad"
* and returns 1 if it produces some output, 0 otherwise.
*/
static int check_ancestors(void)
{ {
struct argv_array rev_argv = { NULL, 0, 0 }; struct rev_info revs;
struct strbuf str = STRBUF_INIT; struct object_array pending_copy;
int i, result = 0; int i, res;
struct child_process rls;
FILE *rls_fout;


argv_array_push(&rev_argv, xstrdup("rev-list")); bisect_rev_setup(&revs, prefix, "^%s", "%s", 0);
argv_array_push_sha1(&rev_argv, current_bad_sha1, "^%s");
for (i = 0; i < good_revs.sha1_nr; i++)
argv_array_push_sha1(&rev_argv, good_revs.sha1[i], "%s");
argv_array_push(&rev_argv, NULL);


memset(&rls, 0, sizeof(rls)); /* Save pending objects, so they can be cleaned up later. */
rls.argv = rev_argv.argv; memset(&pending_copy, 0, sizeof(pending_copy));
rls.out = -1; for (i = 0; i < revs.pending.nr; i++)
rls.git_cmd = 1; add_object_array(revs.pending.objects[i].item,
if (start_command(&rls)) revs.pending.objects[i].name,
die("Could not launch 'git rev-list' command."); &pending_copy);
rls_fout = fdopen(rls.out, "r");
while (strbuf_getline(&str, rls_fout, '\n') != EOF) { bisect_common(&revs);
strbuf_trim(&str); res = (revs.commits != NULL);
if (*str.buf) {
result = 1; /* Clean up objects used, as they will be reused. */
break; for (i = 0; i < pending_copy.nr; i++) {
struct object *o = pending_copy.objects[i].item;
unparse_commit((struct commit *)o);
} }
}
fclose(rls_fout);
finish_command(&rls);


return result; return res;
} }


/* /*
@ -813,7 +802,8 @@ static void check_good_are_ancestors_of_bad(const char *prefix)
if (good_revs.sha1_nr == 0) if (good_revs.sha1_nr == 0)
return; return;


if (check_ancestors()) /* Check if all good revs are ancestor of the bad rev. */
if (check_ancestors(prefix))
check_merge_bases(); check_merge_bases();


/* Create file BISECT_ANCESTORS_OK. */ /* Create file BISECT_ANCESTORS_OK. */
@ -843,10 +833,13 @@ int bisect_next_all(const char *prefix)


check_good_are_ancestors_of_bad(prefix); check_good_are_ancestors_of_bad(prefix);


bisect_rev_setup(&revs, prefix); bisect_rev_setup(&revs, prefix, "%s", "^%s", 1);
revs.limited = 1;


bisect_common(&revs, &reaches, &all); bisect_common(&revs);


revs.commits = find_bisection(revs.commits, &reaches, &all,
!!skipped_revs.sha1_nr);
revs.commits = filter_skipped(revs.commits, &tried, 0); revs.commits = filter_skipped(revs.commits, &tried, 0);


if (!revs.commits) { if (!revs.commits) {

20
commit.c
View File

@ -316,6 +316,26 @@ int parse_commit(struct commit *item)
return ret; return ret;
} }


static void unparse_commit_list(struct commit_list *list)
{
for (; list; list = list->next)
unparse_commit(list->item);
}

void unparse_commit(struct commit *item)
{
item->object.flags = 0;
item->object.used = 0;
if (item->object.parsed) {
item->object.parsed = 0;
if (item->parents) {
unparse_commit_list(item->parents);
free_commit_list(item->parents);
item->parents = NULL;
}
}
}

struct commit_list *commit_list_insert(struct commit *item, struct commit_list **list_p) struct commit_list *commit_list_insert(struct commit *item, struct commit_list **list_p)
{ {
struct commit_list *new_list = xmalloc(sizeof(struct commit_list)); struct commit_list *new_list = xmalloc(sizeof(struct commit_list));

2
commit.h
View File

@ -40,6 +40,8 @@ int parse_commit_buffer(struct commit *item, void *buffer, unsigned long size);


int parse_commit(struct commit *item); int parse_commit(struct commit *item);


void unparse_commit(struct commit *item);

struct commit_list * commit_list_insert(struct commit *item, struct commit_list **list_p); struct commit_list * commit_list_insert(struct commit *item, struct commit_list **list_p);
unsigned commit_list_count(const struct commit_list *l); unsigned commit_list_count(const struct commit_list *l);
struct commit_list * insert_by_date(struct commit *item, struct commit_list **list); struct commit_list * insert_by_date(struct commit *item, struct commit_list **list);

13
t/t6030-bisect-porcelain.sh
View File

@ -482,28 +482,17 @@ test_expect_success 'good merge bases when good and bad are siblings' '
git bisect reset git bisect reset
' '


check_trace() {
grep "$1" "$GIT_TRACE" | grep "\^$2" | grep "$3" >/dev/null
}

test_expect_success 'optimized merge base checks' ' test_expect_success 'optimized merge base checks' '
GIT_TRACE="$(pwd)/trace.log" &&
export GIT_TRACE &&
git bisect start "$HASH7" "$SIDE_HASH7" > my_bisect_log.txt && git bisect start "$HASH7" "$SIDE_HASH7" > my_bisect_log.txt &&
grep "merge base must be tested" my_bisect_log.txt && grep "merge base must be tested" my_bisect_log.txt &&
grep "$HASH4" my_bisect_log.txt && grep "$HASH4" my_bisect_log.txt &&
check_trace "rev-list" "$HASH7" "$SIDE_HASH7" &&
git bisect good > my_bisect_log2.txt && git bisect good > my_bisect_log2.txt &&
test -f ".git/BISECT_ANCESTORS_OK" && test -f ".git/BISECT_ANCESTORS_OK" &&
test "$HASH6" = $(git rev-parse --verify HEAD) && test "$HASH6" = $(git rev-parse --verify HEAD) &&
: > "$GIT_TRACE" &&
git bisect bad > my_bisect_log3.txt && git bisect bad > my_bisect_log3.txt &&
test_must_fail check_trace "rev-list" "$HASH6" "$SIDE_HASH7" &&
git bisect good "$A_HASH" > my_bisect_log4.txt && git bisect good "$A_HASH" > my_bisect_log4.txt &&
grep "merge base must be tested" my_bisect_log4.txt && grep "merge base must be tested" my_bisect_log4.txt &&
test_must_fail test -f ".git/BISECT_ANCESTORS_OK" && test_must_fail test -f ".git/BISECT_ANCESTORS_OK"
check_trace "rev-list" "$HASH6" "$A_HASH" &&
unset GIT_TRACE
' '


# This creates another side branch called "parallel" with some files # This creates another side branch called "parallel" with some files