From fe6fa5a4ac78c2f45a92f84afd55faad7b7cbbdc Mon Sep 17 00:00:00 2001 From: Matthieu Gautier Date: Wed, 29 Apr 2009 22:36:46 +0200 Subject: '# On branch master # Changes to be committed: # (use "git reset HEAD ..." to unstage) # # modified: g-ed-it/gitAction.py # Use git-difftool instead of git-diff. - Force tool to be meld. - No special config in git have to set - meld become a prerequisite' --- 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 afcc954..bf4670d 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-diff","--cached",os.path.basename(fileUri)],stdout=subprocess.PIPE,cwd=os.path.dirname(fileUri)) + subprocess.call(["git-difftool","--tool=meld","--no-prompt","--cached",os.path.basename(fileUri)],stdout=subprocess.PIPE,cwd=os.path.dirname(fileUri)) pass def diff_index_wt(self, launcher, fileUriMethod = None): if fileUriMethod : fileUri = fileUriMethod() - subprocess.call(["git-diff",os.path.basename(fileUri)],stdout=subprocess.PIPE,cwd=os.path.dirname(fileUri)) + subprocess.call(["git-difftool","--tool=meld","--no-prompt",os.path.basename(fileUri)],stdout=subprocess.PIPE,cwd=os.path.dirname(fileUri)) pass -- cgit