# HG changeset patch
# User Mads Kiilerich <[email protected]>
# Date 1239834147 -7200
# Node ID 93e952249e7c195c38279d0f21c3bda058844e3c
# Parent d66e6438ea96152191ab94217e58fd00c1a9a50f
nautilus-thg: remove vdiff special case
With the new visdiff dialog on crew, there is no reason to even look at the
configuration here. We should just pass the vdiff command on to hgtk and let
it deal with the configuration issues.
diff --git a/contrib/nautilus-thg.py b/contrib/nautilus-thg.py
--- a/contrib/nautilus-thg.py
+++ b/contrib/nautilus-thg.py
@@ -134,17 +134,7 @@
cwd = self.cwd
repo = self.get_repo_for_path(cwd)
- if hgcmd == 'vdiff':
- diffcmd = repo.ui.config('tortoisehg', 'vdiff', 'vdiff')
- if not diffcmd:
- hgcmd = 'diff'
- else:
- cmdline = ['hg', diffcmd]
- cmdline.extend(self.files)
- subprocess.Popen(cmdline, shell=False, env=self.env, cwd=cwd)
- return
-
- cmdopts = [sys.executable, self.hgproc, hgcmd]
+ cmdopts = [sys.executable, self.hgproc, hgcmd]
if hgcmd not in nofilecmds and self.files:
# Use stdin to pass file list (avoid shell command
------------------------------------------------------------------------------
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
