/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/plugins/weave_fmt/xml4.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2018-06-30 10:19:02 UTC
  • mfrom: (6973.7.13 python3-g-real)
  • Revision ID: breezy.the.bot@gmail.com-20180630101902-thpqkbi44kqom06g
Fix more tests.

Merged from https://code.launchpad.net/~jelmer/brz/python3-g/+merge/348134

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/weave_fmt/xml4.py
42
42
        """Convert InventoryEntry to XML element"""
43
43
        e = Element('entry')
44
44
        e.set('name', ie.name)
45
 
        e.set('file_id', ie.file_id)
 
45
        e.set('file_id', ie.file_id.decode('ascii'))
46
46
        e.set('kind', ie.kind)
47
47
 
48
48
        if ie.text_size is not None:
70
70
 
71
71
        :param revision_id: Ignored parameter used by xml5.
72
72
        """
73
 
        root_id = elt.get('file_id') or ROOT_ID
 
73
        root_id = elt.get('file_id')
 
74
        root_id = (root_id.encode('ascii') if root_id else ROOT_ID)
74
75
        inv = Inventory(root_id)
75
76
        for e in elt:
76
77
            ie = self._unpack_entry(e, entry_cache=entry_cache,
86
87
        ## nodes in the root directory, but it's cleaner to use one
87
88
        ## internally.
88
89
        parent_id = elt.get('parent_id')
89
 
        if parent_id is None:
90
 
            parent_id = ROOT_ID
 
90
        parent_id = (parent_id.encode('ascii') if parent_id else ROOT_ID)
91
91
 
 
92
        file_id = elt.get('file_id').encode('ascii')
92
93
        kind = elt.get('kind')
93
94
        if kind == 'directory':
94
 
            ie = inventory.InventoryDirectory(elt.get('file_id'),
 
95
            ie = inventory.InventoryDirectory(file_id,
95
96
                                              elt.get('name'),
96
97
                                              parent_id)
97
98
        elif kind == 'file':
98
 
            ie = inventory.InventoryFile(elt.get('file_id'),
 
99
            ie = inventory.InventoryFile(file_id,
99
100
                                         elt.get('name'),
100
101
                                         parent_id)
101
102
            ie.text_id = elt.get('text_id')
102
103
            ie.text_sha1 = elt.get('text_sha1')
 
104
            if ie.text_sha1 is not None:
 
105
                ie.text_sha1 = ie.text_sha1.encode('ascii')
103
106
            v = elt.get('text_size')
104
107
            ie.text_size = v and int(v)
105
108
        elif kind == 'symlink':
106
 
            ie = inventory.InventoryLink(elt.get('file_id'),
 
109
            ie = inventory.InventoryLink(file_id,
107
110
                                         elt.get('name'),
108
111
                                         parent_id)
109
112
            ie.symlink_target = elt.get('symlink_target')