[meld] Make vcview interface take a single path, not a one-element list



commit 2adbf75c6ac0b61713aefeca4e4523e80a3d28ed
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Wed Feb 9 06:02:00 2011 +1000

    Make vcview interface take a single path, not a one-element list

 meld/meldapp.py |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)
---
diff --git a/meld/meldapp.py b/meld/meldapp.py
index 9465678..91dc558 100644
--- a/meld/meldapp.py
+++ b/meld/meldapp.py
@@ -78,7 +78,10 @@ class NewDocDialog(gnomeglade.Component):
                 paths.pop(0)
             for path in paths:
                 self.entrylists[page][0].prepend_history(path)
-            self.diff_methods[page](paths)
+            if page == 2:
+                self.diff_methods[page](paths[0])
+            else:
+                self.diff_methods[page](paths)
         self.widget.destroy()
 
 
@@ -545,9 +548,7 @@ class MeldWindow(gnomeglade.Component):
         else:
             return self.append_filediff(paths)
 
-    def append_vcview(self, locations, auto_compare=False):
-        assert len(locations) in (1,)
-        location = locations[0]
+    def append_vcview(self, location, auto_compare=False):
         doc = vcview.VcView(app.prefs)
         # FIXME: need a good themed VC icon
         self._append_page(doc, "vc-icon")
@@ -650,7 +651,7 @@ class MeldApp(object):
             if os.path.isfile(a):
                 self.window._single_file_open(a)
             else:
-                tab = self.window.append_vcview([a], auto_compare)
+                tab = self.window.append_vcview(a, auto_compare)
                     
         elif len(paths) in (2, 3, 4):
             tab = self.window.append_diff(paths, auto_compare)



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]