subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Daniel Shahaf <danie...@apache.org>
Subject Re: svn commit: r1500343 - /subversion/branches/invoke-diff-cmd-feature/subversion/svnlook/svnlook.c
Date Sat, 06 Jul 2013 23:52:30 GMT
On Sat, Jul 06, 2013 at 11:36:42PM -0000, gbg@apache.org wrote:
> @@ -135,6 +136,9 @@ static const apr_getopt_option_t options
>    {"diff-cmd",          svnlook__diff_cmd, 1,
>     N_("use ARG as diff command")},
>  
> +  {"invoke-diff-cmd",   svnlook__invoke_diff_cmd, 1,
> +   N_("use ARG as diff command (see svn help diff for details)")},
> +

Only seeing this on the second read-through, but:

Is it possible for the help string to be more differentiated from that of
--diff-cmd?  Right now it sounds as though they are just two aliases for the
same functionality (which they aren't).

> @@ -2621,6 +2645,13 @@ main(int argc, const char *argv[])
>                   _("Cannot use the '--show-inherited-props' option with the "
>                     "'--revprop' option")));
>  
> +  /* The --show-inherited-props and --revprop options may not co-exist. */

Copy-pasto.

> +  if (opt_state.diff_cmd && opt_state.invoke_diff_cmd)
> +    SVN_INT_ERR(svn_error_create
> +                (SVN_ERR_CL_MUTUALLY_EXCLUSIVE_ARGS, NULL,
> +                 _("Cannot use the '--diff-cmd' option with the "
> +                   "'--invoke-diff-cmd' option")));
> +
>    /* If the user asked for help, then the rest of the arguments are
>       the names of subcommands to get help on (if any), or else they're
>       just typos/mistakes.  Whatever the case, the subcommand to
> 
> 

Mime
View raw message