[meld/VersionControlRework: 8/123] meld.vc: Remove old-style resolved API

[Kai Willadsen <kaiw src gnome org>]

commit 2b4eaa3e2f29c21e61950303c2e53fa8eb402aba
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Sat Mar 21 14:40:53 2015 +1000

    meld.vc: Remove old-style resolved API

 meld/vc/_vc.py |    3 ---
 meld/vcview.py |    7 ++-----
 2 files changed, 2 insertions(+), 8 deletions(-)
---
diff --git a/meld/vc/_vc.py b/meld/vc/_vc.py
index 6138191..1209272 100644
--- a/meld/vc/_vc.py
+++ b/meld/vc/_vc.py
@@ -146,9 +146,6 @@ class Vc(object):
     def revert_command(self):
         raise NotImplementedError()
 
-    def resolved_command(self):
-        raise NotImplementedError()
-
     # Prototyping VC interface version 2
 
     def get_files_to_commit(self, paths):
diff --git a/meld/vcview.py b/meld/vcview.py
index 04a3a60..9d266e6 100644
--- a/meld/vcview.py
+++ b/meld/vcview.py
@@ -159,7 +159,7 @@ class VcView(melddoc.MeldDoc, gnomeglade.Component):
         "VcUpdate": ("update_command", ()),
         "VcPush": ("push", (lambda *args, **kwargs: None, )),
         "VcAdd": ("add_command", ()),
-        "VcResolved": ("resolved_command", ()),
+        "VcResolved": ("resolve", (lambda *args, **kwargs: None, [])),
         "VcRemove": ("remove_command", ()),
         "VcRevert": ("revert_command", ()),
     }
@@ -761,10 +761,7 @@ class VcView(melddoc.MeldDoc, gnomeglade.Component):
             self._command_on_selected(self.vc.remove_command())
 
     def on_button_resolved_clicked(self, obj):
-        try:
-            self.vc.resolve(self._command, self._get_selected_files())
-        except NotImplementedError:
-            self._command_on_selected(self.vc.resolved_command())
+        self.vc.resolve(self._command, self._get_selected_files())
 
     def on_button_revert_clicked(self, obj):
         try: