/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/bzr/inventory.py

  • Committer: Martin
  • Date: 2018-06-30 22:18:39 UTC
  • mfrom: (7010 work)
  • mto: This revision was merged to the branch mainline in revision 7012.
  • Revision ID: gzlist@googlemail.com-20180630221839-98zi78xwcggestse
Merge trunk to fix conflict

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/bzr/inventory.py
227
227
        """
228
228
        if u'/' in name:
229
229
            raise errors.InvalidEntryName(name=name)
 
230
        if not isinstance(file_id, bytes):
 
231
            raise TypeError(file_id)
230
232
        self.file_id = file_id
231
233
        self.revision = None
232
234
        self.name = name
1152
1154
        >>> inv.get_entry('123123').name
1153
1155
        'hello.c'
1154
1156
        """
 
1157
        if not isinstance(file_id, bytes):
 
1158
            raise TypeError(file_id)
1155
1159
        try:
1156
1160
            return self._byid[file_id]
1157
1161
        except KeyError: