git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
blob bec63d68a97b5702fa8e823568bbe5113de32ecb 3006 bytes (raw)
name: builtin/bisect--helper.c 	 # note: path name is non-authoritative(*)

  1
  2
  3
  4
  5
  6
  7
  8
  9
 10
 11
 12
 13
 14
 15
 16
 17
 18
 19
 20
 21
 22
 23
 24
 25
 26
 27
 28
 29
 30
 31
 32
 33
 34
 35
 36
 37
 38
 39
 40
 41
 42
 43
 44
 45
 46
 47
 48
 49
 50
 51
 52
 53
 54
 55
 56
 57
 58
 59
 60
 61
 62
 63
 64
 65
 66
 67
 68
 69
 70
 71
 72
 73
 74
 75
 76
 77
 78
 79
 80
 81
 82
 83
 84
 85
 86
 87
 88
 89
 90
 91
 92
 93
 94
 95
 96
 97
 98
 99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
 
#include "builtin.h"
#include "cache.h"
#include "parse-options.h"
#include "bisect.h"
#include "refs.h"

static GIT_PATH_FUNC(git_path_bisect_terms, "BISECT_TERMS")

static const char * const git_bisect_helper_usage[] = {
	N_("git bisect--helper --next-all [--no-checkout]"),
	N_("git bisect--helper --write-terms <bad_term> <good_term>"),
	NULL
};

/*
 * Check whether the string `term` belongs to the set of strings
 * included in the variable arguments.
 */
static int one_of(const char *term, ...)
{
	int res = 0;
	va_list matches;
	const char *match;

	va_start(matches, term);
	while (!res && (match = va_arg(matches, const char *)))
		res = !strcmp(term, match);
	va_end(matches);

	return res;
}

static int check_term_format(const char *term, const char *orig_term)
{
	struct strbuf new_term = STRBUF_INIT;
	strbuf_addf(&new_term, "refs/bisect/%s", term);

	if (check_refname_format(new_term.buf, 0)) {
		strbuf_release(&new_term);
		return error(_("'%s' is not a valid term"), term);
	}
	strbuf_release(&new_term);

	if (one_of(term, "help", "start", "skip", "next", "reset",
			"visualize", "replay", "log", "run", NULL))
		return error(_("can't use the builtin command '%s' as a term"), term);

	/*
	 * In theory, nothing prevents swapping completely good and bad,
	 * but this situation could be confusing and hasn't been tested
	 * enough. Forbid it for now.
	 */

	if ((strcmp(orig_term, "bad") && one_of(term, "bad", "new", NULL)) ||
		 (strcmp(orig_term, "good") && one_of(term, "good", "old", NULL)))
		return error(_("can't change the meaning of the term '%s'"), term);

	return 0;
}

static int write_terms(const char *bad, const char *good)
{
	FILE *fp;
	int res;

	if (!strcmp(bad, good))
		return error(_("please use two different terms"));

	if (check_term_format(bad, "bad") || check_term_format(good, "good"))
		return -1;

	fp = fopen(git_path_bisect_terms(), "w");
	if (!fp)
		return error_errno(_("could not open the file BISECT_TERMS"));

	res = fprintf(fp, "%s\n%s\n", bad, good);
	fclose(fp);
	return (res < 0) ? -1 : 0;
}

int cmd_bisect__helper(int argc, const char **argv, const char *prefix)
{
	enum {
		NEXT_ALL = 1,
		WRITE_TERMS
	} cmdmode = 0;
	int no_checkout = 0;
	struct option options[] = {
		OPT_CMDMODE(0, "next-all", &cmdmode,
			 N_("perform 'git bisect next'"), NEXT_ALL),
		OPT_CMDMODE(0, "write-terms", &cmdmode,
			 N_("write the terms to .git/BISECT_TERMS"), WRITE_TERMS),
		OPT_BOOL(0, "no-checkout", &no_checkout,
			 N_("update BISECT_HEAD instead of checking out the current commit")),
		OPT_END()
	};

	argc = parse_options(argc, argv, prefix, options,
			     git_bisect_helper_usage, 0);

	if (!cmdmode)
		usage_with_options(git_bisect_helper_usage, options);

	switch (cmdmode) {
	case NEXT_ALL:
		return bisect_next_all(prefix, no_checkout);
	case WRITE_TERMS:
		if (argc != 2)
			die(_("--write-terms requires two arguments"));
		return write_terms(argv[0], argv[1]);
	default:
		die("BUG: unknown subcommand '%d'", cmdmode);
	}
	return 0;
}

debug log:

solving bec63d6 ...
found bec63d6 in https://public-inbox.org/git/20160712223538.28508-4-pranit.bauva@gmail.com/
found 3c748d1 in https://public-inbox.org/git/20160712223538.28508-3-pranit.bauva@gmail.com/ ||
	https://public-inbox.org/git/1464014928-31548-3-git-send-email-pranit.bauva@gmail.com/ ||
	https://public-inbox.org/git/20160524072124.2945-3-pranit.bauva@gmail.com/ ||
	https://public-inbox.org/git/1463031127-17718-3-git-send-email-pranit.bauva@gmail.com/ ||
	https://public-inbox.org/git/20160524184242.7518-3-pranit.bauva@gmail.com/
