summaryrefslogtreecommitdiff
path: root/bisect.c
diff options
context:
space:
mode:
authorChristian Couder <chriscool@tuxfamily.org>2009-03-26 04:55:59 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-04-05 08:29:44 (GMT)
commit3b437b0dabfdff12d5dd78b9bb55a0be4e2da51c (patch)
tree8c638798de8a094cc2177a1f4c1ecb3d5736ccdb /bisect.c
parent1bf072e3661eeef8d9721079a332e804b5678c7e (diff)
downloadgit-3b437b0dabfdff12d5dd78b9bb55a0be4e2da51c.zip
git-3b437b0dabfdff12d5dd78b9bb55a0be4e2da51c.tar.gz
git-3b437b0dabfdff12d5dd78b9bb55a0be4e2da51c.tar.bz2
bisect: implement "read_bisect_paths" to read paths in "$GIT_DIR/BISECT_NAMES"
This is needed because "git bisect--helper" must read bisect paths in "$GIT_DIR/BISECT_NAMES", so that a bisection can be performed only on commits that touches paths in this file. 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.c55
1 files changed, 46 insertions, 9 deletions
diff --git a/bisect.c b/bisect.c
index 94ec011..3279fb1 100644
--- a/bisect.c
+++ b/bisect.c
@@ -4,6 +4,7 @@
#include "revision.h"
#include "refs.h"
#include "list-objects.h"
+#include "quote.h"
#include "sha1-lookup.h"
#include "bisect.h"
@@ -424,6 +425,32 @@ static int read_bisect_refs(void)
return for_each_ref_in("refs/bisect/", register_ref, NULL);
}
+void read_bisect_paths(void)
+{
+ struct strbuf str = STRBUF_INIT;
+ const char *filename = git_path("BISECT_NAMES");
+ FILE *fp = fopen(filename, "r");
+
+ if (!fp)
+ die("Could not open file '%s': %s", filename, strerror(errno));
+
+ while (strbuf_getline(&str, fp, '\n') != EOF) {
+ char *quoted;
+ int res;
+
+ strbuf_trim(&str);
+ quoted = strbuf_detach(&str, NULL);
+ res = sq_dequote_to_argv(quoted, &rev_argv,
+ &rev_argv_nr, &rev_argv_alloc);
+ if (res)
+ die("Badly quoted content in file '%s': %s",
+ filename, quoted);
+ }
+
+ strbuf_release(&str);
+ fclose(fp);
+}
+
static int skipcmp(const void *a, const void *b)
{
return hashcmp(a, b);
@@ -479,14 +506,11 @@ struct commit_list *filter_skipped(struct commit_list *list,
return filtered;
}
-int bisect_next_vars(const char *prefix)
+static void bisect_rev_setup(struct rev_info *revs, const char *prefix)
{
- struct rev_info revs;
- int reaches = 0, all = 0;
-
- init_revisions(&revs, prefix);
- revs.abbrev = 0;
- revs.commit_format = CMIT_FMT_UNSPECIFIED;
+ init_revisions(revs, prefix);
+ revs->abbrev = 0;
+ revs->commit_format = CMIT_FMT_UNSPECIFIED;
/* argv[0] will be ignored by setup_revisions */
ALLOC_GROW(rev_argv, rev_argv_nr + 1, rev_argv_alloc);
@@ -498,9 +522,22 @@ int bisect_next_vars(const char *prefix)
ALLOC_GROW(rev_argv, rev_argv_nr + 1, rev_argv_alloc);
rev_argv[rev_argv_nr++] = xstrdup("--");
- setup_revisions(rev_argv_nr, rev_argv, &revs, NULL);
+ read_bisect_paths();
+
+ ALLOC_GROW(rev_argv, rev_argv_nr + 1, rev_argv_alloc);
+ rev_argv[rev_argv_nr++] = NULL;
+
+ setup_revisions(rev_argv_nr, rev_argv, revs, NULL);
+
+ revs->limited = 1;
+}
+
+int bisect_next_vars(const char *prefix)
+{
+ struct rev_info revs;
+ int reaches = 0, all = 0;
- revs.limited = 1;
+ bisect_rev_setup(&revs, prefix);
if (prepare_revision_walk(&revs))
die("revision walk setup failed");