Mercurial: tests/test-addremove.t@04036798ebed (annotated)

branches: avoid unnecessary changectx.branch() calls This requires reading from the changelog, which can be costly over NFS. Note that this does not totally remove reading from the changelog; we still do that when calling changectx.closesbranch(). That call will be removed in a later patch. Running hg branches on the PyPy repo (with 996) over a busy NFS server, before this change: $ time hg --profile branches > /dev/null CallCount Recursive Total(s) Inline(s) module:lineno(function) 2042 0 2.2827 2.2827 <open> 2036 0 0.9840 0.9840 <method 'close' of 'file' objects> 2036 0 0.0464 0.0464 <method 'read' of 'file' objects> 5233 0 0.1985 0.0453 mercurial.repoview:161(changelog) 10462 0 0.0791 0.0314 mercurial.changelog:133(tip) 5233 0 0.0388 0.0176 mercurial.localrepo:26(__get__) 10462 0 0.0250 0.0126 <len> 5233 0 0.0059 0.0039 mercurial.repoview:112(filterrevs) 10462 0 0.0029 0.0029 <hash> 2034 0 0.0444 0.0444 <method 'seek' of 'file' objects> 5340 0 0.0390 0.0390 mercurial.revlog:296(rev) 2582 0 0.0371 0.0371 <zlib.decompress> 3155 0 0.1963 0.0366 mercurial.context:202(__init__) 3155 0 0.1238 0.0306 mercurial.repoview:161(changelog) 3155 0 0.0261 0.0080 mercurial.changelog:183(rev) 9465 0 0.0061 0.0061 <isinstance> 1096 0 0.0023 0.0023 <binascii.unhexlify> 4251 0 0.0014 0.0014 <len> 2059 0 3.7341 0.0332 mercurial.changelog:270(read) 2059 0 3.6304 0.0307 mercurial.revlog:907(revision) 2057 0 0.0262 0.0137 mercurial.changelog:28(decodeextra) 4118 0 0.0094 0.0094 <method 'split' of 'str' objects> 4118 0 0.0270 0.0048 mercurial.encoding:61(tolocal) 2059 0 0.0040 0.0040 <method 'index' of 'str' objects> 10462 0 0.0791 0.0314 mercurial.changelog:133(tip) 10462 0 0.0289 0.0207 mercurial.changelog:190(node) 10462 0 0.0188 0.0091 <len> 52433 20932 0.0478 0.0310 <len> 20932 0 0.0221 0.0168 mercurial.revlog:262(__len__) 2059 0 3.6304 0.0307 mercurial.revlog:907(revision) real 0m4.361s user 0m0.986s sys 0m0.237s After this change: $ time hg --profile branches > /dev/null CallCount Recursive Total(s) Inline(s) module:lineno(function) 1069 0 1.1098 1.1098 <open> 1063 0 0.4865 0.4865 <method 'close' of 'file' objects> 4122 0 0.1811 0.0404 mercurial.repoview:161(changelog) 8240 0 0.0712 0.0272 mercurial.changelog:133(tip) 4122 0 0.0378 0.0177 mercurial.localrepo:26(__get__) 8240 0 0.0221 0.0115 <len> 4122 0 0.0057 0.0033 mercurial.repoview:112(filterrevs) 8240 0 0.0025 0.0025 <hash> 3029 0 0.1979 0.0371 mercurial.context:202(__init__) 3029 0 0.1278 0.0310 mercurial.repoview:161(changelog) 3029 0 0.0230 0.0081 mercurial.changelog:183(rev) 9087 0 0.0061 0.0061 <isinstance> 1096 0 0.0026 0.0026 <binascii.unhexlify> 4125 0 0.0014 0.0014 <len> 4229 0 0.0337 0.0337 mercurial.revlog:296(rev) 1061 0 0.0296 0.0296 <method 'seek' of 'file' objects> 1063 0 0.0292 0.0292 <method 'read' of 'file' objects> 8240 0 0.0712 0.0272 mercurial.changelog:133(tip) 8240 0 0.0271 0.0196 mercurial.changelog:190(node) 8240 0 0.0169 0.0083 <len> 40476 16488 0.0422 0.0271 <len> 16488 0 0.0193 0.0152 mercurial.revlog:262(__len__) 1342 0 0.0241 0.0241 <zlib.decompress> 9445 0 0.0336 0.0224 mercurial.changelog:190(node) 9445 0 0.0112 0.0112 mercurial.revlog:317(node) 1074 0 1.9102 0.0224 mercurial.changelog:270(read) 1074 0 1.8397 0.0202 mercurial.revlog:907(revision) 1073 0 0.0187 0.0099 mercurial.changelog:28(decodeextra) 2148 0 0.0061 0.0061 <method 'split' of 'str' objects> 2148 0 0.0184 0.0034 mercurial.encoding:61(tolocal) real 0m2.402s user 0m0.735s sys 0m0.177s

