##// END OF EJS Templates
pathcopies: give up any optimization based on `introrev`...
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%)

File last commit:

r38851:617ae7e3 default
r43469:c16fe77e default
Show More
hggettext
163 lines | 5.2 KiB | text/plain | TextLexer
Martin Geisler
i18n: accurately generate hg.pot
r8542 #!/usr/bin/env python
#
# hggettext - carefully extract docstrings for Mercurial
#
# Copyright 2009 Matt Mackall <mpm@selenic.com> and others
#
# This software may be used and distributed according to the terms of the
Matt Mackall
Update license to GPLv2+
r10263 # GNU General Public License version 2 or any later version.
Martin Geisler
i18n: accurately generate hg.pot
r8542
# The normalize function is taken from pygettext which is distributed
# with Python under the Python License, which is GPL compatible.
"""Extract docstrings from Mercurial commands.
Compared to pygettext, this script knows about the cmdtable and table
dictionaries used by Mercurial, and will only extract docstrings from
functions mentioned therein.
Use xgettext like normal to extract strings marked as translatable and
join the message cataloges to get the final catalog.
"""
Pulkit Goyal
py3: make i18n/hggettext use print_function
r29171 from __future__ import absolute_import, print_function
Pulkit Goyal
py3: make i18n/hggettext use absolute_import
r29170
import inspect
import os
FUJIWARA Katsunori
i18n: ignore doctest part to avoid warning at "make update-pot"...
r33816 import re
Pulkit Goyal
py3: make i18n/hggettext use absolute_import
r29170 import sys
Martin Geisler
i18n: accurately generate hg.pot
r8542
def escape(s):
# The order is important, the backslash must be escaped first
# since the other replacements introduce new backslashes
# themselves.
s = s.replace('\\', '\\\\')
s = s.replace('\n', '\\n')
s = s.replace('\r', '\\r')
s = s.replace('\t', '\\t')
s = s.replace('"', '\\"')
return s
def normalize(s):
# This converts the various Python string types into a format that
# is appropriate for .po files, namely much closer to C style.
lines = s.split('\n')
if len(lines) == 1:
s = '"' + escape(s) + '"'
else:
if not lines[-1]:
del lines[-1]
lines[-1] = lines[-1] + '\n'
lines = map(escape, lines)
lineterm = '\\n"\n"'
s = '""\n"' + lineterm.join(lines) + '"'
return s
def poentry(path, lineno, s):
return ('#: %s:%d\n' % (path, lineno) +
'msgid %s\n' % normalize(s) +
'msgstr ""\n')
FUJIWARA Katsunori
i18n: ignore doctest part to avoid warning at "make update-pot"...
r33816 doctestre = re.compile(r'^ +>>> ', re.MULTILINE)
Martin Geisler
i18n: accurately generate hg.pot
r8542
FUJIWARA Katsunori
i18n: format warning of hggettext in standard compiler error style...
r38851 def offset(src, doc, name, lineno, default):
Martin Geisler
i18n: accurately generate hg.pot
r8542 """Compute offset or issue a warning on stdout."""
FUJIWARA Katsunori
i18n: ignore doctest part to avoid warning at "make update-pot"...
r33816 # remove doctest part, in order to avoid backslash mismatching
m = doctestre.search(doc)
if m:
doc = doc[:m.start()]
Martin Geisler
i18n: accurately generate hg.pot
r8542 # Backslashes in doc appear doubled in src.
end = src.find(doc.replace('\\', '\\\\'))
if end == -1:
# This can happen if the docstring contains unnecessary escape
# sequences such as \" in a triple-quoted string. The problem
# is that \" is turned into " and so doc wont appear in src.
FUJIWARA Katsunori
i18n: format warning of hggettext in standard compiler error style...
r38851 sys.stderr.write("%s:%d:warning:"
" unknown docstr offset, assuming %d lines\n"
% (name, lineno, default))
Martin Geisler
i18n: accurately generate hg.pot
r8542 return default
else:
return src.count('\n', 0, end)
def importpath(path):
"""Import a path like foo/bar/baz.py and return the baz module."""
if path.endswith('.py'):
path = path[:-3]
if path.endswith('/__init__'):
path = path[:-9]
path = path.replace('/', '.')
mod = __import__(path)
for comp in path.split('.')[1:]:
mod = getattr(mod, comp)
return mod
def docstrings(path):
"""Extract docstrings from path.
This respects the Mercurial cmdtable/table convention and will
only extract docstrings from functions mentioned in these tables.
"""
mod = importpath(path)
FUJIWARA Katsunori
i18n: ignore docstring for modules under mercurial...
r33818 if not path.startswith('mercurial/') and mod.__doc__:
Augie Fackler
cleanup: fix some latent open(path).read() et al calls we previously missed...
r36966 with open(path) as fobj:
src = fobj.read()
FUJIWARA Katsunori
i18n: format warning of hggettext in standard compiler error style...
r38851 lineno = 1 + offset(src, mod.__doc__, path, 1, 7)
Pulkit Goyal
py3: make i18n/hggettext use print_function
r29171 print(poentry(path, lineno, mod.__doc__))
Martin Geisler
i18n: accurately generate hg.pot
r8542
Patrick Mezard
hggettext: handle i18nfunctions declaration for docstrings translations
r12823 functions = list(getattr(mod, 'i18nfunctions', []))
functions = [(f, True) for f in functions]
Martin Geisler
i18n: accurately generate hg.pot
r8542 cmdtable = getattr(mod, 'cmdtable', {})
if not cmdtable:
# Maybe we are processing mercurial.commands?
cmdtable = getattr(mod, 'table', {})
Patrick Mezard
hggettext: handle i18nfunctions declaration for docstrings translations
r12823 functions.extend((c[0], False) for c in cmdtable.itervalues())
Martin Geisler
i18n: accurately generate hg.pot
r8542
Patrick Mezard
hggettext: handle i18nfunctions declaration for docstrings translations
r12823 for func, rstrip in functions:
Martin Geisler
i18n: accurately generate hg.pot
r8542 if func.__doc__:
FUJIWARA Katsunori
i18n: use saved object to get actual function information if available...
r33817 docobj = func # this might be a proxy to provide formatted doc
func = getattr(func, '_origfunc', func)
FUJIWARA Katsunori
i18n: use actual filename, in which function is defined, for hg.pot...
r33623 funcmod = inspect.getmodule(func)
extra = ''
if funcmod.__package__ == funcmod.__name__:
extra = '/__init__'
actualpath = '%s%s.py' % (funcmod.__name__.replace('.', '/'), extra)
Martin Geisler
i18n: accurately generate hg.pot
r8542 src = inspect.getsource(func)
Yuya Nishihara
i18n: use inspect.getsourcelines() to obtain lineno from func or class...
r29720 lineno = inspect.getsourcelines(func)[1]
FUJIWARA Katsunori
i18n: use saved object to get actual function information if available...
r33817 doc = docobj.__doc__
origdoc = getattr(docobj, '_origdoc', '')
Patrick Mezard
hggettext: handle i18nfunctions declaration for docstrings translations
r12823 if rstrip:
doc = doc.rstrip()
FUJIWARA Katsunori
i18n: make hggettext use original docstring to compute offset...
r33814 origdoc = origdoc.rstrip()
if origdoc:
FUJIWARA Katsunori
i18n: format warning of hggettext in standard compiler error style...
r38851 lineno += offset(src, origdoc, actualpath, lineno, 1)
FUJIWARA Katsunori
i18n: make hggettext use original docstring to compute offset...
r33814 else:
FUJIWARA Katsunori
i18n: format warning of hggettext in standard compiler error style...
r38851 lineno += offset(src, doc, actualpath, lineno, 1)
FUJIWARA Katsunori
i18n: use actual filename, in which function is defined, for hg.pot...
r33623 print(poentry(actualpath, lineno, doc))
Martin Geisler
i18n: accurately generate hg.pot
r8542
Martin Geisler
help: move help topics from mercurial/help.py to help/*.txt...
r9539 def rawtext(path):
Augie Fackler
cleanup: fix some latent open(path).read() et al calls we previously missed...
r36966 with open(path) as f:
src = f.read()
Pulkit Goyal
py3: make i18n/hggettext use print_function
r29171 print(poentry(path, 1, src))
Martin Geisler
help: move help topics from mercurial/help.py to help/*.txt...
r9539
Martin Geisler
i18n: accurately generate hg.pot
r8542 if __name__ == "__main__":
Martin Geisler
hggettext: ensure correct Mercurial is imported
r8626 # It is very important that we import the Mercurial modules from
# the source tree where hggettext is executed. Otherwise we might
# accidentally import and extract strings from a Mercurial
# installation mentioned in PYTHONPATH.
sys.path.insert(0, os.getcwd())
from mercurial import demandimport; demandimport.enable()
Martin Geisler
i18n: accurately generate hg.pot
r8542 for path in sys.argv[1:]:
Martin Geisler
help: move help topics from mercurial/help.py to help/*.txt...
r9539 if path.endswith('.txt'):
rawtext(path)
else:
docstrings(path)