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

nautilus: call hgtk instead of hgproc

Changeset bb3d6aaa0d40…

Parent 9ba7660d6f35…

by Simon Heimberg

Changes to one file · Browse files at bb3d6aaa0d40 Showing diff from parent 9ba7660d6f35 Diff from another changeset...

Change 1 of 2 Show Entire File contrib/​nautilus-thg.py Stacked
 
78
79
80
81
 
 
 
 
82
83
84
 
134
135
136
137
138
 
139
140
141
 
78
79
80
 
81
82
83
84
85
86
87
 
137
138
139
 
 
140
141
142
143
@@ -78,7 +78,10 @@
  self.env['TORTOISEHG_PATH'] = thgpath   self.env['THG_ICON_PATH'] = os.path.join(thgpath, 'icons')   - self.hgproc = os.path.join(thgpath, 'hgproc.py') + self.hgproc = tortoise.thgutil.find_path('hgtk', + tortoise.thgutil.get_prog_root()) + if not self.hgproc: + self.hgproc = tortoise.thgutil.find_path('hgtk')   self.ipath = os.path.join(thgpath, 'icons', 'tortoise')   self.menu = tortoise.menuthg.menuThg()   @@ -134,8 +137,7 @@
  subprocess.Popen(cmdline, shell=False, env=self.env, cwd=cwd)   return   - cmdopts = [sys.executable, self.hgproc] - cmdopts += ['--command', hgcmd] + cmdopts = [sys.executable, self.hgproc, hgcmd]     if hgcmd not in nofilecmds and self.files:   # Use temporary file to store file list (avoid shell command