[MERGE] minor cleanups

[Robert Collins]

I've opened a misc-fixen branch at 
http://bazaar.launchpad.net/~lifeless/bzr/misc-fixen

Seeking a +1 on the current trivialities:


=== modified file 'bzrlib/branch.py'
--- bzrlib/branch.py    2006-06-15 20:57:44 +0000
+++ bzrlib/branch.py    2006-06-16 16:59:43 +0000
@@ -55,7 +55,6 @@
                              )
 from bzrlib.store import copy_all
 from bzrlib.symbol_versioning import *
-from bzrlib.textui import show_status
 from bzrlib.trace import mutter, note
 import bzrlib.transactions as transactions
 from bzrlib.transport import Transport, get_transport


=== modified file 'bzrlib/delta.py'
--- bzrlib/delta.py     2006-05-30 04:44:48 +0000
+++ bzrlib/delta.py     2006-06-16 16:59:43 +0000
@@ -90,6 +90,7 @@


     def show(self, to_file, show_ids=False, show_unchanged=False):
+        """output this delta in status-like form to to_file."""
         def show_list(files):
             for item in files:
                 path, fid, kind = item[:3]
@@ -141,7 +142,6 @@
             show_list(self.unchanged)


-
 def compare_trees(old_tree, new_tree, want_unchanged=False,
specific_files=None):
     """Describe changes from one tree to another.



=== modified file 'bzrlib/log.py'
--- bzrlib/log.py       2006-06-15 18:11:51 +0000
+++ bzrlib/log.py       2006-06-16 16:59:43 +0000
@@ -173,7 +173,6 @@
     """Worker function for show_log - see show_log."""
     from bzrlib.osutils import format_date
     from bzrlib.errors import BzrCheckError
-    from bzrlib.textui import show_status

     from warnings import warn



Cheers,
Rob

-- 
GPG key available at: <http://www.robertcollins.net/keys.txt>.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 191 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060617/a5a2f65c/attachment.pgp