Pierre Habouzit <madcoder@xxxxxxxxxx> writes:
> This provides the same information as the git bash prompt about the
> current operation that is going on: rebase, merge, am, cherry-pick or
> bisect.
>
> This is very useful for "beginners" who don't have their shell prompt set
> up for git.
>
> The logic has been largely borrowed from
> contrib/completion/git-completion.bash
Very nice idea.
> when hints are enabled, it also gives hints on how to abort or resolve
s/^when/When/
> If we have an ongoing operation then:
> - if we are on a branch it displays:
> # On branch $branch ($what_is_ongoing)
> # ($ongoing_hint)
> - if we are on a detached head it displays:
> # $what_is_ongoing (detached head)
> # ($ongoing_hint)
>
> If we have no ongoing operation the git status does as before:
> - if we are on a branch it displays:
> # On branch $branch
> - if we are on a detached head it displays:
> # Not currently on any branch.
Very nice to have such example in commit message.
> Since the ongoing operation is usually something to be done with before
> continuing with further git operations, the hint and ongoing operations
> are displayed with the "WT_STATUS_NOBRANCH" color to be easy to spot.
>
> Signed-off-by: Pierre Habouzit <madcoder@xxxxxxxxxx>
> ---
> wt-status.c | 138 ++++++++++++++++++++++++++++++++++++++++++++++++++++------
> 1 files changed, 123 insertions(+), 15 deletions(-)
Could you please add some *tests* for this new feature?
Don't forget to mark it with C_LOCALE_OUTPUT or use test_i18ncmp /
/ test_i18ngrep in tests.
> +static void wt_status_print_doingwhat(struct wt_status *s)
> +{
> + const char *status_nobranch = color(WT_STATUS_NOBRANCH, s);
> + const char *branch_name = s->branch;
> + const char *advice = NULL;
> +
> + const char * const rebase_advice =
> + _("use \"git rebase --abort\" to abort current rebase or proceed");
> + const char * const am_advice =
> + _("use \"git am --abort\" to abort current mailbox apply or proceed");
> + const char * const merge_advice =
> + _("use \"git reset --hard\" to abort, or resolve conflicts and commit");
Thanks for marking it up for i18n... though I am not sure if we should
use _() or N_() here...
--
Jakub Narebski
Poland
ShadeHawk on #git
--
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