Mercurial > public > mercurial-scm > hg
comparison mercurial/verify.py @ 7676:43cfbb21f04d
Merge with stable
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Wed, 21 Jan 2009 14:14:56 -0600 |
parents | 4dd7b28003d2 011e69b96c69 |
children | 1fce19b9b011 |
comparison
equal
deleted
inserted
replaced
7674:4d63b10a602e | 7676:43cfbb21f04d |
---|---|
195 # verify contents | 195 # verify contents |
196 try: | 196 try: |
197 t = fl.read(n) | 197 t = fl.read(n) |
198 rp = fl.renamed(n) | 198 rp = fl.renamed(n) |
199 if len(t) != fl.size(i): | 199 if len(t) != fl.size(i): |
200 if not fl._readmeta(n): # ancient copy? | 200 if len(fl.revision(n)) != fl.size(i): |
201 err(lr, _("unpacked size is %s, %s expected") % | 201 err(lr, _("unpacked size is %s, %s expected") % |
202 (len(t), fl.size(i)), f) | 202 (len(t), fl.size(i)), f) |
203 except Exception, inst: | 203 except Exception, inst: |
204 exc(lr, _("unpacking %s") % short(n), inst, f) | 204 exc(lr, _("unpacking %s") % short(n), inst, f) |
205 | 205 |