From: NGUY Thomas <thomasxnguy@gmail.com>
Date: Sat, 26 May 2012 17:17:02 GMT
Subject: Re: [PATCHv2 1/2] wt-status: better advices for git status
Message-ID: <4FC1100E.2080909@gmail.com>
In-Reply-To: <CACsJy8Dx=HWKJ8H3LQhVAAJGtZKmMe0d5e3Q7eHER6Xo4yTAZw@mail.gmail.com>

Le 26/05/2012 15:01, Nguyen Thai Ngoc Duy a écrit :

>> +       if(rebase_state || rebase_interactive_state) {
>> +               if (conflict) {
>> +                       status_printf_ln(s, c, _("You are currently rebasing: fix conflicts and then run \"git rebase -- continue\"."));
>> +                       status_printf_ln(s, c, _("If you would prefer to skip this patch, instead run \"git rebase --skip\"."));
>> +                       status_printf_ln(s, c, _("To check out  the original branch and stop rebasing run \"git rebase --abort\"."));
>> +               }
>> +               else {
>> +                       if (rebase_state)
>> +                               status_printf_ln(s, c, _("You are currently rebasing: all conflicts fixed; run \"git rebase --continue\"."));
>> +                       else {
>> +                               status_printf_ln(s, c, _("You are currently editing in a rebase progress."));
>> +                               status_printf_ln(s, c, _("You can amend the commit with"));
>> +                               status_printf_ln(s, c, _("      git commit --amend"));
>> +                               status_printf_ln(s, c, _("Once you are satisfied with your changes, run"));
>> +                               status_printf_ln(s, c, _("      git rebase --continue"));
>> +                       }
>> +               }
>> +               wt_status_print_trailer(s);
>> +       }
> Should this verbose advice be controlled by advice.* config keys?
> Experienced users know by heart what to do and will appreciate screen
> estate being used more helpful (to them) info
Indeed, the advices are a bit long and could be restricted to the 
information about the
current state but the idea is also to give the user a way to know what 
to do next.
For long messages, such as the rebase case, we could actually use the 
advice_status_hints
variable to display what to do next or not.

Kong Lucien <Lucien.Kong@ensimag.imag.fr>
Nguy Thomas <Thomas.Nguy@ensimag.imag.fr>
Duperray Valentin <Valentin.Duperray@ensimag.imag.fr>
Jonas Franck <Franck.Jonas@ensimag.imag.fr>
Nguyen Huynh Khoi Nguyen <Huynh-Khoi-Nguyen.Nguyen@ensimag.imag.fr>