view setup.py @ 1803:06e7447c7302

speed up hg log --patch

Changing dodiff to read the manifest/changelog for node1 before calling
repo.update allows us to take advantage of the revlog revision cache.

Before this patch and my previous "speed up hg log --debug" patch, when
using hg log -p to display three revisions (A, B and C), dodiff and
repo.changes would end up reading the manifests in this order:

 B A B A C B C B

With both patches, this order becomes:

 A A B B B B C C

(This considers only dodiff and repo.changes.  I'm not sure how other
parts of hg log enter the picture.)

The speed up will depend on the revisions being displayed.  (All
"before" times already have my previous "speed up hg log --debug" patch
applied.)

hg repo (tip = 414e81ae971f).  hg log -p
         before           after
real    0m50.981s       0m45.279s
user    0m47.930s       0m42.560s
sys     0m2.526s        0m2.523s
output size: 6917897 bytes

kernel repo (tip = 9d4e135960ed).  hg log -p -l64
         before           after
real    2m14.995s       1m45.025s
user    2m9.509s        1m33.900s
sys     0m3.663s        0m2.942s
output size: 31497621 bytes

same kernel repo.  hg log -p -l64 -r c84c2069592f:0
         before           after
real    1m48.045s       1m0.076s
user    1m44.094s       0m58.492s
sys     0m2.603s        0m1.103s
output size: 197983 bytes

c84c2069592f was the tip of a 10 day old kernel repo that I had lying
around and was where I first tested this patch.  For some weird
coincidence it's also a place where the patch makes a huge difference.

#!/usr/bin/env python
#
# This is the mercurial setup script.
#
# './setup.py install', or
# './setup.py --help' for more options

import glob
import sys
from distutils.core import setup, Extension
from distutils.command.install_data import install_data

import mercurial.version

# py2exe needs to be installed to work
try:
    import py2exe

    # Help py2exe to find win32com.shell
    try:
        import modulefinder
        import win32com
        for p in win32com.__path__[1:]: # Take the path to win32comext
            modulefinder.AddPackagePath("win32com", p)
        pn = "win32com.shell"
        __import__(pn)
        m = sys.modules[pn]
        for p in m.__path__[1:]:
            modulefinder.AddPackagePath(pn, p)
    except ImportError:
        pass

    # Due to the use of demandload py2exe is not finding the modules.
    # packagescan.getmodules creates a list of modules included in
    # the mercurial package plus depdent modules.
    import mercurial.packagescan
    from py2exe.build_exe import py2exe as build_exe

    class py2exe_for_demandload(build_exe):
        """ overwrites the py2exe command class for getting the build
        directory and for setting the 'includes' option."""
        def initialize_options(self):
            self.build_lib = None
            build_exe.initialize_options(self)
        def finalize_options(self):
            # Get the build directory, ie. where to search for modules.
            self.set_undefined_options('build',
                                       ('build_lib', 'build_lib'))
            # Sets the 'includes' option with the list of needed modules
            if not self.includes:
                self.includes = []
            else:
                self.includes = self.includes.split(',')
            self.includes += mercurial.packagescan.getmodules(self.build_lib,
                                                              'mercurial')
            self.includes += mercurial.packagescan.getmodules(self.build_lib,
                                                              'hgext')
            build_exe.finalize_options(self)
except ImportError:
    py2exe_for_demandload = None


# specify version string, otherwise 'hg identify' will be used:
version = ''

class install_package_data(install_data):
    def finalize_options(self):
        self.set_undefined_options('install',
                                   ('install_lib', 'install_dir'))
        install_data.finalize_options(self)

try:
    mercurial.version.remember_version(version)
    cmdclass = {'install_data': install_package_data}
    py2exe_opts = {}
    if py2exe_for_demandload is not None:
        cmdclass['py2exe'] = py2exe_for_demandload
        py2exe_opts['console'] = ['hg']
    setup(name='mercurial',
          version=mercurial.version.get_version(),
          author='Matt Mackall',
          author_email='[e-mail]',
          url='http://selenic.com/mercurial',
          description='Scalable distributed SCM',
          license='GNU GPL',
          packages=['mercurial', 'hgext'],
          ext_modules=[Extension('mercurial.mpatch', ['mercurial/mpatch.c']),
                       Extension('mercurial.bdiff', ['mercurial/bdiff.c'])],
          data_files=[('mercurial/templates',
                       ['templates/map'] +
                       glob.glob('templates/map-*') +
                       glob.glob('templates/*.tmpl')),
                      ('mercurial/templates/static',
                       glob.glob('templates/static/*'))],
          cmdclass=cmdclass,
          scripts=['hg', 'hgmerge'],
          options=dict(bdist_mpkg=dict(zipdist=True,
                                       license='COPYING',
                                       readme='contrib/macosx/Readme.html',
                                       welcome='contrib/macosx/Welcome.html')),
          **py2exe_opts)
finally:
    mercurial.version.forget_version()