[meld] Remove diff command from API
- From: Kai Willadsen <kaiw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [meld] Remove diff command from API
- Date: Fri, 21 Jun 2013 22:04:26 +0000 (UTC)
commit df4526959d7ec793a20f0afbc6921efa655dc192
Author: Kai Willadsen <kai willadsen gmail com>
Date: Thu Jun 20 07:36:13 2013 +1000
Remove diff command from API
meld/vc/_vc.py | 3 ---
meld/vc/bzr.py | 3 ---
meld/vc/cvs.py | 5 +----
meld/vc/darcs.py | 4 ----
meld/vc/fossil.py | 3 ---
meld/vc/monotone.py | 2 --
meld/vc/svn.py | 2 --
meld/vcview.py | 1 -
8 files changed, 1 insertions(+), 22 deletions(-)
---
diff --git a/meld/vc/_vc.py b/meld/vc/_vc.py
index 121c593..3fc839b 100644
--- a/meld/vc/_vc.py
+++ b/meld/vc/_vc.py
@@ -124,9 +124,6 @@ class Vc(object):
def commit_command(self, message):
raise NotImplementedError()
- def diff_command(self):
- raise NotImplementedError()
-
def update_command(self):
raise NotImplementedError()
diff --git a/meld/vc/bzr.py b/meld/vc/bzr.py
index 49662ac..42071a2 100644
--- a/meld/vc/bzr.py
+++ b/meld/vc/bzr.py
@@ -77,9 +77,6 @@ class Vc(_vc.CachedVc):
def commit_command(self, message):
return [self.CMD] + self.CMDARGS + ["commit", "-m", message]
- def diff_command(self):
- return [self.CMD] + self.CMDARGS + ["diff"]
-
def add_command(self):
return [self.CMD] + self.CMDARGS + ["add"]
diff --git a/meld/vc/cvs.py b/meld/vc/cvs.py
index 7afbff1..ba22977 100644
--- a/meld/vc/cvs.py
+++ b/meld/vc/cvs.py
@@ -60,9 +60,6 @@ class Vc(_vc.Vc):
def commit_command(self, message):
return [self.CMD, "commit", "-m", message]
- def diff_command(self):
- return [self.CMD, "diff", "-u"]
-
def update_command(self):
return [self.CMD, "update"]
@@ -90,7 +87,7 @@ class Vc(_vc.Vc):
raise _vc.InvalidVCPath(self, path, "Path not in repository")
path = path[len(self.root) + 1:]
- diffiter = misc.read_pipe_iter(self.diff_command() + [path],
+ diffiter = misc.read_pipe_iter([self.CMD, "diff", "-u", path],
FakeErrorStream(), workdir=self.root)
patch = None
while patch is None:
diff --git a/meld/vc/darcs.py b/meld/vc/darcs.py
index a5073d8..d854eff 100644
--- a/meld/vc/darcs.py
+++ b/meld/vc/darcs.py
@@ -50,10 +50,6 @@ class Vc(_vc.CachedVc):
"-a",
"-m", message]
- def diff_command(self):
- return [self.CMD, "diff", "-u",
- "--repodir=%s" % self.root]
-
def update_command(self):
# This will not work while passing the files parameter after it
# This hack allows you to update in the root directory
diff --git a/meld/vc/fossil.py b/meld/vc/fossil.py
index 344332e..664008c 100644
--- a/meld/vc/fossil.py
+++ b/meld/vc/fossil.py
@@ -53,9 +53,6 @@ class Vc(_vc.CachedVc):
def commit_command(self, message):
return [self.CMD, "commit", "-m", message]
- def diff_command(self):
- return [self.CMD, "diff"]
-
def update_command(self):
return [self.CMD, "update"]
diff --git a/meld/vc/monotone.py b/meld/vc/monotone.py
index e2812b7..86bf5ea 100644
--- a/meld/vc/monotone.py
+++ b/meld/vc/monotone.py
@@ -129,8 +129,6 @@ class Vc(_vc.CachedVc):
def commit_command(self, message):
return [self.CMD,"commit","-m",message]
- def diff_command(self):
- return [self.CMD,"diff"]
def update_command(self):
return [self.CMD,"update"]
def add_command(self):
diff --git a/meld/vc/svn.py b/meld/vc/svn.py
index dad97d6..ce8817d 100644
--- a/meld/vc/svn.py
+++ b/meld/vc/svn.py
@@ -54,8 +54,6 @@ class Vc(_vc.CachedVc):
def commit_command(self, message):
return [self.CMD,"commit","-m",message]
- def diff_command(self):
- return [self.CMD, "diff"]
def update_command(self):
return [self.CMD,"update"]
diff --git a/meld/vcview.py b/meld/vcview.py
index 12219b6..a497f58 100644
--- a/meld/vcview.py
+++ b/meld/vcview.py
@@ -212,7 +212,6 @@ entry_ignored = lambda x: (x.state == tree.STATE_IGNORED) or x.isdir
class VcView(melddoc.MeldDoc, gnomeglade.Component):
# Map action names to VC commands and required arguments list
action_vc_cmds_map = {
- "VcCompare": ("diff_command", ()),
"VcCommit": ("commit_command", ("",)),
"VcUpdate": ("update_command", ()),
"VcPush": ("push", (lambda *args, **kwargs: None, )),
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]