Mercurial > public > mercurial-scm > hg-stable
diff mercurial/verify.py @ 10698:e930017f9e2a stable
progress: use a verb (+noun) in present participle
author | Martin Geisler <mg@lazybytes.net> |
---|---|
date | Mon, 15 Mar 2010 18:33:39 +0100 |
parents | 45734b51c99b |
children | 6ced27d3168a |
line wrap: on
line diff
--- a/mercurial/verify.py Sun Mar 14 00:28:10 2010 +0100 +++ b/mercurial/verify.py Mon Mar 15 18:33:39 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(_('checking'), 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(_('checking'), 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(_('checking'), 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(_('checking'), 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(_('crosschecking'), 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(_('crosschecking'), 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(_('crosschecking'), 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(_('crosschecking'), 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(_('checking'), 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(_('checking'), None) for f in storefiles: warn(_("warning: orphan revlog '%s'") % f)