git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH v3 05/13] parse the -L options

From
Bo Yang <struggleyb.nku@gmail.com>
Date
Jul 18, 2010, 14:49 UTC
Message-ID
<AANLkTimNAyKZNdIIc6R5ylHuOVJho7UF0fnYC8jiaF9i@mail.gmail.com>
In-Reply-To
<7vbpab2de5.fsf@alter.siamese.dyndns.org>
Hi Junio,
On Wed, Jul 14, 2010 at 7:03 AM, Junio C Hamano <gitster@pobox.com> wrote:
Show 47 quoted lines
>>       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.
>
The point is that, the syntax we support is:
-L n1,m1 -L n2,m2 pathspec1  -L n3,m3 pathspec2

There can be multiple -L options for one pathspec, so I think the STOP_AT_NON_OPTION way is better.

-- 
Regards!
Bo
----------------------------
My blog: http://blog.morebits.org
Why Git: http://www.whygitisbetterthanx.com/
Previous: Junio C HamanoNext: Junio C Hamano
Message 12 of 39 in “parse-options: stop when encounter a non-option”
  1. 01/13 parse-options: stop when encounter a non-optionBo Yang, Jul 11, 2010
  2. 02/13 parse-options: add two helper functionsBo Yang, Jul 11, 2010
  3. Junio C HamanoJul 12, 2010
  4. 03/13 add the basic data structure for line level historyBo Yang, Jul 11, 2010
  5. Bo YangJul 12, 2010
  6. Junio C HamanoJul 12, 2010
  7. Bo YangJul 18, 2010
  8. 04/13 refactor parse_locBo Yang, Jul 11, 2010
  9. Junio C HamanoJul 12, 2010
  10. 05/13 parse the -L optionsBo Yang, Jul 11, 2010
  11. Junio C HamanoJul 13, 2010
  12. Bo YangJul 18, 2010
  13. Junio C HamanoJul 19, 2010
  14. Thomas RastJul 19, 2010
  15. Junio C HamanoJul 19, 2010
  16. Thomas RastJul 20, 2010
  17. Junio C HamanoJul 20, 2010
  18. Thomas RastJul 22, 2010
  19. Junio C HamanoJul 23, 2010
  20. Bo YangJul 20, 2010
  21. Bo YangJul 20, 2010
  22. 06/13 export three functions from diff.cBo Yang, Jul 11, 2010
  23. 07/13 add range clone functionsBo Yang, Jul 11, 2010
  24. Junio C HamanoJul 12, 2010
  25. 08/13 map/take range to parentBo Yang, Jul 11, 2010
  26. Junio C HamanoJul 12, 2010
  27. 09/13 print the line logBo Yang, Jul 11, 2010
  28. Junio C HamanoJul 12, 2010
  29. 10/13 map/print ranges along traversing the history topologicallyBo Yang, Jul 11, 2010
  30. Junio C HamanoJul 12, 2010
  31. 11/13 add --always-print optionBo Yang, Jul 11, 2010
  32. Junio C HamanoJul 13, 2010
  33. 12/13 add two test casesBo Yang, Jul 11, 2010
  34. 13/13 some document updateBo Yang, Jul 11, 2010
  35. Jakub NarebskiJul 11, 2010
  36. Bo YangJul 12, 2010
  37. Junio C HamanoJul 12, 2010
  38. Bo YangJul 18, 2010
  39. Junio C HamanoJul 12, 2010

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.