Re: [PATCHv4 1/3] wt-status.*: better advices for git status added

From: Matthieu Moy <matthieu.moy@grenoble-inp.fr>
Date: May 31, 2012, 06:42 UTC
Message-ID: <vpq1um0svgn.fsf@bauges.imag.fr>
In-Reply-To: <7vmx4pzfse.fsf@alter.siamese.dyndns.org>

Junio C Hamano <gitster@pobox.com> writes:

Show 5 quoted lines

>> +	status_printf_ln(s, color,
>> +		_("You are currently in am progress:"));
>
> Is it just me, or is the above -ECANTPARSE?  "You are currently in
> commit/merge/meal/commute progress?"

It's not just you ;-).

> Perhaps	"You are in the middle of an am session" or something?

I'd just say "rebase in progress".

>> +	status_printf_ln(s, color,
>> +		_("You are currently in am progress:"));

[...]

Show 12 quoted lines

>> +	if (advice_status_help) {
>> +		status_printf_ln(s, color,
>> +			_("  When you have resolved this problem run \"git am --resolved\"."));
>> +		status_printf_ln(s, color,
>> +			_("  If you would prefer to skip this patch, instead run \"git am --skip\"."));
>> +		status_printf_ln(s, color,
>> +			_("  To restore the original branch and stop patching run \"git am --abort\"."));
>> +	}
>
> I doubt it makes much sense to hide only these messages behind "if
> (advice_status_help)".  Look at how you give your "what to do"
> advices in wt-status-merge-in-progress function.

I disagree.

"rebase in progress" adds information for advanced Git users as well as for newbies. I think it makes sense to display it unconditionnally, like we currently display "Not currently on any branch." or "Your branch is ahead of ...".

The state in which the user is is important for anyone, but the set of commands to get out of this state is not relevant for advanced users, and simply eats a few terminal lines for them.

I think the situation is no different from other messages like "Changes not staged for commit:", where the list matters for everyone, but the suggested commands don't, and that's why I still think advice.statusHints should be used here too.

-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/