[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: Branko Čibej <brane_at_wandisco.com>
Date: Wed, 03 Jul 2013 11:56:16 +0200

On 03.07.2013 11:41, Prabhu wrote:
> 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

The last message ("failed to verify") is not specific to revision 6;
that it's attached to the list of corrupt revisions is extremely
confusing. IMO it should be something like:

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

Repeating the svnadmin: prefix in the summary seems unnecessary.

-- Brane

-- 
Branko Čibej | Director of Subversion
WANdisco // Non-Stop Data
e. brane_at_wandisco.com
Received on 2013-07-03 11:56:56 CEST

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