Show More
@@ -33,10 +33,10 b' def write_version(version):' | |||
|
33 | 33 | f.write("version = %r\n" % version) |
|
34 | 34 | f.close() |
|
35 | 35 | |
|
36 | def remember_version(): | |
|
36 | def remember_version(version=None): | |
|
37 | 37 | """Store version information.""" |
|
38 | 38 | global remembered_version |
|
39 | if os.access(".hg", os.F_OK): | |
|
39 | if not version and os.path.isdir(".hg"): | |
|
40 | 40 | f = os.popen("hg identify 2>/dev/null") # use real hg installation |
|
41 | 41 | ident = f.read()[:-1] |
|
42 | 42 | if not f.close() and ident: |
@@ -55,8 +55,9 b' def remember_version():' | |||
|
55 | 55 | break |
|
56 | 56 | if modified: |
|
57 | 57 | version += time.strftime('+%Y%m%d') |
|
58 | remembered_version = True | |
|
59 | write_version(version) | |
|
58 | if version: | |
|
59 | remembered_version = True | |
|
60 | write_version(version) | |
|
60 | 61 | |
|
61 | 62 | def forget_version(): |
|
62 | 63 | """Remove version information.""" |
@@ -11,6 +11,9 b' from distutils.command.install_data impo' | |||
|
11 | 11 | |
|
12 | 12 | import mercurial.version |
|
13 | 13 | |
|
14 | # specify version string, otherwise 'hg identify' will be used: | |
|
15 | version = '' | |
|
16 | ||
|
14 | 17 | class install_package_data(install_data): |
|
15 | 18 | def finalize_options(self): |
|
16 | 19 | self.set_undefined_options('install', |
@@ -18,7 +21,7 b' class install_package_data(install_data)' | |||
|
18 | 21 | install_data.finalize_options(self) |
|
19 | 22 | |
|
20 | 23 | try: |
|
21 | mercurial.version.remember_version() | |
|
24 | mercurial.version.remember_version(version) | |
|
22 | 25 | setup(name='mercurial', |
|
23 | 26 | version=mercurial.version.get_version(), |
|
24 | 27 | author='Matt Mackall', |
General Comments 0
You need to be logged in to leave comments.
Login now