Mercurial > hg
view tests/test-revset-legacy-lookup.t @ 43198:c16fe77e340a
pathcopies: give up any optimization based on `introrev`
Between 8a0136f69027 and d98fb3f42f33, we sped up the search for the
introduction revision during path copies. However, further checking show that
finding the introduction revision is still expensive and that we are better off
without it. So we simply drop it and only rely on the linkrev optimisation.
I ran `perfpathcopies` on 6989 pair of revision in the pypy
repository (`hg perfhelper-pathcopies`. The result is massively in favor of
dropping this condition. The result of the copy tracing are unchanged.
Attempt to use a smaller changes preserving linkrev usage were unsuccessful, it
can return wrong result. The following changesets broke test-mv-cp-st-diff.t
- if not f.isintroducedafter(limit):
+ if limit >= 0 and f.linkrev() < limit:
return None
Here are various numbers (before this changeset/after this changesets)
source destination before after saved-time ratio
worth cases e66f24650daf 695dfb0f493b 1.062843 1.246369 -0.183526 1.172675
c979853a3b6a 8d60fe293e79 1.036985 1.196414 -0.159429 1.153743
22349fa2fc33 fbb1c9fd86c0 0.879926 1.038682 -0.158756 1.180420
682b98f3e672 a4878080a536 0.909952 1.063801 -0.153849 1.169074
5adabc9b9848 920958a93997 0.993622 1.147452 -0.153830 1.154817
worse 1% dbfbfcf077e9 aea8f2fd3593 1.016595 1.082999 -0.066404 1.065320
worse 5% c95f1ced15f2 7d29d5e39734 0.453694 0.471156 -0.017462 1.038488
worse 10% 3e144ed1d5b7 2aef0e942480 0.035140 0.037535 -0.002395 1.068156
worse 25% 321fc60db035 801748ba582a 0.009267 0.009325 -0.000058 1.006259
median 2088ce763fc2 e6991321d78b 0.000665 0.000651 0.000014 0.978947
best 25% 915631a97de6 385b31354be6 0.040743 0.040363 0.000380 0.990673
best 10% ad495c36a765 19c10384d3e7 0.431658 0.411490 0.020168 0.953278
best 5% d13ae7d283ae 813c99f810ac 1.141404 1.075346 0.066058 0.942126
best 1% 81593cb4a496 99ae11866969 1.833297 0.063823 1.769474 0.034813
best cases c3b14617fbd7 743a0fcaa4eb 1101.811740 2.735970 1099.075770 0.002483
c3b14617fbd7 9ba6ab77fd29 1116.753953 2.800729 1113.953224 0.002508
058b99d6e81f 57e249b7a3ea 1246.128485 3.042762 1243.085723 0.002442
9a8c361aab49 0354a250d371 1253.111894 3.085796 1250.026098 0.002463
442dbbc53c68 3ec1002a818c 1261.786294 3.138607 1258.647687 0.002487
As one can see, the average case is not really impacted. However, the worth case
we get after this changeset are much better than the one we had before it. We
have 30 pairs where improvements are above 10 minutes.
This reflect in the combined time for all pairs
before: 26256s
after: 1300s (-95%)
If we remove these pathological 30 cases, we still see a significant improvements:
before: 1631s
after: 1245s (-24%)
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Thu, 10 Oct 2019 03:49:33 +0200 |
parents | 29eb4cafeeb8 |
children | ed84a4d48910 |
line wrap: on
line source
$ cat >> $HGRCPATH << EOF > [ui] > logtemplate="{rev}:{node|short} {desc} [{tags}]\n" > EOF $ hg init legacy-lookup $ cd legacy-lookup $ echo a > a $ hg add a $ hg commit -m 'first' $ echo aa > a $ hg commit -m 'second' $ hg log -G @ 1:43114e71eddd second [tip] | o 0:a87874c6ec31 first [] Create a tag that looks like a revset $ hg tag 'rev(0)' $ hg log -G @ 2:fb616635b18f Added tag rev(0) for changeset 43114e71eddd [tip] | o 1:43114e71eddd second [rev(0)] | o 0:a87874c6ec31 first [] See how various things are resolved ----------------------------------- Revision numbers $ hg log -r '0' 0:a87874c6ec31 first [] $ hg log -r '1' 1:43114e71eddd second [rev(0)] "rev(x)" form (the one conflicting with the tags) (resolved as a label) $ hg log -r 'rev(0)' 1:43114e71eddd second [rev(0)] $ hg log -r 'rev(1)' 1:43114e71eddd second [rev(0)] same within a simple revspec (still resolved as the label) $ hg log -r ':rev(0)' 0:a87874c6ec31 first [] 1:43114e71eddd second [rev(0)] $ hg log -r 'rev(0):' 1:43114e71eddd second [rev(0)] 2:fb616635b18f Added tag rev(0) for changeset 43114e71eddd [tip] within a more advances revset (still resolved as the label) $ hg log -r 'rev(0) and branch(default)' 0:a87874c6ec31 first [] with explicit revset resolution (still resolved as the label) $ hg log -r 'revset(rev(0))' 0:a87874c6ec31 first [] some of the above with quote to force its resolution as a label $ hg log -r ':"rev(0)"' 0:a87874c6ec31 first [] 1:43114e71eddd second [rev(0)] $ hg log -r '"rev(0)":' 1:43114e71eddd second [rev(0)] 2:fb616635b18f Added tag rev(0) for changeset 43114e71eddd [tip] $ hg log -r '"rev(0)" and branch(default)' 1:43114e71eddd second [rev(0)] confusing bits within parents $ hg log -r '(rev(0))' 0:a87874c6ec31 first [] $ hg log -r '( rev(0))' 0:a87874c6ec31 first [] $ hg log -r '("rev(0)")' 1:43114e71eddd second [rev(0)] Test label with quote in them. $ hg tag '"foo"' $ hg log -r '"foo"' 2:fb616635b18f Added tag rev(0) for changeset 43114e71eddd ["foo"] $ hg log -r '("foo")' abort: unknown revision 'foo'! [255] $ hg log -r 'revset("foo")' abort: unknown revision 'foo'! [255] $ hg log -r '("\"foo\"")' 2:fb616635b18f Added tag rev(0) for changeset 43114e71eddd ["foo"] $ hg log -r 'revset("\"foo\"")' 2:fb616635b18f Added tag rev(0) for changeset 43114e71eddd ["foo"] Test label with dash in them. $ hg tag 'foo-bar' $ hg log -r 'foo-bar' 3:a50aae922707 Added tag "foo" for changeset fb616635b18f [foo-bar] $ hg log -r '(foo-bar)' 3:a50aae922707 Added tag "foo" for changeset fb616635b18f [foo-bar] $ hg log -r '"foo-bar"' 3:a50aae922707 Added tag "foo" for changeset fb616635b18f [foo-bar] $ hg log -r '("foo-bar")' 3:a50aae922707 Added tag "foo" for changeset fb616635b18f [foo-bar] Test label with + in them. $ hg tag 'foo+bar' $ hg log -r 'foo+bar' 4:bbf52b87b370 Added tag foo-bar for changeset a50aae922707 [foo+bar] $ hg log -r '(foo+bar)' abort: unknown revision 'foo'! [255] $ hg log -r 'revset(foo+bar)' abort: unknown revision 'foo'! [255] $ hg log -r '"foo+bar"' 4:bbf52b87b370 Added tag foo-bar for changeset a50aae922707 [foo+bar] $ hg log -r '("foo+bar")' 4:bbf52b87b370 Added tag foo-bar for changeset a50aae922707 [foo+bar] Test tag with numeric version number. $ hg tag '1.2' $ hg log -r '1.2' 5:ff42fde8edbb Added tag foo+bar for changeset bbf52b87b370 [1.2] $ hg log -r '(1.2)' 5:ff42fde8edbb Added tag foo+bar for changeset bbf52b87b370 [1.2] $ hg log -r 'revset(1.2)' 5:ff42fde8edbb Added tag foo+bar for changeset bbf52b87b370 [1.2] $ hg log -r '"1.2"' 5:ff42fde8edbb Added tag foo+bar for changeset bbf52b87b370 [1.2] $ hg log -r '("1.2")' 5:ff42fde8edbb Added tag foo+bar for changeset bbf52b87b370 [1.2] $ hg log -r '::"1.2"' 0:a87874c6ec31 first [] 1:43114e71eddd second [rev(0)] 2:fb616635b18f Added tag rev(0) for changeset 43114e71eddd ["foo"] 3:a50aae922707 Added tag "foo" for changeset fb616635b18f [foo-bar] 4:bbf52b87b370 Added tag foo-bar for changeset a50aae922707 [foo+bar] 5:ff42fde8edbb Added tag foo+bar for changeset bbf52b87b370 [1.2] $ hg log -r '::1.2' 0:a87874c6ec31 first [] 1:43114e71eddd second [rev(0)] 2:fb616635b18f Added tag rev(0) for changeset 43114e71eddd ["foo"] 3:a50aae922707 Added tag "foo" for changeset fb616635b18f [foo-bar] 4:bbf52b87b370 Added tag foo-bar for changeset a50aae922707 [foo+bar] 5:ff42fde8edbb Added tag foo+bar for changeset bbf52b87b370 [1.2] Test tag with parenthesis (but not a valid revset) $ hg tag 'release_4.1(candidate1)' $ hg log -r 'release_4.1(candidate1)' 6:db72e24fe069 Added tag 1.2 for changeset ff42fde8edbb [release_4.1(candidate1)] $ hg log -r '(release_4.1(candidate1))' hg: parse error: unknown identifier: release_4.1 [255] $ hg log -r 'revset(release_4.1(candidate1))' hg: parse error: unknown identifier: release_4.1 [255] $ hg log -r '"release_4.1(candidate1)"' 6:db72e24fe069 Added tag 1.2 for changeset ff42fde8edbb [release_4.1(candidate1)] $ hg log -r '("release_4.1(candidate1)")' 6:db72e24fe069 Added tag 1.2 for changeset ff42fde8edbb [release_4.1(candidate1)] $ hg log -r '::"release_4.1(candidate1)"' 0:a87874c6ec31 first [] 1:43114e71eddd second [rev(0)] 2:fb616635b18f Added tag rev(0) for changeset 43114e71eddd ["foo"] 3:a50aae922707 Added tag "foo" for changeset fb616635b18f [foo-bar] 4:bbf52b87b370 Added tag foo-bar for changeset a50aae922707 [foo+bar] 5:ff42fde8edbb Added tag foo+bar for changeset bbf52b87b370 [1.2] 6:db72e24fe069 Added tag 1.2 for changeset ff42fde8edbb [release_4.1(candidate1)] $ hg log -r '::release_4.1(candidate1)' hg: parse error: unknown identifier: release_4.1 [255] Test tag with parenthesis and other function like char $ hg tag 'release_4.1(arch=x86,arm)' $ hg log -r 'release_4.1(arch=x86,arm)' 7:b29b25d7d687 Added tag release_4.1(candidate1) for changeset db72e24fe069 [release_4.1(arch=x86,arm)] $ hg log -r '(release_4.1(arch=x86,arm))' hg: parse error: unknown identifier: release_4.1 [255] $ hg log -r 'revset(release_4.1(arch=x86,arm))' hg: parse error: unknown identifier: release_4.1 [255] $ hg log -r '"release_4.1(arch=x86,arm)"' 7:b29b25d7d687 Added tag release_4.1(candidate1) for changeset db72e24fe069 [release_4.1(arch=x86,arm)] $ hg log -r '("release_4.1(arch=x86,arm)")' 7:b29b25d7d687 Added tag release_4.1(candidate1) for changeset db72e24fe069 [release_4.1(arch=x86,arm)] $ hg log -r '::"release_4.1(arch=x86,arm)"' 0:a87874c6ec31 first [] 1:43114e71eddd second [rev(0)] 2:fb616635b18f Added tag rev(0) for changeset 43114e71eddd ["foo"] 3:a50aae922707 Added tag "foo" for changeset fb616635b18f [foo-bar] 4:bbf52b87b370 Added tag foo-bar for changeset a50aae922707 [foo+bar] 5:ff42fde8edbb Added tag foo+bar for changeset bbf52b87b370 [1.2] 6:db72e24fe069 Added tag 1.2 for changeset ff42fde8edbb [release_4.1(candidate1)] 7:b29b25d7d687 Added tag release_4.1(candidate1) for changeset db72e24fe069 [release_4.1(arch=x86,arm)] $ hg log -r '::release_4.1(arch=x86,arm)' hg: parse error: unknown identifier: release_4.1 [255] Test tag conflicting with revset function $ hg tag 'secret(team=foo,project=bar)' $ hg log -r 'secret(team=foo,project=bar)' 8:6b2e2d4ea455 Added tag release_4.1(arch=x86,arm) for changeset b29b25d7d687 [secret(team=foo,project=bar)] $ hg log -r '(secret(team=foo,project=bar))' hg: parse error: secret takes no arguments [255] $ hg log -r 'revset(secret(team=foo,project=bar))' hg: parse error: secret takes no arguments [255] $ hg log -r '"secret(team=foo,project=bar)"' 8:6b2e2d4ea455 Added tag release_4.1(arch=x86,arm) for changeset b29b25d7d687 [secret(team=foo,project=bar)] $ hg log -r '("secret(team=foo,project=bar)")' 8:6b2e2d4ea455 Added tag release_4.1(arch=x86,arm) for changeset b29b25d7d687 [secret(team=foo,project=bar)] $ hg log -r '::"secret(team=foo,project=bar)"' 0:a87874c6ec31 first [] 1:43114e71eddd second [rev(0)] 2:fb616635b18f Added tag rev(0) for changeset 43114e71eddd ["foo"] 3:a50aae922707 Added tag "foo" for changeset fb616635b18f [foo-bar] 4:bbf52b87b370 Added tag foo-bar for changeset a50aae922707 [foo+bar] 5:ff42fde8edbb Added tag foo+bar for changeset bbf52b87b370 [1.2] 6:db72e24fe069 Added tag 1.2 for changeset ff42fde8edbb [release_4.1(candidate1)] 7:b29b25d7d687 Added tag release_4.1(candidate1) for changeset db72e24fe069 [release_4.1(arch=x86,arm)] 8:6b2e2d4ea455 Added tag release_4.1(arch=x86,arm) for changeset b29b25d7d687 [secret(team=foo,project=bar)] $ hg log -r '::secret(team=foo,project=bar)' hg: parse error: secret takes no arguments [255] Test tag with space $ hg tag 'my little version' $ hg log -r 'my little version' 9:269192bf8fc3 Added tag secret(team=foo,project=bar) for changeset 6b2e2d4ea455 [my little version] $ hg log -r '(my little version)' hg: parse error at 4: unexpected token: symbol ((my little version) ^ here) [255] $ hg log -r 'revset(my little version)' hg: parse error at 10: unexpected token: symbol (revset(my little version) ^ here) [255] $ hg log -r '"my little version"' 9:269192bf8fc3 Added tag secret(team=foo,project=bar) for changeset 6b2e2d4ea455 [my little version] $ hg log -r '("my little version")' 9:269192bf8fc3 Added tag secret(team=foo,project=bar) for changeset 6b2e2d4ea455 [my little version] $ hg log -r '::"my little version"' 0:a87874c6ec31 first [] 1:43114e71eddd second [rev(0)] 2:fb616635b18f Added tag rev(0) for changeset 43114e71eddd ["foo"] 3:a50aae922707 Added tag "foo" for changeset fb616635b18f [foo-bar] 4:bbf52b87b370 Added tag foo-bar for changeset a50aae922707 [foo+bar] 5:ff42fde8edbb Added tag foo+bar for changeset bbf52b87b370 [1.2] 6:db72e24fe069 Added tag 1.2 for changeset ff42fde8edbb [release_4.1(candidate1)] 7:b29b25d7d687 Added tag release_4.1(candidate1) for changeset db72e24fe069 [release_4.1(arch=x86,arm)] 8:6b2e2d4ea455 Added tag release_4.1(arch=x86,arm) for changeset b29b25d7d687 [secret(team=foo,project=bar)] 9:269192bf8fc3 Added tag secret(team=foo,project=bar) for changeset 6b2e2d4ea455 [my little version] $ hg log -r '::my little version' hg: parse error at 5: invalid token (::my little version ^ here) [255]