Rev 23: cleanup diffstatus for new bzr api in http://bzr.arbash-meinel.com/plugins/ezbzr-jam

[John Arbash Meinel]

At http://bzr.arbash-meinel.com/plugins/ezbzr-jam

------------------------------------------------------------
revno: 23
revision-id: john at arbash-meinel.com-20070212210130-58l6n7h7x3ae9qmj
parent: john at arbash-meinel.com-20070212204943-mjjntx4227n2tkbo
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: ezbzr
timestamp: Mon 2007-02-12 15:01:30 -0600
message:
  cleanup diffstatus for new bzr api
modified:
  diffstatus.py                  statndiff.py-20060125022953-e558f01fcb5bef21
-------------- next part --------------
=== modified file 'diffstatus.py'
--- a/diffstatus.py	2006-01-25 16:40:14 +0000
+++ b/diffstatus.py	2007-02-12 21:01:30 +0000
@@ -18,26 +18,33 @@
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 """
 
-import os
-
-import bzrlib
-
-class cmd_diffstatus(bzrlib.commands.Command):
+from bzrlib import (
+    builtins,
+    commands,
+    )
+
+
+class cmd_diffstatus(commands.Command):
     """Prints lots of status, including a diff"""
+
     takes_args = ['file*']
     takes_options = ['revision']
 
-    @bzrlib.commands.display_command
+    @commands.display_command
     def run(self, revision=None, file_list=None):
-        
+
         # Do status
-        status = bzrlib.builtins.cmd_status()
+        status = builtins.cmd_status()
+        status._setup_outf()
         status.run(file_list=file_list, revision=revision)
-        
-        print os.linesep * 2
-        
+
+        print
+        print
+
         # Do diff
-        diff = bzrlib.builtins.cmd_diff()
+        diff = builtins.cmd_diff()
+        status._setup_outf()
         diff.run(revision=revision, file_list=file_list)
-        
-bzrlib.commands.register_command(cmd_diffstatus)
+
+
+commands.register_command(cmd_diffstatus)