← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/xml5.py

Merge Tree.changes_from work.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/xml5.py
32
32
    
33
33
    def _pack_inventory(self, inv):
34
34
        """Convert to XML Element"""
 
35
        entries = inv.iter_entries()
35
36
        e = Element('inventory',
36
37
                    format='5')
37
38
        e.text = '\n'
38
 
        if inv.root.file_id not in (None, ROOT_ID):
39
 
            e.set('file_id', inv.root.file_id)
 
39
        path, root = entries.next()
 
40
        if root.file_id not in (None, ROOT_ID):
 
41
            e.set('file_id', root.file_id)
40
42
        if inv.revision_id is not None:
41
43
            e.set('revision_id', inv.revision_id)
42
 
        for path, ie in inv.iter_entries():
 
44
        for path, ie in entries:
43
45
            e.append(self._pack_entry(ie))
44
46
        return e
45
47