Don't forget version at the end of setup.py, write it only if changed.

This fixes issue159: "python setup.py install" shouldn't write new files
in the working dir if one has done "python setup.py build" first.

mercurial/version.py

@@ -1,67 +1,74
 # Copyright (C) 2005 by Intevation GmbH
 # Author(s):
 # Thomas Arendsen Hein <[e-mail]>
 #
 # This program is free software under the GNU GPL (>=v2)
 # Read the file COPYING coming with the software for details.
 
 """
 Mercurial version
 """
 
 import os
 import os.path
 import re
 import time
 import util
 
 unknown_version = 'unknown'
 remembered_version = False
 
 def get_version():
     """Return version information if available."""
     try:
         from mercurial.__version__ import version
     except ImportError:
         version = unknown_version
     return version
 
 def write_version(version):
     """Overwrite version file."""
-    filename = os.path.join(os.path.dirname(__file__), '__version__.py')
-    f = open(filename, 'w')
+    if version == get_version():
+        return
+    directory = os.path.dirname(__file__)
+    for suffix in ['py', 'pyc', 'pyo']:
+        try:
+            os.unlink(os.path.join(directory, '__version__.%s' % suffix))
+        except OSError:
+            pass
+    f = open(os.path.join(directory, '__version__.py'), 'w')
     f.write("# This file is auto-generated.\n")
     f.write("version = %r\n" % version)
     f.close()
 
 def remember_version(version=None):
     """Store version information."""
     global remembered_version
     if not version and os.path.isdir(".hg"):
         f = os.popen("hg identify 2> %s" % util.nulldev)  # use real hg installation
         ident = f.read()[:-1]
         if not f.close() and ident:
             ids = ident.split(' ', 1)
             version = ids.pop(0)
             if version[-1] == '+':
                 version = version[:-1]
                 modified = True
             else:
                 modified = False
             if version.isalnum() and ids:
                 for tag in ids[0].split('/'):
                     # is a tag is suitable as a version number?
                     if re.match(r'^(\d+\.)+[\w.-]+$', tag):
                         version = tag
                         break
             if modified:
                 version += time.strftime('+%Y%m%d')
     if version:
         remembered_version = True
         write_version(version)
 
 def forget_version():
     """Remove version information."""
     if remembered_version:
         write_version(unknown_version)
 

setup.py

@@ -1,106 +1,103
 #!/usr/bin/env python
 #
 # This is the mercurial setup script.
 #
 # './setup.py install', or
 # './setup.py --help' for more options
 
 import sys
 if not hasattr(sys, 'version_info') or sys.version_info < (2, 3):
     raise SystemExit, "Mercurial requires python 2.3 or later."
 
 import glob
 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()
+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)