# HG changeset patch
# User Mads Kiilerich <[email protected]>
# Date 1239834592 -7200
# Node ID c098159a767f08ac1f7dd247f5eb27de5c6dc3bf
# Parent 93e952249e7c195c38279d0f21c3bda058844e3c
nautilus-thg: hgproc/hgtk variable cleanups
diff --git a/contrib/nautilus-thg.py b/contrib/nautilus-thg.py
--- a/contrib/nautilus-thg.py
+++ b/contrib/nautilus-thg.py
@@ -82,10 +82,10 @@
self.env['TORTOISEHG_PATH'] = thgpath
self.env['THG_ICON_PATH'] = os.path.join(thgpath, 'icons')
- self.hgproc = tortoise.thgutil.find_path('hgtk',
+ self.hgtk = tortoise.thgutil.find_path('hgtk',
tortoise.thgutil.get_prog_root())
- if not self.hgproc:
- self.hgproc = tortoise.thgutil.find_path('hgtk')
+ if not self.hgtk:
+ self.hgtk = tortoise.thgutil.find_path('hgtk')
self.ipath = os.path.join(thgpath, 'icons', 'tortoise')
self.menu = tortoise.menuthg.menuThg()
@@ -124,9 +124,9 @@
print e
return None
- def run_dialog(self, menuitem, hgcmd, cwd = None):
+ def run_dialog(self, menuitem, hgtkcmd, cwd = None):
'''
- hgcmd - hgproc subcommand
+ hgtkcmd - hgtk subcommand
'''
if cwd: #bg
self.files = []
@@ -134,9 +134,9 @@
cwd = self.cwd
repo = self.get_repo_for_path(cwd)
- cmdopts = [sys.executable, self.hgproc, hgcmd]
+ cmdopts = [sys.executable, self.hgtk, hgtkcmd]
- if hgcmd not in nofilecmds and self.files:
+ if hgtkcmd not in nofilecmds and self.files:
# Use stdin to pass file list (avoid shell command
# line limitations)
pipe = subprocess.PIPE
@@ -150,7 +150,7 @@
stdin.write('\n'.join(self.files))
stdin.close()
- if hgcmd not in nocachecmds:
+ if hgtkcmd not in nocachecmds:
# Remove cached repo object, dirstate may change
self.cacherepo = None
self.cacheroot = None
------------------------------------------------------------------------------
Stay on top of everything new and different, both inside and
around Java (TM) technology - register by April 22, and save
$200 on the JavaOne (SM) conference, June 2-5, 2009, San Francisco.
300 plus technical and hands-on sessions. Register today.
Use priority code J9JMT32. http://p.sf.net/sfu/p
_______________________________________________
Tortoisehg-develop mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tortoisehg-develop
