Mercurial > hg > mercurial-crew-with-dirclash

comparison mercurial/commands.py @ 1803:06e7447c7302

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
speed up hg log --patch Changing dodiff to read the manifest/changelog for node1 before calling repo.update allows us to take advantage of the revlog revision cache. Before this patch and my previous "speed up hg log --debug" patch, when using hg log -p to display three revisions (A, B and C), dodiff and repo.changes would end up reading the manifests in this order: B A B A C B C B With both patches, this order becomes: A A B B B B C C (This considers only dodiff and repo.changes. I'm not sure how other parts of hg log enter the picture.) The speed up will depend on the revisions being displayed. (All "before" times already have my previous "speed up hg log --debug" patch applied.) hg repo (tip = 414e81ae971f). hg log -p before after real 0m50.981s 0m45.279s user 0m47.930s 0m42.560s sys 0m2.526s 0m2.523s output size: 6917897 bytes kernel repo (tip = 9d4e135960ed). hg log -p -l64 before after real 2m14.995s 1m45.025s user 2m9.509s 1m33.900s sys 0m3.663s 0m2.942s output size: 31497621 bytes same kernel repo. hg log -p -l64 -r c84c2069592f:0 before after real 1m48.045s 1m0.076s user 1m44.094s 0m58.492s sys 0m2.603s 0m1.103s output size: 197983 bytes c84c2069592f was the tip of a 10 day old kernel repo that I had lying around and was where I first tested this patch. For some weird coincidence it's also a place where the patch makes a huge difference.
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Sun, 26 Feb 2006 02:26:17 +0100
parents 38e19b1d3de8
children c3f959c1c3ff
comparison
equal deleted inserted replaced
1802:8a7a24b96697 1803:06e7447c7302
274 pathname), 274 pathname),
275 mode) 275 mode)
276 276
277 def dodiff(fp, ui, repo, node1, node2, files=None, match=util.always, 277 def dodiff(fp, ui, repo, node1, node2, files=None, match=util.always,
278 changes=None, text=False, opts={}): 278 changes=None, text=False, opts={}):
279 if node1:
280 # reading the data for node1 early allows it to play nicely
281 # with repo.changes and the revlog cache.
282 change = repo.changelog.read(node1)
283 mmap = repo.manifest.read(change[0])
284 date1 = util.datestr(change[2])
285
279 if not changes: 286 if not changes:
280 changes = repo.changes(node1, node2, files, match=match) 287 changes = repo.changes(node1, node2, files, match=match)
281 modified, added, removed, deleted, unknown = changes 288 modified, added, removed, deleted, unknown = changes
282 if files: 289 if files:
283 modified, added, removed = map(lambda x: filterfiles(files, x), 290 modified, added, removed = map(lambda x: filterfiles(files, x),
294 return repo.file(f).read(mmap2[f]) 301 return repo.file(f).read(mmap2[f])
295 else: 302 else:
296 date2 = util.datestr() 303 date2 = util.datestr()
297 if not node1: 304 if not node1:
298 node1 = repo.dirstate.parents()[0] 305 node1 = repo.dirstate.parents()[0]
306 change = repo.changelog.read(node1)
307 mmap = repo.manifest.read(change[0])
308 date1 = util.datestr(change[2])
299 def read(f): 309 def read(f):
300 return repo.wread(f) 310 return repo.wread(f)
301 311
302 if ui.quiet: 312 if ui.quiet:
303 r = None 313 r = None
304 else: 314 else:
305 hexfunc = ui.verbose and hex or short 315 hexfunc = ui.verbose and hex or short
306 r = [hexfunc(node) for node in [node1, node2] if node] 316 r = [hexfunc(node) for node in [node1, node2] if node]
307
308 change = repo.changelog.read(node1)
309 mmap = repo.manifest.read(change[0])
310 date1 = util.datestr(change[2])
311 317
312 diffopts = ui.diffopts() 318 diffopts = ui.diffopts()
313 showfunc = opts.get('show_function') or diffopts['showfunc'] 319 showfunc = opts.get('show_function') or diffopts['showfunc']
314 ignorews = opts.get('ignore_all_space') or diffopts['ignorews'] 320 ignorews = opts.get('ignore_all_space') or diffopts['ignorews']
315 for f in modified: 321 for f in modified: