[meld/VersionControlRework: 84/123] vc: Update svn and hg for new-style revert() command, remove old one

[Kai Willadsen <kaiw src gnome org>]

commit 8eb50ddd1fa7bb29dfe7a44c7e626e293594c913
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Sat Apr 11 08:04:51 2015 +1000

    vc: Update svn and hg for new-style revert() command, remove old one

 meld/vc/_vc.py       |    5 -----
 meld/vc/mercurial.py |    5 +++--
 meld/vc/svn.py       |    5 +++--
 meld/vcview.py       |    7 ++-----
 4 files changed, 8 insertions(+), 14 deletions(-)
---
diff --git a/meld/vc/_vc.py b/meld/vc/_vc.py
index 6216a83..f777bf3 100644
--- a/meld/vc/_vc.py
+++ b/meld/vc/_vc.py
@@ -121,11 +121,6 @@ class Vc(object):
         self._tree_cache = {}
         self._tree_meta_cache = {}
 
-    def revert_command(self):
-        raise NotImplementedError()
-
-    # Prototyping VC interface version 2
-
     def get_files_to_commit(self, paths):
         raise NotImplementedError()
 
diff --git a/meld/vc/mercurial.py b/meld/vc/mercurial.py
index 2070c7f..137f449 100644
--- a/meld/vc/mercurial.py
+++ b/meld/vc/mercurial.py
@@ -63,8 +63,9 @@ class Vc(_vc.Vc):
         command = [self.CMD, 'rm']
         runner(command, files, refresh=True, working_dir=self.root)
 
-    def revert_command(self):
-        return [self.CMD, "revert"]
+    def revert(self, runner, files):
+        command = [self.CMD, 'revert']
+        runner(command, files, refresh=True, working_dir=self.root)
 
     @classmethod
     def valid_repo(cls, path):
diff --git a/meld/vc/svn.py b/meld/vc/svn.py
index a4094bf..a512be1 100644
--- a/meld/vc/svn.py
+++ b/meld/vc/svn.py
@@ -64,8 +64,9 @@ class Vc(_vc.Vc):
         command = [self.CMD, 'rm', '--force']
         runner(command, files, refresh=True, working_dir=self.root)
 
-    def revert_command(self):
-        return [self.CMD,"revert"]
+    def revert(self, runner, files):
+        command = [self.CMD, 'revert']
+        runner(command, files, refresh=True, working_dir=self.root)
 
     def resolve(self, runner, files):
         command = [self.CMD, 'resolve', '--accept=working']
diff --git a/meld/vcview.py b/meld/vcview.py
index dda6343..a15ef09 100644
--- a/meld/vcview.py
+++ b/meld/vcview.py
@@ -161,7 +161,7 @@ class VcView(melddoc.MeldDoc, gnomeglade.Component):
         "VcAdd": ("add", (lambda *args, **kwargs: None, [])),
         "VcRemove": ("remove", (lambda *args, **kwargs: None, [])),
         "VcResolved": ("resolve", (lambda *args, **kwargs: None, [])),
-        "VcRevert": ("revert_command", ()),
+        "VcRevert": ("revert", (lambda *args, **kwargs: None, [])),
     }
 
     # Map for inter-tab command() calls
@@ -731,10 +731,7 @@ class VcView(melddoc.MeldDoc, gnomeglade.Component):
         self.vc.resolve(self._command, self._get_selected_files())
 
     def on_button_revert_clicked(self, obj):
-        try:
-            self.vc.revert(self._command, self._get_selected_files())
-        except NotImplementedError:
-            self._command_on_selected(self.vc.revert_command())
+        self.vc.revert(self._command, self._get_selected_files())
 
     def on_button_delete_clicked(self, obj):
         files = self._get_selected_files()