Rev 4643: Get rid of useless code in transform.py. in file:///home/vila/src/bzr/experimental/conflict-manager/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/experimental/conflict-manager/

------------------------------------------------------------
revno: 4643
revision-id: v.ladeuil+lp at free.fr-20100827075421-o37z8fd07jw4icz9
parent: v.ladeuil+lp at free.fr-20100825130232-p6ti8njzv5dn322t
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: cleanup
timestamp: Fri 2010-08-27 09:54:21 +0200
message:
  Get rid of useless code in transform.py.
  
  * bzrlib/transform.py:
  (TreeTransformBase._parent_type_conflicts): Delete useless code.
  (TreeTransformBase._any_contents): Slightly simplify.
-------------- next part --------------
=== modified file 'bzrlib/transform.py'
--- a/bzrlib/transform.py	2010-08-25 13:02:32 +0000
+++ b/bzrlib/transform.py	2010-08-27 07:54:21 +0000
@@ -676,9 +676,6 @@
                 continue
             if not self._any_contents(children):
                 continue
-            for child in children:
-                if self.final_kind(child) is None:
-                    continue
             kind = self.final_kind(parent_id)
             if kind is None:
                 conflicts.append(('missing parent', parent_id))
@@ -689,9 +686,8 @@
     def _any_contents(self, trans_ids):
         """Return true if any of the trans_ids, will have contents."""
         for trans_id in trans_ids:
-            if self.final_kind(trans_id) is None:
-                continue
-            return True
+            if self.final_kind(trans_id) is not None:
+                return True
         return False
 
     def _set_executability(self, path, trans_id):