wt-status: turn advice_status_hints into a field of wt_status

No behavior change in this patch, but this makes the display of status
hints more flexible as they can be enabled or disabled for individual
calls to commit.c:run_status().

Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/commit.c b/builtin/commit.c
index 94512c05bfa8a18170a27c73f5814ebeaf192a7c..28c6309d46a9135022ded5c6f230e971774c3415 100644 (file)
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -169,6 +169,7 @@ static void status_init_config(struct wt_status *s, config_fn_t fn)
        gitmodules_config();
        git_config(fn, s);
        determine_whence(s);
        gitmodules_config();
        git_config(fn, s);
        determine_whence(s);

+       s->hints = advice_status_hints; /* must come after git_config() */

 }
 
 static void rollback_index_files(void)
 }
 
 static void rollback_index_files(void)

diff --git a/wt-status.c b/wt-status.c
index cb24f1fa9b9f9632e5fd92bbcceb44008619fa14..885ee666eec900e40a7f72516362abbf839c1801 100644 (file)
--- a/wt-status.c
+++ b/wt-status.c
@@ -160,7 +160,7 @@ static void wt_status_print_unmerged_header(struct wt_status *s)
                }
        }
 
                }
        }
 

-       if (!advice_status_hints)
+       if (!s->hints)

                return;
        if (s->whence != FROM_COMMIT)
                ;
                return;
        if (s->whence != FROM_COMMIT)
                ;


@@ -187,7 +187,7 @@ static void wt_status_print_cached_header(struct wt_status *s)
        const char *c = color(WT_STATUS_HEADER, s);
 
        status_printf_ln(s, c, _("Changes to be committed:"));
        const char *c = color(WT_STATUS_HEADER, s);
 
        status_printf_ln(s, c, _("Changes to be committed:"));

-       if (!advice_status_hints)
+       if (!s->hints)

                return;
        if (s->whence != FROM_COMMIT)
                ; /* NEEDSWORK: use "git reset --unresolve"??? */
                return;
        if (s->whence != FROM_COMMIT)
                ; /* NEEDSWORK: use "git reset --unresolve"??? */


