From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 12 Oct 2011 19:34:15 +0000 (-0700)
Subject: Merge branch 'jc/parse-options-boolean'
X-Git-Tag: v1.7.8-rc0~95
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=af543833d4e10163af8045859cc081969fa5fcec;p=git.git

Merge branch 'jc/parse-options-boolean'

* jc/parse-options-boolean:
  apply: use OPT_NOOP_NOARG
  revert: use OPT_NOOP_NOARG
  parseopt: add OPT_NOOP_NOARG
  archive.c: use OPT_BOOL()
  parse-options: deprecate OPT_BOOLEAN

Conflicts:
	builtin/revert.c
---

af543833d4e10163af8045859cc081969fa5fcec
diff --cc builtin/revert.c
index 200149e2e,db5b1d49c..010508d57
--- a/builtin/revert.c
+++ b/builtin/revert.c
@@@ -92,62 -69,18 +92,60 @@@ static int option_parse_x(const struct 
  	return 0;
  }
  
 -static void parse_args(int argc, const char **argv)
 +static void verify_opt_compatible(const char *me, const char *base_opt, ...)
 +{
 +	const char *this_opt;
 +	va_list ap;
 +
 +	va_start(ap, base_opt);
 +	while ((this_opt = va_arg(ap, const char *))) {
 +		if (va_arg(ap, int))
 +			break;
 +	}
 +	va_end(ap);
 +
 +	if (this_opt)
 +		die(_("%s: %s cannot be used with %s"), me, this_opt, base_opt);
 +}
 +
 +static void verify_opt_mutually_compatible(const char *me, ...)
 +{
 +	const char *opt1, *opt2 = NULL;
 +	va_list ap;
 +
 +	va_start(ap, me);
 +	while ((opt1 = va_arg(ap, const char *))) {
 +		if (va_arg(ap, int))
 +			break;
 +	}
 +	if (opt1) {
 +		while ((opt2 = va_arg(ap, const char *))) {
 +			if (va_arg(ap, int))
 +				break;
 +		}
 +	}
 +
 +	if (opt1 && opt2)
 +		die(_("%s: %s cannot be used with %s"),	me, opt1, opt2);
 +}
 +
 +static void parse_args(int argc, const char **argv, struct replay_opts *opts)
  {
 -	const char * const * usage_str = revert_or_cherry_pick_usage();
 +	const char * const * usage_str = revert_or_cherry_pick_usage(opts);
 +	const char *me = action_name(opts);
- 	int noop;
 +	int reset = 0;
 +	int contin = 0;
  	struct option options[] = {
 -		OPT_BOOLEAN('n', "no-commit", &no_commit, "don't automatically commit"),
 -		OPT_BOOLEAN('e', "edit", &edit, "edit the commit message"),
 +		OPT_BOOLEAN(0, "reset", &reset, "forget the current operation"),
 +		OPT_BOOLEAN(0, "continue", &contin, "continue the current operation"),
 +		OPT_BOOLEAN('n', "no-commit", &opts->no_commit, "don't automatically commit"),
 +		OPT_BOOLEAN('e', "edit", &opts->edit, "edit the commit message"),
- 		{ OPTION_BOOLEAN, 'r', NULL, &noop, NULL, "no-op (backward compatibility)",
- 		  PARSE_OPT_NOARG | PARSE_OPT_HIDDEN, NULL, 0 },
+ 		OPT_NOOP_NOARG('r', NULL),
 -		OPT_BOOLEAN('s', "signoff", &signoff, "add Signed-off-by:"),
 -		OPT_INTEGER('m', "mainline", &mainline, "parent number"),
 -		OPT_RERERE_AUTOUPDATE(&allow_rerere_auto),
 -		OPT_STRING(0, "strategy", &strategy, "strategy", "merge strategy"),
 -		OPT_CALLBACK('X', "strategy-option", &xopts, "option",
 +		OPT_BOOLEAN('s', "signoff", &opts->signoff, "add Signed-off-by:"),
 +		OPT_INTEGER('m', "mainline", &opts->mainline, "parent number"),
 +		OPT_RERERE_AUTOUPDATE(&opts->allow_rerere_auto),
 +		OPT_STRING(0, "strategy", &opts->strategy, "strategy", "merge strategy"),
 +		OPT_CALLBACK('X', "strategy-option", &opts, "option",
  			"option for merge strategy", option_parse_x),
  		OPT_END(),
  		OPT_END(),