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

Avoid using file ids in object store code.

Merged from https://code.launchpad.net/~jelmer/brz-git/no-push-file-ids/+merge/342827

Show diffs side-by-side

added added

removed removed

Lines of Context:
cache.py
297
297
            self.cache.idmap._by_revid[self.revid] = obj.id
298
298
        elif obj.type_name in ("blob", "tree"):
299
299
            if bzr_key_data is not None:
300
 
                if obj.type_name == "blob":
301
 
                    revision = bzr_key_data[1]
302
 
                else:
303
 
                    revision = self.revid
304
 
                key = type_data = (bzr_key_data[0], revision)
 
300
                key = type_data = bzr_key_data
305
301
                self.cache.idmap._by_fileid.setdefault(type_data[1], {})[type_data[0]] = obj.id
306
302
        else:
307
303
            raise AssertionError
363
359
            self._testament3_sha1 = bzr_key_data.get("testament3-sha1")
364
360
        elif obj.type_name == "tree":
365
361
            if bzr_key_data is not None:
366
 
                self._trees.append((obj.id, bzr_key_data[0], self.revid))
 
362
                self._trees.append((obj.id, bzr_key_data[0], bzr_key_data[1]))
367
363
        elif obj.type_name == "blob":
368
364
            if bzr_key_data is not None:
369
365
                self._blobs.append((obj.id, bzr_key_data[0], bzr_key_data[1]))
539
535
        elif obj.type_name == "tree":
540
536
            if bzr_key_data is None:
541
537
                return
542
 
            (file_id, ) = bzr_key_data
543
 
            type_data = (file_id, self.revid)
 
538
            type_data = bzr_key_data
544
539
        else:
545
540
            raise AssertionError
546
541
        entry = "\0".join((obj.type_name, ) + type_data) + "\n"
746
741
            self.cache.idmap._add_node(("blob", bzr_key_data[0],
747
742
                bzr_key_data[1]), obj.id)
748
743
        elif obj.type_name == "tree":
749
 
            self.cache.idmap._add_git_sha(obj.id, "tree",
750
 
                (bzr_key_data[0], self.revid))
 
744
            self.cache.idmap._add_git_sha(obj.id, "tree", bzr_key_data)
751
745
            self._cache_objs.add((obj, path))
752
746
        else:
753
747
            raise AssertionError