From: Johannes Sixt <j6t@kdbg.org>
Date: Wed, 29 Dec 2021 19:36:59 GMT
Subject: Re: [PATCH v3 03/11] i18n: turn "options are incompatible" into "cannot be used together"
Message-ID: <233ae6c6-294f-f68c-51ca-ec83d25f05dd@kdbg.org>
In-Reply-To: <486cc6c89e2612761bc8835700c9c85c0b50ab55.1640804108.git.gitgitgadget@gmail.com>

Am 29.12.21 um 19:54 schrieb Jean-Noël Avila via GitGitGadget:
> @@ -2867,24 +2867,24 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct s
>  	compile_grep_patterns(&revs->grep_filter);
>  
>  	if (revs->reverse && revs->reflog_info)
> -		die("cannot combine --reverse with --walk-reflogs");
> +		die(_("options '%s' and '%s' cannot be used together"), "--reverse", "--walk-reflogs");
>  	if (revs->reflog_info && revs->limited)
>  		die("cannot combine --walk-reflogs with history-limiting options");
>  	if (revs->rewrite_parents && revs->children.name)
> -		die("cannot combine --parents and --children");
> +		die(_("options '%s' and '%s' cannot be used together"), "--parents", "--children");
>  
>  	/*
>  	 * Limitations on the graph functionality
>  	 */
>  	if (revs->reverse && revs->graph)
> -		die("cannot combine --reverse with --graph");
> +		die(_("options '%s' and '%s' cannot be used together"), "--reverse", "--graph");
>  
>  	if (revs->reflog_info && revs->graph)
> -		die("cannot combine --walk-reflogs with --graph");
> +		die(_("options '%s' and '%s' cannot be used together"), "--walk-reflogs", "--graph");
>  	if (revs->no_walk && revs->graph)
> -		die("cannot combine --no-walk with --graph");
> +		die(_("options '%s' and '%s' cannot be used together"), "--no-walk", "--graph");
>  	if (!revs->reflog_info && revs->grep_filter.use_reflog_filter)
> -		die("cannot use --grep-reflog without --walk-reflogs");
> +		die(_("%s requires %s"), "--grep-reflog", "--walk-reflogs");

This last transformation does not fit the topic of this patch. It should
go into patch 6/11, I think.

>  
>  	if (revs->line_level_traverse &&
>  	    (revs->diffopt.output_format & ~(DIFF_FORMAT_PATCH | DIFF_FORMAT_NO_OUTPUT)))

-- Hannes