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

Re: [PATCH v14 30/41] Move libified code from builtin/apply.c to apply.{c,h}

From
Stefan Beller <sbeller@google.com>
Date
Sep 6, 2016, 18:29 UTC
Message-ID
<CAGZ79kb5jOpMXhLe_7tGdCAq51p5F07=fv2pR7FohCZ53SFswA@mail.gmail.com>
In-Reply-To
<20160904201833.21676-31-chriscool@tuxfamily.org>

On Sun, Sep 4, 2016 at 1:18 PM, Christian Couder <christian.couder@gmail.com> wrote:

Show 12 quoted lines
> As most of the apply code in builtin/apply.c has been libified by a number of
> previous commits, it can now be moved to apply.{c,h}, so that more code can
> use it.
>
> Helped-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
> Helped-by: Ramsay Jones <ramsay@ramsayjones.plus.com>
> Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
> ---
>  apply.c         | 4731 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
>  apply.h         |   19 +
>  builtin/apply.c | 4733 +------------------------------------------------------
>  3 files changed, 4751 insertions(+), 4732 deletions(-)

So I wanted to review this patch, so I wrote a patch to review this patch. ;) https://public-inbox.org/git/82367750-adea-6dee-198a-e39ac7a84b31@gmail.com/T/#t

Show 13 quoted lines
> +                       if (!state->apply_in_reverse &&
> +                           state->ws_error_action != nowarn_ws_error)
> +                               check_whitespace(state, line, len, patch->ws_rule);
> +                       added++;
> +                       newlines--;
> +                       trailing = 0;
> +                       break;
> +
> +               /*
> +                * We allow "\ No newline at end of file". Depending
> +                 * on locale settings when the patch was produced we
> +                 * don't know what this line looks like. The only
> +                 * thing we do know is that it begins with "\ ".

The previous three lines are white space broken AFAICT. The seem to be white space broken in the original location as well, so no need for a reroll just for this. But in case you do a reroll, you may want to fix these on the fly?

Show 9 quoted lines
> +
> +int apply_option_parse_exclude(const struct option *opt,
> +                              const char *arg, int unset)
> +
> +int apply_option_parse_include(const struct option *opt,
> +                              const char *arg, int unset)
> +int apply_option_parse_p(const struct option *opt,
> +                        const char *arg,
> +                        int unset)

These three functions seem slightly different, not just moved. Oh you removed the static key word!

Apart from the one minor nit and the removal of the static keyword, the rest is just moved code.

Thanks, Stefan

Previous: Junio C Hamano
Message 44 of 44 in “libify apply and use lib in am, part 2”
  1. 00/41 libify apply and use lib in am, part 2Christian Couder, Sep 4, 2016
  2. 01/41 apply: make some names more specificChristian Couder, Sep 4, 2016
  3. 02/41 apply: move 'struct apply_state' to apply.hChristian Couder, Sep 4, 2016
  4. 04/41 builtin/apply: read_patch_file() return -1 instead of die()ingChristian Couder, Sep 4, 2016
  5. 03/41 builtin/apply: make apply_patch() return -1 or -128 instead of die()ingChristian Couder, Sep 4, 2016
  6. 12/41 builtin/apply: make check_apply_state() return -1 instead of die()ingChristian Couder, Sep 4, 2016
  7. 11/41 apply: make init_apply_state() return -1 instead of exit()ingChristian Couder, Sep 4, 2016
  8. 14/41 builtin/apply: make apply_all_patches() return 128 or 1 on errorChristian Couder, Sep 4, 2016
  9. 15/41 builtin/apply: make parse_traditional_patch() return -1 on errorChristian Couder, Sep 4, 2016
  10. 17/41 builtin/apply: make gitdiff_*() return -1 on errorChristian Couder, Sep 4, 2016
  11. 13/41 builtin/apply: move check_apply_state() to apply.cChristian Couder, Sep 4, 2016
  12. 19/41 builtin/apply: make build_fake_ancestor() return -1 on errorChristian Couder, Sep 4, 2016
  13. 20/41 builtin/apply: make remove_file() return -1 on errorChristian Couder, Sep 4, 2016
  14. 16/41 builtin/apply: make gitdiff_*() return 1 at end of headerChristian Couder, Sep 4, 2016
  15. 23/41 builtin/apply: make create_file() return -1 on errorChristian Couder, Sep 4, 2016
  16. 22/41 builtin/apply: make add_index_file() return -1 on errorChristian Couder, Sep 4, 2016
  17. 18/41 builtin/apply: change die_on_unsafe_path() to check_unsafe_path()Christian Couder, Sep 4, 2016
  18. 24/41 builtin/apply: make write_out_one_result() return -1 on errorChristian Couder, Sep 4, 2016
  19. 21/41 builtin/apply: make add_conflicted_stages_file() return -1 on errorChristian Couder, Sep 4, 2016
  20. 25/41 builtin/apply: make write_out_results() return -1 on errorChristian Couder, Sep 4, 2016
  21. 29/41 apply: rename and move opt constants to apply.hChristian Couder, Sep 4, 2016
  22. 27/41 builtin/apply: make create_one_file() return -1 on errorChristian Couder, Sep 4, 2016
  23. 31/41 apply: make some parsing functions static againChristian Couder, Sep 4, 2016
  24. 32/41 apply: use error_errno() where possibleChristian Couder, Sep 4, 2016
  25. 28/41 builtin/apply: rename option parsing functionsChristian Couder, Sep 4, 2016
  26. 33/41 apply: make it possible to silently applyChristian Couder, Sep 4, 2016
  27. 34/41 apply: don't print on stdout in verbosity_silent modeChristian Couder, Sep 4, 2016
  28. 26/41 builtin/apply: make try_create_file() return -1 on errorChristian Couder, Sep 4, 2016
  29. 35/41 usage: add set_warn_routine()Christian Couder, Sep 4, 2016
  30. 41/41 builtin/am: use apply API in run_apply()Christian Couder, Sep 4, 2016
  31. 40/41 apply: learn to use a different index fileChristian Couder, Sep 4, 2016
  32. 39/41 apply: pass apply state to build_fake_ancestor()Christian Couder, Sep 4, 2016
  33. 38/41 apply: refactor `git apply` option parsingChristian Couder, Sep 4, 2016
  34. 37/41 apply: change error_routine when silentChristian Couder, Sep 4, 2016
  35. 36/41 usage: add get_error_routine() and get_warn_routine()Christian Couder, Sep 4, 2016
  36. 06/41 builtin/apply: make parse_chunk() return a negative integer on errorChristian Couder, Sep 4, 2016
  37. 10/41 builtin/apply: move init_apply_state() to apply.cChristian Couder, Sep 4, 2016
  38. 09/41 builtin/apply: make parse_ignorewhitespace_option() return -1 instead of die()ingChristian Couder, Sep 4, 2016
  39. 07/41 builtin/apply: make parse_single_patch() return -1 on errorChristian Couder, Sep 4, 2016
  40. 08/41 builtin/apply: make parse_whitespace_option() return -1 instead of die()ingChristian Couder, Sep 4, 2016
  41. 05/41 builtin/apply: make find_header() return -128 instead of die()ingChristian Couder, Sep 4, 2016
  42. Stefan BellerSep 6, 2016
  43. Junio C HamanoSep 7, 2016
  44. Stefan BellerSep 6, 2016

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.