From b9ec0c418594803394bd16bc015e0c2970606e86 Mon Sep 17 00:00:00 2001 From: Matthieu Gautier Date: Thu, 30 Apr 2009 23:19:08 +0200 Subject: Revert to git-diff. git-difftool is not yet present in the current version of git (Fedora). Use a git-difftool will be recommit when next git update. --- g-ed-it/gitAction.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/g-ed-it/gitAction.py b/g-ed-it/gitAction.py index f25706c..47bd68e 100644 --- a/g-ed-it/gitAction.py +++ b/g-ed-it/gitAction.py @@ -51,10 +51,10 @@ class GitAction (object): def diff_head_index(self,launcher, fileUriMethod = None): if fileUriMethod : fileUri = fileUriMethod() - subprocess.call("git-difftool --tool=meld --no-prompt --cached "+os.path.basename(fileUri),stdout=subprocess.PIPE,cwd=os.path.dirname(fileUri), shell=True) + subprocess.call("git-diff --cached "+os.path.basename(fileUri),stdout=subprocess.PIPE,cwd=os.path.dirname(fileUri), shell=True) pass def diff_index_wt(self, launcher, fileUriMethod = None): if fileUriMethod : fileUri = fileUriMethod() - subprocess.call("git-difftool --tool=meld --no-prompt "+os.path.basename(fileUri),stdout=subprocess.PIPE,cwd=os.path.dirname(fileUri), shell=True) + subprocess.call("git-diff "+os.path.basename(fileUri),stdout=subprocess.PIPE,cwd=os.path.dirname(fileUri), shell=True) pass -- cgit