[Pkg-bazaar-commits] ./bzr/unstable r597: - tidy up add code

[Martin Pool]

------------------------------------------------------------
revno: 597
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Mon 2005-05-30 13:31:51 +1000
message:
  - tidy up add code
  - always show progress messages while adding
modified:
  bzrlib/add.py
-------------- next part --------------
=== modified file 'bzrlib/add.py'
--- a/bzrlib/add.py	2005-05-16 05:26:51 +0000
+++ b/bzrlib/add.py	2005-05-30 03:31:51 +0000
@@ -17,16 +17,17 @@
 import os, sys
 import bzrlib
 
-from osutils import quotefn, appendpath
 from errors import bailout
 from trace import mutter, note
 
-def smart_add(file_list, verbose=False, recurse=True):
+def smart_add(file_list, verbose=True, recurse=True):
     """Add files to version, optionall recursing into directories.
 
     This is designed more towards DWIM for humans than API simplicity.
     For the specific behaviour see the help for cmd_add().
     """
+    from bzrlib.osutils import quotefn, kind_marker
+    
     assert file_list
     user_list = file_list[:]
     assert not isinstance(file_list, basestring)
@@ -63,12 +64,12 @@
             inv.add_path(rf, kind=kind, file_id=file_id)
             bzrlib.mutter("added %r kind %r file_id={%s}" % (rf, kind, file_id))
             count += 1 
-            if verbose:
-                bzrlib.textui.show_status('A', kind, quotefn(f))
+
+            print 'added', quotefn(f)
 
         if kind == 'directory' and recurse:
             for subf in os.listdir(af):
-                subp = appendpath(rf, subf)
+                subp = os.path.join(rf, subf)
                 if subf == bzrlib.BZRDIR:
                     mutter("skip control directory %r" % subp)
                 elif tree.is_ignored(subp):