undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bisect: rework some rev related functions to make them more reusable

Browse Source 
This patches changes the "bisect_rev_setup" and "bisect_common"
functions to make it easier to reuse them in a later patch.

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-17 17:36:44 +02:00 committed by Junio C Hamano
parent 0871984d30
commit a22347c6c8
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
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("--"));
read_bisect_paths(&rev_argv); if (read_paths)
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,
@ -843,10 +843,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) {