@@ -205,7 +205,7 @@ static void wt_status_print_dirty_header(struct wt_status *s,
        const char *c = color(WT_STATUS_HEADER, s);
 
        status_printf_ln(s, c, _("Changes not staged for commit:"));
        const char *c = color(WT_STATUS_HEADER, s);
 
        status_printf_ln(s, c, _("Changes not staged for commit:"));

-       if (!advice_status_hints)
+       if (!s->hints)

                return;
        if (!has_deleted)
                status_printf_ln(s, c, _("  (use \"git add <file>...\" to update what will be committed)"));
                return;
        if (!has_deleted)
                status_printf_ln(s, c, _("  (use \"git add <file>...\" to update what will be committed)"));


@@ -223,7 +223,7 @@ static void wt_status_print_other_header(struct wt_status *s,
 {
        const char *c = color(WT_STATUS_HEADER, s);
        status_printf_ln(s, c, "%s:", what);
 {
        const char *c = color(WT_STATUS_HEADER, s);
        status_printf_ln(s, c, "%s:", what);

-       if (!advice_status_hints)
+       if (!s->hints)

                return;
        status_printf_ln(s, c, _("  (use \"git %s <file>...\" to include in what will be committed)"), how);
        status_printf_ln(s, c, "");
                return;
        status_printf_ln(s, c, _("  (use \"git %s <file>...\" to include in what will be committed)"), how);
        status_printf_ln(s, c, "");


@@ -801,13 +801,13 @@ static void show_merge_in_progress(struct wt_status *s,
 {
        if (has_unmerged(s)) {
                status_printf_ln(s, color, _("You have unmerged paths."));
 {
        if (has_unmerged(s)) {
                status_printf_ln(s, color, _("You have unmerged paths."));

-               if (advice_status_hints)
+               if (s->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."));
                        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."));

-               if (advice_status_hints)
+               if (s->hints)

                        status_printf_ln(s, color,
                                _("  (use \"git commit\" to conclude merge)"));
        }
                        status_printf_ln(s, color,
                                _("  (use \"git commit\" to conclude merge)"));
        }


@@ -823,7 +823,7 @@ static void show_am_in_progress(struct wt_status *s,
        if (state->am_empty_patch)
                status_printf_ln(s, color,
                        _("The current patch is empty."));
        if (state->am_empty_patch)
                status_printf_ln(s, color,
                        _("The current patch is empty."));

-       if (advice_status_hints) {
+       if (s->hints) {

                if (!state->am_empty_patch)
                        status_printf_ln(s, color,
                                _("  (fix conflicts and then run \"git am --continue\")"));
                if (!state->am_empty_patch)
                        status_printf_ln(s, color,
                                _("  (fix conflicts and then run \"git am --continue\")"));


@@ -896,7 +896,7 @@ static void show_rebase_in_progress(struct wt_status *s,
                else
                        status_printf_ln(s, color,
                                         _("You are currently rebasing."));
                else
                        status_printf_ln(s, color,
                                         _("You are currently rebasing."));

-               if (advice_status_hints) {
+               if (s->hints) {

                        status_printf_ln(s, color,
                                _("  (fix conflicts and then run \"git rebase --continue\")"));
                        status_printf_ln(s, color,
                        status_printf_ln(s, color,
                                _("  (fix conflicts and then run \"git rebase --continue\")"));
                        status_printf_ln(s, color,


@@ -913,7 +913,7 @@ static void show_rebase_in_progress(struct wt_status *s,
                else
                        status_printf_ln(s, color,
                                         _("You are currently rebasing."));
                else
                        status_printf_ln(s, color,
                                         _("You are currently rebasing."));

-               if (advice_status_hints)
+               if (s->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,
                                _("  (all conflicts fixed: run \"git rebase --continue\")"));
        } else if (split_commit_in_progress(s)) {


@@ -925,7 +925,7 @@ static void show_rebase_in_progress(struct wt_status *s,
                else
                        status_printf_ln(s, color,
                                         _("You are currently splitting a commit during a rebase."));
                else
                        status_printf_ln(s, color,
                                         _("You are currently splitting a commit during a rebase."));

-               if (advice_status_hints)
+               if (s->hints)

                        status_printf_ln(s, color,
                                _("  (Once your working directory is clean, run \"git rebase --continue\")"));
        } else {
                        status_printf_ln(s, color,
                                _("  (Once your working directory is clean, run \"git rebase --continue\")"));
        } else {


@@ -937,7 +937,7 @@ static void show_rebase_in_progress(struct wt_status *s,
                else
                        status_printf_ln(s, color,
                                         _("You are currently editing a commit during a rebase."));
                else
                        status_printf_ln(s, color,
                                         _("You are currently editing a commit during a rebase."));

-               if (advice_status_hints && !s->amend) {
+               if (s->hints && !s->amend) {

                        status_printf_ln(s, color,
                                _("  (use \"git commit --amend\" to amend the current commit)"));
                        status_printf_ln(s, color,
                        status_printf_ln(s, color,
                                _("  (use \"git commit --amend\" to amend the current commit)"));
                        status_printf_ln(s, color,


@@ -952,7 +952,7 @@ static void show_cherry_pick_in_progress(struct wt_status *s,
                                        const char *color)
 {
        status_printf_ln(s, color, _("You are currently cherry-picking."));
                                        const char *color)
 {
        status_printf_ln(s, color, _("You are currently cherry-picking."));

-       if (advice_status_hints) {
+       if (s->hints) {

                if (has_unmerged(s))
                        status_printf_ln(s, color,
                                _("  (fix conflicts and run \"git cherry-pick --continue\")"));
                if (has_unmerged(s))
                        status_printf_ln(s, color,
                                _("  (fix conflicts and run \"git cherry-pick --continue\")"));


@@ -971,7 +971,7 @@ static void show_revert_in_progress(struct wt_status *s,
 {
        status_printf_ln(s, color, _("You are currently reverting commit %s."),
                         find_unique_abbrev(state->revert_head_sha1, DEFAULT_ABBREV));
 {
        status_printf_ln(s, color, _("You are currently reverting commit %s."),
                         find_unique_abbrev(state->revert_head_sha1, DEFAULT_ABBREV));

-       if (advice_status_hints) {
+       if (s->hints) {

                if (has_unmerged(s))
                        status_printf_ln(s, color,
                                _("  (fix conflicts and run \"git revert --continue\")"));
                if (has_unmerged(s))
                        status_printf_ln(s, color,
                                _("  (fix conflicts and run \"git revert --continue\")"));


@@ -995,7 +995,7 @@ static void show_bisect_in_progress(struct wt_status *s,
        else
                status_printf_ln(s, color,
                                 _("You are currently bisecting."));
        else
                status_printf_ln(s, color,
                                 _("You are currently bisecting."));

-       if (advice_status_hints)
+       if (s->hints)

                status_printf_ln(s, color,
                        _("  (use \"git bisect reset\" to get back to the original branch)"));
        wt_status_print_trailer(s);
                status_printf_ln(s, color,
                        _("  (use \"git bisect reset\" to get back to the original branch)"));
        wt_status_print_trailer(s);


@@ -1233,7 +1233,7 @@ void wt_status_print(struct wt_status *s)
                }
        } else if (s->commitable)
                status_printf_ln(s, GIT_COLOR_NORMAL, _("Untracked files not listed%s"),
                }
        } else if (s->commitable)
                status_printf_ln(s, GIT_COLOR_NORMAL, _("Untracked files not listed%s"),

-                       advice_status_hints
+                       s->hints

                        ? _(" (use -u option to show untracked files)") : "");
 
        if (s->verbose)
                        ? _(" (use -u option to show untracked files)") : "");
 
        if (s->verbose)


@@ -1244,25 +1244,25 @@ void wt_status_print(struct wt_status *s)
                else if (s->nowarn)
                        ; /* nothing */
                else if (s->workdir_dirty) {
                else if (s->nowarn)
                        ; /* nothing */
                else if (s->workdir_dirty) {

-                       if (advice_status_hints)
+                       if (s->hints)

                                printf(_("no changes added to commit "
                                         "(use \"git add\" and/or \"git commit -a\")\n"));
                        else
                                printf(_("no changes added to commit\n"));
                } else if (s->untracked.nr) {
                                printf(_("no changes added to commit "
                                         "(use \"git add\" and/or \"git commit -a\")\n"));
                        else
                                printf(_("no changes added to commit\n"));
                } else if (s->untracked.nr) {

-                       if (advice_status_hints)
+                       if (s->hints)

                                printf(_("nothing added to commit but untracked files "
                                         "present (use \"git add\" to track)\n"));
                        else
                                printf(_("nothing added to commit but untracked files present\n"));
                } else if (s->is_initial) {
                                printf(_("nothing added to commit but untracked files "
                                         "present (use \"git add\" to track)\n"));
                        else
                                printf(_("nothing added to commit but untracked files present\n"));
                } else if (s->is_initial) {

-                       if (advice_status_hints)
+                       if (s->hints)

                                printf(_("nothing to commit (create/copy files "
                                         "and use \"git add\" to track)\n"));
                        else
                                printf(_("nothing to commit\n"));
                } else if (!s->show_untracked_files) {
                                printf(_("nothing to commit (create/copy files "
                                         "and use \"git add\" to track)\n"));
                        else
                                printf(_("nothing to commit\n"));
                } else if (!s->show_untracked_files) {

-                       if (advice_status_hints)
+                       if (s->hints)

                                printf(_("nothing to commit (use -u to show untracked files)\n"));
                        else
                                printf(_("nothing to commit\n"));
                                printf(_("nothing to commit (use -u to show untracked files)\n"));
                        else
                                printf(_("nothing to commit\n"));

diff --git a/wt-status.h b/wt-status.h
index fb7152e187a2fe7c080aab1d84b7fd2cbe6c47a1..b4c9cb46c75a6fc67302987611894c682ec2d5a6 100644 (file)
--- a/wt-status.h
+++ b/wt-status.h
@@ -59,6 +59,7 @@ struct wt_status {
        unsigned colopts;
        int null_termination;
        int show_branch;
        unsigned colopts;
        int null_termination;
        int show_branch;

+       int hints;

 
        /* These are computed during processing of the individual sections */
        int commitable;
 
        /* These are computed during processing of the individual sections */
        int commitable;