summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthieu Gautier <mgautier@fedoraproject.org>2009-04-29 22:36:46 +0200
committerMatthieu Gautier <mgautier@fedoraproject.org>2009-04-29 23:32:52 +0200
commitbd5dfa965466f89937d97294ac4e06d3f8b3b587 (patch)
tree53cbd2faf3841ea4b0001d91c4a1b6465419f92c
parent27492e9d1ca951116d0b193fbd41e9146c7c66fc (diff)
downloadg-ed-it-bd5dfa965466f89937d97294ac4e06d3f8b3b587.zip
g-ed-it-bd5dfa965466f89937d97294ac4e06d3f8b3b587.tar.gz
g-ed-it-bd5dfa965466f89937d97294ac4e06d3f8b3b587.tar.xz
Use git-difftool instead of git-diff.
- Force tool to be meld. - No special config in git have to set - meld become a prerequisite'
-rw-r--r--g-ed-it/gitAction.py4
1 files 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