51 lines
1.6 KiB
Text
51 lines
1.6 KiB
Text
diff -r 4d79ed5b9ecd mercurial-1.2.1/setup.py
|
|
--- setup.py Fri May 15 13:58:32 2009 +0400
|
|
+++ setup.py Fri May 15 14:02:00 2009 +0400
|
|
@@ -97,10 +97,7 @@
|
|
except ImportError:
|
|
pass
|
|
|
|
-def getversion():
|
|
- if not os.path.exists('.hg'):
|
|
- return None # not in a repository
|
|
-
|
|
+if os.path.exists('.hg'):
|
|
# execute hg out of this directory with a custom environment which
|
|
# includes the pure Python modules in mercurial/pure
|
|
pypath = os.environ.get('PYTHONPATH', '')
|
|
@@ -108,6 +105,7 @@
|
|
os.environ['PYTHONPATH'] = os.pathsep.join(['mercurial', purepath, pypath])
|
|
os.environ['HGRCPATH'] = '' # do not read any config file
|
|
cmd = '%s hg id -it' % sys.executable
|
|
+ version = None
|
|
|
|
try:
|
|
l = os.popen(cmd).read().split()
|
|
@@ -122,16 +120,18 @@
|
|
version = l[-1] # latest tag or revision number
|
|
if version.endswith('+'):
|
|
version += time.strftime('%Y%m%d')
|
|
- return version
|
|
|
|
-version = getversion()
|
|
-if version:
|
|
- f = file("mercurial/__version__.py", "w")
|
|
- f.write('# this file is autogenerated by setup.py\n')
|
|
- f.write('version = "%s"\n' % version)
|
|
- f.close()
|
|
-else:
|
|
- version = "unknown"
|
|
+ if version:
|
|
+ f = file("mercurial/__version__.py", "w")
|
|
+ f.write('# this file is autogenerated by setup.py\n')
|
|
+ f.write('version = "%s"\n' % version)
|
|
+ f.close()
|
|
+
|
|
+try:
|
|
+ from mercurial import __version__
|
|
+ version = __version__.version
|
|
+except ImportError:
|
|
+ version = 'unknown'
|
|
|
|
class install_package_data(install_data):
|
|
def finalize_options(self):
|