Make it possible to specify a version number in setup.py.

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Make it possible to specify a version number in setup.py.

manifest hash: 905feb305205801eb3833e5a84161fb57b83c86e
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)

iD8DBQFCtc/QW7P1GVgWeRoRAlCaAJ9G2GRf0wIEVEbYNoV4PjV4b024bQCfcUFf
WVYQlTXqninDXyKas2yQYdo=
=ofg/
-----END PGP SIGNATURE-----

mercurial/version.py

@@ -1,65 +1,66 b''
 # 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
 
 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')
     f.write("# This file is auto-generated.\n")
     f.write("version = %r\n" % version)
     f.close()
 
-def remember_version():
+def remember_version(version=None):
     """Store version information."""
     global remembered_version
-    if os.access(".hg", os.F_OK):
+    if not version and os.path.isdir(".hg"):
         f = os.popen("hg identify 2>/dev/null")  # 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')
-            remembered_version = True
-            write_version(version)
+    if version:
+        remembered_version = True
+        write_version(version)
 
 def forget_version():
     """Remove version information."""
     if remembered_version:
         write_version(unknown_version)
 

setup.py

@@ -1,38 +1,41 b''
 #!/usr/bin/env python
 
 # This is the mercurial setup script. 
 #
 # './setup.py install', or
 # './setup.py --help' for more options
 
 import glob
 from distutils.core import setup, Extension
 from distutils.command.install_data import install_data
 
 import mercurial.version
 
+# 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()
+    mercurial.version.remember_version(version)
     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'],
         ext_modules=[Extension('mercurial.mpatch', ['mercurial/mpatch.c'])],
         data_files=[('mercurial/templates',
                     ['templates/map'] +
                     glob.glob('templates/map-*') +
                     glob.glob('templates/*.tmpl'))], 
         cmdclass = { 'install_data' : install_package_data },
         scripts=['hg', 'hgmerge'])
 finally:
     mercurial.version.forget_version()