Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.7, 0.7.1, and 0.7.2

about: further versioning fixes

Changeset 405fce1bd3d3…

Parent 971477e82229…

by Steve Borho

Changes to 4 files · Browse files at 405fce1bd3d3 Showing diff from parent 971477e82229 Diff from another changeset...

Change 1 of 1 Show Entire File hggtk/​about.py Stacked
 
14
15
16
17
18
 
 
 
 
 
 
 
 
 
 
 
 
 
 
19
20
21
 
14
15
16
 
 
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
@@ -14,8 +14,20 @@
 import pango  import shlib   -from tortoise.__version__ import version as thgversion -from mercurial.__version__ import version as hgversion +try: + # post 1.1.2 + from mercurial import util + hgversion = util.version() +except AttributeError: + # <= 1.1.2 + from mercurial import version + hgversion = version.get_version() + +try: + import tortoise.version + thgversion = tortoise.version.get_version() +except ImportError: + thgversion = "unknown"    def browse_url(url):   import threading
Change 1 of 2 Show Entire File setup.py Stacked
 
10
11
12
13
 
14
15
16
 
32
33
34
35
 
 
 
 
36
37
38
 
10
11
12
 
13
14
15
16
 
32
33
34
 
35
36
37
38
39
40
41
@@ -10,7 +10,7 @@
 import os    # non-Win32 platforms doesn't require setup -if os.name != 'nt': +if os.name != 'nt' and '--version' not in sys.argv:   sys.stderr.write("abort: %s is for Win32 platforms only" % sys.argv[0])   sys.exit(1)   @@ -32,7 +32,10 @@
  pass    from distutils.core import setup -import py2exe +try: import py2exe +except ImportError: + if '--version' not in sys.argv: + raise    _data_files = []  extra = {}
Change 1 of 1 Show Entire File tortoise/​version.py Stacked
 
 
 
 
 
 
 
 
 
 
 
1
2
3
4
5
6
7
8
9
@@ -0,0 +1,9 @@
+# Published under the GNU GPL, v2 or later. +# Copyright (C) 2009 Steve Borho <steve@borho.org> + +def get_version(): + try: + import __version__ + return __version__.version + except ImportError: + return 'unknown'
Change 1 of 1 Show Entire File tortoisehg.py Stacked
 
13
14
15
16
17
18
19
20
 
 
21
22
23
 
13
14
15
 
 
 
 
 
16
17
18
19
20
@@ -13,11 +13,8 @@
 if hasattr(sys, "frozen") and sys.frozen == 'dll':   import win32traceutil   -# specify version string, otherwise 'hg identify' will be used: -version = '' - -import tortoise.version -tortoise.version.remember_version(version) +# ensure version has been recorded +os.popen('python setup.py --version')    # shell extension classes  from tortoise.contextmenu import ContextMenuExtension