Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 2.1.1, 2.1.2, and tip

stable thg: fix Mercurial version check reporting

Changeset 4a3a25bf7513…

Parent 32f65825cd27…

by Steve Borho

Changes to 2 files · Browse files at 4a3a25bf7513 Showing diff from parent 32f65825cd27 Diff from another changeset...

Change 1 of 1 Show Entire File thg Stacked
 
60
61
62
 
63
64
65
66
67
68
69
 
70
71
72
 
60
61
62
63
64
65
66
67
68
69
 
70
71
72
73
@@ -60,13 +60,14 @@
 from tortoisehg.util.hgversion import hgversion, checkhgversion  errmsg = checkhgversion(hgversion)  if errmsg: + from mercurial import ui   from tortoisehg.hgqt.bugreport import run   from tortoisehg.hgqt.run import qtrun   opts = {}   opts['cmd'] = ' '.join(sys.argv[1:])   opts['error'] = '\n' + errmsg + '\n'   opts['nofork'] = True - qtrun(run, ui, **opts) + qtrun(run, ui.ui(), **opts)   sys.exit(1)    ret = tortoisehg.hgqt.run.dispatch(sys.argv[1:])
Change 1 of 1 Show Changes Only tortoisehg/​util/​hgversion.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
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
 # hgversion.py - Version information for Mercurial  #  # 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 re    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()    def checkhgversion(v):   """range check the Mercurial version"""   reqver = ['1', '9']   v = v.split('+')[0]   if not v or v == 'unknown' or len(v) >= 12:   # can't make any intelligent decisions about unknown or hashes   return   vers = re.split(r'\.|-', v)[:2]   if vers == reqver or len(vers) < 2:   return   nextver = list(reqver) - nextver[1] = chr(ord(reqver[1])+1) + nextver[1] = str(int(reqver[1])+1)   if vers == nextver:   return   return (('This version of TortoiseHg requires Mercurial '   'version %s.n to %s.n, but found %s') %   ('.'.join(reqver), '.'.join(nextver), v))