Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.9, 1.9.1, and 1.9.2

thg: report the actual import error

Changeset 2a4f89ec0791…

Parent 3f5e69db8fde…

by Steve Borho

Changes to one file · Browse files at 2a4f89ec0791 Showing diff from parent 3f5e69db8fde Diff from another changeset...

Change 1 of 1 Show Changes Only thg 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
66
67
68
69
70
71
72
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
 #!/usr/bin/env python  #  # thg - front-end script for TortoiseHg dialogs  #  # Copyright (C) 2008-2010 Steve Borho <steve@borho.org>  # Copyright (C) 2008 TK Soh <teekaysoh@gmail.com>  #  # 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  import sys    if not hasattr(sys, "frozen"):   thgpath = os.path.dirname(os.path.realpath(__file__))   testpath = os.path.join(thgpath, 'tortoisehg')   if os.path.isdir(testpath) and thgpath not in sys.path:   sys.path.insert(0, thgpath)     if 'HGPATH' in os.environ:   hgpath = os.environ['HGPATH']   testpath = os.path.join(hgpath, 'mercurial')   if os.path.isdir(testpath) and hgpath not in sys.path:   sys.path.insert(0, hgpath)    from mercurial import ui, util  import cStringIO  import traceback    try:   import tortoisehg.hgqt.run -except ImportError: +except ImportError, e: + sys.stderr.write(str(e)+'\n')   sys.stderr.write("abort: couldn't find tortoisehg libraries in [%s]\n" %   os.pathsep.join(sys.path))   sys.stderr.write("(check your install and PYTHONPATH)\n")   sys.exit(-1)    _ui = ui.ui()  capt = _ui.configbool('tortoisehg', 'stderrcapt', True)    errors = ('Traceback', 'TypeError', 'NameError', 'AttributeError')    if not capt or 'THGDEBUG' in os.environ or '--profile' in sys.argv:   sys.exit(tortoisehg.hgqt.run.dispatch(sys.argv[1:]))  else:   mystderr = cStringIO.StringIO()   origstderr = sys.stderr   sys.stderr = mystderr   ret = 0   try:   ret = tortoisehg.hgqt.run.dispatch(sys.argv[1:])   sys.stderr = origstderr   mystderr.seek(0)   for l in mystderr.readlines():   if l.startswith(errors):   from tortoisehg.hgqt.bugreport import run   from tortoisehg.hgqt.run import qtrun   error = 'Recoverable runtime error (stderr):\n'   error += mystderr.getvalue()   opts = {}   opts['cmd'] = ' '.join(sys.argv[1:])   opts['error'] = error   opts['nofork'] = True   qtrun(run, _ui, **opts)   break   sys.exit(ret)   except:   if sys.exc_info()[0] not in [SystemExit, KeyboardInterrupt]:   sys.stderr = origstderr   traceback.print_exc()   else:   raise SystemExit(ret)