Merge branch 'jk/rebase-i-comment-char'

[git.git] / wt-status.c

diff --git a/wt-status.c b/wt-status.c
index aa2734fcbea68850a23468d36cc0d33f1caec2a7..ef405d03d928c34fe90e27b188bb7a942e3f834c 100644 (file)
--- a/wt-status.c
+++ b/wt-status.c
@@ -874,7 +874,14 @@ static void show_rebase_in_progress(struct wt_status *s,
        struct stat st;
 
        if (has_unmerged(s)) {
-               status_printf_ln(s, color, _("You are currently rebasing."));
+               if (state->branch)
+                       status_printf_ln(s, color,
+                                        _("You are currently rebasing branch '%s' on '%s'."),
+                                        state->branch,
+                                        state->onto);
+               else
+                       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\")"));
@@ -884,17 +891,38 @@ static void show_rebase_in_progress(struct wt_status *s,
                                _("  (use \"git rebase --abort\" to check out the original branch)"));
                }
        } else if (state->rebase_in_progress || !stat(git_path("MERGE_MSG"), &st)) {
-               status_printf_ln(s, color, _("You are currently rebasing."));
+               if (state->branch)
+                       status_printf_ln(s, color,
+                                        _("You are currently rebasing branch '%s' on '%s'."),
+                                        state->branch,
+                                        state->onto);
+               else
+                       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 if (split_commit_in_progress(s)) {
-               status_printf_ln(s, color, _("You are currently splitting a commit during a rebase."));
+               if (state->branch)
+                       status_printf_ln(s, color,
+                                        _("You are currently splitting a commit while rebasing branch '%s' on '%s'."),
+                                        state->branch,
+                                        state->onto);
+               else
+                       status_printf_ln(s, color,
+                                        _("You are currently splitting a commit during a rebase."));
                if (advice_status_hints)
                        status_printf_ln(s, color,
                                _("  (Once your working directory is clean, run \"git rebase --continue\")"));
        } else {
-               status_printf_ln(s, color, _("You are currently editing a commit during a rebase."));
+               if (state->branch)
+                       status_printf_ln(s, color,
+                                        _("You are currently editing a commit while rebasing branch '%s' on '%s'."),
+                                        state->branch,
+                                        state->onto);
+               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)"));
@@ -925,16 +953,57 @@ static void show_bisect_in_progress(struct wt_status *s,
                                struct wt_status_state *state,
                                const char *color)
 {
-       status_printf_ln(s, color, _("You are currently bisecting."));
+       if (state->branch)
+               status_printf_ln(s, color,
+                                _("You are currently bisecting branch '%s'."),
+                                state->branch);
+       else
+               status_printf_ln(s, color,
+                                _("You are currently bisecting."));
        if (advice_status_hints)
                status_printf_ln(s, color,
                        _("  (use \"git bisect reset\" to get back to the original branch)"));
        wt_status_print_trailer(s);
 }
 
+/*
+ * Extract branch information from rebase/bisect
+ */
+static void read_and_strip_branch(struct strbuf *sb,
+                                 const char **branch,
+                                 const char *path)
+{
+       unsigned char sha1[20];
+
+       strbuf_reset(sb);
+       if (strbuf_read_file(sb, git_path("%s", path), 0) <= 0)
+               return;
+
+       while (sb->len && sb->buf[sb->len - 1] == '\n')
+               strbuf_setlen(sb, sb->len - 1);
+       if (!sb->len)
+               return;
+       if (!prefixcmp(sb->buf, "refs/heads/"))
+               *branch = sb->buf + strlen("refs/heads/");
+       else if (!prefixcmp(sb->buf, "refs/"))
+               *branch = sb->buf;
+       else if (!get_sha1_hex(sb->buf, sha1)) {
+               const char *abbrev;
+               abbrev = find_unique_abbrev(sha1, DEFAULT_ABBREV);
+               strbuf_reset(sb);
+               strbuf_addstr(sb, abbrev);
+               *branch = sb->buf;
+       } else if (!strcmp(sb->buf, "detached HEAD")) /* rebase */
+               ;
+       else                    /* bisect */
+               *branch = sb->buf;
+}
+
 static void wt_status_print_state(struct wt_status *s)
 {
        const char *state_color = color(WT_STATUS_HEADER, s);
+       struct strbuf branch = STRBUF_INIT;
+       struct strbuf onto = STRBUF_INIT;
        struct wt_status_state state;
        struct stat st;
 
@@ -949,17 +1018,28 @@ static void wt_status_print_state(struct wt_status *s)
                                state.am_empty_patch = 1;
                } else {
                        state.rebase_in_progress = 1;
+                       read_and_strip_branch(&branch, &state.branch,
+                                             "rebase-apply/head-name");
+                       read_and_strip_branch(&onto, &state.onto,
+                                             "rebase-apply/onto");
                }
        } 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;
+               read_and_strip_branch(&branch, &state.branch,
+                                     "rebase-merge/head-name");
+               read_and_strip_branch(&onto, &state.onto,
+                                     "rebase-merge/onto");
        } else if (!stat(git_path("CHERRY_PICK_HEAD"), &st)) {
                state.cherry_pick_in_progress = 1;
        }
-       if (!stat(git_path("BISECT_LOG"), &st))
+       if (!stat(git_path("BISECT_LOG"), &st)) {
                state.bisect_in_progress = 1;
+               read_and_strip_branch(&branch, &state.branch,
+                                     "BISECT_START");
+       }
 
        if (state.merge_in_progress)
                show_merge_in_progress(s, &state, state_color);
@@ -971,6 +1051,8 @@ static void wt_status_print_state(struct wt_status *s)
                show_cherry_pick_in_progress(s, &state, state_color);
        if (state.bisect_in_progress)
                show_bisect_in_progress(s, &state, state_color);
+       strbuf_release(&branch);
+       strbuf_release(&onto);
 }
 
 void wt_status_print(struct wt_status *s)