Kong Lucien <Lucien.Kong@xxxxxxxxxxxxxxx> writes:
> diff --git a/Documentation/config.txt b/Documentation/config.txt
> index 915cb5a..670945d 100644
> --- a/Documentation/config.txt
> +++ b/Documentation/config.txt
> @@ -162,6 +162,10 @@ advice.*::
> Directions on how to stage/unstage/add shown in the
> output of linkgit:git-status[1] and the template shown
> when writing commit messages.
> + Show directions on how to proceed from the current
> + state in the output of linkgit:git-status[1] and in
> + the template shown when writing commit messages in
> + linkgit:git-commit[1].
I meant these four lines to _replace_, not _add_.
Reading the three lines we can see in the context before this hunk,
don't you agree that they are now unnecessary because what they say
is merely a subset of the four lines you added say?
> diff --git a/t/t7060-wtstatus.sh b/t/t7060-wtstatus.sh
> index b8cb490..61d1f38 100755
> --- a/t/t7060-wtstatus.sh
> +++ b/t/t7060-wtstatus.sh
> @@ -118,4 +121,68 @@ test_expect_success 'git diff-index --cached -C shows 2 copies + 1 unmerged' '
> ...
> +test_expect_success 'status when conflicts with add and rm advice (both deleted)' '
> + git init git &&
> + cd git &&
> + test_commit init main.txt init &&
Please do not chdir around outside a subshell.
"This is the last test in this script" is not an excuse, as that
will forbid others from improving the script by adding new ones
later.
> diff --git a/wt-status.c b/wt-status.c
> index dd6d8c4..2460e20 100644
> --- a/wt-status.c
> +++ b/wt-status.c
> @@ -728,6 +729,169 @@ static void wt_status_print_tracking(struct wt_status *s)
> ...
> +static void show_merge_in_progress(struct wt_status *s,
> + struct wt_status_state *state,
> + const char *color)
> +{
> + if (has_unmerged(s)) {
> + status_printf_ln(s, color, _("You have unmerged paths."));
> + if (advice_status_hints)
> + status_printf_ln(s, color,
> + _(" (fix conflicts and run \"git commit\")"));
> + } else {
> + status_printf_ln(s, color,
> + _("All conflicts fixed but you are still merging."));
Thanks for rephrasing; this reads much easier.
> +static void show_am_in_progress(struct wt_status *s,
> + struct wt_status_state *state,
> + const char *color)
> +{
> + status_printf_ln(s, color,
> + _("You are in the middle of an am session."));
> + if (state->am_empty_patch) {
> + status_printf_ln(s, color,
> + _("The current patch is empty; run \"git am --skip\" to skip it."));
Isn't everything after "; " an advice?
> + if (advice_status_hints)
> + status_printf_ln(s, color,
> + _(" (use \"git am --abort\" to restore the original branch)"));
> + } else if (advice_status_hints) {
> + status_printf_ln(s, color,
> + _(" (when you have fixed this problem run \"git am --resolved\")"));
> + status_printf_ln(s, color,
> + _(" (use \"git am --skip\" to skip this patch)"));
> + status_printf_ln(s, color,
> + _(" (use \"git am --abort\" to restore the original branch)"));
> + }
I think the structure can simply be:
if (am_empty_patch)
"The current patch is empty.";
if (advice_status_hints) {
" (use --abort to restore)";
" (use --skip to skip)";
if (!am_empty_patch)
" (use --resolved after you are done)";
}
Note that I am not suggesting to change the wording of the message
in the above; just showing the flow-structure.
Also when you are in the middle of "git am -3", there may be
unmerged entries in the index; do we want to suggest "add/rm" to
resolve to fill in the missing detail of "fix" in your "when you
have fixed this problem" message?
We may want to decide how detailed we want to make the help texts;
the same fuzziness exists in "fix conflicts and then" at the
beginning of show_rebase_in_progress().
> +static void show_rebase_in_progress(struct wt_status *s,
> + struct wt_status_state *state,
> + const char *color)
> +{
> + if (has_unmerged(s)) {
> + status_printf_ln(s, color, _("You are currently rebasing."));
> + if (advice_status_hints) {
> + status_printf_ln(s, color,
> + _(" (fix conflicts and then run \"git rebase --continue\")"));
> + status_printf_ln(s, color,
> + _(" (use \"git rebase --skip\" to skip this patch)"));
> + status_printf_ln(s, color,
> + _(" (use \"git rebase --abort\" to check out the original branch)"));
> + }
> + } else if (state->rebase_in_progress) {
> + status_printf_ln(s, color, _("You are currently rebasing."));
> + if (advice_status_hints)
> + status_printf_ln(s, color,
> + _(" (all conflicts fixed: run \"git rebase --continue\")"));
> + } else {
> + status_printf_ln(s, color, _("You are currently editing a commit during a rebase."));
> + if (advice_status_hints && !s->amend) {
> + status_printf_ln(s, color,
> + _(" (use \"git commit --amend\" to amend the current commit)"));
> + status_printf_ln(s, color,
> + _(" (use \"git rebase --continue\" once you are satisfied with your changes)"));
> + }
This last "else" block is taken when running "rebase -i" and there
is no longer any unmerged index entry. I wonder if the message from
the first printf_ln needs to be clarified further depending on the
context.
Specifically, in this sequence:
- the user marked a commit as "pick";
- replaying of that commit resulted in conflicts;
- the user edited files and used add/rm to resolve conflicts;
- the user did one of these:
1. "git status"
2. "git commit" without "--amend"
3. "git commit --amend"
can this message come up?
In such a case, "You are currently editing a commit" is actively
wrong. The user has finished resolving the conflict and are about
to record the result. Also, "git status" and "git commit" without
"--amend" are both sensible commands in this situation, but running
"git commit --amend" is likely to be a mistake, no?
Side note: I am not absolutely sure if "--amend" is always a
mistake in this situation; I'd very much appreciate users
who creatively use "rebase -i" in real life to offer valid
uses of "commit --amend" in this scenario.
> +static void show_cherry_pick_in_progress(struct wt_status *s,
> + struct wt_status_state *state,
> + const char *color)
> +{
> + if (has_unmerged(s)) {
> + status_printf_ln(s, color, _("You are currently cherry-picking."));
> + if (advice_status_hints)
> + status_printf_ln(s, color,
> + _(" (fix conflicts and run \"git commit\")"));
> + } else {
> + status_printf_ln(s, color, _("You are currently cherry-picking."));
> + if (advice_status_hints)
> + status_printf_ln(s, color,
> + _(" (all conflicts fixed: run \"git commit\")"));
> + }
The current status is the same in either arm of if/else; shouldn't
they be lifted outside, i.e.
"You are currently cherry-picking";
if (advice_status_hints) {
if (has_unmerged(s))
" (fix conflicts ...)";
else
" (all fixed, run ...)";
}
The rest of this patch I did not quote looked all very much
sensible.
Thanks.
--
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