From: Junio C Hamano <gitster@pobox•com>
To: Bo Yang <struggleyb.nku@gmail•com>
Cc: git@vger•kernel.org
Subject: Re: [PATCH v3 05/13] parse the -L options
Date: Tue, 13 Jul 2010 16:03:14 -0700 [thread overview]
Message-ID: <7vbpab2de5.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <1278829141-11900-5-git-send-email-struggleyb.nku@gmail.com> (Bo Yang's message of "Sun\, 11 Jul 2010 14\:18\:53 +0800")
Bo Yang <struggleyb.nku@gmail•com> writes:
> +static int log_line_range_callback(const struct option *option, const char *arg, int unset)
> +{
> + struct line_opt_callback_data *data = option->value;
> + struct diff_line_range *r = *data->range;
> + struct parse_opt_ctx_t *ctx = data->ctx;
Need a blank line here for readability.
> + if (!arg)
> + return -1;
> ...
> @@ -75,6 +118,58 @@ static void cmd_log_init(int argc, const char **argv, const char *prefix,
> */
> if (argc == 2 && !strcmp(argv[1], "-h"))
> usage(builtin_log_usage);
> +
> + parse_options_start(&ctx, argc, argv, prefix, PARSE_OPT_KEEP_DASHDASH |
> + PARSE_OPT_KEEP_ARGV0 | PARSE_OPT_STOP_AT_NON_OPTION);
> + for (;;) {
> + switch (parse_options_step(&ctx, options, log_opt_usage)) {
> + case PARSE_OPT_HELP:
> + exit(129);
> + case PARSE_OPT_DONE:
> + goto parse_done;
> + case PARSE_OPT_NON_OPTION:
> + path = parse_options_current(&ctx);
> + pathspec = prefix_path(prefix, prefix ? strlen(prefix) : 0, path);
> + range->spec = alloc_filespec(pathspec);
> + free((void *)pathspec);
> + if (range->nr == 0) {
> + if(range->next) {
> + die("Path %s need a -L <range> option\n"
> + "If you want follow the history of the whole file "
> + "whether to using 'git log' without -L or using "
> + "'git log -L 1,$ <path>'", range->spec->path);
> + } else {
> + parse_options_next(&ctx, 1);
> + continue;
This loop smells bad.
When "-L n,m" appears on the command line, log_line_range_callback() would
be called and would eat n,m (which is correct), but at that point you
would not just want to be prepared to accept a non-option ("path" in "-L
n,m path"), but actually would want to force the user to give a path, no?
IOW, isn't "git log -L n,m -U20" an error, unless "-U20" is a filename
that the user wants to track?
I somehow suspect that futzing with STOP_AT_NON_OPTION (done in the first
two patches in the series) to parse "-L n,m path" is a misguided design
attempt. Shouldn't you be instead giving a support for option callback to
take more than one argument to do this?
> + }
> + }
> + struct diff_line_range *r = xmalloc(sizeof(*r));
decl-after-statement, but at this point it may be moot as I am doubting
the higher-level design of this option parser now.
next prev parent reply other threads:[~2010-07-13 23:03 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-11 6:18 [PATCH v3 01/13] parse-options: stop when encounter a non-option Bo Yang
2010-07-11 6:18 ` [PATCH v3 02/13] parse-options: add two helper functions Bo Yang
2010-07-12 16:45 ` Junio C Hamano
2010-07-11 6:18 ` [PATCH v3 03/13] add the basic data structure for line level history Bo Yang
2010-07-12 14:16 ` Bo Yang
2010-07-12 16:50 ` Junio C Hamano
2010-07-18 14:35 ` Bo Yang
2010-07-11 6:18 ` [PATCH v3 04/13] refactor parse_loc Bo Yang
2010-07-12 18:32 ` Junio C Hamano
2010-07-11 6:18 ` [PATCH v3 05/13] parse the -L options Bo Yang
2010-07-13 23:03 ` Junio C Hamano [this message]
2010-07-18 14:49 ` Bo Yang
2010-07-19 18:44 ` Junio C Hamano
2010-07-19 22:48 ` Thomas Rast
2010-07-19 23:53 ` Junio C Hamano
2010-07-20 7:51 ` Thomas Rast
2010-07-20 15:45 ` Junio C Hamano
2010-07-22 9:06 ` Thomas Rast
2010-07-23 2:08 ` Junio C Hamano
2010-07-20 15:46 ` Bo Yang
2010-07-20 15:47 ` Bo Yang
2010-07-11 6:18 ` [PATCH v3 06/13] export three functions from diff.c Bo Yang
2010-07-11 6:18 ` [PATCH v3 07/13] add range clone functions Bo Yang
2010-07-12 21:52 ` Junio C Hamano
2010-07-11 6:18 ` [PATCH v3 08/13] map/take range to parent Bo Yang
2010-07-12 21:52 ` Junio C Hamano
2010-07-11 6:18 ` [PATCH v3 09/13] print the line log Bo Yang
2010-07-12 21:52 ` Junio C Hamano
2010-07-11 6:18 ` [PATCH v3 10/13] map/print ranges along traversing the history topologically Bo Yang
2010-07-12 21:52 ` Junio C Hamano
2010-07-11 6:18 ` [PATCH v3 11/13] add --always-print option Bo Yang
2010-07-13 20:35 ` Junio C Hamano
2010-07-11 6:19 ` [PATCH v3 12/13] add two test cases Bo Yang
2010-07-11 6:19 ` [PATCH v3 13/13] some document update Bo Yang
2010-07-11 8:27 ` Jakub Narebski
2010-07-12 14:12 ` Bo Yang
2010-07-12 18:45 ` Junio C Hamano
2010-07-18 14:37 ` Bo Yang
2010-07-12 16:45 ` [PATCH v3 01/13] parse-options: stop when encounter a non-option Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7vbpab2de5.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=struggleyb.nku@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox