Re: [PATCH v2 1/2] commit: fix --short and --porcelain options
On Tue, May 1, 2018 at 10:50 PM Junio C Hamano wrote:
> Samuel Lijin writes:
> > Mark the commitable flag in the wt_status object in the call to
> > `wt_status_collect()`, instead of in `wt_longstatus_print_updated()`,
> > and simplify the logic in the latter function to take advantage of the
> > logic shifted to the former. This means that callers do not need to use
> > `wt_longstatus_print_updated()` to collect the `commitable` flag;
> > calling `wt_status_collect()` is sufficient.
> >
> > As a result, invoking `git commit` with `--short` or `--porcelain`
> > (which imply `--dry-run`, but previously returned an inconsistent error
> > code inconsistent with dry run behavior) correctly returns status code
> > zero when there is something to commit. This fixes two bugs documented
> > in the test suite.
> Hmm, I couldn't quite get what the above two paragraphs were trying
> to say, but I think I figured out by looking at wt_status.c before
> applying this patch, so let me see if I correctly understand what
> this patch is about by thinking a bit aloud.
> There are only two assignments to s->commitable in wt-status.c; one
> happens in wt_longstatus_print_updated(), when the function notices
> there is even one record to be shown (i.e. there is an "updated"
> path) and the other in show_merge_in_progress() which is called by
> wt_longstatus_prpint_state(). The latter codepath happens when we
> are in a merge and there is no remaining conflicted paths (the code
> allows the contents to be committed to be identical to HEAD). Both
> are called from wt_longstatus_print(), which in turn is called by
> wt_status_print().
> The implication of the above observation is that we do not set
> commitable bit (by the way, shouldn't we spell it with two 'T's?)
Yep, MW confirms: https://www.merriam-webster.com/dictionary/commitable
I didn't think to check how common "commitable" is in the codebase, but it
doesn't seem to be too many, looking at the output of `git grep
commitable`, so I'll add that to the patch series when I reroll.
> if we are not doing the long format status. The title hints at it
> but "fix" is too vague. It would be easier to understand if it
> began like this (i.e. state problem clearly first, before outlining
> the solution):
> [PATCH 1/2] commit: fix exit status under --short/--porcelain
options
> In wt-status.c, s->commitable bit is set only in the
> codepaths reachable from wt_status_print() when output
> format is STATUS_FORMAT_LONG as a side effect of printing
> bits of status. Consequently, when running with --short and
> --porcelain options, the bit is not set to reflect if there
> is anything to be committed, and "git commit --short" or
> "--porcelain" (both of which imply "--dry-run") failed to
> signal if there is anything to commit with its exit status.
> Instead, update s->commitable bit in wt_status_collect(),
> regardless of the output format. ...
> Is that what is going on here? Yours made it sound as if moving the
> code to _collect() was done for the sake of moving code around and
> simplifying the logic, and bugfix fell out of the move merely as a
> side effect, which probably was the source of my confusion.
Yep, that's right. I wasn't sure if the imperative tone was required for
the whole commit or just the description, hence the awkward structure. (I
also wasn't sure how strict the 70 char limit on the description was.)
> > +static void wt_status_mark_commitable(struct wt_status *s) {
> > + int i;
> > +
> > + for (i = 0; i < s->change.nr; i++) {
> > + struct wt_status_change_data *d =
(s->change.items[i]).util;
> > +
> > + if (d->index_status && d->index_status !=
DIFF_STATUS_UNMERGED) {
> > + s->commitable = 1;
> > + return;
> > + }
> > + }
> > +}
> I am not sure if this is sufficient. From a cursory look of the
> existing code (and vague recollection in my ageing brain ;-), I
> think we say it is committable if
> (1) when not merging, there is something to show in the "to be
> committed" section (i.e. there must be something changed since
> HEAD in the index).
> (2) when merging, no conflicting paths remain (i.e. change.nr being
> zero is fine).
> So it is unclear to me how you are dealing with (2) under "--short"
> option, which does not call show_merge_in_progress() to catch that
> case.
And the answer there is that I'm not :) I had hoped that there was a test
to catch mistakes like this but evidently not. Thanks for pointing that
out, I'll add a test to catch that.
I'm also realizing that I didn't const-ify wt_longstatus_print() in the
next patch, which is another reason I didn't catch this.
This seems a bit trickier to handle. What do you think of this approach:
(1) move wt_status_state into wt_status and (2) move the call to
wt_status_get_sta
Re: [PATCH v2 1/2] commit: fix --short and --porcelain options
Samuel Lijin writes:
> Mark the commitable flag in the wt_status object in the call to
> `wt_status_collect()`, instead of in `wt_longstatus_print_updated()`,
> and simplify the logic in the latter function to take advantage of the
> logic shifted to the former. This means that callers do not need to use
> `wt_longstatus_print_updated()` to collect the `commitable` flag;
> calling `wt_status_collect()` is sufficient.
>
> As a result, invoking `git commit` with `--short` or `--porcelain`
> (which imply `--dry-run`, but previously returned an inconsistent error
> code inconsistent with dry run behavior) correctly returns status code
> zero when there is something to commit. This fixes two bugs documented
> in the test suite.
Hmm, I couldn't quite get what the above two paragraphs were trying
to say, but I think I figured out by looking at wt_status.c before
applying this patch, so let me see if I correctly understand what
this patch is about by thinking a bit aloud.
There are only two assignments to s->commitable in wt-status.c; one
happens in wt_longstatus_print_updated(), when the function notices
there is even one record to be shown (i.e. there is an "updated"
path) and the other in show_merge_in_progress() which is called by
wt_longstatus_prpint_state(). The latter codepath happens when we
are in a merge and there is no remaining conflicted paths (the code
allows the contents to be committed to be identical to HEAD). Both
are called from wt_longstatus_print(), which in turn is called by
wt_status_print().
The implication of the above observation is that we do not set
commitable bit (by the way, shouldn't we spell it with two 'T's?)
if we are not doing the long format status. The title hints at it
but "fix" is too vague. It would be easier to understand if it
began like this (i.e. state problem clearly first, before outlining
the solution):
[PATCH 1/2] commit: fix exit status under --short/--porcelain options
In wt-status.c, s->commitable bit is set only in the
codepaths reachable from wt_status_print() when output
format is STATUS_FORMAT_LONG as a side effect of printing
bits of status. Consequently, when running with --short and
--porcelain options, the bit is not set to reflect if there
is anything to be committed, and "git commit --short" or
"--porcelain" (both of which imply "--dry-run") failed to
signal if there is anything to commit with its exit status.
Instead, update s->commitable bit in wt_status_collect(),
regardless of the output format. ...
Is that what is going on here? Yours made it sound as if moving the
code to _collect() was done for the sake of moving code around and
simplifying the logic, and bugfix fell out of the move merely as a
side effect, which probably was the source of my confusion.
> +static void wt_status_mark_commitable(struct wt_status *s) {
> + int i;
> +
> + for (i = 0; i < s->change.nr; i++) {
> + struct wt_status_change_data *d = (s->change.items[i]).util;
> +
> + if (d->index_status && d->index_status != DIFF_STATUS_UNMERGED)
> {
> + s->commitable = 1;
> + return;
> + }
> + }
> +}
I am not sure if this is sufficient. From a cursory look of the
existing code (and vague recollection in my ageing brain ;-), I
think we say it is committable if
(1) when not merging, there is something to show in the "to be
committed" section (i.e. there must be something changed since
HEAD in the index).
(2) when merging, no conflicting paths remain (i.e. change.nr being
zero is fine).
So it is unclear to me how you are dealing with (2) under "--short"
option, which does not call show_merge_in_progress() to catch that
case.
[PATCH v2 1/2] commit: fix --short and --porcelain options
Mark the commitable flag in the wt_status object in the call to
`wt_status_collect()`, instead of in `wt_longstatus_print_updated()`,
and simplify the logic in the latter function to take advantage of the
logic shifted to the former. This means that callers do not need to use
`wt_longstatus_print_updated()` to collect the `commitable` flag;
calling `wt_status_collect()` is sufficient.
As a result, invoking `git commit` with `--short` or `--porcelain`
(which imply `--dry-run`, but previously returned an inconsistent error
code inconsistent with dry run behavior) correctly returns status code
zero when there is something to commit. This fixes two bugs documented
in the test suite.
Signed-off-by: Samuel Lijin
---
t/t7501-commit.sh | 4 ++--
wt-status.c | 38 +++---
2 files changed, 29 insertions(+), 13 deletions(-)
diff --git a/t/t7501-commit.sh b/t/t7501-commit.sh
index fa61b1a4e..85a8217fd 100755
--- a/t/t7501-commit.sh
+++ b/t/t7501-commit.sh
@@ -87,12 +87,12 @@ test_expect_success '--dry-run with stuff to commit returns
ok' '
git commit -m next -a --dry-run
'
-test_expect_failure '--short with stuff to commit returns ok' '
+test_expect_success '--short with stuff to commit returns ok' '
echo bongo bongo bongo >>file &&
git commit -m next -a --short
'
-test_expect_failure '--porcelain with stuff to commit returns ok' '
+test_expect_success '--porcelain with stuff to commit returns ok' '
echo bongo bongo bongo >>file &&
git commit -m next -a --porcelain
'
diff --git a/wt-status.c b/wt-status.c
index 50815e5fa..2e5452731 100644
--- a/wt-status.c
+++ b/wt-status.c
@@ -718,6 +718,19 @@ static void wt_status_collect_untracked(struct wt_status
*s)
s->untracked_in_ms = (getnanotime() - t_begin) / 100;
}
+static void wt_status_mark_commitable(struct wt_status *s) {
+ int i;
+
+ for (i = 0; i < s->change.nr; i++) {
+ struct wt_status_change_data *d = (s->change.items[i]).util;
+
+ if (d->index_status && d->index_status != DIFF_STATUS_UNMERGED)
{
+ s->commitable = 1;
+ return;
+ }
+ }
+}
+
void wt_status_collect(struct wt_status *s)
{
wt_status_collect_changes_worktree(s);
@@ -726,7 +739,10 @@ void wt_status_collect(struct wt_status *s)
wt_status_collect_changes_initial(s);
else
wt_status_collect_changes_index(s);
+
wt_status_collect_untracked(s);
+
+ wt_status_mark_commitable(s);
}
static void wt_longstatus_print_unmerged(struct wt_status *s)
@@ -754,26 +770,26 @@ static void wt_longstatus_print_unmerged(struct wt_status
*s)
static void wt_longstatus_print_updated(struct wt_status *s)
{
- int shown_header = 0;
int i;
+ if (!s->commitable) {
+ return;
+ }
+
+ wt_longstatus_print_cached_header(s);
+
for (i = 0; i < s->change.nr; i++) {
struct wt_status_change_data *d;
struct string_list_item *it;
it = &(s->change.items[i]);
d = it->util;
- if (!d->index_status ||
- d->index_status == DIFF_STATUS_UNMERGED)
- continue;
- if (!shown_header) {
- wt_longstatus_print_cached_header(s);
- s->commitable = 1;
- shown_header = 1;
+ if (d->index_status &&
+ d->index_status != DIFF_STATUS_UNMERGED) {
+ wt_longstatus_print_change_data(s, WT_STATUS_UPDATED,
it);
}
- wt_longstatus_print_change_data(s, WT_STATUS_UPDATED, it);
}
- if (shown_header)
- wt_longstatus_print_trailer(s);
+
+ wt_longstatus_print_trailer(s);
}
/*
--
2.17.0
