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

Re: svn commit: r1498394 - in /subversion/branches/verify-keep-going/subversion: libsvn_repos/dump.c svnadmin/svnadmin.c

From: Prabhu <prabhugs_at_collab.net>
Date: Wed, 03 Jul 2013 15:11:36 +0530

On 07/01/2013 05:35 PM, Daniel Shahaf wrote:
>
>> +++ subversion/branches/verify-keep-going/subversion/svnadmin/svnadmin.c Mon Jul 1 12:01:38 2013
>> @@ -850,13 +850,16 @@ repos_notify_handler(void *baton,
>> case svn_repos_notify_failure_summary:
>> if (notify->revision != SVN_INVALID_REVNUM)
>> cmdline_stream_printf(feedback_stream, scratch_pool,
>> - _("r%ld: %s\n"),
>> - notify->revision, notify->err->message);
>> + _("\nRevision %ld \n"),
>> + notify->revision);
>> + if (notify->err)
>> + svn_handle_error2(notify->err, stderr, FALSE /* non-fatal */,
>> + "svnadmin: ");
> How about using "svnadmin: r%ld: " as the prefix, for clarity?
>
> Daniel
Thanks Daniel,

Currently the implementation looks like

<
$ svnadmin verify /tmp/testrepo --keep-going
* Verifying repository metadata ...
* Verified revision 0.
* Verified revision 1.
* Error verifying revision 2.
svnadmin: E160004: Final line in revision file r2 missing space
* Verified revision 3.
* Error verifying revision 4.
svnadmin: E160004: Invalid change kind in rev file
* Verified revision 5.
* Error verifying revision 6.
svnadmin: E160004: Final line in revision file r6 missing space

-----Summary of corrupt revisions-----
Revision 2
svnadmin: E160004: Final line in revision file r2 missing space

Revision 4
svnadmin: E160004: Invalid change kind in rev file

Revision 6
svnadmin: E160004: Final line in revision file r6 missing space
svnadmin: E165011: Repository '/tmp/testrepo' failed to verify

>

Do you want it to look like,

<
$ svnadmin verify /tmp/testrepo/ --keep-going
* Verifying repository metadata ...
* Verified revision 0.
* Verified revision 1.
* Error verifying revision 2.
svnadmin: E160004: Final line in revision file r2 missing space
* Verified revision 3.
* Error verifying revision 4.
svnadmin: E160004: Invalid change kind in rev file
* Verified revision 5.
* Error verifying revision 6.
svnadmin: E160004: Final line in revision file r6 missing space

-----Summary of corrupt revisions-----
Revision 2: svnadmin: E160004: Final line in revision file r2 missing space
Revision 4: svnadmin: E160004: Invalid change kind in rev file
Revision 6: svnadmin: E160004: Final line in revision file r6 missing space
Revision 6: svnadmin: E165011: Repository '/tmp/testrepo' failed to verify
>

I am ok with the second type because it needs lesser number of lines to
display the summary.

Regards
Prabhu
Received on 2013-07-03 11:42:13 CEST

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