--- a/mercurial/verify.py Wed Feb 17 17:11:20 2010 +0100
+++ b/mercurial/verify.py Wed Feb 17 23:07:50 2010 +0100
@@ -122,7 +122,7 @@
checklog(cl, "changelog", 0)
total = len(repo)
for i in repo:
- ui.progress('changelog', i, total=total)
+ ui.progress(_('changelog'), i, total=total)
n = cl.node(i)
checkentry(cl, i, n, seen, [i], "changelog")
@@ -133,14 +133,14 @@
filelinkrevs.setdefault(f, []).append(i)
except Exception, inst:
exc(i, _("unpacking changeset %s") % short(n), inst)
- ui.progress('changelog', None)
+ ui.progress(_('changelog'), None)
ui.status(_("checking manifests\n"))
seen = {}
checklog(mf, "manifest", 0)
total = len(mf)
for i in mf:
- ui.progress('manifests', i, total=total)
+ ui.progress(_('manifests'), i, total=total)
n = mf.node(i)
lr = checkentry(mf, i, n, seen, mflinkrevs.get(n, []), "manifest")
if n in mflinkrevs:
@@ -156,7 +156,7 @@
filenodes.setdefault(f, {}).setdefault(fn, lr)
except Exception, inst:
exc(lr, _("reading manifest delta %s") % short(n), inst)
- ui.progress('manifests', None)
+ ui.progress(_('manifests'), None)
ui.status(_("crosschecking files in changesets and manifests\n"))
@@ -166,13 +166,13 @@
for c, m in sorted([(c, m) for m in mflinkrevs
for c in mflinkrevs[m]]):
count += 1
- ui.progress('crosscheck', count, total=total)
+ ui.progress(_('crosscheck'), count, total=total)
err(c, _("changeset refers to unknown manifest %s") % short(m))
mflinkrevs = None # del is bad here due to scope issues
for f in sorted(filelinkrevs):
count += 1
- ui.progress('crosscheck', count, total=total)
+ ui.progress(_('crosscheck'), count, total=total)
if f not in filenodes:
lr = filelinkrevs[f][0]
err(lr, _("in changeset but not in manifest"), f)
@@ -180,7 +180,7 @@
if havecl:
for f in sorted(filenodes):
count += 1
- ui.progress('crosscheck', count, total=total)
+ ui.progress(_('crosscheck'), count, total=total)
if f not in filelinkrevs:
try:
fl = repo.file(f)
@@ -189,7 +189,7 @@
lr = None
err(lr, _("in manifest but not in changeset"), f)
- ui.progress('crosscheck', None)
+ ui.progress(_('crosscheck'), None)
ui.status(_("checking files\n"))
@@ -203,7 +203,7 @@
files = sorted(set(filenodes) | set(filelinkrevs))
total = len(files)
for i, f in enumerate(files):
- ui.progress('files', i, item=f, total=total)
+ ui.progress(_('files'), i, item=f, total=total)
try:
linkrevs = filelinkrevs[f]
except KeyError:
@@ -281,7 +281,7 @@
fns = [(lr, n) for n, lr in filenodes[f].iteritems()]
for lr, node in sorted(fns):
err(lr, _("%s in manifests not found") % short(node), f)
- ui.progress('files', None)
+ ui.progress(_('files'), None)
for f in storefiles:
warn(_("warning: orphan revlog '%s'") % f)