This patch provides new informative help messages in the display of
'git status' (at the top) during conflicts, rebase, am, bisect or
cherry-pick process.
The new messages are not shown when using options such as -s or
--porcelain. The messages about the current situation of the user are
always displayed but the advices on what the user needs to do in order
to resume a rebase/bisect /am/ commit after resolving conflicts can be
hidden by setting advice.statushints to 'false' in the config file.
Thus, information about the updated advice.statushints key are added
in Documentation/config.txt.
Also, the test t7060-wt-status.sh is now working with the new help
messages. Tests about suggestions of "git rm" are also added.
Signed-off-by: Kong Lucien <Lucien.Kong@xxxxxxxxxxxxxxx>
Signed-off-by: Duperray Valentin <Valentin.Duperray@xxxxxxxxxxxxxxx>
Signed-off-by: Jonas Franck <Franck.Jonas@xxxxxxxxxxxxxxx>
Signed-off-by: Nguy Thomas <Thomas.Nguy@xxxxxxxxxxxxxxx>
Signed-off-by: Nguyen Huynh Khoi Nguyen <Huynh-Khoi-Nguyen.Nguyen@xxxxxxxxxxxxxxx>
---
The key advice.statushelp introduced in the previous patches is
deleted. The messages are now controlled by advice.statushints.
Documentation/config.txt | 2 +
t/t7060-wtstatus.sh | 71 +++++++++++++++++++++
wt-status.c | 154 ++++++++++++++++++++++++++++++++++++++++++++++
wt-status.h | 11 +++
4 files changed, 238 insertions(+), 0 deletions(-)
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 915cb5a..52f5009 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -162,6 +162,8 @@ 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.
+ Directions on how to end the current process shown
+ in the output of linkgit:git-status[1].
commitBeforeMerge::
Advice shown when linkgit:git-merge[1] refuses to
merge to avoid overwriting local changes.
diff --git a/t/t7060-wtstatus.sh b/t/t7060-wtstatus.sh
index b8cb490..8a6d68a 100755
--- a/t/t7060-wtstatus.sh
+++ b/t/t7060-wtstatus.sh
@@ -30,6 +30,8 @@ test_expect_success 'Report new path with conflict' '
cat >expect <<EOF
# On branch side
+# You have unmerged paths; fix conflicts and run "git commit".
+#
# Unmerged paths:
# (use "git add/rm <file>..." as appropriate to mark resolution)
#
@@ -118,4 +120,73 @@ test_expect_success 'git diff-index --cached -C shows 2 copies + 1 unmerged' '
test_cmp expected actual
'
+
+test_expect_success 'status when conflicts with add and rm advice (deleted by them)' '
+ git init git &&
+ cd git &&
+ test_when_finished "cd ../ && rm -rf git" &&
+ test_commit init main.txt init &&
+ git checkout -b second_branch &&
+ git rm main.txt &&
+ git commit -m "main.txt deleted on second_branch" &&
+ test_commit second conflict.txt second &&
+ git checkout master &&
+ test_commit on_second main.txt on_second &&
+ test_commit master conflict.txt master &&
+ test_must_fail git merge second_branch &&
+ cat >expect <<-\EOF &&
+ # On branch master
+ # You have unmerged paths; fix conflicts and run "git commit".
+ #
+ # Unmerged paths:
+ # (use "git add/rm <file>..." as appropriate to mark resolution)
+ #
+ # both added: conflict.txt
+ # deleted by them: main.txt
+ #
+ # Untracked files:
+ # (use "git add <file>..." to include in what will be committed)
+ #
+ # expect
+ # output
+ no changes added to commit (use "git add" and/or "git commit -a")
+ EOF
+ git status >output &&
+ test_cmp expect output
+'
+
+
+test_expect_success 'status when conflicts with add and rm advice (both deleted)' '
+ git init git &&
+ cd git &&
+ test_commit init main.txt init &&
+ git branch second_branch &&
+ git mv main.txt sub_master.txt &&
+ git commit -m "main.txt renamed in sub_master.txt" &&
+ git checkout second_branch &&
+ git mv main.txt sub_second.txt &&
+ git commit -m "main.txt renamed in sub_second.txt" &&
+ test_must_fail git merge master &&
+ cat >expect <<-\EOF &&
+ # On branch second_branch
+ # You have unmerged paths; fix conflicts and run "git commit".
+ #
+ # Unmerged paths:
+ # (use "git add/rm <file>..." as appropriate to mark resolution)
+ #
+ # both deleted: main.txt
+ # added by them: sub_master.txt
+ # added by us: sub_second.txt
+ #
+ # Untracked files:
+ # (use "git add <file>..." to include in what will be committed)
+ #
+ # expect
+ # output
+ no changes added to commit (use "git add" and/or "git commit -a")
+ EOF
+ git status >output &&
+ test_cmp expect output
+'
+
test_done
diff --git a/wt-status.c b/wt-status.c
index dd6d8c4..f4ba021 100644
--- a/wt-status.c
+++ b/wt-status.c
@@ -23,6 +23,7 @@ static char default_wt_status_colors[][COLOR_MAXLEN] = {
GIT_COLOR_GREEN, /* WT_STATUS_LOCAL_BRANCH */
GIT_COLOR_RED, /* WT_STATUS_REMOTE_BRANCH */
GIT_COLOR_NIL, /* WT_STATUS_ONBRANCH */
+ GIT_COLOR_NORMAL, /* WT_STATUS_IN_PROGRESS */
};
static const char *color(int slot, struct wt_status *s)
@@ -728,6 +729,158 @@ static void wt_status_print_tracking(struct wt_status *s)
color_fprintf_ln(s->fp, color(WT_STATUS_HEADER, s), "#");
}
+static int has_unmerged(struct wt_status *s)
+{
+ int i;
+
+ for (i = 0; i < s->change.nr; i++) {
+ struct wt_status_change_data *d;
+ d = s->change.items[i].util;
+ if (d->stagemask)
+ return 1;
+ }
+ return 0;
+}
+
+static void merge_in_progress_show(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%s"),
+ advice_status_hints
+ ? _("; fix conflicts and run \"git commit\".") : ".");
+ else
+ status_printf_ln(s, color, _("You are still merging%s"),
+ advice_status_hints
+ ? _(", run \"git commit\" to conclude merge.") : ".");
+ wt_status_print_trailer(s);
+}
+
+static void am_in_progress_show(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!"));
+ if (advice_status_hints) {
+ status_printf_ln(s, color,
+ _(" When you have resolved this problem run \"git am --resolved\"."));
+ status_printf_ln(s, color,
+ _(" If you would prefer to skip this patch, instead run \"git am --skip\"."));
+ status_printf_ln(s, color,
+ _(" To restore the original branch and stop patching run \"git am --abort\"."));
+ }
+ wt_status_print_trailer(s);
+}
+
+static void rebase_in_progress_show(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%s"),
+ advice_status_hints
+ ? _(": fix conflicts and then run \"git rebase --continue\".") : ".");
+ if (advice_status_hints) {
+ status_printf_ln(s, color,
+ _(" If you would prefer to skip this patch, instead run \"git rebase --skip\"."));
+ status_printf_ln(s, color,
+ _(" To check out the original branch and stop rebasing run \"git rebase --abort\"."));
+ }
+ } else if (state->rebase_in_progress) {
+ status_printf_ln(s, color, _("You are currently rebasing%s"),
+ advice_status_hints
+ ? _(": 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) {
+ status_printf_ln(s, color, _(" You can amend the commit with"));
+ status_printf_ln(s, color, _(" git commit --amend"));
+ status_printf_ln(s, color, _(" Once you are satisfied with your changes, run"));
+ status_printf_ln(s, color, _(" git rebase --continue"));
+ }
+ }
+ wt_status_print_trailer(s);
+}
+
+static void cherry_pick_in_progress_show(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%s"),
+ advice_status_hints
+ ? _(": fix conflicts and run \"git commit\".") : ".");
+ else
+ status_printf_ln(s, color, _("You are currently cherry-picking%s"),
+ advice_status_hints
+ ? _(": all conflicts fixed: run \"git commit\".") : ".");
+ wt_status_print_trailer(s);
+}
+
+static void bisect_in_progress_show(struct wt_status *s,
+ struct wt_status_state *state,
+ const char *color)
+{
+ status_printf_ln(s, color, _("You are currently bisecting."));
+ if (advice_status_hints)
+ status_printf_ln(s, color,
+ _(" To get back to the original branch run \"git bisect reset\""));
+ wt_status_print_trailer(s);
+}
+
+static void wt_status_print_state(struct wt_status *s)
+{
+ const char *state_color = color(WT_STATUS_IN_PROGRESS, s);
+ struct wt_status_state *state = calloc(1, sizeof(*state));
+ struct stat st;
+
+ state->merge_in_progress = 0;
+ state->am_in_progress = 0;
+ state->am_empty_patch = 0;
+ state->rebase_in_progress = 0;
+ state->rebase_interactive_in_progress = 0;
+ state->cherry_pick_in_progress = 0;
+ state->bisect_in_progress = 0;
+
+ if (!stat(git_path("MERGE_HEAD"), &st)) {
+ state->merge_in_progress = 1;
+ } else if (!stat(git_path("rebase-apply"), &st)) {
+ if (!stat(git_path("rebase-apply/applying"), &st)) {
+ state->am_in_progress = 1;
+ if (!stat(git_path("rebase-apply/patch"), &st) && !st.st_size)
+ state->am_empty_patch = 1;
+ } else {
+ state->rebase_in_progress = 1;
+ }
+ } else if (!stat(git_path("rebase-merge"), &st)) {
+ if (!stat(git_path("rebase-merge/interactive"), &st))
+ state->rebase_interactive_in_progress = 1;
+ else
+ state->rebase_in_progress = 1;
+ } else if (!stat(git_path("CHERRY_PICK_HEAD"), &st)) {
+ state->cherry_pick_in_progress = 1;
+ }
+ if (!stat(git_path("BISECT_LOG"), &st))
+ state->bisect_in_progress = 1;
+
+ if (state->merge_in_progress)
+ merge_in_progress_show(s, state, state_color);
+ else if (state->am_in_progress)
+ am_in_progress_show(s, state, state_color);
+ else if (state->rebase_in_progress || state->rebase_interactive_in_progress)
+ rebase_in_progress_show(s, state, state_color);
+ else if (state->cherry_pick_in_progress)
+ cherry_pick_in_progress_show(s, state, state_color);
+ if (state->bisect_in_progress)
+ bisect_in_progress_show(s, state, state_color);
+ free(state);
+}
+
void wt_status_print(struct wt_status *s)
{
const char *branch_color = color(WT_STATUS_ONBRANCH, s);
@@ -750,6 +903,7 @@ void wt_status_print(struct wt_status *s)
wt_status_print_tracking(s);
}
+ wt_status_print_state(s);
if (s->is_initial) {
status_printf_ln(s, color(WT_STATUS_HEADER, s), "");
status_printf_ln(s, color(WT_STATUS_HEADER, s), _("Initial commit"));
diff --git a/wt-status.h b/wt-status.h
index 14aa9f7..c1066a0 100644
--- a/wt-status.h
+++ b/wt-status.h
@@ -15,6 +15,7 @@ enum color_wt_status {
WT_STATUS_LOCAL_BRANCH,
WT_STATUS_REMOTE_BRANCH,
WT_STATUS_ONBRANCH,
+ WT_STATUS_IN_PROGRESS,
WT_STATUS_MAXSLOT
};
@@ -71,6 +72,16 @@ struct wt_status {
struct string_list ignored;
};
+struct wt_status_state {
+ int merge_in_progress;
+ int am_in_progress;
+ int am_empty_patch;
+ int rebase_in_progress;
+ int rebase_interactive_in_progress;
+ int cherry_pick_in_progress;
+ int bisect_in_progress;
+};
+
void wt_status_prepare(struct wt_status *s);
void wt_status_print(struct wt_status *s);
void wt_status_collect(struct wt_status *s);
--
1.7.8
--
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