view setup.py @ 1564:34579a67fa71

Re: [PATCH 2 of 3] remove walk warning about nonexistent files

On 11/15/05, Robin Farine <[e-mail]> wrote:
> # HG changeset patch
> # User Robin Farine <[e-mail]>
> # Node ID ce0a3cc309a8d1e81278ec01a3c61fbb99c691f4
> # Parent  feb77e0951e74d75c213e8471f107fdcc124c876
> remove walk warning about nonexistent files
>
> diff -r feb77e0951e7 -r ce0a3cc309a8 mercurial/dirstate.py
> --- a/mercurial/dirstate.py     Tue Nov 15 08:42:45 2005 +0100
> +++ b/mercurial/dirstate.py     Tue Nov 15 08:59:50 2005 +0100
> @@ -336,9 +336,6 @@
>              try:
>                  st = os.lstat(f)
>              except OSError, inst:
> -                if ff not in dc: self.ui.warn('%s: %s\n' % (
> -                    util.pathto(self.getcwd(), ff),
> -                    inst.strerror))
>                  continue
>              if stat.S_ISDIR(st.st_mode):
>                  cmp1 = (lambda x, y: cmp(x[1], y[1]))

this break some tests,
a better fix would be to check if ff can be a directory prefix from files in dc

you can try the attached patch.

Benoit

#!/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'))],
          cmdclass=cmdclass,
          scripts=['hg', 'hgmerge'],
          **py2exe_opts)
finally:
    mercurial.version.forget_version()