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

  • Committer: Jelmer Vernooij
  • Date: 2018-12-18 20:55:37 UTC
  • mfrom: (7223 work)
  • mto: This revision was merged to the branch mainline in revision 7231.
  • Revision ID: jelmer@jelmer.uk-20181218205537-td8qyejigxki0xmn
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/git/memorytree.py
73
73
                if kinds[pos] is None:
74
74
                    kinds[pos] = self.kind(f)
75
75
 
76
 
    def put_file_bytes_non_atomic(self, path, bytes, file_id=None):
 
76
    def put_file_bytes_non_atomic(self, path, bytes):
77
77
        """See MutableTree.put_file_bytes_non_atomic."""
78
78
        self._file_transport.put_bytes(path, bytes)
79
79
 
192
192
            raise AssertionError('unknown type %d' % stat_val.st_mode)
193
193
        return index_entry_from_stat(stat_val, blob.id, 0)
194
194
 
195
 
    def get_file_with_stat(self, path, file_id=None):
196
 
        return (self.get_file(path, file_id), self._lstat(path))
 
195
    def get_file_with_stat(self, path):
 
196
        return (self.get_file(path), self._lstat(path))
197
197
 
198
 
    def get_file(self, path, file_id=None):
 
198
    def get_file(self, path):
199
199
        """See Tree.get_file."""
200
200
        return self._file_transport.get(path)
201
201
 
202
 
    def get_file_sha1(self, path, file_id=None, stat_value=None):
 
202
    def get_file_sha1(self, path, stat_value=None):
203
203
        """See Tree.get_file_sha1()."""
204
204
        stream = self._file_transport.get(path)
205
205
        return osutils.sha_file(stream)