Merge lp:~baztian/bzr-difftools/rename-to-extdiff into lp:bzr-difftools

[Bastian]

Renamed command from diff to extdiff to don't interfere with diff's original --using

Unmerged revisions

42. By Bastian on 2011-07-15

Renamed command from diff to extdiff to don't interfere with diff's original --using

=== modified file '__init__.py'
--- __init__.py	2007-09-30 18:13:15 +0000
+++ __init__.py	2011-07-15 08:36:02 +0000
@@ -5,10 +5,11 @@
 """
 External diff tools plugin for Bazaar
 
-This plugin overrides the default 'bzr diff' command to add a new option
-'--using', which is used to specify an external diff tool to run in place
-of the builtin implementation.  Usually, this will be some form of 
-graphical diff tool.
+This plugin overrides the default 'bzr diff' command to provide a new
+command 'bzr extdiff' and to add a new option '--using', which is used
+to specify an external diff tool to run in place of the builtin
+implementation.  Usually, this will be some form of graphical diff
+tool.
 
 If the '--using' option is not provided, the original builtin 'bzr diff'
 behavior is used.
@@ -27,10 +28,11 @@
 safely.  So this option can potentially be used for both external diff
 tools and alternate internal diff algorithms.
 
-The 'cmd_diff' class, defined here, is a minimalist command extension; most
-of the actual work is delegated to the Controller class instead.  The 
-purpose of this separation is to minimize the startup overhead, by deferring
-most of the 'import' processing until the command is actually executed.
+The 'cmd_extdiff' class, defined here, is a minimalist command
+extension; most of the actual work is delegated to the Controller
+class instead.  The purpose of this separation is to minimize the
+startup overhead, by deferring most of the 'import' processing until
+the command is actually executed.
 
 Note that this extension is not truly a decorator for the 'diff' command,
 because it does not always call the builtin 'diff' command.  This could 
@@ -45,7 +47,7 @@
     option,
     )
 
-class cmd_diff(builtins.cmd_diff):
+class cmd_extdiff(builtins.cmd_diff):
   """
   The '--using TOOL' option can be used to run an external diff tool.
 
@@ -78,7 +80,7 @@
       return Controller().run(*args, **kwargs)
     else:
       # Run the builtin diff command normally:
-      return super(cmd_diff, self).run(*args, **kwargs)
+      return super(cmd_extdiff, self).run(*args, **kwargs)
 
 
   def help(self):
@@ -86,15 +88,15 @@
     Return help message for this class, including text from superclass.
     """
     from inspect import getdoc
-    return getdoc(super(cmd_diff, self)) + '\n\n' + getdoc(self)
+    return getdoc(super(cmd_extdiff, self)) + '\n\n' + getdoc(self)
 
-  # End class cmd_diff
+  # End class cmd_extdiff
 
 
 # Initialize the plugin:
 version_info = (0, 91, 0, 'final', 0)
 
 # Register the new command provided by this plugin:
-commands.register_command(cmd_diff, decorate=False)
+commands.register_command(cmd_extdiff, decorate=False)
 
 # The End.