Mercurial > hg
view tests/test-byteify-strings.t @ 43252:32187ae9eeb3
copies: simplify the handling of merges
Instead of stacking copies for both parent on the head, we move copies outside
of the heap into a dedicated dictionary. The two side of merge can we merged
sooner, making the algorithm simpler.
This simplicity reflect in the heap structure and speed up the execution for
copies involving a large amount of merges.
Here are timing for perfpathcopies of multiple revision pairs.
- filelog: timing using filelog (with the introrev condition dropped)
- base: this series base
- before: the parent of this changeset
- after: this changeset
revision: large amount; added files: large amount; rename small amount; c3b14617fbd7 9ba6ab77fd29
filelog: ! wall 3.679613 comb 3.680000 user 3.580000 sys 0.100000 (median of 3)
base: ! wall 8.884369 comb 8.880000 user 8.850000 sys 0.030000 (median of 3)
before: ! wall 8.443747 comb 8.420000 user 8.410000 sys 0.010000 (median of 3)
after: ! wall 4.697917 comb 4.690000 user 4.660000 sys 0.030000 (median of 3)
revision: large amount; added files: small amount; rename small amount; c3b14617fbd7 f650a9b140d2
filelog: ! wall 0.003357 comb 0.010000 user 0.010000 sys 0.000000 (median of 781)
base: ! wall 12.398524 comb 12.400000 user 12.330000 sys 0.070000 (median of 3)
before: ! wall 10.852593 comb 10.850000 user 10.800000 sys 0.050000 (median of 3)
after: ! wall 6.750832 comb 6.750000 user 6.640000 sys 0.110000 (median of 3)
revision: large amount; added files: large amount; rename large amount; 08ea3258278e d9fa043f30c0
filelog: ! wall 2.754687 comb 2.760000 user 2.650000 sys 0.110000 (median of 4)
base: ! wall 1.423166 comb 1.420000 user 1.400000 sys 0.020000 (median of 8)
before: ! wall 1.068041 comb 1.060000 user 1.050000 sys 0.010000 (median of 10)
after: ! wall 1.045916 comb 1.050000 user 1.040000 sys 0.010000 (median of 10)
revision: small amount; added files: large amount; rename large amount; df6f7a526b60 a83dc6a2d56f
filelog: ! wall 1.552293 comb 1.550000 user 1.510000 sys 0.040000 (median of 6
base: ! wall 0.022662 comb 0.020000 user 0.020000 sys 0.000000 (median of 128)
before: ! wall 0.021111 comb 0.020000 user 0.020000 sys 0.000000 (median of 139)
after: ! wall 0.021577 comb 0.020000 user 0.020000 sys 0.000000 (median of 138)
revision: small amount; added files: large amount; rename small amount; 4aa4e1f8e19a 169138063d63
filelog: ! wall 1.500983 comb 1.500000 user 1.420000 sys 0.080000 (median of 7)
base: ! wall 0.006956 comb 0.010000 user 0.010000 sys 0.000000 (median of 392)
before: ! wall 0.004356 comb 0.010000 user 0.010000 sys 0.000000 (median of 675)
after: ! wall 0.004329 comb 0.000000 user 0.000000 sys 0.000000 (median of 682)
revision: small amount; added files: small amount; rename small amount; 4bc173b045a6 964879152e2e
filelog: ! wall 0.011745 comb 0.020000 user 0.020000 sys 0.000000 (median of 250)
base: ! wall 0.000156 comb 0.000000 user 0.000000 sys 0.000000 (median of 17180)
before: ! wall 0.000100 comb 0.000000 user 0.000000 sys 0.000000 (median of 26912)
after: ! wall 0.000105 comb 0.000000 user 0.000000 sys 0.000000 (median of 25689)
revision: medium amount; added files: large amount; rename medium amount; c95f1ced15f2 2c68e87c3efe
filelog: ! wall 3.228230 comb 3.230000 user 3.110000 sys 0.120000 (median of 4)
base: ! wall 0.997640 comb 1.000000 user 0.980000 sys 0.020000 (median of 10)
before: ! wall 0.778291 comb 0.780000 user 0.780000 sys 0.000000 (median of 13)
after: ! wall 0.706594 comb 0.710000 user 0.710000 sys 0.000000 (median of 15)
revision: medium amount; added files: medium amount; rename small amount; d343da0c55a8 d7746d32bf9d
filelog: ! wall 1.052501 comb 1.060000 user 1.040000 sys 0.020000 (median of 10
base: ! wall 0.214519 comb 0.220000 user 0.220000 sys 0.000000 (median of 45)
before: ! wall 0.160804 comb 0.160000 user 0.160000 sys 0.000000 (median of 62)
after: ! wall 0.163736 comb 0.160000 user 0.160000 sys 0.000000 (median of 60)
Differential Revision: https://phab.mercurial-scm.org/D7069
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Wed, 02 Oct 2019 13:43:27 -0400 |
parents | 11498aa91c03 |
children | bb509f39d387 |
line wrap: on
line source
#require py3 $ byteify_strings () { > $PYTHON "$TESTDIR/../contrib/byteify-strings.py" "$@" > } Test version $ byteify_strings --version Byteify strings * (glob) Test in-place $ cat > testfile.py <<EOF > obj['test'] = b"1234" > mydict.iteritems() > EOF $ byteify_strings testfile.py -i $ cat testfile.py obj[b'test'] = b"1234" mydict.iteritems() Test with dictiter $ cat > testfile.py <<EOF > obj['test'] = b"1234" > mydict.iteritems() > EOF $ byteify_strings testfile.py --dictiter obj[b'test'] = b"1234" mydict.items() Test kwargs-like objects $ cat > testfile.py <<EOF > kwargs['test'] = "123" > kwargs[test['testing']] > kwargs[test[[['testing']]]] > kwargs[kwargs['testing']] > kwargs.get('test') > kwargs.pop('test') > kwargs.get('test', 'testing') > kwargs.pop('test', 'testing') > kwargs.setdefault('test', 'testing') > > opts['test'] = "123" > opts[test['testing']] > opts[test[[['testing']]]] > opts[opts['testing']] > opts.get('test') > opts.pop('test') > opts.get('test', 'testing') > opts.pop('test', 'testing') > opts.setdefault('test', 'testing') > > commitopts['test'] = "123" > commitopts[test['testing']] > commitopts[test[[['testing']]]] > commitopts[commitopts['testing']] > commitopts.get('test') > commitopts.pop('test') > commitopts.get('test', 'testing') > commitopts.pop('test', 'testing') > commitopts.setdefault('test', 'testing') > EOF $ byteify_strings testfile.py --treat-as-kwargs kwargs opts commitopts kwargs['test'] = b"123" kwargs[test[b'testing']] kwargs[test[[[b'testing']]]] kwargs[kwargs['testing']] kwargs.get('test') kwargs.pop('test') kwargs.get('test', b'testing') kwargs.pop('test', b'testing') kwargs.setdefault('test', b'testing') opts['test'] = b"123" opts[test[b'testing']] opts[test[[[b'testing']]]] opts[opts['testing']] opts.get('test') opts.pop('test') opts.get('test', b'testing') opts.pop('test', b'testing') opts.setdefault('test', b'testing') commitopts['test'] = b"123" commitopts[test[b'testing']] commitopts[test[[[b'testing']]]] commitopts[commitopts['testing']] commitopts.get('test') commitopts.pop('test') commitopts.get('test', b'testing') commitopts.pop('test', b'testing') commitopts.setdefault('test', b'testing') Test attr*() as methods $ cat > testfile.py <<EOF > setattr(o, 'a', 1) > util.setattr(o, 'ae', 1) > util.getattr(o, 'alksjdf', 'default') > util.addattr(o, 'asdf') > util.hasattr(o, 'lksjdf', 'default') > util.safehasattr(o, 'lksjdf', 'default') > @eh.wrapfunction(func, 'lksjdf') > def f(): > pass > @eh.wrapclass(klass, 'lksjdf') > def f(): > pass > EOF $ byteify_strings testfile.py --allow-attr-methods setattr(o, 'a', 1) util.setattr(o, 'ae', 1) util.getattr(o, 'alksjdf', b'default') util.addattr(o, 'asdf') util.hasattr(o, 'lksjdf', b'default') util.safehasattr(o, 'lksjdf', b'default') @eh.wrapfunction(func, 'lksjdf') def f(): pass @eh.wrapclass(klass, 'lksjdf') def f(): pass Test without attr*() as methods $ cat > testfile.py <<EOF > setattr(o, 'a', 1) > util.setattr(o, 'ae', 1) > util.getattr(o, 'alksjdf', 'default') > util.addattr(o, 'asdf') > util.hasattr(o, 'lksjdf', 'default') > util.safehasattr(o, 'lksjdf', 'default') > @eh.wrapfunction(func, 'lksjdf') > def f(): > pass > @eh.wrapclass(klass, 'lksjdf') > def f(): > pass > EOF $ byteify_strings testfile.py setattr(o, 'a', 1) util.setattr(o, b'ae', 1) util.getattr(o, b'alksjdf', b'default') util.addattr(o, b'asdf') util.hasattr(o, b'lksjdf', b'default') util.safehasattr(o, b'lksjdf', b'default') @eh.wrapfunction(func, b'lksjdf') def f(): pass @eh.wrapclass(klass, b'lksjdf') def f(): pass Test ignore comments $ cat > testfile.py <<EOF > # py3-transform: off > "none" > "of" > 'these' > s = """should""" > d = '''be''' > # py3-transform: on > "this should" > 'and this also' > > # no-py3-transform > l = "this should be ignored" > l2 = "this shouldn't" > > EOF $ byteify_strings testfile.py # py3-transform: off "none" "of" 'these' s = """should""" d = '''be''' # py3-transform: on b"this should" b'and this also' # no-py3-transform l = "this should be ignored" l2 = b"this shouldn't" Test triple-quoted strings $ cat > testfile.py <<EOF > """This is ignored > """ > > line = """ > This should not be > """ > line = ''' > Neither should this > ''' > EOF $ byteify_strings testfile.py """This is ignored """ line = b""" This should not be """ line = b''' Neither should this ''' Test prefixed strings $ cat > testfile.py <<EOF > obj['test'] = b"1234" > obj[r'test'] = u"1234" > EOF $ byteify_strings testfile.py obj[b'test'] = b"1234" obj[r'test'] = u"1234" Test multi-line alignment $ cat > testfile.py <<'EOF' > def foo(): > error.Abort(_("foo" > "bar" > "%s") > % parameter) > { > 'test': dict, > 'test2': dict, > } > [ > "thing", > "thing2" > ] > ( > "tuple", > "tuple2", > ) > {"thing", > } > EOF $ byteify_strings testfile.py def foo(): error.Abort(_(b"foo" b"bar" b"%s") % parameter) { b'test': dict, b'test2': dict, } [ b"thing", b"thing2" ] ( b"tuple", b"tuple2", ) {b"thing", }