[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: [PATCH] Improve internal diff error messages

From: Daniel Shahaf <d.s_at_daniel.shahaf.name>
Date: Wed, 10 Nov 2010 18:29:03 +0200

+1 in genenral, except:

Julian Foad wrote on Wed, Nov 10, 2010 at 16:09:06 +0000:
> @@ -587,7 +618,12 @@ svn_diff_file_options_parse(svn_diff_fil
> if (APR_STATUS_IS_EOF(err))
> break;
> if (err)
> - return svn_error_wrap_apr(err, _("Error parsing diff options"));
> + /* Avoid displaying APR's generic error message associated with
> + * status code ERR, because at least one such message refers to the
> + * "command line" which may not be where our options came from. */
> + return svn_error_createf(SVN_ERR_INVALID_DIFF_OPTION, NULL,
> + _("Internal diff: %s"),
> + opt_parsing_error_baton.err_msg);
>

s/NULL/err/

I haven't studied the APR interface here; is it guaranteed
that baton.err_msg is not NULL?

> switch (opt_id)
> {
Received on 2010-11-10 17:33:08 CET

This is an archived mail posted to the Subversion Dev mailing list.