← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transform.py

Get rid of useless code in transform.py.

* bzrlib/transform.py:
(TreeTransformBase._parent_type_conflicts): Delete useless code.
(TreeTransformBase._any_contents): Slightly simplify.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transform.py
676
676
                continue
677
677
            if not self._any_contents(children):
678
678
                continue
679
 
            for child in children:
680
 
                if self.final_kind(child) is None:
681
 
                    continue
682
679
            kind = self.final_kind(parent_id)
683
680
            if kind is None:
684
681
                conflicts.append(('missing parent', parent_id))
689
686
    def _any_contents(self, trans_ids):
690
687
        """Return true if any of the trans_ids, will have contents."""
691
688
        for trans_id in trans_ids:
692
 
            if self.final_kind(trans_id) is None:
693
 
                continue
694
 
            return True
 
689
            if self.final_kind(trans_id) is not None:
 
690
                return True
695
691
        return False
696
692
 
697
693
    def _set_executability(self, path, trans_id):