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

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2018-11-16 15:19:49 UTC
  • mfrom: (7141.7.6 no-file-ids)
  • Revision ID: breezy.the.bot@gmail.com-20181116151949-hrmuv6s7ow1cqdhi
Drop file_id argument from read functions in Tree.

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

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/memorytree.py
144
144
        """See Tree.has_filename()."""
145
145
        return self._file_transport.has(filename)
146
146
 
147
 
    def is_executable(self, path, file_id=None):
148
 
        return self._inventory[file_id].executable
 
147
    def is_executable(self, path):
 
148
        return self._inventory.get_entry_by_path(path).executable
149
149
 
150
150
    def kind(self, path, file_id=None):
151
151
        if file_id is None:
230
230
                self._file_transport.mkdir(path)
231
231
            elif entry.kind == 'file':
232
232
                self._file_transport.put_file(path,
233
 
                    self._basis_tree.get_file(path, entry.file_id))
 
233
                    self._basis_tree.get_file(path))
234
234
            else:
235
235
                raise NotImplementedError(self._populate_from_branch)
236
236