From: Christian Couder <christian.couder@gmail.com>
To: git <git@vger.kernel.org>
Cc: "Junio C Hamano" <gitster@pobox.com>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
"Nguyen Thai Ngoc Duy" <pclouds@gmail.com>,
"Stefan Beller" <sbeller@google.com>,
"Eric Sunshine" <sunshine@sunshineco.com>,
"Ramsay Jones" <ramsay@ramsayjones.plus.com>,
"Jeff King" <peff@peff.net>,
"Karsten Blees" <karsten.blees@gmail.com>,
"Matthieu Moy" <Matthieu.Moy@grenoble-inp.fr>,
"Christian Couder" <chriscool@tuxfamily.org>
Subject: Re: [PATCH v3 00/49] libify apply and use lib in am, part 1
Date: Tue, 24 May 2016 10:59:58 +0200 [thread overview]
Message-ID: <CAP8UFD0oU4BM=k=+9ijz86ZH8o63i3EVxqL-XMZaZKdyD7_x-w@mail.gmail.com> (raw)
In-Reply-To: <20160524081126.16973-1-chriscool@tuxfamily.org>
On Tue, May 24, 2016 at 10:10 AM, Christian Couder
<christian.couder@gmail.com> wrote:
>
> I will send a diff between this version and the 50 first patches of v2
> soon as a reply to this email.
Here is the diff:
diff --git a/builtin/apply.c b/builtin/apply.c
index ec55768..c1c5592 100644
--- a/builtin/apply.c
+++ b/builtin/apply.c
@@ -59,44 +59,44 @@ struct apply_state {
struct lock_file *lock_file;
int newfd;
- int apply;
+ /* These control what gets looked at and modified */
+ int apply; /* this is not a dry-run */
+ int cached; /* apply to the index only */
+ int check; /* preimage must match working tree, don't actually apply */
+ int check_index; /* preimage must match the indexed version */
+ int update_index; /* check_index && apply */
+
+ /* These control cosmetic aspect of the output */
+ int diffstat; /* just show a diffstat, and don't actually apply */
+ int numstat; /* just show a numeric diffstat, and don't actually apply */
+ int summary; /* just report creation, deletion, etc, and don't
actually apply */
+
+ /* These boolean parameters control how the apply is done */
int allow_overlap;
int apply_in_reverse;
int apply_with_reject;
int apply_verbosely;
-
- /* --cached updates only the cache without ever touching the
working tree. */
- int cached;
-
- /* --stat does just a diffstat, and doesn't actually apply */
- int diffstat;
-
- /* --numstat does numeric diffstat, and doesn't actually apply */
- int numstat;
-
- int summary;
- int threeway;
int no_add;
+ int threeway;
+ int unidiff_zero;
+ int unsafe_paths;
+
+ /* Other non boolean parameters */
const char *fake_ancestor;
const char *patch_input_file;
- struct string_list limit_by_name;
- int has_include;
+ int line_termination;
struct strbuf root;
- struct string_list symlink_changes;
-
- /*
- * --check turns on checking that the working tree matches the
- * files that are being modified, but doesn't apply the patch
- */
- int check;
+ int p_value;
+ int p_value_known;
+ unsigned int p_context;
- /* --index updates the cache as well. */
- int check_index;
+ /* Exclude and include path parameters */
+ struct string_list limit_by_name;
+ int has_include;
- int unidiff_zero;
- int update_index;
- int unsafe_paths;
- int line_termination;
+ /* Various "current state" */
+ int linenr; /* current line number */
+ struct string_list symlink_changes; /* we have to track symlinks */
/*
* For "diff-stat" like behaviour, we keep track of the biggest change
@@ -106,30 +106,19 @@ struct apply_state {
int max_change;
int max_len;
- /*
- * Various "current state", notably line numbers and what
- * file (and how) we're patching right now.. The "is_xxxx"
- * things are flags, where -1 means "don't know yet".
- */
- int linenr;
-
/*
* Records filenames that have been touched, in order to handle
* the case where more than one patches touch the same file.
*/
struct string_list fn_table;
-
- int p_value;
- int p_value_known;
- unsigned int p_context;
+ /* These control whitespace errors */
+ enum ws_error_action ws_error_action;
+ enum ws_ignore ws_ignore_action;
const char *whitespace_option;
int whitespace_error;
int squelch_whitespace_errors;
int applied_after_fixing_ws;
-
- enum ws_error_action ws_error_action;
- enum ws_ignore ws_ignore_action;
};
static const char * const apply_usage[] = {
@@ -4688,6 +4677,15 @@ static void init_apply_state(struct apply_state *state,
parse_ignorewhitespace_option(state, apply_default_ignorewhitespace);
}
+static void clear_apply_state(struct apply_state *state)
+{
+ string_list_clear(&state->limit_by_name, 0);
+ string_list_clear(&state->symlink_changes, 0);
+ strbuf_release(&state->root);
+
+ /* &state->fn_table is cleared at the end of apply_patch() */
+}
+
static void check_apply_state(struct apply_state *state, int force_apply)
{
int is_not_gitdir = !startup_info->have_repository;
@@ -4790,6 +4788,7 @@ int cmd_apply(int argc, const char **argv, const
char *prefix)
{
int force_apply = 0;
int options = 0;
+ int ret;
struct apply_state state;
struct option builtin_apply_options[] = {
@@ -4868,5 +4867,9 @@ int cmd_apply(int argc, const char **argv, const
char *prefix)
check_apply_state(&state, force_apply);
- return apply_all_patches(&state, argc, argv, options);
+ ret = apply_all_patches(&state, argc, argv, options);
+
+ clear_apply_state(&state);
+
+ return ret;
}
prev parent reply other threads:[~2016-05-24 9:00 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-24 8:10 [PATCH v3 00/49] libify apply and use lib in am, part 1 Christian Couder
2016-05-24 8:10 ` [PATCH v3 01/49] builtin/apply: make gitdiff_verify_name() return void Christian Couder
2016-05-24 8:10 ` [PATCH v3 02/49] builtin/apply: avoid parameter shadowing 'p_value' global Christian Couder
2016-05-24 8:10 ` [PATCH v3 03/49] builtin/apply: avoid parameter shadowing 'linenr' global Christian Couder
2016-05-24 8:10 ` [PATCH v3 04/49] builtin/apply: avoid local variable shadowing 'len' parameter Christian Couder
2016-05-24 8:10 ` [PATCH v3 05/49] builtin/apply: extract line_by_line_fuzzy_match() from match_fragment() Christian Couder
2016-05-24 8:10 ` [PATCH v3 06/49] builtin/apply: move 'options' variable into cmd_apply() Christian Couder
2016-05-24 8:10 ` [PATCH v3 07/49] builtin/apply: move 'read_stdin' global " Christian Couder
2016-05-24 8:10 ` [PATCH v3 08/49] builtin/apply: introduce 'struct apply_state' to start libifying Christian Couder
2016-05-24 8:10 ` [PATCH v3 09/49] builtin/apply: move 'state' init into init_apply_state() Christian Couder
2016-05-24 8:10 ` [PATCH v3 10/49] builtin/apply: move 'unidiff_zero' global into 'struct apply_state' Christian Couder
2016-05-24 8:10 ` [PATCH v3 11/49] builtin/apply: move 'check' " Christian Couder
2016-05-24 8:10 ` [PATCH v3 12/49] builtin/apply: move 'check_index' " Christian Couder
2016-05-24 8:10 ` [PATCH v3 13/49] builtin/apply: move 'apply_in_reverse' " Christian Couder
2016-05-24 8:10 ` [PATCH v3 14/49] builtin/apply: move 'apply_with_reject' " Christian Couder
2016-05-24 8:10 ` [PATCH v3 15/49] builtin/apply: move 'apply_verbosely' " Christian Couder
2016-05-24 8:10 ` [PATCH v3 16/49] builtin/apply: move 'update_index' " Christian Couder
2016-05-24 8:10 ` [PATCH v3 17/49] builtin/apply: move 'allow_overlap' " Christian Couder
2016-05-24 8:10 ` [PATCH v3 18/49] builtin/apply: move 'cached' " Christian Couder
2016-05-24 8:10 ` [PATCH v3 19/49] builtin/apply: move 'diffstat' " Christian Couder
2016-05-24 8:10 ` [PATCH v3 20/49] builtin/apply: move 'numstat' " Christian Couder
2016-05-24 8:10 ` [PATCH v3 21/49] builtin/apply: move 'summary' " Christian Couder
2016-05-24 8:10 ` [PATCH v3 22/49] builtin/apply: move 'threeway' " Christian Couder
2016-05-24 8:11 ` [PATCH v3 23/49] builtin/apply: move 'no_add' " Christian Couder
2016-05-24 8:11 ` [PATCH v3 24/49] builtin/apply: move 'unsafe_paths' " Christian Couder
2016-05-24 8:11 ` [PATCH v3 25/49] builtin/apply: move 'line_termination' " Christian Couder
2016-05-24 8:11 ` [PATCH v3 26/49] builtin/apply: move 'fake_ancestor' " Christian Couder
2016-05-24 8:11 ` [PATCH v3 27/49] builtin/apply: move 'p_context' " Christian Couder
2016-05-24 8:11 ` [PATCH v3 28/49] builtin/apply: move 'apply' " Christian Couder
2016-05-24 8:11 ` [PATCH v3 29/49] builtin/apply: move 'patch_input_file' " Christian Couder
2016-05-24 8:11 ` [PATCH v3 30/49] builtin/apply: move 'limit_by_name' " Christian Couder
2016-05-24 8:11 ` [PATCH v3 31/49] builtin/apply: move 'has_include' " Christian Couder
2016-05-24 8:11 ` [PATCH v3 32/49] builtin/apply: move 'p_value' " Christian Couder
2016-05-24 8:11 ` [PATCH v3 33/49] builtin/apply: move 'p_value_known' " Christian Couder
2016-05-24 8:11 ` [PATCH v3 34/49] builtin/apply: move 'root' " Christian Couder
2016-05-24 8:11 ` [PATCH v3 35/49] builtin/apply: move 'whitespace_error' " Christian Couder
2016-05-24 8:11 ` [PATCH v3 36/49] builtin/apply: move 'whitespace_option' " Christian Couder
2016-05-24 8:11 ` [PATCH v3 37/49] builtin/apply: remove whitespace_option arg from set_default_whitespace_mode() Christian Couder
2016-05-24 8:11 ` [PATCH v3 38/49] builtin/apply: move 'squelch_whitespace_errors' into 'struct apply_state' Christian Couder
2016-05-24 8:11 ` [PATCH v3 39/49] builtin/apply: move 'applied_after_fixing_ws' " Christian Couder
2016-05-24 8:11 ` [PATCH v3 40/49] builtin/apply: move 'ws_error_action' " Christian Couder
2016-05-24 8:11 ` [PATCH v3 41/49] builtin/apply: move 'ws_ignore_action' " Christian Couder
2016-05-24 8:11 ` [PATCH v3 42/49] builtin/apply: move 'max_change' and 'max_len' " Christian Couder
2016-05-24 8:11 ` [PATCH v3 43/49] builtin/apply: move 'state_linenr' global " Christian Couder
2016-05-24 8:11 ` [PATCH v3 44/49] builtin/apply: move 'fn_table' " Christian Couder
2016-05-24 8:11 ` [PATCH v3 45/49] builtin/apply: move 'symlink_changes' " Christian Couder
2016-05-24 8:11 ` [PATCH v3 46/49] builtin/apply: move 'state' check into check_apply_state() Christian Couder
2016-05-24 8:11 ` [PATCH v3 47/49] builtin/apply: move applying patches into apply_all_patches() Christian Couder
2016-05-24 8:11 ` [PATCH v3 48/49] builtin/apply: move 'lock_file' global into 'struct apply_state' Christian Couder
2016-06-01 17:23 ` Junio C Hamano
2016-06-03 9:42 ` Christian Couder
2016-05-24 8:11 ` [PATCH v3 49/49] builtin/apply: move 'newfd' " Christian Couder
2016-05-24 8:59 ` Christian Couder [this message]
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='CAP8UFD0oU4BM=k=+9ijz86ZH8o63i3EVxqL-XMZaZKdyD7_x-w@mail.gmail.com' \
--to=christian.couder@gmail.com \
--cc=Matthieu.Moy@grenoble-inp.fr \
--cc=avarab@gmail.com \
--cc=chriscool@tuxfamily.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=karsten.blees@gmail.com \
--cc=pclouds@gmail.com \
--cc=peff@peff.net \
--cc=ramsay@ramsayjones.plus.com \
--cc=sbeller@google.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).