Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.8, 0.8.1, and 0.8.2

hgtk: remove most path hacks from hgtk script

Changeset e792dc281e56…

Parent 16c1b95cf604…

by Steve Borho

Changes to one file · Browse files at e792dc281e56 Showing diff from parent 16c1b95cf604 Diff from another changeset...

Change 1 of 2 Show Entire File hgtk Stacked
 
6
7
8
 
 
 
9
10
11
 
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
 
6
7
8
9
10
11
12
13
14
 
18
19
20
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
21
22
23
24
25
26
 
27
28
29
@@ -6,6 +6,9 @@
 # Copyright (C) 2008 TK Soh <teekaysoh@gmail.com>  #   +# if hasattr(sys, "frozen"): +# os.environ['PATH'] += '' +  import pygtk  pygtk.require('2.0')  import gtk @@ -15,28 +18,12 @@
 import sys  import cStringIO   -if hasattr(sys, "frozen"): - thgdir = os.path.dirname(sys.executable) - os.environ['THG_ICON_PATH'] = os.path.join(thgdir, 'icons') -else: - # check if hggtk is a symlink first - pfile = __file__ - if pfile.endswith('.pyc'): - pfile = pfile[:-1] - thgpath = os.path.dirname(os.path.realpath(pfile)) - testpath = os.path.join(thgpath, 'hggtk') - if os.path.isdir(testpath): - if thgpath not in sys.path: - sys.path.insert(0, thgpath) - else: - # try environment - thgpath = os.environ.get('TORTOISEHG_PATH') - if thgpath: - thgpath = os.path.normpath(os.path.expanduser(thgpath)) - if os.path.exists(thgpath) and thgpath not in sys.path: - sys.path.insert(0, thgpath) +# if hgtk is a symlink, insert symlink target directory in sys.path +thgpath = os.path.dirname(os.path.realpath(__file__)) +if os.path.isdir(os.path.join(thgpath, 'thgutil')): + if thgpath not in sys.path: + sys.path.insert(0, thgpath)   -# else assume tortoise is already in PYTHONPATH  try:   import hggtk.hgtk  except ImportError: