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

Make revision_hint mandatory.

Show diffs side-by-side

added added

removed removed

Lines of Context:
shamap.py
78
78
class InventorySHAMap(object):
79
79
    """Maps inventory file ids to Git SHAs."""
80
80
 
81
 
    def lookup_blob(self, file_id, revision_hint=None):
 
81
    def lookup_blob(self, file_id, revision):
82
82
        """Retrieve a Git blob SHA by file id.
83
83
 
84
84
        :param file_id: File id of the file/symlink
85
 
        :param revision_hint: Optional revision in which the file was last
86
 
            changed.
 
85
        :param revision: revision in which the file was last changed.
87
86
        """
88
87
        raise NotImplementedError(self.lookup_blob)
89
88
 
169
168
                self._base = base
170
169
                self.revid = revid
171
170
 
172
 
            def lookup_blob(self, fileid, revision_hint=None):
173
 
                if revision_hint is not None:
174
 
                    revid = revision_hint
175
 
                else:
176
 
                    revid = self.revid
177
 
                return self._base._by_fileid[revid][fileid]
 
171
            def lookup_blob(self, fileid, revision):
 
172
                return self._base._by_fileid[revision][fileid]
178
173
 
179
174
            def lookup_tree(self, fileid):
180
175
                return self._base._by_fileid[self.revid][fileid]
290
285
                self.db = db
291
286
                self.revid = revid
292
287
 
293
 
            def lookup_blob(self, fileid, revision_hint=None):
294
 
                if revision_hint is not None:
295
 
                    revid = revision_hint
296
 
                else:
297
 
                    revid = self.revid
298
 
                row = self.db.execute("select sha1 from blobs where fileid = ? and revid = ?", (fileid, revid)).fetchone()
 
288
            def lookup_blob(self, fileid, revision):
 
289
                row = self.db.execute("select sha1 from blobs where fileid = ? and revid = ?", (fileid, revision)).fetchone()
299
290
                if row is not None:
300
291
                    return row[0]
301
292
                raise KeyError(fileid)
426
417
                self.db = db
427
418
                self.revid = revid
428
419
 
429
 
            def lookup_blob(self, fileid, revision_hint=None):
430
 
                if revision_hint is not None:
431
 
                    revid = revision_hint
432
 
                else:
433
 
                    revid = self.revid
434
 
                return sha_to_hex(self.db["\0".join(("blob", fileid, revid))])
 
420
            def lookup_blob(self, fileid, revision):
 
421
                return sha_to_hex(self.db["\0".join(("blob", fileid, revision))])
435
422
                
436
423
        return TdbInventorySHAMap(self.db, revid)
437
424