found 8111c91 in https://public-inbox.org/git/010201567675adc1-17e27495-6b36-40d1-836d-814da029fcc4-000000@eu-west-1.amazonses.com/ ||
	https://public-inbox.org/git/01020157c38b19e0-81123fa5-5d9d-4f64-8f1b-ff336e83ebe4-000000@eu-west-1.amazonses.com/ ||
	https://public-inbox.org/git/01020156b73fe5b4-5dc768ab-b73b-4a21-ab92-018e2a7aa6f7-000000@eu-west-1.amazonses.com/ ||
	https://public-inbox.org/git/01020156a48144f8-c0e127c1-8cd9-4295-ac16-449a54315cac-000000@eu-west-1.amazonses.com/ ||
	https://public-inbox.org/git/0102015640423c26-2060fd70-c90d-4de3-ae8c-1801ad160b1c-000000@eu-west-1.amazonses.com/ ||
	https://public-inbox.org/git/010201560a4781be-e8418d6a-5996-45cd-b11b-ca25894ad7f2-000000@eu-west-1.amazonses.com/ ||
	https://public-inbox.org/git/20160712223538.28508-2-pranit.bauva@gmail.com/ ||
	https://public-inbox.org/git/1464014928-31548-2-git-send-email-pranit.bauva@gmail.com/ ||
	https://public-inbox.org/git/20160524072124.2945-2-pranit.bauva@gmail.com/ ||
	https://public-inbox.org/git/1463031127-17718-2-git-send-email-pranit.bauva@gmail.com/ ||
	https://public-inbox.org/git/20160524184242.7518-2-pranit.bauva@gmail.com/
found 3324229 in https://80x24.org/mirrors/git.git
preparing index
index prepared:
100644 3324229025300f7d7de600753c03af3ac22e2152	builtin/bisect--helper.c

applying [1/3] https://public-inbox.org/git/010201567675adc1-17e27495-6b36-40d1-836d-814da029fcc4-000000@eu-west-1.amazonses.com/
diff --git a/builtin/bisect--helper.c b/builtin/bisect--helper.c
index 3324229..8111c91 100644

Checking patch builtin/bisect--helper.c...
Applied patch builtin/bisect--helper.c cleanly.

skipping https://public-inbox.org/git/01020157c38b19e0-81123fa5-5d9d-4f64-8f1b-ff336e83ebe4-000000@eu-west-1.amazonses.com/ for 8111c91
skipping https://public-inbox.org/git/01020156b73fe5b4-5dc768ab-b73b-4a21-ab92-018e2a7aa6f7-000000@eu-west-1.amazonses.com/ for 8111c91
skipping https://public-inbox.org/git/01020156a48144f8-c0e127c1-8cd9-4295-ac16-449a54315cac-000000@eu-west-1.amazonses.com/ for 8111c91
skipping https://public-inbox.org/git/0102015640423c26-2060fd70-c90d-4de3-ae8c-1801ad160b1c-000000@eu-west-1.amazonses.com/ for 8111c91
skipping https://public-inbox.org/git/010201560a4781be-e8418d6a-5996-45cd-b11b-ca25894ad7f2-000000@eu-west-1.amazonses.com/ for 8111c91
skipping https://public-inbox.org/git/20160712223538.28508-2-pranit.bauva@gmail.com/ for 8111c91
skipping https://public-inbox.org/git/1464014928-31548-2-git-send-email-pranit.bauva@gmail.com/ for 8111c91
skipping https://public-inbox.org/git/20160524072124.2945-2-pranit.bauva@gmail.com/ for 8111c91
skipping https://public-inbox.org/git/1463031127-17718-2-git-send-email-pranit.bauva@gmail.com/ for 8111c91
skipping https://public-inbox.org/git/20160524184242.7518-2-pranit.bauva@gmail.com/ for 8111c91
index at:
100644 8111c9149f5b95234f7144b1310f3d2bd5f6310e	builtin/bisect--helper.c

applying [2/3] https://public-inbox.org/git/20160712223538.28508-3-pranit.bauva@gmail.com/
diff --git a/builtin/bisect--helper.c b/builtin/bisect--helper.c
index 8111c91..3c748d1 100644

Checking patch builtin/bisect--helper.c...
Applied patch builtin/bisect--helper.c cleanly.

skipping https://public-inbox.org/git/1464014928-31548-3-git-send-email-pranit.bauva@gmail.com/ for 3c748d1
skipping https://public-inbox.org/git/20160524072124.2945-3-pranit.bauva@gmail.com/ for 3c748d1
skipping https://public-inbox.org/git/1463031127-17718-3-git-send-email-pranit.bauva@gmail.com/ for 3c748d1
skipping https://public-inbox.org/git/20160524184242.7518-3-pranit.bauva@gmail.com/ for 3c748d1
index at:
100644 3c748d159698c1d605363e3385fd3cd335c076c3	builtin/bisect--helper.c

applying [3/3] https://public-inbox.org/git/20160712223538.28508-4-pranit.bauva@gmail.com/
diff --git a/builtin/bisect--helper.c b/builtin/bisect--helper.c
index 3c748d1..bec63d6 100644

Checking patch builtin/bisect--helper.c...
Applied patch builtin/bisect--helper.c cleanly.

index at:
100644 bec63d68a97b5702fa8e823568bbe5113de32ecb	builtin/bisect--helper.c

(*) Git path names are given by the tree(s) the blob belongs to.
    Blobs themselves have no identifier aside from the hash of its contents.^

Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).