← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transform.py

  • Committer: Jelmer Vernooij
  • Date: 2012-01-18 10:42:07 UTC
  • mfrom: (6437.3.6 2.5)
  • mto: (6437.3.7 2.5)
  • mto: This revision was merged to the branch mainline in revision 6441.
  • Revision ID: jelmer@vernstok.nl-20120118104207-yc5fhsaz4mupjcam
Merge 2.5 branch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transform.py
232
232
        irrelevant.
233
233
 
234
234
        """
235
 
        new_roots = [k for k, v in self._new_parent.iteritems() if v is
 
235
        new_roots = [k for k, v in self._new_parent.iteritems() if v ==
236
236
                     ROOT_PARENT]
237
237
        if len(new_roots) < 1:
238
238
            return
628
628
        for trans_id in self._new_parent:
629
629
            seen = set()
630
630
            parent_id = trans_id
631
 
            while parent_id is not ROOT_PARENT:
 
631
            while parent_id != ROOT_PARENT:
632
632
                seen.add(parent_id)
633
633
                try:
634
634
                    parent_id = self.final_parent(parent_id)
644
644
        """If parent directories are versioned, children must be versioned."""
645
645
        conflicts = []
646
646
        for parent_id, children in by_parent.iteritems():
647
 
            if parent_id is ROOT_PARENT:
 
647
            if parent_id == ROOT_PARENT:
648
648
                continue
649
649
            if self.final_file_id(parent_id) is not None:
650
650
                continue
743
743
        """Children must have a directory parent"""
744
744
        conflicts = []
745
745
        for parent_id, children in by_parent.iteritems():
746
 
            if parent_id is ROOT_PARENT:
 
746
            if parent_id == ROOT_PARENT:
747
747
                continue
748
748
            no_children = True
749
749
            for child_id in children: