git@vger.kernel.org list mirror (unofficial, one of many)
 help / color / mirror / code / Atom feed
* [PATCH v3 0/2] bisect: status improvements when bisect is not fully fleshed out
@ 2022-05-11 18:00 Chris Down
  2022-05-11 18:00 ` [PATCH v3 1/2] bisect: output state before we are ready to compute bisection Chris Down
                   ` (2 more replies)
  0 siblings, 3 replies; 4+ messages in thread
From: Chris Down @ 2022-05-11 18:00 UTC (permalink / raw)
  To: git
  Cc: Junio C Hamano, Johannes Schindelin, Christian Couder,
	Taylor Blau, kernel-team

When bisecting, we currently don't output anything before bisection
starts in earnest, which can result in some confusion. For example, in
the case illustrated in the first commit in this patch series, it's
trivial to accidentally misspell a tag or branch and accidentally end up
in an unintended state with no clear indication about what happened.

This patch series makes it so that we give information about bisect
state even before the bisect is ready to begin. We also store these
changes in state to the bisect log.

v2:

- Move to improve bisect output overall, instead of just warning for the
  specific unintended pathspec case.

v3:

- Fix test indentation
- Rename bs to state
- Use `unsigned int' for nr_{good,bad}
- Pass the bisect state struct as an argument into bisect_print_status
- Zero-initialise bisect_state directly, don't use memset()
- Fix multiline comment style in bisect.h
- Use strbuf in bisect_log_printf
- Change `git bisect log' use an output file in tests instead of piping

Chris Down (2):
  bisect: output state before we are ready to compute bisection
  bisect: output bisect setup status in bisect log

 bisect.h                    |  9 +++++
 builtin/bisect--helper.c    | 69 ++++++++++++++++++++++++++++++-------
 t/t6030-bisect-porcelain.sh | 28 +++++++++++++++
 3 files changed, 93 insertions(+), 13 deletions(-)

-- 
2.36.0


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

* [PATCH v3 1/2] bisect: output state before we are ready to compute bisection
  2022-05-11 18:00 [PATCH v3 0/2] bisect: status improvements when bisect is not fully fleshed out Chris Down
