[PATCH] vimdiff takes -r

[John Arbash Meinel]

Aaron Bentley wrote:
> Hi all,
> 
> This patch adds support to the vimdiff plugin for supplying a revision.
> You can also use http://code.aaronbentley.com/bzr/vimdiff/
> 
> Aaron

------------------------------------------------------------------------

=== modified file '__init__.py'
--- __init__.py	
+++ __init__.py	
@@ -5,7 +5,7 @@
 """vimdiff plugin for bzr"""

 from bzrlib.commands import Command, register_command
-from bzrlib.errors import BzrError, NotVersionedError
+from bzrlib.errors import BzrError, NotVersionedError, BzrCommandError

 class cmd_vimdiff(Command):
     """Show changes to a file in vimdiff
@@ -19,7 +19,8 @@
     See also vimdiff.
     """
     takes_args = ['file_to_diff']
-    def run(self, file_to_diff):
+    takes_options = ['revision']
+    def run(self, file_to_diff, revision=None):
         vimdiff_to_file(['vimdiff', '-f'], file_to_diff)


And I should also point out that you didn't actually fix "bzr vimdiff"
it takes the option, but ignores it. You need to at least pass the
revision parameter to vimdiff_to_file.

John
=:->


-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 254 bytes
Desc: OpenPGP digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060222/1df21883/attachment.pgp