git@vger.kernel.org list mirror (unofficial, one of many)
 help / color / mirror / code / Atom feed
* [PATCH] git-apply: modify prints to account for --3way changes
@ 2021-04-27  1:13 Jerry Zhang
  2021-04-27  7:46 ` Junio C Hamano
  2021-04-27 19:40 ` [PATCH V2] " Jerry Zhang
  0 siblings, 2 replies; 7+ messages in thread
From: Jerry Zhang @ 2021-04-27  1:13 UTC (permalink / raw)
  To: git, gitster; +Cc: ross, abe, brian.kubisiak, Jerry Zhang

"git apply" specifically calls out when it
is falling back to 3way merge application.
Since the order changed to preferring 3way
and falling back to direct application,
continue that behavior by printing whenever
3way fails and git has to fall back.

Add a --quiet flag to "git apply" so the user
can turn down the verbosity.

Signed-off-by: Jerry Zhang <jerry@skydio.com>
---
 apply.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/apply.c b/apply.c
index 8532b48e4f..2abf2e8a61 100644
--- a/apply.c
+++ b/apply.c
@@ -3572,7 +3572,7 @@ static int try_threeway(struct apply_state *state,
 		 read_blob_object(&buf, &pre_oid, patch->old_mode))
 		return error(_("repository lacks the necessary blob to perform 3-way merge."));
 
-	if (state->apply_verbosity > verbosity_silent)
+	if (state->apply_verbosity > verbosity_silent && patch->direct_to_threeway)
 		fprintf(stderr, _("Performing three-way merge...\n"));
 
 	img = strbuf_detach(&buf, &len);
