Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.0.1, 1.0.2, and 1.0.3

stable fix util.version.package_version()

For versions of the sort A.B (e.g. 1.0), there was no periodic.

This caused hgtk.exe, hg.exe, etc. not having any version
resource in post-1.0 nightlies.

Changeset 266cc36f9999…

Parent d82508e64d5d…

by Adrian Buehlmann

Changes to one file · Browse files at 266cc36f9999 Showing diff from parent d82508e64d5d Diff from another changeset...

Change 1 of 1 Show Changes Only tortoisehg/​util/​version.py Stacked
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
 
 
 
53
54
 
 
 
 
 
 
 
55
56
 
57
58
59
60
61
62
 
 
63
64
65
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
 
52
53
54
55
 
56
57
58
59
60
61
62
63
 
64
65
66
67
68
 
 
69
70
71
72
73
 # version.py - TortoiseHg version  #  # Copyright 2009 Steve Borho <steve@borho.org>  #  # This software may be used and distributed according to the terms of the  # GNU General Public License version 2, incorporated herein by reference.    import os  from mercurial import ui, hg, commands, error  from tortoisehg.util.i18n import _    def liveversion():   'Attempt to read the version from the live repository'   utilpath = os.path.dirname(os.path.realpath(__file__))   thgpath = os.path.dirname(os.path.dirname(utilpath))   if not os.path.isdir(os.path.join(thgpath, '.hg')):   raise error.RepoError(_('repository %s not found') % thgpath)     u = ui.ui()   repo = hg.repository(u, path=thgpath)     u.pushbuffer()   commands.identify(u, repo, id=True, tags=True)   l = u.popbuffer().split()   while len(l) > 1 and l[-1][0].isalpha(): # remove non-numbered tags   l.pop()   if len(l) > 1: # tag found   version = l[-1]   if l[0].endswith('+'): # propagate the dirty status to the tag   version += '+'   elif len(l) == 1: # no tag found   u.pushbuffer()   commands.parents(u, repo, template='{latesttag}+{latesttagdistance}-')   version = u.popbuffer() + l[0]   return repo[None].branch(), version    def version():   try:   branch, version = liveversion()   return version   except:   pass   try:   import __version__   return __version__.version   except ImportError:   return _('unknown')    def package_version():   try:   branch, version = liveversion() - if '+' in version: + + extra = None + if '+' in version:   version, extra = version.split('+', 1) - major, minor, periodic = version.split('.') + + v = [int(x) for x in version.split('.')] + while len(v) < 3: + v.append(0) + major, minor, periodic = v + + if extra != None:   tagdistance = int(extra.split('-', 1)[0]) - periodic = int(periodic) * 10000 + periodic *= 10000   if branch == 'default':   periodic += tagdistance + 5000   else:   periodic += tagdistance + 1000 - version = '.'.join([major, minor, str(periodic)]) - return version + + return '.'.join([str(x) for x in (major, minor, periodic)])   except:   pass   return _('unknown')