@ 2022-05-11 18:00 ` Chris Down
  2022-05-11 18:00 ` [PATCH v3 2/2] bisect: output bisect setup status in bisect log Chris Down
  2022-05-11 19:41 ` [PATCH v3 0/2] bisect: status improvements when bisect is not fully fleshed out Junio C Hamano
  2 siblings, 0 replies; 4+ messages in thread
From: Chris Down @ 2022-05-11 18:00 UTC (permalink / raw)
  To: git
  Cc: Junio C Hamano, Johannes Schindelin, Christian Couder,
	Taylor Blau, kernel-team

Commit 73c6de06aff8 ("bisect: don't use invalid oid as rev when
starting") changes the behaviour of `git bisect` to consider invalid
oids as pathspecs again, as in the old shell implementation.

While that behaviour may be desirable, it can also cause confusion. For
example, while bisecting in a particular repo I encountered this:

    $ git bisect start d93ff48803f0 v6.3
    $

...which led to me sitting for a few moments, wondering why there's no
printout stating the first rev to check.

It turns out that the tag was actually "6.3", not "v6.3", and thus the
bisect was still silently started with only a bad rev, because
d93ff48803f0 was a valid oid and "v6.3" was silently considered to be a
pathspec.

While this behaviour may be desirable, it can be confusing, especially
with different repo conventions either using or not using "v" before
release names, or when a branch name or tag is simply misspelled on the
command line.

In order to avoid situations like this, make it more clear what we're
waiting for:

    $ git bisect start d93ff48803f0 v6.3
    status: waiting for good commit(s), bad commit known

We already have good output once the bisect process has begun in
earnest, so we don't need to do anything more there.

Signed-off-by: Chris Down <chris@chrisdown.name>
---
 bisect.h                    |  9 +++++++
 builtin/bisect--helper.c    | 53 ++++++++++++++++++++++++++++---------
 t/t6030-bisect-porcelain.sh | 18 +++++++++++++
 3 files changed, 67 insertions(+), 13 deletions(-)

diff --git a/bisect.h b/bisect.h
index 1015aeb8ea..ee3fd65f3b 100644
--- a/bisect.h
+++ b/bisect.h
@@ -62,6 +62,15 @@ enum bisect_error {
 	BISECT_INTERNAL_SUCCESS_MERGE_BASE = -11
 };
 
+/*
+ * Stores how many good/bad commits we have stored for a bisect. nr_bad can
+ * only be 0 or 1.
+ */
+struct bisect_state {
+	unsigned int nr_good;
+	unsigned int nr_bad;
+};
+
 enum bisect_error bisect_next_all(struct repository *r, const char *prefix);
 
 int estimate_bisect_steps(int all);
diff --git a/builtin/bisect--helper.c b/builtin/bisect--helper.c
index 8b2b259ff0..fa8024a864 100644
--- a/builtin/bisect--helper.c
+++ b/builtin/bisect--helper.c
@@ -329,12 +329,12 @@ static int check_and_set_terms(struct bisect_terms *terms, const char *cmd)
 	return 0;
 }
 
-static int mark_good(const char *refname, const struct object_id *oid,
-		     int flag, void *cb_data)
+static int inc_nr(const char *refname, const struct object_id *oid,
+		  int flag, void *cb_data)
 {
-	int *m_good = (int *)cb_data;
-	*m_good = 0;
-	return 1;
+	unsigned int *nr = (unsigned int *)cb_data;
+	(*nr)++;
+	return 0;
 }
 
 static const char need_bad_and_good_revision_warning[] =
@@ -384,23 +384,48 @@ static int decide_next(const struct bisect_terms *terms,
 			     vocab_good, vocab_bad, vocab_good, vocab_bad);
 }
 
-static int bisect_next_check(const struct bisect_terms *terms,
-			     const char *current_term)
+static void bisect_status(struct bisect_state *state,
+			  const struct bisect_terms *terms)
 {
-	int missing_good = 1, missing_bad = 1;
 	char *bad_ref = xstrfmt("refs/bisect/%s", terms->term_bad);
 	char *good_glob = xstrfmt("%s-*", terms->term_good);
 
 	if (ref_exists(bad_ref))
-		missing_bad = 0;
+		state->nr_bad = 1;
 
-	for_each_glob_ref_in(mark_good, good_glob, "refs/bisect/",
-			     (void *) &missing_good);
+	for_each_glob_ref_in(inc_nr, good_glob, "refs/bisect/",
+			     (void *) &state->nr_good);
 
 	free(good_glob);
 	free(bad_ref);
+}
+
+static void bisect_print_status(const struct bisect_terms *terms)
+{
+	struct bisect_state state = { 0 };
+
+	bisect_status(&state, terms);
+
+	/* If we had both, we'd already be started, and shouldn't get here. */
+	if (state.nr_good && state.nr_bad)
+		return;
 
-	return decide_next(terms, current_term, missing_good, missing_bad);
+	if (!state.nr_good && !state.nr_bad)
+		printf(_("status: waiting for both good and bad commits\n"));
+	else if (state.nr_good)
+		printf(Q_("status: waiting for bad commit, %d good commit known\n",
+			  "status: waiting for bad commit, %d good commits known\n",
+			  state.nr_good), state.nr_good);
+	else
+		printf(_("status: waiting for good commit(s), bad commit known\n"));
+}
+
+static int bisect_next_check(const struct bisect_terms *terms,
+			     const char *current_term)
+{
+	struct bisect_state state = { 0 };
+	bisect_status(&state, terms);
+	return decide_next(terms, current_term, !state.nr_good, !state.nr_bad);
 }
 
 static int get_terms(struct bisect_terms *terms)
@@ -606,8 +631,10 @@ static enum bisect_error bisect_next(struct bisect_terms *terms, const char *pre
 
 static enum bisect_error bisect_auto_next(struct bisect_terms *terms, const char *prefix)
 {
-	if (bisect_next_check(terms, NULL))
+	if (bisect_next_check(terms, NULL)) {
+		bisect_print_status(terms);
 		return BISECT_OK;
+	}
 
 	return bisect_next(terms, prefix);
 }
diff --git a/t/t6030-bisect-porcelain.sh b/t/t6030-bisect-porcelain.sh
index 5382e5d216..686f6d5c7f 100755
--- a/t/t6030-bisect-porcelain.sh
+++ b/t/t6030-bisect-porcelain.sh
@@ -1025,4 +1025,22 @@ test_expect_success 'bisect visualize with a filename with dash and space' '
 	git bisect visualize -p -- "-hello 2"
 '
 
+test_expect_success 'bisect state output with multiple good commits' '
+	git bisect reset &&
+	git bisect start >output &&
+	grep "waiting for both good and bad commits" output &&
+	git bisect good "$HASH1" >output &&
+	grep "waiting for bad commit, 1 good commit known" output &&
+	git bisect good "$HASH2" >output &&
+	grep "waiting for bad commit, 2 good commits known" output
+'
+
+test_expect_success 'bisect state output with bad commit' '
+	git bisect reset &&
+	git bisect start >output &&
+	grep "waiting for both good and bad commits" output &&
+	git bisect bad "$HASH4" >output &&
+	grep -F "waiting for good commit(s), bad commit known" output
+'
+
 test_done
-- 
2.36.0


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

* [PATCH v3 2/2] bisect: output bisect setup status in bisect log
  2022-05-11 18:00 [PATCH v3 0/2] bisect: status improvements when bisect is not fully fleshed out Chris Down
  2022-05-11 18:00 ` [PATCH v3 1/2] bisect: output state before we are ready to compute bisection Chris Down
