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

  • Committer: Jelmer Vernooij
  • Date: 2017-05-22 00:56:52 UTC
  • mfrom: (6621.2.26 py3_pokes)
  • Revision ID: jelmer@jelmer.uk-20170522005652-yjahcr9hwmjkno7n
Merge Python3 porting work ('py3 pokes')

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/mutabletree.py
21
21
 
22
22
from __future__ import absolute_import
23
23
 
24
 
from breezy.lazy_import import lazy_import
 
24
from .lazy_import import lazy_import
25
25
lazy_import(globals(), """
26
26
import operator
27
27
import os
41
41
    )
42
42
""")
43
43
 
44
 
from breezy.decorators import needs_read_lock, needs_write_lock
 
44
from .decorators import needs_read_lock, needs_write_lock
45
45
 
46
46
 
47
47
def needs_tree_write_lock(unbound):
327
327
        """
328
328
        raise NotImplementedError(self.mkdir)
329
329
 
330
 
    def _observed_sha1(self, file_id, path, (sha1, stat_value)):
 
330
    def _observed_sha1(self, file_id, path, sha_and_stat):
331
331
        """Tell the tree we have observed a paths sha1.
332
332
 
333
333
        The intent of this function is to allow trees that have a hashcache to
339
339
 
340
340
        :param file_id: The file id
341
341
        :param path: The file path
342
 
        :param sha1: The sha 1 that was observed.
343
 
        :param stat_value: A stat result for the file the sha1 was read from.
 
342
        :param sha_and_stat: The sha 1 and stat result observed.
344
343
        :return: None
345
344
        """
346
345