@@ -3639,6 +3639,10 @@ static int apply_data(struct apply_state *state, struct patch *patch,
 		return -1;
 
 	if (!state->threeway || try_threeway(state, &image, patch, st, ce) < 0) {
+		if (state->apply_verbosity > verbosity_silent &&
+		    state->threeway && !patch->direct_to_threeway)
+			fprintf(stderr, _("Falling back to direct application...\n"));
+
 		/* Note: with --reject, apply_fragments() returns 0 */
 		if (patch->direct_to_threeway || apply_fragments(state, &image, patch) < 0)
 			return -1;
@@ -5050,6 +5054,8 @@ int apply_parse_options(int argc, const char **argv,
 		OPT_BOOL(0, "allow-overlap", &state->allow_overlap,
 			N_("allow overlapping hunks")),
 		OPT__VERBOSE(&state->apply_verbosity, N_("be verbose")),
+		OPT_SET_INT('q', "quiet", &state->apply_verbosity,
+			N_("be quiet"), -1),
 		OPT_BIT(0, "inaccurate-eof", options,
 			N_("tolerate incorrectly detected missing new-line at the end of file"),
 			APPLY_OPT_INACCURATE_EOF),
-- 
2.29.0


^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH] git-apply: modify prints to account for --3way changes
  2021-04-27  1:13 [PATCH] git-apply: modify prints to account for --3way changes Jerry Zhang
@ 2021-04-27  7:46 ` Junio C Hamano
  2021-04-27 19:40 ` [PATCH V2] " Jerry Zhang
  1 sibling, 0 replies; 7+ messages in thread
From: Junio C Hamano @ 2021-04-27  7:46 UTC (permalink / raw)
  To: Jerry Zhang; +Cc: git, ross, abe, brian.kubisiak

Jerry Zhang <jerry@skydio.com> writes:

> "git apply" specifically calls out when it
> is falling back to 3way merge application.
> Since the order changed to preferring 3way
> and falling back to direct application,
> continue that behavior by printing whenever
> 3way fails and git has to fall back.

That makes sense.


> Add a --quiet flag to "git apply" so the user
> can turn down the verbosity.

It makes sense, too.

But aren't they a different change that should belong to a separate
patch?  After all, the first point is to give the same kind of
fallback warning/report as we used to before we swapped the fallback
order, and no users needed extra "more silent" setting to deal with
the fallback warning messages.  Allowing to set the verbosity even
lower may be desirable, but that is an independent new feature,
isn't it?

I wonder if it is the more correct approach to replace
OPT__VERBOSE() with OPT_VERBOSITY() here, instead of adding a
separate OPT_SET_INT() like you did.

Thanks.

> Signed-off-by: Jerry Zhang <jerry@skydio.com>
> ---
>  apply.c | 8 +++++++-
>  1 file changed, 7 insertions(+), 1 deletion(-)
>
> diff --git a/apply.c b/apply.c
> index 8532b48e4f..2abf2e8a61 100644
> --- a/apply.c
> +++ b/apply.c
> @@ -3572,7 +3572,7 @@ static int try_threeway(struct apply_state *state,
>  		 read_blob_object(&buf, &pre_oid, patch->old_mode))
>  		return error(_("repository lacks the necessary blob to perform 3-way merge."));
>  
> -	if (state->apply_verbosity > verbosity_silent)
> +	if (state->apply_verbosity > verbosity_silent && patch->direct_to_threeway)
>  		fprintf(stderr, _("Performing three-way merge...\n"));
>  
>  	img = strbuf_detach(&buf, &len);
> @@ -3639,6 +3639,10 @@ static int apply_data(struct apply_state *state, struct patch *patch,
>  		return -1;
>  
>  	if (!state->threeway || try_threeway(state, &image, patch, st, ce) < 0) {
> +		if (state->apply_verbosity > verbosity_silent &&
> +		    state->threeway && !patch->direct_to_threeway)
> +			fprintf(stderr, _("Falling back to direct application...\n"));
> +
>  		/* Note: with --reject, apply_fragments() returns 0 */
>  		if (patch->direct_to_threeway || apply_fragments(state, &image, patch) < 0)
>  			return -1;
> @@ -5050,6 +5054,8 @@ int apply_parse_options(int argc, const char **argv,
>  		OPT_BOOL(0, "allow-overlap", &state->allow_overlap,
>  			N_("allow overlapping hunks")),
>  		OPT__VERBOSE(&state->apply_verbosity, N_("be verbose")),
> +		OPT_SET_INT('q', "quiet", &state->apply_verbosity,
> +			N_("be quiet"), -1),
>  		OPT_BIT(0, "inaccurate-eof", options,
>  			N_("tolerate incorrectly detected missing new-line at the end of file"),
>  			APPLY_OPT_INACCURATE_EOF),

^ permalink raw reply	[flat|nested] 7+ messages in thread

* [PATCH V2] git-apply: modify prints to account for --3way changes
  2021-04-27  1:13 [PATCH] git-apply: modify prints to account for --3way changes Jerry Zhang
  2021-04-27  7:46 ` Junio C Hamano
@ 2021-04-27 19:40 ` Jerry Zhang
  2021-04-28  7:32   ` Junio C Hamano
  2021-04-29  2:35   ` [PATCH V3] git-apply: adjust messages " Jerry Zhang
  1 sibling, 2 replies; 7+ messages in thread
From: Jerry Zhang @ 2021-04-27 19:40 UTC (permalink / raw)
  To: git, gitster; +Cc: ross, abe, brian.kubisiak, Jerry Zhang

"git apply" specifically calls out when it
is falling back to 3way merge application.
Since the order changed to preferring 3way
and falling back to direct application,
continue that behavior by printing whenever
3way fails and git has to fall back.

Signed-off-by: Jerry Zhang <jerry@skydio.com>
---
V1 -> V2:
- Moved --quiet flag to separate patch

 apply.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/apply.c b/apply.c
index a36d4002ca..7aa49e2048 100644
--- a/apply.c
+++ b/apply.c
@@ -3572,7 +3572,7 @@ static int try_threeway(struct apply_state *state,
 		 read_blob_object(&buf, &pre_oid, patch->old_mode))
 		return error(_("repository lacks the necessary blob to perform 3-way merge."));
 
-	if (state->apply_verbosity > verbosity_silent)
+	if (state->apply_verbosity > verbosity_silent && patch->direct_to_threeway)
 		fprintf(stderr, _("Performing three-way merge...\n"));
 
 	img = strbuf_detach(&buf, &len);
@@ -3639,6 +3639,10 @@ static int apply_data(struct apply_state *state, struct patch *patch,
 		return -1;
 
 	if (!state->threeway || try_threeway(state, &image, patch, st, ce) < 0) {
+		if (state->apply_verbosity > verbosity_silent &&
+		    state->threeway && !patch->direct_to_threeway)
+			fprintf(stderr, _("Falling back to direct application...\n"));
+
 		/* Note: with --reject, apply_fragments() returns 0 */
 		if (patch->direct_to_threeway || apply_fragments(state, &image, patch) < 0)
 			return -1;
-- 
2.29.0


^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH V2] git-apply: modify prints to account for --3way changes
  2021-04-27 19:40 ` [PATCH V2] " Jerry Zhang
@ 2021-04-28  7:32   ` Junio C Hamano
  2021-04-28 18:26     ` Jerry Zhang
  2021-04-29  2:35   ` [PATCH V3] git-apply: adjust messages " Jerry Zhang
  1 sibling, 1 reply; 7+ messages in thread
From: Junio C Hamano @ 2021-04-28  7:32 UTC (permalink / raw)
  To: Jerry Zhang; +Cc: git, ross, abe, brian.kubisiak

Jerry Zhang <jerry@skydio.com> writes:

> Subject: Re: [PATCH V2] git-apply: modify prints to account for --3way changes

Sorry that I missed this in the previous round, but what do you mean
by "prints" here?

> "git apply" specifically calls out when it is falling back to 3way
> merge application.  Since the order changed to preferring 3way and
> falling back to direct application, continue that behavior by
> printing whenever 3way fails and git has to fall back.

I am guessing it is safe to s/modify prints/adjust messages/ after
reading this explanation.

> Signed-off-by: Jerry Zhang <jerry@skydio.com>
> ---
> V1 -> V2:
> - Moved --quiet flag to separate patch
>
>  apply.c | 6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/apply.c b/apply.c
> index a36d4002ca..7aa49e2048 100644
> --- a/apply.c
> +++ b/apply.c
> @@ -3572,7 +3572,7 @@ static int try_threeway(struct apply_state *state,
>  		 read_blob_object(&buf, &pre_oid, patch->old_mode))
>  		return error(_("repository lacks the necessary blob to perform 3-way merge."));
>  
> -	if (state->apply_verbosity > verbosity_silent)
> +	if (state->apply_verbosity > verbosity_silent && patch->direct_to_threeway)
>  		fprintf(stderr, _("Performing three-way merge...\n"));
>  
>  	img = strbuf_detach(&buf, &len);
> @@ -3639,6 +3639,10 @@ static int apply_data(struct apply_state *state, struct patch *patch,
>  		return -1;
>  
>  	if (!state->threeway || try_threeway(state, &image, patch, st, ce) < 0) {
> +		if (state->apply_verbosity > verbosity_silent &&
> +		    state->threeway && !patch->direct_to_threeway)
> +			fprintf(stderr, _("Falling back to direct application...\n"));
> +
>  		/* Note: with --reject, apply_fragments() returns 0 */
>  		if (patch->direct_to_threeway || apply_fragments(state, &image, patch) < 0)
>  			return -1;

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH V2] git-apply: modify prints to account for --3way changes
  2021-04-28  7:32   ` Junio C Hamano
@ 2021-04-28 18:26     ` Jerry Zhang
  2021-04-29  0:58       ` Junio C Hamano
  0 siblings, 1 reply; 7+ messages in thread
From: Jerry Zhang @ 2021-04-28 18:26 UTC (permalink / raw)
  To: Junio C Hamano
  Cc: Git Mailing List, Ross Yeager, Abraham Bachrach, Brian Kubisiak

On Wed, Apr 28, 2021 at 12:32 AM Junio C Hamano <gitster@pobox.com> wrote:
>
> Jerry Zhang <jerry@skydio.com> writes:
>
> > Subject: Re: [PATCH V2] git-apply: modify prints to account for --3way changes
>
> Sorry that I missed this in the previous round, but what do you mean
> by "prints" here?
>
> > "git apply" specifically calls out when it is falling back to 3way
> > merge application.  Since the order changed to preferring 3way and
> > falling back to direct application, continue that behavior by
> > printing whenever 3way fails and git has to fall back.
>
> I am guessing it is safe to s/modify prints/adjust messages/ after
> reading this explanation.
Sure, do you want  a new patch for that?
>
> > Signed-off-by: Jerry Zhang <jerry@skydio.com>
> > ---
> > V1 -> V2:
> > - Moved --quiet flag to separate patch
> >
> >  apply.c | 6 +++++-
> >  1 file changed, 5 insertions(+), 1 deletion(-)
> >
> > diff --git a/apply.c b/apply.c
> > index a36d4002ca..7aa49e2048 100644
> > --- a/apply.c
> > +++ b/apply.c
> > @@ -3572,7 +3572,7 @@ static int try_threeway(struct apply_state *state,
> >                read_blob_object(&buf, &pre_oid, patch->old_mode))
> >               return error(_("repository lacks the necessary blob to perform 3-way merge."));
> >
> > -     if (state->apply_verbosity > verbosity_silent)
> > +     if (state->apply_verbosity > verbosity_silent && patch->direct_to_threeway)
> >               fprintf(stderr, _("Performing three-way merge...\n"));
> >
> >       img = strbuf_detach(&buf, &len);
> > @@ -3639,6 +3639,10 @@ static int apply_data(struct apply_state *state, struct patch *patch,
> >               return -1;
> >
> >       if (!state->threeway || try_threeway(state, &image, patch, st, ce) < 0) {
> > +             if (state->apply_verbosity > verbosity_silent &&
> > +                 state->threeway && !patch->direct_to_threeway)
> > +                     fprintf(stderr, _("Falling back to direct application...\n"));
> > +
> >               /* Note: with --reject, apply_fragments() returns 0 */
> >               if (patch->direct_to_threeway || apply_fragments(state, &image, patch) < 0)
> >                       return -1;

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH V2] git-apply: modify prints to account for --3way changes
  2021-04-28 18:26     ` Jerry Zhang
@ 2021-04-29  0:58       ` Junio C Hamano
  0 siblings, 0 replies; 7+ messages in thread
From: Junio C Hamano @ 2021-04-29  0:58 UTC (permalink / raw)
  To: Jerry Zhang
  Cc: Git Mailing List, Ross Yeager, Abraham Bachrach, Brian Kubisiak

Jerry Zhang <jerry@skydio.com> writes:

> On Wed, Apr 28, 2021 at 12:32 AM Junio C Hamano <gitster@pobox.com> wrote:
>>
>> Jerry Zhang <jerry@skydio.com> writes:
>>
>> > Subject: Re: [PATCH V2] git-apply: modify prints to account for --3way changes
>>
>> Sorry that I missed this in the previous round, but what do you mean
>> by "prints" here?
>>
>> > "git apply" specifically calls out when it is falling back to 3way
>> > merge application.  Since the order changed to preferring 3way and
>> > falling back to direct application, continue that behavior by
>> > printing whenever 3way fails and git has to fall back.
>>
>> I am guessing it is safe to s/modify prints/adjust messages/ after
>> reading this explanation.
> Sure, do you want  a new patch for that?

It's not what *I* want ;-).  

If what you sent is not sufficiently clear to help readers, you
would want to update, no?


^ permalink raw reply	[flat|nested] 7+ messages in thread

* [PATCH V3] git-apply: adjust messages to account for --3way changes
  2021-04-27 19:40 ` [PATCH V2] " Jerry Zhang
  2021-04-28  7:32   ` Junio C Hamano
@ 2021-04-29  2:35   ` Jerry Zhang
  1 sibling, 0 replies; 7+ messages in thread
From: Jerry Zhang @ 2021-04-29  2:35 UTC (permalink / raw)
  To: git, gitster; +Cc: ross, abe, brian.kubisiak, Jerry Zhang

"git apply" specifically calls out when it
is falling back to 3way merge application.
Since the order changed to preferring 3way
and falling back to direct application,
continue that behavior by printing whenever
3way fails and git has to fall back.

Signed-off-by: Jerry Zhang <jerry@skydio.com>
---
V2->V3 
- Changed "modify prints" to "adjust messages"

 apply.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/apply.c b/apply.c
index 5957430433..0ddde5e8a8 100644
--- a/apply.c
+++ b/apply.c
@@ -3572,7 +3572,7 @@ static int try_threeway(struct apply_state *state,
 		 read_blob_object(&buf, &pre_oid, patch->old_mode))
 		return error(_("repository lacks the necessary blob to perform 3-way merge."));
 
-	if (state->apply_verbosity > verbosity_silent)
+	if (state->apply_verbosity > verbosity_silent && patch->direct_to_threeway)
 		fprintf(stderr, _("Performing three-way merge...\n"));
 
 	img = strbuf_detach(&buf, &len);
@@ -3639,6 +3639,10 @@ static int apply_data(struct apply_state *state, struct patch *patch,
 		return -1;
 
 	if (!state->threeway || try_threeway(state, &image, patch, st, ce) < 0) {
+		if (state->apply_verbosity > verbosity_silent &&
+		    state->threeway && !patch->direct_to_threeway)
+			fprintf(stderr, _("Falling back to direct application...\n"));
+
 		/* Note: with --reject, apply_fragments() returns 0 */
 		if (patch->direct_to_threeway || apply_fragments(state, &image, patch) < 0)
 			return -1;
-- 
2.29.0


^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2021-04-29  2:35 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-04-27  1:13 [PATCH] git-apply: modify prints to account for --3way changes Jerry Zhang
2021-04-27  7:46 ` Junio C Hamano
2021-04-27 19:40 ` [PATCH V2] " Jerry Zhang
2021-04-28  7:32   ` Junio C Hamano
2021-04-28 18:26     ` Jerry Zhang
2021-04-29  0:58       ` Junio C Hamano
2021-04-29  2:35   ` [PATCH V3] git-apply: adjust messages " Jerry Zhang

Code repositories for project(s) associated with this 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).