← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/bzrdir.py

Make root entry an InventoryDirectory, make EmptyTree really empty

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bzrdir.py
1577
1577
               rev_id)
1578
1578
        parent_invs = map(self._load_updated_inventory, present_parents)
1579
1579
        for file_id in inv:
 
1580
            if inv.is_root(file_id):
 
1581
                continue
1580
1582
            ie = inv[file_id]
1581
1583
            self._convert_file_version(rev, ie, parent_invs)
1582
1584
 
1586
1588
        The file needs to be added into the weave if it is a merge
1587
1589
        of >=2 parents or if it's changed from its parent.
1588
1590
        """
1589
 
        if ie.kind == 'root_directory':
1590
 
            return
1591
1591
        file_id = ie.file_id
1592
1592
        rev_id = rev.revision_id
1593
1593
        w = self.text_weaves.get(file_id)
1601
1601
                                                  entry_vf=w)
1602
1602
        for old_revision in previous_entries:
1603
1603
                # if this fails, its a ghost ?
1604
 
                assert old_revision in self.converted_revs 
 
1604
                assert old_revision in self.converted_revs, \
 
1605
                    "Revision {%s} not in converted_revs" % old_revision
1605
1606
        self.snapshot_ie(previous_entries, ie, w, rev_id)
1606
1607
        del ie.text_id
1607
1608
        assert getattr(ie, 'revision', None) is not None