##// END OF EJS Templates
revset: make descendants() lazier...
revset: make descendants() lazier Previously descendants() would force the provided subset to become a set. In the case of revsets like '(%ld::) - (%ld)' (as used by histedit) this would force the '- (%ld)' set to be evaluated, which produced a set containing every commit in the repo (except %ld). This takes 0.6s on large repos. This changes descendants to trust the subset to implement __contains__ efficiently, which improves the above revset to 0.16s. Shaving 0.4 seconds off of histedit. revset #27: (20000::) - (20000) 0) obsolete feature not enabled but 54243 markers found! ! wall 0.023640 comb 0.020000 user 0.020000 sys 0.000000 (best of 100) 1) obsolete feature not enabled but 54243 markers found! ! wall 0.019589 comb 0.020000 user 0.020000 sys 0.000000 (best of 100) This commit removes the final revset related perf hotspot from histedit. Combined with the previous two patches, they shave a little over 3 seconds off histedit on large repos.

File last commit:

r16686:67964cda default
r22449:da05fe01 default
Show More
test-walkrepo.py
55 lines | 1.8 KiB | text/x-python | PythonLexer
Eric Hopper
test: Add tests for webdir symlinks and walkrepos.
r6341 import os
from mercurial import hg, ui
Adrian Buehlmann
move walkrepos from util to scmutil
r13975 from mercurial.scmutil import walkrepos
Matt Mackall
tests: make test-walkrepo use hg's symlink test
r16321 from mercurial.util import checklink
Eric Hopper
test: Add tests for webdir symlinks and walkrepos.
r6341 from os import mkdir, chdir
from os.path import join as pjoin
u = ui.ui()
Matt Mackall
tests: make test-walkrepo use hg's symlink test
r16321 sym = checklink('.')
Eric Hopper
test: Add tests for webdir symlinks and walkrepos.
r6341
hg.repository(u, 'top1', create=1)
mkdir('subdir')
chdir('subdir')
hg.repository(u, 'sub1', create=1)
mkdir('subsubdir')
chdir('subsubdir')
hg.repository(u, 'subsub1', create=1)
chdir(os.path.pardir)
if sym:
os.symlink(os.path.pardir, 'circle')
os.symlink(pjoin('subsubdir', 'subsub1'), 'subsub1')
def runtest():
reposet = frozenset(walkrepos('.', followsym=True))
Patrick Mezard
util: disable walkrepo() recursive behaviour...
r7494 if sym and (len(reposet) != 3):
Eric Hopper
test: Add tests for webdir symlinks and walkrepos.
r6341 print "reposet = %r" % (reposet,)
Brodie Rao
cleanup: eradicate long lines
r16683 print ("Found %d repositories when I should have found 3"
% (len(reposet),))
Patrick Mezard
util: disable walkrepo() recursive behaviour...
r7494 if (not sym) and (len(reposet) != 2):
Eric Hopper
test: Add tests for webdir symlinks and walkrepos.
r6341 print "reposet = %r" % (reposet,)
Brodie Rao
cleanup: eradicate long lines
r16683 print ("Found %d repositories when I should have found 2"
% (len(reposet),))
Eric Hopper
test: Add tests for webdir symlinks and walkrepos.
r6341 sub1set = frozenset((pjoin('.', 'sub1'),
pjoin('.', 'circle', 'subdir', 'sub1')))
if len(sub1set & reposet) != 1:
print "sub1set = %r" % (sub1set,)
print "reposet = %r" % (reposet,)
Benoit Allard
tests: test-walkrepo shouldn't throw SystemExit...
r7492 print "sub1set and reposet should have exactly one path in common."
Eric Hopper
test: Add tests for webdir symlinks and walkrepos.
r6341 sub2set = frozenset((pjoin('.', 'subsub1'),
pjoin('.', 'subsubdir', 'subsub1')))
if len(sub2set & reposet) != 1:
print "sub2set = %r" % (sub2set,)
print "reposet = %r" % (reposet,)
Benoit Allard
tests: test-walkrepo shouldn't throw SystemExit...
r7492 print "sub1set and reposet should have exactly one path in common."
Eric Hopper
test: Add tests for webdir symlinks and walkrepos.
r6341 sub3 = pjoin('.', 'circle', 'top1')
Brodie Rao
cleanup: "not x in y" -> "x not in y"
r16686 if sym and sub3 not in reposet:
Eric Hopper
test: Add tests for webdir symlinks and walkrepos.
r6341 print "reposet = %r" % (reposet,)
Benoit Allard
tests: test-walkrepo shouldn't throw SystemExit...
r7492 print "Symbolic links are supported and %s is not in reposet" % (sub3,)
Eric Hopper
test: Add tests for webdir symlinks and walkrepos.
r6341
runtest()
if sym:
# Simulate not having symlinks.
del os.path.samestat
sym = False
runtest()