/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 object_store.py

Cope with the fact that _type is gone in upstream dulwich.

Show diffs side-by-side

added added

removed removed

Lines of Context:
object_store.py
318
318
        commit_obj = None
319
319
        entries = []
320
320
        for path, obj in self._revision_to_objects(rev, inv):
321
 
            if obj._type == "commit":
 
321
            if obj.type_name == "commit":
322
322
                commit_obj = obj
323
 
            elif obj._type in ("blob", "tree"):
 
323
            elif obj.type_name in ("blob", "tree"):
324
324
                file_id = inv.path2id(path)
325
325
                ie = inv[file_id]
326
 
                if obj._type == "blob":
 
326
                if obj.type_name == "blob":
327
327
                    revision = ie.revision
328
328
                else:
329
329
                    revision = revid
330
 
                entries.append((file_id, obj._type, obj.id, revision))
 
330
                entries.append((file_id, obj.type_name, obj.id, revision))
331
331
            else:
332
332
                raise AssertionError
333
333
        self._idmap.add_entries(revid, rev.parent_ids, commit_obj.id,