[meld/VersionControlRework: 82/123] vc: Update bzr and hg for new-style add() command
- From: Kai Willadsen <kaiw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [meld/VersionControlRework: 82/123] vc: Update bzr and hg for new-style add() command
- Date: Sun, 19 Apr 2015 20:12:53 +0000 (UTC)
commit b5f0a34dbddcf9ab32267d5a7c9c80c4f593e2e2
Author: Kai Willadsen <kai willadsen gmail com>
Date: Sat Apr 11 07:46:50 2015 +1000
vc: Update bzr and hg for new-style add() command
meld/vc/_vc.py | 3 ---
meld/vc/bzr.py | 6 ++++--
meld/vc/mercurial.py | 5 +++--
meld/vcview.py | 7 ++-----
4 files changed, 9 insertions(+), 12 deletions(-)
---
diff --git a/meld/vc/_vc.py b/meld/vc/_vc.py
index 75dc5a0..a099ce2 100644
--- a/meld/vc/_vc.py
+++ b/meld/vc/_vc.py
@@ -121,9 +121,6 @@ class Vc(object):
self._tree_cache = {}
self._tree_meta_cache = {}
- def add_command(self):
- raise NotImplementedError()
-
def remove_command(self, force=0):
raise NotImplementedError()
diff --git a/meld/vc/bzr.py b/meld/vc/bzr.py
index 3c98efc..9b092c0 100644
--- a/meld/vc/bzr.py
+++ b/meld/vc/bzr.py
@@ -88,8 +88,10 @@ class Vc(_vc.Vc):
''.join(state_2_map.keys()),
''.join(state_3_map.keys()),)
- def add_command(self):
- return [self.CMD] + self.CMDARGS + ["add"]
+ def add(self, runner, files):
+ fullcmd = [self.CMD] + self.CMDARGS
+ command = [fullcmd, 'add']
+ runner(command, files, refresh=True, working_dir=self.root)
def commit(self, runner, files, message):
fullcmd = [self.CMD] + self.CMDARGS
diff --git a/meld/vc/mercurial.py b/meld/vc/mercurial.py
index 635c3ed..2f79a94 100644
--- a/meld/vc/mercurial.py
+++ b/meld/vc/mercurial.py
@@ -55,8 +55,9 @@ class Vc(_vc.Vc):
command = [self.CMD, 'pull', '-u']
runner(command, [], refresh=True, working_dir=self.root)
- def add_command(self):
- return [self.CMD, "add"]
+ def add(self, runner, files):
+ command = [self.CMD, 'add']
+ runner(command, files, refresh=True, working_dir=self.root)
def remove_command(self, force=0):
return [self.CMD, "rm"]
diff --git a/meld/vcview.py b/meld/vcview.py
index 6315b48..c22af46 100644
--- a/meld/vcview.py
+++ b/meld/vcview.py
@@ -158,7 +158,7 @@ class VcView(melddoc.MeldDoc, gnomeglade.Component):
"VcCommit": ("commit", (lambda *args, **kwargs: None, [], "")),
"VcUpdate": ("update", (lambda *args, **kwargs: None, )),
"VcPush": ("push", (lambda *args, **kwargs: None, )),
- "VcAdd": ("add_command", ()),
+ "VcAdd": ("add", (lambda *args, **kwargs: None, [])),
"VcResolved": ("resolve", (lambda *args, **kwargs: None, [])),
"VcRemove": ("remove_command", ()),
"VcRevert": ("revert_command", ()),
@@ -703,10 +703,7 @@ class VcView(melddoc.MeldDoc, gnomeglade.Component):
self._command, self._get_selected_files(), commit_msg)
def on_button_add_clicked(self, obj):
- try:
- self.vc.add(self._command, self._get_selected_files())
- except NotImplementedError:
- self._command_on_selected(self.vc.add_command())
+ self.vc.add(self._command, self._get_selected_files())
def on_button_remove_clicked(self, obj):
selected = self._get_selected_files()
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]