diff mercurial/verify.py @ 6900:def492d1b592

store: change handling of decoding errors
author Matt Mackall <mpm@selenic.com>
date Wed, 13 Aug 2008 20:18:43 -0500
parents dab95717058d
children 90227c42b5f6
line wrap: on
line diff
--- a/mercurial/verify.py	Wed Aug 13 20:18:43 2008 -0500
+++ b/mercurial/verify.py	Wed Aug 13 20:18:43 2008 -0500
@@ -159,16 +159,18 @@
 
     ui.status(_("checking files\n"))
 
-    storefiles = {} 
-    for f, size in repo.store.datafiles(lambda m: err(None, m)):
-        if size > 0:
+    storefiles = {}
+    for f, f2, size in repo.store.datafiles():
+        if not f:
+            err(None, _("cannot decode filename '%s'") % f2)
+        elif size > 0:
             storefiles[f] = True
 
     files = util.sort(util.unique(filenodes.keys() + filelinkrevs.keys()))
     for f in files:
         fl = repo.file(f)
 
-        for ff in fl.files():    
+        for ff in fl.files():
             try:
                 del storefiles[ff]
             except KeyError: