comparison mercurial/verify.py @ 8209:a1a5a57efe90

replace util.sort with sorted built-in This is marginally faster for small and moderately-sized lists
author Matt Mackall <mpm@selenic.com>
date Sun, 26 Apr 2009 16:50:44 -0500
parents aaec1f65926e
children 46293a0c7e9f
comparison
equal deleted inserted replaced
8208:32a2a1e244f1 8209:a1a5a57efe90
141 exc(lr, _("reading manifest delta %s") % short(n), inst) 141 exc(lr, _("reading manifest delta %s") % short(n), inst)
142 142
143 ui.status(_("crosschecking files in changesets and manifests\n")) 143 ui.status(_("crosschecking files in changesets and manifests\n"))
144 144
145 if havemf: 145 if havemf:
146 for c, m in util.sort([(c, m) for m in mflinkrevs for c in mflinkrevs[m]]): 146 for c,m in sorted([(c, m) for m in mflinkrevs for c in mflinkrevs[m]]):
147 err(c, _("changeset refers to unknown manifest %s") % short(m)) 147 err(c, _("changeset refers to unknown manifest %s") % short(m))
148 del mflinkrevs 148 del mflinkrevs
149 149
150 for f in util.sort(filelinkrevs): 150 for f in sorted(filelinkrevs):
151 if f not in filenodes: 151 if f not in filenodes:
152 lr = filelinkrevs[f][0] 152 lr = filelinkrevs[f][0]
153 err(lr, _("in changeset but not in manifest"), f) 153 err(lr, _("in changeset but not in manifest"), f)
154 154
155 if havecl: 155 if havecl:
156 for f in util.sort(filenodes): 156 for f in sorted(filenodes):
157 if f not in filelinkrevs: 157 if f not in filelinkrevs:
158 try: 158 try:
159 fl = repo.file(f) 159 fl = repo.file(f)
160 lr = min([fl.linkrev(fl.rev(n)) for n in filenodes[f]]) 160 lr = min([fl.linkrev(fl.rev(n)) for n in filenodes[f]])
161 except: 161 except:
169 if not f: 169 if not f:
170 err(None, _("cannot decode filename '%s'") % f2) 170 err(None, _("cannot decode filename '%s'") % f2)
171 elif size > 0: 171 elif size > 0:
172 storefiles[f] = True 172 storefiles[f] = True
173 173
174 files = util.sort(set(filenodes) | set(filelinkrevs)) 174 files = sorted(set(filenodes) | set(filelinkrevs))
175 for f in files: 175 for f in files:
176 lr = filelinkrevs[f][0] 176 lr = filelinkrevs[f][0]
177 try: 177 try:
178 fl = repo.file(f) 178 fl = repo.file(f)
179 except error.RevlogError, e: 179 except error.RevlogError, e:
225 exc(lr, _("checking rename of %s") % short(n), inst, f) 225 exc(lr, _("checking rename of %s") % short(n), inst, f)
226 226
227 # cross-check 227 # cross-check
228 if f in filenodes: 228 if f in filenodes:
229 fns = [(mf.linkrev(l), n) for n,l in filenodes[f].iteritems()] 229 fns = [(mf.linkrev(l), n) for n,l in filenodes[f].iteritems()]
230 for lr, node in util.sort(fns): 230 for lr, node in sorted(fns):
231 err(lr, _("%s in manifests not found") % short(node), f) 231 err(lr, _("%s in manifests not found") % short(node), f)
232 232
233 for f in storefiles: 233 for f in storefiles:
234 warn(_("warning: orphan revlog '%s'") % f) 234 warn(_("warning: orphan revlog '%s'") % f)
235 235