Mercurial > hg
view Makefile @ 16721:3e6d59ae4dc2
branches: improve performance by removing redundant operations
This refactors the branches command so it collects all the information it needs
about a branch in one pass over the branch map.
In particular, it fixes an issue where the command called repo.branchtags() to
get branch tips, and then used repo.branchheads() to get the closed/open
status. Both repo methods read the changelog to determine if the branch is
closed, resulting in extra, redundant I/O.
For the PyPy repo with 744 branches and 843 branch heads, this brings
hg branches over NFS from:
CallCount Recursive Total(ms) Inline(ms) module:lineno(function)
2427 0 0.9057 0.9057 <open>
2424 0 0.4096 0.4096 <method 'close' of 'file' objects>
2424 0 0.0476 0.0476 <method 'read' of 'file' objects>
1 0 0.0468 0.0468 mercurial.revlog:637(headrevs)
+1 0 0.0000 0.0000 +<len>
2422 0 0.0443 0.0443 <method 'seek' of 'file' objects>
2962 0 0.0337 0.0337 <zlib.decompress>
2491 0 1.8008 0.0322 mercurial.changelog:182(read)
+2491 0 1.6982 0.0315 +mercurial.revlog:881(revision)
+2488 0 0.0269 0.0134 +mercurial.changelog:28(decodeextra)
+4982 0 0.0085 0.0085 +<method 'split' of 'str' objects>
+4982 0 0.0274 0.0049 +mercurial.encoding:61(tolocal)
+2491 0 0.0039 0.0039 +<method 'index' of 'str' objects>
2491 0 1.6982 0.0315 mercurial.revlog:881(revision)
+2413 0 0.0112 0.0112 +mercurial.revlog:305(rev)
+2491 0 1.5315 0.0068 +mercurial.revlog:847(_chunkraw)
+2491 0 0.0414 0.0058 +mercurial.revlog:945(_checkhash)
+2491 0 0.0028 0.0028 +mercurial.revlog:349(flags)
+2491 0 0.0025 0.0025 +<mercurial.mpatch.patches>
2422 0 1.5089 0.0286 mercurial.revlog:818(_loadchunk)
+2422 0 0.4093 0.4093 +<method 'close' of 'file' objects>
+2422 0 0.0451 0.0451 +<method 'read' of 'file' objects>
+2422 0 0.0443 0.0443 +<method 'seek' of 'file' objects>
+2422 0 0.9703 0.0096 +mercurial.store:374(__call__)
+2422 0 0.0079 0.0069 +mercurial.revlog:810(_addchunk)
5804 0 0.0204 0.0204 mercurial.revlog:305(rev)
2426 0 0.9552 0.0177 mercurial.scmutil:218(__call__)
+2426 0 0.9057 0.9057 +<open>
+2426 0 0.0120 0.0083 +os.path:80(split)
+2426 0 0.0061 0.0049 +mercurial.scmutil:92(__call__)
Time: real 1.950 secs (user 0.560+0.000 sys 0.220+0.000)
down to:
CallCount Recursive Total(ms) Inline(ms) module:lineno(function)
1545 0 0.6035 0.6035 <open>
1542 0 0.2697 0.2697 <method 'close' of 'file' objects>
1 0 0.0547 0.0547 mercurial.revlog:637(headrevs)
+1 0 0.0000 0.0000 +<len>
1542 0 0.0389 0.0389 <method 'read' of 'file' objects>
1540 0 0.0316 0.0316 <method 'seek' of 'file' objects>
1853 0 0.0227 0.0227 <zlib.decompress>
1557 0 1.2131 0.0226 mercurial.changelog:182(read)
+1557 0 1.1398 0.0221 +mercurial.revlog:881(revision)
+1555 0 0.0199 0.0094 +mercurial.changelog:28(decodeextra)
+3114 0 0.0058 0.0058 +<method 'split' of 'str' objects>
+3114 0 0.0196 0.0035 +mercurial.encoding:61(tolocal)
+1557 0 0.0026 0.0026 +<method 'index' of 'str' objects>
1557 0 1.1398 0.0221 mercurial.revlog:881(revision)
+1557 0 1.0307 0.0047 +mercurial.revlog:847(_chunkraw)
+1557 0 0.0287 0.0040 +mercurial.revlog:945(_checkhash)
+1557 0 0.0018 0.0018 +<mercurial.mpatch.patches>
+1557 0 0.0018 0.0018 +mercurial.revlog:326(node)
+1557 0 0.0417 0.0013 +mercurial.revlog:857(_chunkbase)
1540 0 1.0147 0.0210 mercurial.revlog:818(_loadchunk)
+1540 0 0.2693 0.2693 +<method 'close' of 'file' objects>
+1540 0 0.0360 0.0360 +<method 'read' of 'file' objects>
+1540 0 0.0316 0.0316 +<method 'seek' of 'file' objects>
+1540 0 0.6487 0.0070 +mercurial.store:374(__call__)
+1540 0 0.0059 0.0052 +mercurial.revlog:810(_addchunk)
3192 0 0.0173 0.0173 mercurial.revlog:305(rev)
8184 0 0.0300 0.0147 <method 'decode' of 'str' objects>
+5204 0 0.0149 0.0048 +encodings.utf_8:15(decode)
+1 0 0.0004 0.0000 +encodings:71(search_function)
43 26 0.0147 0.0129 <__import__>
Time: real 1.390 secs (user 0.450+0.000 sys 0.170+0.000)
author | Brodie Rao <brodie@sf.io> |
---|---|
date | Sun, 13 May 2012 14:04:07 +0200 |
parents | d9e2f09d5488 |
children | 3c398032bf46 |
line wrap: on
line source
# If you want to change PREFIX, do not just edit it below. The changed # value wont get passed on to recursive make calls. You should instead # override the variable on the command like: # # % make PREFIX=/opt/ install PREFIX=/usr/local export PREFIX PYTHON=python PURE= PYFILES:=$(shell find mercurial hgext doc -name '*.py') DOCFILES=mercurial/help/*.txt help: @echo 'Commonly used make targets:' @echo ' all - build program and documentation' @echo ' install - install program and man pages to PREFIX ($(PREFIX))' @echo ' install-home - install with setup.py install --home=HOME ($(HOME))' @echo ' local - build for inplace usage' @echo ' tests - run all tests in the automatic test suite' @echo ' test-foo - run only specified tests (e.g. test-merge1.t)' @echo ' dist - run all tests and create a source tarball in dist/' @echo ' clean - remove files created by other targets' @echo ' (except installed files or dist source tarball)' @echo ' update-pot - update i18n/hg.pot' @echo @echo 'Example for a system-wide installation under /usr/local:' @echo ' make all && su -c "make install" && hg version' @echo @echo 'Example for a local installation (usable in this directory):' @echo ' make local && ./hg version' all: build doc local: $(PYTHON) setup.py $(PURE) build_py -c -d . build_ext -i build_mo $(PYTHON) hg version build: $(PYTHON) setup.py $(PURE) build doc: $(MAKE) -C doc clean: -$(PYTHON) setup.py clean --all # ignore errors from this command find . \( -name '*.py[cdo]' -o -name '*.so' \) -exec rm -f '{}' ';' rm -f $(addprefix mercurial/,$(notdir $(wildcard mercurial/pure/[a-z]*.py))) rm -f MANIFEST MANIFEST.in tests/*.err rm -rf build mercurial/locale $(MAKE) -C doc clean install: install-bin install-doc install-bin: build $(PYTHON) setup.py $(PURE) install --root="$(DESTDIR)/" --prefix="$(PREFIX)" --force install-doc: doc cd doc && $(MAKE) $(MFLAGS) install install-home: install-home-bin install-home-doc install-home-bin: build $(PYTHON) setup.py $(PURE) install --home="$(HOME)" --force install-home-doc: doc cd doc && $(MAKE) $(MFLAGS) PREFIX="$(HOME)" install MANIFEST-doc: $(MAKE) -C doc MANIFEST MANIFEST.in: MANIFEST-doc hg manifest | sed -e 's/^/include /' > MANIFEST.in echo include mercurial/__version__.py >> MANIFEST.in sed -e 's/^/include /' < doc/MANIFEST >> MANIFEST.in dist: tests dist-notests dist-notests: doc MANIFEST.in TAR_OPTIONS="--owner=root --group=root --mode=u+w,go-w,a+rX-s" $(PYTHON) setup.py -q sdist check: tests tests: cd tests && $(PYTHON) run-tests.py $(TESTFLAGS) test-%: cd tests && $(PYTHON) run-tests.py $(TESTFLAGS) $@ update-pot: i18n/hg.pot i18n/hg.pot: $(PYFILES) $(DOCFILES) $(PYTHON) i18n/hggettext mercurial/commands.py \ hgext/*.py hgext/*/__init__.py \ mercurial/fileset.py mercurial/revset.py \ mercurial/templatefilters.py mercurial/templatekw.py \ mercurial/filemerge.py \ $(DOCFILES) > i18n/hg.pot # All strings marked for translation in Mercurial contain # ASCII characters only. But some files contain string # literals like this '\037\213'. xgettext thinks it has to # parse them even though they are not marked for translation. # Extracting with an explicit encoding of ISO-8859-1 will make # xgettext "parse" and ignore them. echo $(PYFILES) | xargs \ xgettext --package-name "Mercurial" \ --msgid-bugs-address "<mercurial-devel@selenic.com>" \ --copyright-holder "Matt Mackall <mpm@selenic.com> and others" \ --from-code ISO-8859-1 --join --sort-by-file --add-comments=i18n: \ -d hg -p i18n -o hg.pot $(PYTHON) i18n/posplit i18n/hg.pot %.po: i18n/hg.pot msgmerge --no-location --update $@ $^ .PHONY: help all local build doc clean install install-bin install-doc \ install-home install-home-bin install-home-doc dist dist-notests tests \ update-pot