Since 0e987a1 (am, rebase: teach quiet option, 2009-06-16), git-am
supported the --quiet option and GIT_QUIET environment variable, and
when told to be quiet, would only speak on failure. Re-implement this by
introducing the say() function, which works like fprintf_ln(), but would
only write to the stream when state->quiet is false.
Signed-off-by: Paul Tan <pyokagan@xxxxxxxxx>
---
builtin/am.c | 36 +++++++++++++++++++++++++++++++++---
1 file changed, 33 insertions(+), 3 deletions(-)
diff --git a/builtin/am.c b/builtin/am.c
index 4adc487..5f38264 100644
--- a/builtin/am.c
+++ b/builtin/am.c
@@ -68,6 +68,8 @@ struct am_state {
/* number of digits in patch filename */
int prec;
+
+ int quiet;
};
/**
@@ -75,6 +77,8 @@ struct am_state {
*/
static void am_state_init(struct am_state *state)
{
+ const char *quiet;
+
memset(state, 0, sizeof(*state));
strbuf_init(&state->dir, 0);
@@ -85,6 +89,10 @@ static void am_state_init(struct am_state *state)
strbuf_init(&state->msg, 0);
state->prec = 4;
+
+ quiet = getenv("GIT_QUIET");
+ if (quiet && *quiet)
+ state->quiet = 1;
}
/**
@@ -108,6 +116,22 @@ static inline const char *am_path(const struct am_state *state, const char *path
}
/**
+ * If state->quiet is false, calls fprintf(fp, fmt, ...), and appends a newline
+ * at the end.
+ */
+static void say(const struct am_state *state, FILE *fp, const char *fmt, ...)
+{
+ va_list ap;
+
+ va_start(ap, fmt);
+ if (!state->quiet) {
+ vfprintf(fp, fmt, ap);
+ putc('\n', fp);
+ }
+ va_end(ap);
+}
+
+/**
* Returns 1 if there is an am session in progress, 0 otherwise.
*/
static int am_in_progress(const struct am_state *state)
@@ -262,6 +286,9 @@ static void am_load(struct am_state *state)
read_state_file(&state->msg, am_path(state, "final-commit"), 0, 0);
+ read_state_file(&sb, am_path(state, "quiet"), 2, 1);
+ state->quiet = !strcmp(sb.buf, "t");
+
strbuf_release(&sb);
}
@@ -445,6 +472,8 @@ static void am_setup(struct am_state *state, enum patch_format patch_format,
write_file(am_path(state, "last"), 1, "%d", state->last);
+ write_file(am_path(state, "quiet"), 1, state->quiet ? "t" : "f");
+
if (!get_sha1("HEAD", curr_head)) {
write_file(am_path(state, "abort-safety"), 1, "%s", sha1_to_hex(curr_head));
update_ref("am", "ORIG_HEAD", curr_head, NULL, 0, UPDATE_REFS_DIE_ON_ERR);
@@ -654,7 +683,7 @@ static void do_commit(const struct am_state *state)
commit_list_insert(lookup_commit(parent), &parents);
} else {
ptr = NULL;
- fprintf_ln(stderr, _("applying to an empty history"));
+ say(state, stderr, _("applying to an empty history"));
}
author = fmt_ident(state->author_name.buf, state->author_email.buf,
@@ -705,7 +734,7 @@ static void am_run(struct am_state *state)
write_author_script(state);
write_file(am_path(state, "final-commit"), 1, "%s", state->msg.buf);
- printf_ln(_("Applying: %s"), firstline(state->msg.buf));
+ say(state, stdout, _("Applying: %s"), firstline(state->msg.buf));
if (run_apply(state) < 0) {
int value;
@@ -736,7 +765,7 @@ next:
*/
static void am_resolve(struct am_state *state)
{
- printf_ln(_("Applying: %s"), firstline(state->msg.buf));
+ say(state, stdout, _("Applying: %s"), firstline(state->msg.buf));
if (!index_has_changes(NULL)) {
printf_ln(_("No changes - did you forget to use 'git add'?\n"
@@ -959,6 +988,7 @@ static const char * const am_usage[] = {
};
static struct option am_options[] = {
+ OPT__QUIET(&state.quiet, N_("be quiet")),
OPT_CALLBACK(0, "patch-format", &opt_patch_format, N_("format"),
N_("format the patch(es) are in"), parse_opt_patchformat),
OPT_CMDMODE(0, "continue", &opt_resume,
--
2.1.4
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html