summaryrefslogtreecommitdiff
path: root/bisect.c
diff options
context:
space:
mode:
authorChristian Couder <chriscool@tuxfamily.org>2009-05-09 17:55:46 +0200
committerJunio C Hamano <gitster@pobox.com>2009-05-10 14:30:32 -0700
commitd937d4aca1f10b9202b620a89dc6a5972e9605eb (patch)
treef60e6d37e8b5442c48bea0bc412625aaa6160c89 /bisect.c
parentc0537662806f4b3d3ba883d05a48fdf9120893f0 (diff)
downloadgit-d937d4aca1f10b9202b620a89dc6a5972e9605eb.tar.gz
bisect: add "check_good_are_ancestors_of_bad" function
This is a port of the function with the same name that is in "git-bisect.sh". The new function is not used yet but will be in a later patch. We also implement an helper "check_ancestors" function that use "start_command" and "finish_command" to launch "git rev-list $good ^$bad". Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'bisect.c')
-rw-r--r--bisect.c75
1 files changed, 75 insertions, 0 deletions
diff --git a/bisect.c b/bisect.c
index b24ee78ba9..09102daba8 100644
--- a/bisect.c
+++ b/bisect.c
@@ -751,6 +751,81 @@ static void check_merge_bases(void)
}
/*
+ * 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 strbuf str = STRBUF_INIT;
+ int i, result = 0;
+ struct child_process rls;
+ FILE *rls_fout;
+
+ argv_array_push(&rev_argv, xstrdup("rev-list"));
+ 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));
+ rls.argv = rev_argv.argv;
+ rls.out = -1;
+ rls.git_cmd = 1;
+ if (start_command(&rls))
+ die("Could not launch 'git rev-list' command.");
+ rls_fout = fdopen(rls.out, "r");
+ while (strbuf_getline(&str, rls_fout, '\n') != EOF) {
+ strbuf_trim(&str);
+ if (*str.buf) {
+ result = 1;
+ break;
+ }
+ }
+ fclose(rls_fout);
+ finish_command(&rls);
+
+ return result;
+}
+
+/*
+ * "check_good_are_ancestors_of_bad" checks that all "good" revs are
+ * ancestor of the "bad" rev.
+ *
+ * If that's not the case, we need to check the merge bases.
+ * If a merge base must be tested by the user, its source code will be
+ * checked out to be tested by the user and we will exit.
+ */
+static void check_good_are_ancestors_of_bad(const char *prefix)
+{
+ const char *filename = git_path("BISECT_ANCESTORS_OK");
+ struct stat st;
+ int fd;
+
+ if (!current_bad_sha1)
+ die("a bad revision is needed");
+
+ /* Check if file BISECT_ANCESTORS_OK exists. */
+ if (!stat(filename, &st) && S_ISREG(st.st_mode))
+ return;
+
+ /* Bisecting with no good rev is ok. */
+ if (good_revs.sha1_nr == 0)
+ return;
+
+ if (check_ancestors())
+ check_merge_bases();
+
+ /* Create file BISECT_ANCESTORS_OK. */
+ fd = open(filename, O_CREAT | O_TRUNC | O_WRONLY, 0600);
+ if (fd < 0)
+ warning("could not create file '%s': %s",
+ filename, strerror(errno));
+ else
+ close(fd);
+}
+
+/*
* We use the convention that exiting with an exit code 10 means that
* the bisection process finished successfully.
* In this case the calling shell script should exit 0.