On Fri, May 06, 2011 at 03:13:55AM -0700, Jakub Narebski wrote:
> Pierre Habouzit <madcoder@xxxxxxxxxx> writes:
> > 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.
Frankly I sadly don't have the time to write them, which is a very bad
excuse, this is a feature I wrote for $work and that I use and I thought
it would be nice to share.
Generating all the possible cases is just very long, and the test
framework changed too much since the last time I used it a few years ago
and I abandoned after 10minutes not being able to make it work properly.
> > +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...
It's _() you want to translate those. They are used through a
printf(" (%s)", ...) later that doesn't need i18n.
--
ÂOÂ Pierre Habouzit
ÂÂO madcoder@xxxxxxxxxx
OOO http://www.madism.org
--
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