[PATCH 2 of 3] verify: report existence of journal

Sune Foldager cryo at cyanite.org
Sat Oct 31 09:41:51 CDT 2009


Benoit Boissinot wrote:
> On Fri, Oct 30, 2009 at 05:42:43PM +0100, Sune Foldager wrote:
>   
>> +    if os.path.exists(repo.sjoin("journal")):
>> +        ui.warn(_("partially aborted transaction found - you should run hg recover\n"))
>> +
>>     
>
> Maybe something closer to the other similar error messages:
> mercurial/localrepo.py
> 559:            raise error.RepoError(_("journal already exists - run hg recover"))
>
> mercurial/transaction.py
> 153:                self.report(_("rollback failed - please run hg recover\n"))
>
>
> E.g.: "partial transaction journal exists - run hg recover\n" (not sure
> about the first part).
>
>   
Yes, that sounds good to me. I wanted a bit more than "journal already 
exists", since it's a pretty internal message which makes little sense 
to Joe script-coder.
I think Matt "flagged [my] changes for merge", though, so I am not sure 
how it should be changed at this point :-).  Matt?

/Sune



More information about the Mercurial-devel mailing list