Merge lp:~janos-gyerik/bzr-oodiff/fixes-for-bzr2.5 into lp:~ollie-petch/bzr-oodiff/trunk

[Janos Gyerik]

Fixed some bugs that prevented this plugin from working with Bazaar 2.5 (the current version).

I also removed the global `--wdiff` option, as it was polluting all other commands too.

Unmerged revisions

8. By Janos Gyerik <janos@axiom> on 2013-04-09

removed global --wdiff option

7. By Janos Gyerik <janos@axiom> on 2013-02-21

diff_text function arguments were in the wrong order

6. By Janos Gyerik <janos@axiom> on 2013-02-21

wdiff_dir and wdiff_file should be used only after wdiff is confirmed

=== modified file '__init__.py'
--- __init__.py	2009-04-22 15:54:05 +0000
+++ __init__.py	2013-04-09 21:13:24 +0000
@@ -28,11 +28,9 @@
 from oo_diff import OODiffer
 
 
-_standard_option('wdiff')
-
 class cmd_oodiff(Command):
     takes_args = ['file_to_diff+']
-    takes_options = ['revision', 'wdiff']
+    takes_options = ['revision']
     def run(self, file_to_diff_list, revision=None, wdiff=None):
         for file_to_diff in file_to_diff_list:
             from bzrlib.workingtree import WorkingTree
 
=== modified file 'oo_diff.py'
--- oo_diff.py	2009-04-22 15:54:05 +0000
+++ oo_diff.py	2013-04-09 21:13:24 +0000
@@ -84,14 +84,14 @@
         return list;
 
       
-    def diff_text(self, to_file = None, from_file = None):
+    def diff_text(self, from_file = None, to_file = None):
         """Feed's the contents of the given lists through the bazaar diff algorithm 
         :param from_text: The text from the from file  
         :param to_text: The text from the to file.
         """
-        wdiff_dir = bzrlib.plugin.get_default_plugin_path() + "/wdiff/"
-        wdiff_file = "wdiff.py"
         if self.wdiff == True:
+            wdiff_dir = bzrlib.plugin.get_default_plugin_path() + "/wdiff/"
+            wdiff_file = "wdiff.py"
             if os.path.exists(wdiff_dir):
                 sys.path.append(wdiff_dir)
                 from wdiff import Differ
@@ -145,4 +145,4 @@
     def __init__(self, from_tree = None, to_tree= None, wdiff=None):  pass
     
     def diff_text(self, to_file = None, from_file = None):
-        print "Error: File Format is non ODF standard"
 \ No newline at end of file
+        print "Error: File Format is non ODF standard"