11850 54dbf16b401f tests: unify test-addremove Martin Geisler <mg@lazybytes.net> parents: 8990 diff changeset	1	$ hg init rep
54dbf16b401f tests: unify test-addremove Martin Geisler <mg@lazybytes.net> parents: 8990 diff changeset	2	$ cd rep
54dbf16b401f tests: unify test-addremove Martin Geisler <mg@lazybytes.net> parents: 8990 diff changeset	3	$ mkdir dir
54dbf16b401f tests: unify test-addremove Martin Geisler <mg@lazybytes.net> parents: 8990 diff changeset	4	$ touch foo dir/bar
54dbf16b401f tests: unify test-addremove Martin Geisler <mg@lazybytes.net> parents: 8990 diff changeset	5	$ hg -v addremove
54dbf16b401f tests: unify test-addremove Martin Geisler <mg@lazybytes.net> parents: 8990 diff changeset	6	adding dir/bar
54dbf16b401f tests: unify test-addremove Martin Geisler <mg@lazybytes.net> parents: 8990 diff changeset	7	adding foo
12156 4c94b6d0fb1c tests: remove unneeded -d flags Martin Geisler <mg@lazybytes.net> parents: 11850 diff changeset	8	$ hg -v commit -m "add 1"
11850 54dbf16b401f tests: unify test-addremove Martin Geisler <mg@lazybytes.net> parents: 8990 diff changeset	9	dir/bar
54dbf16b401f tests: unify test-addremove Martin Geisler <mg@lazybytes.net> parents: 8990 diff changeset	10	foo
12156 4c94b6d0fb1c tests: remove unneeded -d flags Martin Geisler <mg@lazybytes.net> parents: 11850 diff changeset	11	committed changeset 0:6f7f953567a2
11850 54dbf16b401f tests: unify test-addremove Martin Geisler <mg@lazybytes.net> parents: 8990 diff changeset	12	$ cd dir/
16874 8017ac7a0e8f test-addremove: remove bits about con.xml Adrian Buehlmann <adrian@cadifra.com> parents: 15444 diff changeset	13	$ touch ../foo_2 bar_2
11850 54dbf16b401f tests: unify test-addremove Martin Geisler <mg@lazybytes.net> parents: 8990 diff changeset	14	$ hg -v addremove
54dbf16b401f tests: unify test-addremove Martin Geisler <mg@lazybytes.net> parents: 8990 diff changeset	15	adding dir/bar_2
54dbf16b401f tests: unify test-addremove Martin Geisler <mg@lazybytes.net> parents: 8990 diff changeset	16	adding foo_2
12156 4c94b6d0fb1c tests: remove unneeded -d flags Martin Geisler <mg@lazybytes.net> parents: 11850 diff changeset	17	$ hg -v commit -m "add 2"
11850 54dbf16b401f tests: unify test-addremove Martin Geisler <mg@lazybytes.net> parents: 8990 diff changeset	18	dir/bar_2
54dbf16b401f tests: unify test-addremove Martin Geisler <mg@lazybytes.net> parents: 8990 diff changeset	19	foo_2
16874 8017ac7a0e8f test-addremove: remove bits about con.xml Adrian Buehlmann <adrian@cadifra.com> parents: 15444 diff changeset	20	committed changeset 1:e65414bf35c5
16912 6ef3107c661e tests: cleanup of tests that got lost in their own nested directories Mads Kiilerich <mads@kiilerich.com> parents: 16874 diff changeset	21	$ cd ../..
2958 ff3ea21a981a addremove: add -s/--similarity option Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1933 diff changeset	22
11850 54dbf16b401f tests: unify test-addremove Martin Geisler <mg@lazybytes.net> parents: 8990 diff changeset	23	$ hg init sim
54dbf16b401f tests: unify test-addremove Martin Geisler <mg@lazybytes.net> parents: 8990 diff changeset	24	$ cd sim
54dbf16b401f tests: unify test-addremove Martin Geisler <mg@lazybytes.net> parents: 8990 diff changeset	25	$ echo a > a
54dbf16b401f tests: unify test-addremove Martin Geisler <mg@lazybytes.net> parents: 8990 diff changeset	26	$ echo a >> a
54dbf16b401f tests: unify test-addremove Martin Geisler <mg@lazybytes.net> parents: 8990 diff changeset	27	$ echo a >> a
54dbf16b401f tests: unify test-addremove Martin Geisler <mg@lazybytes.net> parents: 8990 diff changeset	28	$ echo c > c
54dbf16b401f tests: unify test-addremove Martin Geisler <mg@lazybytes.net> parents: 8990 diff changeset	29	$ hg commit -Ama
54dbf16b401f tests: unify test-addremove Martin Geisler <mg@lazybytes.net> parents: 8990 diff changeset	30	adding a
54dbf16b401f tests: unify test-addremove Martin Geisler <mg@lazybytes.net> parents: 8990 diff changeset	31	adding c
54dbf16b401f tests: unify test-addremove Martin Geisler <mg@lazybytes.net> parents: 8990 diff changeset	32	$ mv a b
54dbf16b401f tests: unify test-addremove Martin Geisler <mg@lazybytes.net> parents: 8990 diff changeset	33	$ rm c
54dbf16b401f tests: unify test-addremove Martin Geisler <mg@lazybytes.net> parents: 8990 diff changeset	34	$ echo d > d
54dbf16b401f tests: unify test-addremove Martin Geisler <mg@lazybytes.net> parents: 8990 diff changeset	35	$ hg addremove -n -s 50 # issue 1696
54dbf16b401f tests: unify test-addremove Martin Geisler <mg@lazybytes.net> parents: 8990 diff changeset	36	removing a
54dbf16b401f tests: unify test-addremove Martin Geisler <mg@lazybytes.net> parents: 8990 diff changeset	37	adding b
54dbf16b401f tests: unify test-addremove Martin Geisler <mg@lazybytes.net> parents: 8990 diff changeset	38	removing c
54dbf16b401f tests: unify test-addremove Martin Geisler <mg@lazybytes.net> parents: 8990 diff changeset	39	adding d
54dbf16b401f tests: unify test-addremove Martin Geisler <mg@lazybytes.net> parents: 8990 diff changeset	40	recording removal of a as rename to b (100% similar)
54dbf16b401f tests: unify test-addremove Martin Geisler <mg@lazybytes.net> parents: 8990 diff changeset	41	$ hg addremove -s 50
54dbf16b401f tests: unify test-addremove Martin Geisler <mg@lazybytes.net> parents: 8990 diff changeset	42	removing a
54dbf16b401f tests: unify test-addremove Martin Geisler <mg@lazybytes.net> parents: 8990 diff changeset	43	adding b
54dbf16b401f tests: unify test-addremove Martin Geisler <mg@lazybytes.net> parents: 8990 diff changeset	44	removing c
54dbf16b401f tests: unify test-addremove Martin Geisler <mg@lazybytes.net> parents: 8990 diff changeset	45	adding d
54dbf16b401f tests: unify test-addremove Martin Geisler <mg@lazybytes.net> parents: 8990 diff changeset	46	recording removal of a as rename to b (100% similar)
54dbf16b401f tests: unify test-addremove Martin Geisler <mg@lazybytes.net> parents: 8990 diff changeset	47	$ hg commit -mb
16912 6ef3107c661e tests: cleanup of tests that got lost in their own nested directories Mads Kiilerich <mads@kiilerich.com> parents: 16874 diff changeset	48	$ cd ..

author	Brodie Rao <brodie@sf.io>
	Fri, 15 Nov 2013 23:18:08 -0500
changeset 20182	04036798ebed
parent 16912	6ef3107c661e
child 23259	9f4778027bc2
permissions	-rw-r--r--