@ 2022-05-11 18:00 ` Chris Down
  2022-05-11 19:41 ` [PATCH v3 0/2] bisect: status improvements when bisect is not fully fleshed out Junio C Hamano
  2 siblings, 0 replies; 4+ messages in thread
From: Chris Down @ 2022-05-11 18:00 UTC (permalink / raw)
  To: git
  Cc: Junio C Hamano, Johannes Schindelin, Christian Couder,
	Taylor Blau, kernel-team

This allows seeing the current intermediate status without adding a new
good or bad commit:

    $ git bisect log | tail -1
    # status: waiting for bad commit, 1 good commit known

Signed-off-by: Chris Down <chris@chrisdown.name>
---
 builtin/bisect--helper.c    | 26 +++++++++++++++++++++-----
 t/t6030-bisect-porcelain.sh | 10 ++++++++++
 2 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/builtin/bisect--helper.c b/builtin/bisect--helper.c
index fa8024a864..e358e3dd5b 100644
--- a/builtin/bisect--helper.c
+++ b/builtin/bisect--helper.c
@@ -400,6 +400,22 @@ static void bisect_status(struct bisect_state *state,
 	free(bad_ref);
 }
 
+__attribute__((format (printf, 1, 2)))
+static void bisect_log_printf(const char *fmt, ...)
+{
+	struct strbuf buf = STRBUF_INIT;
+	va_list ap;
+
+	va_start(ap, fmt);
+	strbuf_vaddf(&buf, fmt, ap);
+	va_end(ap);
+
+	printf("%s", buf.buf);
+	append_to_file(git_path_bisect_log(), "# %s", buf.buf);
+
+	strbuf_release(&buf);
+}
+
 static void bisect_print_status(const struct bisect_terms *terms)
 {
 	struct bisect_state state = { 0 };
@@ -411,13 +427,13 @@ static void bisect_print_status(const struct bisect_terms *terms)
 		return;
 
 	if (!state.nr_good && !state.nr_bad)
-		printf(_("status: waiting for both good and bad commits\n"));
+		bisect_log_printf(_("status: waiting for both good and bad commits\n"));
 	else if (state.nr_good)
-		printf(Q_("status: waiting for bad commit, %d good commit known\n",
-			  "status: waiting for bad commit, %d good commits known\n",
-			  state.nr_good), state.nr_good);
+		bisect_log_printf(Q_("status: waiting for bad commit, %d good commit known\n",
+				     "status: waiting for bad commit, %d good commits known\n",
+				     state.nr_good), state.nr_good);
 	else
-		printf(_("status: waiting for good commit(s), bad commit known\n"));
+		bisect_log_printf(_("status: waiting for good commit(s), bad commit known\n"));
 }
 
 static int bisect_next_check(const struct bisect_terms *terms,
diff --git a/t/t6030-bisect-porcelain.sh b/t/t6030-bisect-porcelain.sh
index 686f6d5c7f..83931d482f 100755
--- a/t/t6030-bisect-porcelain.sh
+++ b/t/t6030-bisect-porcelain.sh
@@ -1029,9 +1029,15 @@ test_expect_success 'bisect state output with multiple good commits' '
 	git bisect reset &&
 	git bisect start >output &&
 	grep "waiting for both good and bad commits" output &&
+	git bisect log >output &&
+	grep "waiting for both good and bad commits" output &&
 	git bisect good "$HASH1" >output &&
 	grep "waiting for bad commit, 1 good commit known" output &&
+	git bisect log >output &&
+	grep "waiting for bad commit, 1 good commit known" output &&
 	git bisect good "$HASH2" >output &&
+	grep "waiting for bad commit, 2 good commits known" output &&
+	git bisect log >output &&
 	grep "waiting for bad commit, 2 good commits known" output
 '
 
@@ -1039,7 +1045,11 @@ test_expect_success 'bisect state output with bad commit' '
 	git bisect reset &&
 	git bisect start >output &&
 	grep "waiting for both good and bad commits" output &&
+	git bisect log >output &&
+	grep "waiting for both good and bad commits" output &&
 	git bisect bad "$HASH4" >output &&
+	grep -F "waiting for good commit(s), bad commit known" output &&
+	git bisect log >output &&
 	grep -F "waiting for good commit(s), bad commit known" output
 '
 
-- 
2.36.0


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

* Re: [PATCH v3 0/2] bisect: status improvements when bisect is not fully fleshed out
  2022-05-11 18:00 [PATCH v3 0/2] bisect: status improvements when bisect is not fully fleshed out Chris Down
  2022-05-11 18:00 ` [PATCH v3 1/2] bisect: output state before we are ready to compute bisection Chris Down
  2022-05-11 18:00 ` [PATCH v3 2/2] bisect: output bisect setup status in bisect log Chris Down
@ 2022-05-11 19:41 ` Junio C Hamano
  2 siblings, 0 replies; 4+ messages in thread
From: Junio C Hamano @ 2022-05-11 19:41 UTC (permalink / raw)
  To: Chris Down
  Cc: git, Johannes Schindelin, Christian Couder, Taylor Blau, kernel-team

Chris Down <chris@chrisdown.name> writes:

> When bisecting, we currently don't output anything before bisection
> starts in earnest, which can result in some confusion. For example, in
> the case illustrated in the first commit in this patch series, it's
> trivial to accidentally misspell a tag or branch and accidentally end up
> in an unintended state with no clear indication about what happened.
>
> This patch series makes it so that we give information about bisect
> state even before the bisect is ready to begin. We also store these
> changes in state to the bisect log.
>
> v2:
>
> - Move to improve bisect output overall, instead of just warning for the
>   specific unintended pathspec case.
>
> v3:
>
> - Fix test indentation
> - Rename bs to state
> - Use `unsigned int' for nr_{good,bad}
> - Pass the bisect state struct as an argument into bisect_print_status
> - Zero-initialise bisect_state directly, don't use memset()
> - Fix multiline comment style in bisect.h
> - Use strbuf in bisect_log_printf
> - Change `git bisect log' use an output file in tests instead of piping

Will replace.  Unless there are more inputs, let's merge it to
'next'.  This round looks more than good enough to me.

Thanks.  

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

end of thread, other threads:[~2022-05-11 19:41 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-05-11 18:00 [PATCH v3 0/2] bisect: status improvements when bisect is not fully fleshed out Chris Down
2022-05-11 18:00 ` [PATCH v3 1/2] bisect: output state before we are ready to compute bisection Chris Down
2022-05-11 18:00 ` [PATCH v3 2/2] bisect: output bisect setup status in bisect log Chris Down
2022-05-11 19:41 ` [PATCH v3 0/2] bisect: status improvements when bisect is not fully fleshed out Junio C Hamano

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).