refactor version code

- simplify version detection code
- move detection code into setup.py
- move version reading function into util.py
- drop version.py code

This makes hg more closely follow its own recommendation of how to deal with
versioning your builds: use hg id in your build script.

mercurial/commands.py

@@ -11,7 +11,6 b' from i18n import _, gettext'
 import os, re, sys
 import hg, util, revlog, bundlerepo, extensions, copies, context
 import difflib, patch, time, help, mdiff, tempfile, url
-import version
 import archival, changegroup, cmdutil, hgweb.server, sshserver, hbisect
 import merge as merge_
 
@@ -2961,7 +2960,7 b' def verify(ui, repo):'
 def version_(ui):
     """output version and copyright information"""
     ui.write(_("Mercurial Distributed SCM (version %s)\n")
-             % version.get_version())
+             % util.version())
     ui.status(_(
         "\nCopyright (C) 2005-2008 Matt Mackall <[e-mail]> and others\n"
         "This is free software; see the source for copying conditions. "

mercurial/dispatch.py

@@ -8,7 +8,7 b''
 from i18n import _
 from repo import RepoError
 import os, sys, atexit, signal, pdb, socket, errno, shlex, time
-import util, commands, hg, lock, fancyopts, revlog, version, extensions, hook
+import util, commands, hg, lock, fancyopts, revlog, extensions, hook
 import cmdutil
 import ui as _ui
 
@@ -145,7 +145,7 b' def _runcatch(ui, args):'
                  "http://www.selenic.com/mercurial/bts\n"))
         ui.warn(_("** or [e-mail]\n"))
         ui.warn(_("** Mercurial Distributed SCM (version %s)\n")
-               % version.get_version())
+               % util.version())
         ui.warn(_("** Extensions loaded: %s\n")
                % ", ".join([x[0] for x in extensions.extensions()]))
         raise

mercurial/util.py

@@ -142,6 +142,14 b' def locallen(s):'
     """Find the length in characters of a local string"""
     return len(s.decode(_encoding, "replace"))
 
+def version():
+    """Return version information if available."""
+    try:
+        import __version__
+        return __version__.version
+    except ImportError:
+        return 'unknown'
+
 # used by parsedate
 defaultdateformats = (
     '%Y-%m-%d %H:%M:%S',

setup.py

@@ -26,15 +26,13 b' except:'
     raise SystemExit(
         "Couldn't import standard zlib (incomplete Python install).")
 
-import os
+import os, time
 import shutil
 import tempfile
 from distutils.core import setup, Extension
 from distutils.command.install_data import install_data
 from distutils.ccompiler import new_compiler
 
-import mercurial.version
-
 extra = {}
 scripts = ['hg']
 if os.name == 'nt':
@@ -95,8 +93,21 b' try:'
 except ImportError:
     pass
 
-# specify version string, otherwise 'hg identify' will be used:
-version = ''
+try:
+    l = os.popen('hg id -it').read().split()
+    while len(l) > 1 and l[-1][0].isalpha(): # remove non-numbered tags
+        l.pop()
+    version = l[-1] or 'unknown' # latest tag or revision number
+    if version.endswith('+'):
+        version += time.strftime('%Y%m%d')
+
+except OSError:
+    version = "unknown"
+
+f = file("mercurial/__version__.py", "w")
+f.write('# this file is autogenerated by setup.py\n')
+f.write('version = "%s"\n' % version)
+f.close()
 
 class install_package_data(install_data):
     def finalize_options(self):
@@ -104,7 +115,6 b' class install_package_data(install_data)'
                                    ('install_lib', 'install_dir'))
         install_data.finalize_options(self)
 
-mercurial.version.remember_version(version)
 cmdclass = {'install_data': install_package_data}
 
 ext_modules=[
@@ -140,7 +150,7 b' except ImportError:'
     pass
 
 setup(name='mercurial',
-      version=mercurial.version.get_version(),
+      version=version,
       author='Matt Mackall',
       author_email='[e-mail]',
       url='http://selenic.com/mercurial',

tests/test-demandimport

@@ -18,13 +18,6 b' print "os =", f(os)'
 print "os.system =", f(os.system)
 print "os =", f(os)
 
-import mercurial.version
-
-print "mercurial.version =", f(mercurial.version)
-print "mercurial.version.get_version =", f(mercurial.version.get_version)
-print "mercurial.version =", f(mercurial.version)
-print "mercurial =", f(mercurial)
-
 from mercurial import util
 
 print "util =", f(util)

tests/test-demandimport.out

@@ -1,10 +1,6 b''
 os = <unloaded module 'os'>
 os.system = <built-in function system>
 os = <module 'os' from '?'>
-mercurial.version = <unloaded module 'version'>
-mercurial.version.get_version = <function get_version at 0x?>
-mercurial.version = <module 'mercurial.version' from '?'>
-mercurial = <module 'mercurial' from '?'>
 util = <unloaded module 'util'>
 util.system = <function system at 0x?>
 util = <module 'mercurial.util' from '?'>