git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Stefan Beller <sbeller@google.com>
To: Christian Couder <christian.couder@gmail.com>
Cc: "git@vger.kernel.org" <git@vger.kernel.org>,
	"Junio C Hamano" <gitster@pobox.com>, "Jeff King" <peff@peff.net>,
	"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
	"Karsten Blees" <karsten.blees@gmail.com>,
	"Nguyen Thai Ngoc Duy" <pclouds@gmail.com>,
	"Eric Sunshine" <sunshine@sunshineco.com>,
	"Ramsay Jones" <ramsay@ramsayjones.plus.com>,
	"Johannes Sixt" <j6t@kdbg.org>, "René Scharfe" <l.s.r@web.de>,
	"Stefan Naewe" <stefan.naewe@atlas-elektronik.com>,
	"Christian Couder" <chriscool@tuxfamily.org>
Subject: Re: [PATCH v14 30/41] Move libified code from builtin/apply.c to apply.{c,h}
Date: Tue, 6 Sep 2016 11:29:11 -0700	[thread overview]
Message-ID: <CAGZ79kb5jOpMXhLe_7tGdCAq51p5F07=fv2pR7FohCZ53SFswA@mail.gmail.com> (raw)
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:
> 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

> +                       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?

> +
> +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

  parent reply	other threads:[~2016-09-06 18:29 UTC|newest]

Thread overview: 44+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-09-04 20:17 [PATCH v14 00/41] libify apply and use lib in am, part 2 Christian Couder
2016-09-04 20:17 ` [PATCH v14 01/41] apply: make some names more specific Christian Couder
2016-09-04 20:17 ` [PATCH v14 02/41] apply: move 'struct apply_state' to apply.h Christian Couder
2016-09-04 20:17 ` [PATCH v14 03/41] builtin/apply: make apply_patch() return -1 or -128 instead of die()ing Christian Couder
2016-09-04 20:17 ` [PATCH v14 04/41] builtin/apply: read_patch_file() return -1 " Christian Couder
2016-09-04 20:17 ` [PATCH v14 05/41] builtin/apply: make find_header() return -128 " Christian Couder
2016-09-04 20:17 ` [PATCH v14 06/41] builtin/apply: make parse_chunk() return a negative integer on error Christian Couder
2016-09-04 20:17 ` [PATCH v14 07/41] builtin/apply: make parse_single_patch() return -1 " Christian Couder
2016-09-04 20:18 ` [PATCH v14 08/41] builtin/apply: make parse_whitespace_option() return -1 instead of die()ing Christian Couder
2016-09-04 20:18 ` [PATCH v14 09/41] builtin/apply: make parse_ignorewhitespace_option() " Christian Couder
2016-09-04 20:18 ` [PATCH v14 10/41] builtin/apply: move init_apply_state() to apply.c Christian Couder
2016-09-04 20:18 ` [PATCH v14 11/41] apply: make init_apply_state() return -1 instead of exit()ing Christian Couder
2016-09-04 20:18 ` [PATCH v14 12/41] builtin/apply: make check_apply_state() return -1 instead of die()ing Christian Couder
2016-09-04 20:18 ` [PATCH v14 13/41] builtin/apply: move check_apply_state() to apply.c Christian Couder
2016-09-04 20:18 ` [PATCH v14 14/41] builtin/apply: make apply_all_patches() return 128 or 1 on error Christian Couder
2016-09-04 20:18 ` [PATCH v14 15/41] builtin/apply: make parse_traditional_patch() return -1 " Christian Couder
2016-09-04 20:18 ` [PATCH v14 16/41] builtin/apply: make gitdiff_*() return 1 at end of header Christian Couder
2016-09-04 20:18 ` [PATCH v14 17/41] builtin/apply: make gitdiff_*() return -1 on error Christian Couder
2016-09-04 20:18 ` [PATCH v14 18/41] builtin/apply: change die_on_unsafe_path() to check_unsafe_path() Christian Couder
2016-09-04 20:18 ` [PATCH v14 19/41] builtin/apply: make build_fake_ancestor() return -1 on error Christian Couder
2016-09-04 20:18 ` [PATCH v14 20/41] builtin/apply: make remove_file() " Christian Couder
2016-09-04 20:18 ` [PATCH v14 21/41] builtin/apply: make add_conflicted_stages_file() " Christian Couder
2016-09-04 20:18 ` [PATCH v14 22/41] builtin/apply: make add_index_file() " Christian Couder
2016-09-04 20:18 ` [PATCH v14 23/41] builtin/apply: make create_file() " Christian Couder
2016-09-04 20:18 ` [PATCH v14 24/41] builtin/apply: make write_out_one_result() " Christian Couder
2016-09-04 20:18 ` [PATCH v14 25/41] builtin/apply: make write_out_results() " Christian Couder
2016-09-04 20:18 ` [PATCH v14 26/41] builtin/apply: make try_create_file() " Christian Couder
2016-09-04 20:18 ` [PATCH v14 27/41] builtin/apply: make create_one_file() " Christian Couder
2016-09-04 20:18 ` [PATCH v14 28/41] builtin/apply: rename option parsing functions Christian Couder
2016-09-04 20:18 ` [PATCH v14 29/41] apply: rename and move opt constants to apply.h Christian Couder
2016-09-04 20:18 ` [PATCH v14 31/41] apply: make some parsing functions static again Christian Couder
2016-09-04 20:18 ` [PATCH v14 32/41] apply: use error_errno() where possible Christian Couder
2016-09-04 20:18 ` [PATCH v14 33/41] apply: make it possible to silently apply Christian Couder
2016-09-04 20:18 ` [PATCH v14 34/41] apply: don't print on stdout in verbosity_silent mode Christian Couder
2016-09-04 20:18 ` [PATCH v14 35/41] usage: add set_warn_routine() Christian Couder
2016-09-04 20:18 ` [PATCH v14 36/41] usage: add get_error_routine() and get_warn_routine() Christian Couder
2016-09-04 20:18 ` [PATCH v14 37/41] apply: change error_routine when silent Christian Couder
2016-09-04 20:18 ` [PATCH v14 38/41] apply: refactor `git apply` option parsing Christian Couder
2016-09-04 20:18 ` [PATCH v14 39/41] apply: pass apply state to build_fake_ancestor() Christian Couder
2016-09-04 20:18 ` [PATCH v14 40/41] apply: learn to use a different index file Christian Couder
2016-09-04 20:18 ` [PATCH v14 41/41] builtin/am: use apply API in run_apply() Christian Couder
     [not found] ` <20160904201833.21676-31-chriscool@tuxfamily.org>
2016-09-06 18:29   ` Stefan Beller [this message]
2016-09-06 18:54 ` [PATCH v14 00/41] libify apply and use lib in am, part 2 Stefan Beller
2016-09-07 19:51 ` 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

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='CAGZ79kb5jOpMXhLe_7tGdCAq51p5F07=fv2pR7FohCZ53SFswA@mail.gmail.com' \
    --to=sbeller@google.com \
    --cc=avarab@gmail.com \
    --cc=chriscool@tuxfamily.org \
    --cc=christian.couder@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=j6t@kdbg.org \
    --cc=karsten.blees@gmail.com \
    --cc=l.s.r@web.de \
    --cc=pclouds@gmail.com \
    --cc=peff@peff.net \
    --cc=ramsay@ramsayjones.plus.com \
    --cc=stefan.naewe@atlas-elektronik.com \
    --cc=sunshine@sunshineco.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).