Mercurial > public > mercurial-scm > hg-stable

diff mercurial/transaction.py @ 20524:28b8ff84db3f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
journal: report parsing errors on recover/rollback (issue4172)
author Matt Mackall <mpm@selenic.com>
date Mon, 17 Feb 2014 14:49:56 -0600
parents cf3b8285af00
children 3c47677a8d04
line wrap: on
line diff
--- a/mercurial/transaction.py	Sat Feb 15 22:09:32 2014 -0600
+++ b/mercurial/transaction.py	Mon Feb 17 14:49:56 2014 -0600
@@ -174,7 +174,10 @@
     lines = fp.readlines()
     fp.close()
     for l in lines:
-        f, o = l.split('\0')
-        entries.append((f, int(o), None))
+        try:
+            f, o = l.split('\0')
+            entries.append((f, int(o), None))
+        except ValueError:
+            report(_("couldn't read journal entry %r!\n") % l)
 
     _playback(file, report, opener, entries)