From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 13 May 2011 18:00:25 +0000 (-0700)
Subject: Merge branch 'jn/setup-revisions-glob-and-friends-passthru'
X-Git-Tag: v1.7.6-rc0~79
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/3e1a363b1ff748237f3a6e4f3e2803445f09c54c?ds=inline;hp=-c

Merge branch 'jn/setup-revisions-glob-and-friends-passthru'

* jn/setup-revisions-glob-and-friends-passthru:
revisions: allow --glob and friends in parse_options-enabled commands
revisions: split out handle_revision_pseudo_opt function
---

3e1a363b1ff748237f3a6e4f3e2803445f09c54c
diff --combined revision.c
index 541f09e218,238976466d..a7cf79bf2e
--- a/revision.c
+++ b/revision.c
@@@ -955,8 -955,6 +955,8 @@@ void init_revisions(struct rev_info *re
  		revs->diffopt.prefix = prefix;
  		revs->diffopt.prefix_length = strlen(prefix);
  	}
 +
 +	revs->notes_opt.use_default_notes = -1;
  }
  
  static void add_pending_commit_list(struct rev_info *revs,
@@@ -1180,7 -1178,9 +1180,9 @@@ static int handle_revision_opt(struct r
  	    !strcmp(arg, "--tags") || !strcmp(arg, "--remotes") ||
  	    !strcmp(arg, "--reflog") || !strcmp(arg, "--not") ||
  	    !strcmp(arg, "--no-walk") || !strcmp(arg, "--do-walk") ||
- 	    !strcmp(arg, "--bisect"))
+ 	    !strcmp(arg, "--bisect") || !prefixcmp(arg, "--glob=") ||
+ 	    !prefixcmp(arg, "--branches=") || !prefixcmp(arg, "--tags=") ||
+ 	    !prefixcmp(arg, "--remotes="))
  	{
  		unkv[(*unkc)++] = arg;
  		return 1;
@@@ -1367,39 -1367,32 +1369,39 @@@
  		revs->verbose_header = 1;
  		revs->pretty_given = 1;
  		get_commit_format(arg+9, revs);
 -	} else if (!strcmp(arg, "--show-notes")) {
 +	} else if (!strcmp(arg, "--show-notes") || !strcmp(arg, "--notes")) {
  		revs->show_notes = 1;
  		revs->show_notes_given = 1;
 -	} else if (!prefixcmp(arg, "--show-notes=")) {
 +		revs->notes_opt.use_default_notes = 1;
 +	} else if (!prefixcmp(arg, "--show-notes=") ||
 +		   !prefixcmp(arg, "--notes=")) {
  		struct strbuf buf = STRBUF_INIT;
  		revs->show_notes = 1;
  		revs->show_notes_given = 1;
 -		if (!revs->notes_opt.extra_notes_refs)
 -			revs->notes_opt.extra_notes_refs = xcalloc(1, sizeof(struct string_list));
 -		if (!prefixcmp(arg+13, "refs/"))
 -			/* happy */;
 -		else if (!prefixcmp(arg+13, "notes/"))
 -			strbuf_addstr(&buf, "refs/");
 +		if (!prefixcmp(arg, "--show-notes")) {
 +			if (revs->notes_opt.use_default_notes < 0)
 +				revs->notes_opt.use_default_notes = 1;
 +			strbuf_addstr(&buf, arg+13);
 +		}
  		else
 -			strbuf_addstr(&buf, "refs/notes/");
 -		strbuf_addstr(&buf, arg+13);
 -		string_list_append(revs->notes_opt.extra_notes_refs,
 +			strbuf_addstr(&buf, arg+8);
 +		expand_notes_ref(&buf);
 +		string_list_append(&revs->notes_opt.extra_notes_refs,
  				   strbuf_detach(&buf, NULL));
  	} else if (!strcmp(arg, "--no-notes")) {
  		revs->show_notes = 0;
  		revs->show_notes_given = 1;
 +		revs->notes_opt.use_default_notes = -1;
 +		/* we have been strdup'ing ourselves, so trick
 +		 * string_list into free()ing strings */
 +		revs->notes_opt.extra_notes_refs.strdup_strings = 1;
 +		string_list_clear(&revs->notes_opt.extra_notes_refs, 0);
 +		revs->notes_opt.extra_notes_refs.strdup_strings = 0;
  	} else if (!strcmp(arg, "--standard-notes")) {
  		revs->show_notes_given = 1;
 -		revs->notes_opt.suppress_default_notes = 0;
 +		revs->notes_opt.use_default_notes = 1;
  	} else if (!strcmp(arg, "--no-standard-notes")) {
 -		revs->notes_opt.suppress_default_notes = 1;
 +		revs->notes_opt.use_default_notes = 0;
  	} else if (!strcmp(arg, "--oneline")) {
  		revs->verbose_header = 1;
  		get_commit_format("oneline", revs);
@@@ -1535,6 -1528,69 +1537,69 @@@ static void append_prune_data(const cha
  	*prune_data = prune;
  }
  
+ static int handle_revision_pseudo_opt(const char *submodule,
+ 				struct rev_info *revs,
+ 				int argc, const char **argv, int *flags)
+ {
+ 	const char *arg = argv[0];
+ 	const char *optarg;
+ 	int argcount;
+ 
+ 	/*
+ 	 * NOTE!
+ 	 *
+ 	 * Commands like "git shortlog" will not accept the options below
+ 	 * unless parse_revision_opt queues them (as opposed to erroring
+ 	 * out).
+ 	 *
+ 	 * When implementing your new pseudo-option, remember to
+ 	 * register it in the list at the top of handle_revision_opt.
+ 	 */
+ 	if (!strcmp(arg, "--all")) {
+ 		handle_refs(submodule, revs, *flags, for_each_ref_submodule);
+ 		handle_refs(submodule, revs, *flags, head_ref_submodule);
+ 	} else if (!strcmp(arg, "--branches")) {
+ 		handle_refs(submodule, revs, *flags, for_each_branch_ref_submodule);
+ 	} else if (!strcmp(arg, "--bisect")) {
+ 		handle_refs(submodule, revs, *flags, for_each_bad_bisect_ref);
+ 		handle_refs(submodule, revs, *flags ^ UNINTERESTING, for_each_good_bisect_ref);
+ 		revs->bisect = 1;
+ 	} else if (!strcmp(arg, "--tags")) {
+ 		handle_refs(submodule, revs, *flags, for_each_tag_ref_submodule);
+ 	} else if (!strcmp(arg, "--remotes")) {
+ 		handle_refs(submodule, revs, *flags, for_each_remote_ref_submodule);
+ 	} else if ((argcount = parse_long_opt("glob", argv, &optarg))) {
+ 		struct all_refs_cb cb;
+ 		init_all_refs_cb(&cb, revs, *flags);
+ 		for_each_glob_ref(handle_one_ref, optarg, &cb);
+ 		return argcount;
+ 	} else if (!prefixcmp(arg, "--branches=")) {
+ 		struct all_refs_cb cb;
+ 		init_all_refs_cb(&cb, revs, *flags);
+ 		for_each_glob_ref_in(handle_one_ref, arg + 11, "refs/heads/", &cb);
+ 	} else if (!prefixcmp(arg, "--tags=")) {
+ 		struct all_refs_cb cb;
+ 		init_all_refs_cb(&cb, revs, *flags);
+ 		for_each_glob_ref_in(handle_one_ref, arg + 7, "refs/tags/", &cb);
+ 	} else if (!prefixcmp(arg, "--remotes=")) {
+ 		struct all_refs_cb cb;
+ 		init_all_refs_cb(&cb, revs, *flags);
+ 		for_each_glob_ref_in(handle_one_ref, arg + 10, "refs/remotes/", &cb);
+ 	} else if (!strcmp(arg, "--reflog")) {
+ 		handle_reflog(revs, *flags);
+ 	} else if (!strcmp(arg, "--not")) {
+ 		*flags ^= UNINTERESTING;
+ 	} else if (!strcmp(arg, "--no-walk")) {
+ 		revs->no_walk = 1;
+ 	} else if (!strcmp(arg, "--do-walk")) {
+ 		revs->no_walk = 0;
+ 	} else {
+ 		return 0;
+ 	}
+ 
+ 	return 1;
+ }
+ 
  /*
   * Parse revision information, filling in the "rev_info" structure,
   * and removing the used arguments from the argument list.
@@@ -1547,8 -1603,6 +1612,6 @@@ int setup_revisions(int argc, const cha
  	int i, flags, left, seen_dashdash, read_from_stdin, got_rev_arg = 0;
  	const char **prune_data = NULL;
  	const char *submodule = NULL;
- 	const char *optarg;
- 	int argcount;
  
  	if (opt)
  		submodule = opt->submodule;
@@@ -1575,70 -1629,14 +1638,14 @@@
  		if (*arg == '-') {
  			int opts;
  
- 			if (!strcmp(arg, "--all")) {
- 				handle_refs(submodule, revs, flags, for_each_ref_submodule);
- 				handle_refs(submodule, revs, flags, head_ref_submodule);
- 				continue;
- 			}
- 			if (!strcmp(arg, "--branches")) {
- 				handle_refs(submodule, revs, flags, for_each_branch_ref_submodule);
- 				continue;
- 			}
- 			if (!strcmp(arg, "--bisect")) {
- 				handle_refs(submodule, revs, flags, for_each_bad_bisect_ref);
- 				handle_refs(submodule, revs, flags ^ UNINTERESTING, for_each_good_bisect_ref);
- 				revs->bisect = 1;
- 				continue;
- 			}
- 			if (!strcmp(arg, "--tags")) {
- 				handle_refs(submodule, revs, flags, for_each_tag_ref_submodule);
- 				continue;
- 			}
- 			if (!strcmp(arg, "--remotes")) {
- 				handle_refs(submodule, revs, flags, for_each_remote_ref_submodule);
- 				continue;
- 			}
- 			if ((argcount = parse_long_opt("glob", argv + i, &optarg))) {
- 				struct all_refs_cb cb;
- 				i += argcount - 1;
- 				init_all_refs_cb(&cb, revs, flags);
- 				for_each_glob_ref(handle_one_ref, optarg, &cb);
- 				continue;
- 			}
- 			if (!prefixcmp(arg, "--branches=")) {
- 				struct all_refs_cb cb;
- 				init_all_refs_cb(&cb, revs, flags);
- 				for_each_glob_ref_in(handle_one_ref, arg + 11, "refs/heads/", &cb);
- 				continue;
- 			}
- 			if (!prefixcmp(arg, "--tags=")) {
- 				struct all_refs_cb cb;
- 				init_all_refs_cb(&cb, revs, flags);
- 				for_each_glob_ref_in(handle_one_ref, arg + 7, "refs/tags/", &cb);
- 				continue;
- 			}
- 			if (!prefixcmp(arg, "--remotes=")) {
- 				struct all_refs_cb cb;
- 				init_all_refs_cb(&cb, revs, flags);
- 				for_each_glob_ref_in(handle_one_ref, arg + 10, "refs/remotes/", &cb);
- 				continue;
- 			}
- 			if (!strcmp(arg, "--reflog")) {
- 				handle_reflog(revs, flags);
- 				continue;
- 			}
- 			if (!strcmp(arg, "--not")) {
- 				flags ^= UNINTERESTING;
- 				continue;
- 			}
- 			if (!strcmp(arg, "--no-walk")) {
- 				revs->no_walk = 1;
- 				continue;
- 			}
- 			if (!strcmp(arg, "--do-walk")) {
- 				revs->no_walk = 0;
+ 			opts = handle_revision_pseudo_opt(submodule,
+ 						revs, argc - i, argv + i,
+ 						&flags);
+ 			if (opts > 0) {
+ 				i += opts - 1;
  				continue;
  			}
+ 
  			if (!strcmp(arg, "--stdin")) {
  				if (revs->disable_stdin) {
  					argv[left++] = arg;