From: Christian Couder <christian.couder@gmail.com>
To: git@vger.kernel.org, Christian Couder <christian.couder@gmail.com>
Cc: "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>,
"Stefan Beller" <sbeller@google.com>,
"Matthieu Moy" <Matthieu.Moy@grenoble-inp.fr>,
"Eric Sunshine" <sunshine@sunshineco.com>,
"Ramsay Jones" <ramsay@ramsayjones.plus.com>,
"Christian Couder" <chriscool@tuxfamily.org>
Subject: [PATCH v6 35/44] apply: add 'be_silent' variable to 'struct apply_state'
Date: Fri, 10 Jun 2016 22:11:09 +0200 [thread overview]
Message-ID: <20160610201118.13813-36-chriscool@tuxfamily.org> (raw)
In-Reply-To: <20160610201118.13813-1-chriscool@tuxfamily.org>
This variable should prevent anything to be printed on both stderr
and stdout.
Let's not take care of stdout and apply_verbosely for now though,
as that will be taken care of in following patches.
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
---
apply.c | 43 +++++++++++++++++++++++++++++--------------
apply.h | 1 +
2 files changed, 30 insertions(+), 14 deletions(-)
diff --git a/apply.c b/apply.c
index 713d1c0..dbb2515 100644
--- a/apply.c
+++ b/apply.c
@@ -1612,8 +1612,9 @@ static void record_ws_error(struct apply_state *state,
return;
err = whitespace_error_string(result);
- fprintf(stderr, "%s:%d: %s.\n%.*s\n",
- state->patch_input_file, linenr, err, len, line);
+ if (!state->be_silent)
+ fprintf(stderr, "%s:%d: %s.\n%.*s\n",
+ state->patch_input_file, linenr, err, len, line);
free(err);
}
@@ -1808,7 +1809,7 @@ static int parse_single_patch(struct apply_state *state,
return error(_("new file %s depends on old contents"), patch->new_name);
if (0 < patch->is_delete && newlines)
return error(_("deleted file %s still has contents"), patch->old_name);
- if (!patch->is_delete && !newlines && context)
+ if (!patch->is_delete && !newlines && context && !state->be_silent)
fprintf_ln(stderr,
_("** warning: "
"file %s becomes empty but is not deleted"),
@@ -3031,8 +3032,8 @@ static int apply_one_fragment(struct apply_state *state,
* Warn if it was necessary to reduce the number
* of context lines.
*/
- if ((leading != frag->leading) ||
- (trailing != frag->trailing))
+ if ((leading != frag->leading ||
+ trailing != frag->trailing) && !state->be_silent)
fprintf_ln(stderr, _("Context reduced to (%ld/%ld)"
" to apply fragment at %d"),
leading, trailing, applied_pos+1);
@@ -3529,7 +3530,8 @@ static int try_threeway(struct apply_state *state,
read_blob_object(&buf, pre_sha1, patch->old_mode))
return error("repository lacks the necessary blob to fall back on 3-way merge.");
- fprintf(stderr, "Falling back to three-way merge...\n");
+ if (!state->be_silent)
+ fprintf(stderr, "Falling back to three-way merge...\n");
img = strbuf_detach(&buf, &len);
prepare_image(&tmp_image, img, len, 1);
@@ -3559,7 +3561,9 @@ static int try_threeway(struct apply_state *state,
status = three_way_merge(image, patch->new_name,
pre_sha1, our_sha1, post_sha1);
if (status < 0) {
- fprintf(stderr, "Failed to fall back on three-way merge...\n");
+ if (!state->be_silent)
+ fprintf(stderr,
+ "Failed to fall back on three-way merge...\n");
return status;
}
@@ -3571,9 +3575,15 @@ static int try_threeway(struct apply_state *state,
hashcpy(patch->threeway_stage[0].hash, pre_sha1);
hashcpy(patch->threeway_stage[1].hash, our_sha1);
hashcpy(patch->threeway_stage[2].hash, post_sha1);
- fprintf(stderr, "Applied patch to '%s' with conflicts.\n", patch->new_name);
+ if (!state->be_silent)
+ fprintf(stderr,
+ "Applied patch to '%s' with conflicts.\n",
+ patch->new_name);
} else {
- fprintf(stderr, "Applied patch to '%s' cleanly.\n", patch->new_name);
+ if (!state->be_silent)
+ fprintf(stderr,
+ "Applied patch to '%s' cleanly.\n",
+ patch->new_name);
}
return 0;
}
@@ -4472,7 +4482,8 @@ static int write_out_one_reject(struct apply_state *state, struct patch *patch)
"Applying patch %%s with %d rejects...",
cnt),
cnt);
- say_patch_name(stderr, sb.buf, patch);
+ if (!state->be_silent)
+ say_patch_name(stderr, sb.buf, patch);
strbuf_release(&sb);
cnt = strlen(patch->new_name);
@@ -4499,10 +4510,12 @@ static int write_out_one_reject(struct apply_state *state, struct patch *patch)
frag;
cnt++, frag = frag->next) {
if (!frag->rejected) {
- fprintf_ln(stderr, _("Hunk #%d applied cleanly."), cnt);
+ if (!state->be_silent)
+ fprintf_ln(stderr, _("Hunk #%d applied cleanly."), cnt);
continue;
}
- fprintf_ln(stderr, _("Rejected hunk #%d."), cnt);
+ if (!state->be_silent)
+ fprintf_ln(stderr, _("Rejected hunk #%d."), cnt);
fprintf(rej, "%.*s", frag->size, frag->patch);
if (frag->patch[frag->size-1] != '\n')
fputc('\n', rej);
@@ -4551,8 +4564,10 @@ static int write_out_results(struct apply_state *state, struct patch *list)
struct string_list_item *item;
string_list_sort(&cpath);
- for_each_string_list_item(item, &cpath)
- fprintf(stderr, "U %s\n", item->string);
+ if (!state->be_silent) {
+ for_each_string_list_item(item, &cpath)
+ fprintf(stderr, "U %s\n", item->string);
+ }
string_list_clear(&cpath, 0);
rerere(0);
diff --git a/apply.h b/apply.h
index 89e7982..034541a 100644
--- a/apply.h
+++ b/apply.h
@@ -52,6 +52,7 @@ struct apply_state {
int apply_in_reverse;
int apply_with_reject;
int apply_verbosely;
+ int be_silent;
int no_add;
int threeway;
int unidiff_zero;
--
2.9.0.rc2.362.g3cd93d0
next prev parent reply other threads:[~2016-06-10 20:12 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-10 20:10 [PATCH v6 00/44] libify apply and use lib in am, part 2 Christian Couder
2016-06-10 20:10 ` [PATCH v6 01/44] apply: move 'struct apply_state' to apply.h Christian Couder
2016-06-10 20:10 ` [PATCH v6 02/44] builtin/apply: make apply_patch() return -1 instead of die()ing Christian Couder
2016-06-10 20:10 ` [PATCH v6 03/44] builtin/apply: read_patch_file() " Christian Couder
2016-06-10 20:10 ` [PATCH v6 04/44] builtin/apply: make find_header() " Christian Couder
2016-06-10 20:10 ` [PATCH v6 05/44] builtin/apply: make parse_chunk() return a negative integer on error Christian Couder
2016-06-10 20:10 ` [PATCH v6 06/44] builtin/apply: make parse_single_patch() return -1 " Christian Couder
2016-06-10 20:10 ` [PATCH v6 07/44] builtin/apply: make parse_whitespace_option() return -1 instead of die()ing Christian Couder
2016-06-10 20:10 ` [PATCH v6 08/44] builtin/apply: make parse_ignorewhitespace_option() " Christian Couder
2016-06-10 20:10 ` [PATCH v6 09/44] builtin/apply: move init_apply_state() to apply.c Christian Couder
2016-06-10 20:10 ` [PATCH v6 10/44] apply: make init_apply_state() return -1 instead of exit()ing Christian Couder
2016-06-10 20:10 ` [PATCH v6 11/44] builtin/apply: make check_apply_state() return -1 instead of die()ing Christian Couder
2016-06-10 20:10 ` [PATCH v6 12/44] builtin/apply: move check_apply_state() to apply.c Christian Couder
2016-06-10 20:10 ` [PATCH v6 13/44] builtin/apply: make apply_all_patches() return -1 on error Christian Couder
2016-06-10 20:10 ` [PATCH v6 14/44] builtin/apply: make parse_traditional_patch() " Christian Couder
2016-06-10 20:10 ` [PATCH v6 15/44] builtin/apply: make gitdiff_*() return 1 at end of header Christian Couder
2016-06-10 20:10 ` [PATCH v6 16/44] builtin/apply: make gitdiff_*() return -1 on error Christian Couder
2016-06-10 20:10 ` [PATCH v6 17/44] builtin/apply: change die_on_unsafe_path() to check_unsafe_path() Christian Couder
2016-06-10 20:10 ` [PATCH v6 18/44] builtin/apply: make build_fake_ancestor() return -1 on error Christian Couder
2016-06-10 20:10 ` [PATCH v6 19/44] builtin/apply: make remove_file() " Christian Couder
2016-06-10 20:10 ` [PATCH v6 20/44] builtin/apply: make add_conflicted_stages_file() " Christian Couder
2016-06-10 20:10 ` [PATCH v6 21/44] builtin/apply: make add_index_file() " Christian Couder
2016-06-10 20:10 ` [PATCH v6 22/44] builtin/apply: make create_file() " Christian Couder
2016-06-10 20:10 ` [PATCH v6 23/44] builtin/apply: make write_out_one_result() " Christian Couder
2016-06-10 20:10 ` [PATCH v6 24/44] builtin/apply: make write_out_results() " Christian Couder
2016-06-10 20:10 ` [PATCH v6 25/44] builtin/apply: make try_create_file() " Christian Couder
2016-06-10 20:11 ` [PATCH v6 26/44] builtin/apply: make create_one_file() " Christian Couder
2016-06-10 20:11 ` [PATCH v6 27/44] builtin/apply: rename option parsing functions Christian Couder
2016-06-10 20:11 ` [PATCH v6 28/44] apply: rename and move opt constants to apply.h Christian Couder
2016-06-10 20:11 ` [PATCH v6 30/44] apply: make some parsing functions static again Christian Couder
2016-06-10 20:11 ` [PATCH v6 31/44] run-command: make dup_devnull() non static Christian Couder
2016-06-11 8:17 ` Johannes Sixt
2016-06-11 10:18 ` Christian Couder
2016-06-10 20:11 ` [PATCH v6 32/44] environment: add set_index_file() Christian Couder
2016-06-10 20:11 ` [PATCH v6 33/44] builtin/am: use apply api in run_apply() Christian Couder
2016-06-10 20:11 ` [PATCH v6 34/44] write_or_die: use warning() instead of fprintf(stderr, ...) Christian Couder
2016-06-10 20:11 ` Christian Couder [this message]
2016-06-10 20:11 ` [PATCH v6 36/44] apply: make 'be_silent' incompatible with 'apply_verbosely' Christian Couder
2016-06-10 20:11 ` [PATCH v6 37/44] apply: don't print on stdout when be_silent is set Christian Couder
2016-06-10 20:11 ` [PATCH v6 38/44] usage: add set_warn_routine() Christian Couder
2016-06-10 20:11 ` [PATCH v6 39/44] usage: add get_error_routine() and get_warn_routine() Christian Couder
2016-06-10 20:11 ` [PATCH v6 40/44] apply: change error_routine when be_silent is set Christian Couder
2016-06-10 20:11 ` [PATCH v6 41/44] am: use be_silent in 'struct apply_state' to shut up applying patches Christian Couder
2016-06-10 22:07 ` Junio C Hamano
2016-06-11 10:07 ` Christian Couder
2016-06-10 20:11 ` [PATCH v6 42/44] run-command: make dup_devnull() static again Christian Couder
2016-06-10 20:11 ` [PATCH v6 43/44] builtin/apply: add a cli option for be_silent Christian Couder
2016-06-10 20:59 ` René Scharfe
2016-06-11 10:16 ` Christian Couder
2016-06-10 20:11 ` [PATCH v6 44/44] apply: use error_errno() where possible Christian Couder
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=20160610201118.13813-36-chriscool@tuxfamily.org \
--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).