[Pkg-bazaar-commits] ./bzr/unstable r88: smart_add: no warning for already-added files

[mbp at sourcefrog.net]

------------------------------------------------------------
revno: 88
committer: mbp at sourcefrog.net
timestamp: Fri 2005-03-25 14:18:21 +1100
message:
  smart_add: no warning for already-added files
modified:
  bzrlib/add.py
-------------- next part --------------
=== modified file 'bzrlib/add.py'
--- a/bzrlib/add.py	2005-03-25 03:09:43 +0000
+++ b/bzrlib/add.py	2005-03-25 03:18:21 +0000
@@ -28,7 +28,7 @@
     For the specific behaviour see the help for cmd_add().
     """
     assert file_list
-    assert not isinstance(file_list, types.StringTypes)
+    assert not isinstance(file_list, basestring)
     b = bzrlib.branch.Branch(file_list[0], find_root=True)
     inv = b.read_working_inventory()
     tree = b.working_tree()
@@ -53,7 +53,7 @@
         versioned = (inv.path2id(rf) != None)
 
         if versioned:
-            bzrlib.warning("%r is already versioned" % f)
+            mutter("%r is already versioned" % f)
         else:
             file_id = bzrlib.branch.gen_file_id(rf)
             inv.add_path(rf, kind=kind, file_id=file_id)