~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_dirstate.py

  • Committer: Ian Clatworthy
  • Date: 2008-04-17 14:10:33 UTC
  • mto: (4171.1.1 ianc-integration)
  • mto: This revision was merged to the branch mainline in revision 4173.
  • Revision ID: ian.clatworthy@canonical.com-20080417141033-0fnc7oe07535rw90
make content filter lookup a tree responsibility

Show diffs side-by-side

added added

removed removed

Lines of Context:
23
23
from bzrlib import (
24
24
    dirstate,
25
25
    errors,
 
26
    filters,
26
27
    osutils,
27
28
    )
28
29
from bzrlib.memorytree import MemoryTree
1623
1624
        timestamp = super(InstrumentedDirState, self)._sha_cutoff_time()
1624
1625
        self._cutoff_time = timestamp + self._time_offset
1625
1626
 
1626
 
    def _sha1_file_and_log(self, abspath):
 
1627
    def _sha1_file_and_log(self, abspath, filters_):
1627
1628
        self._log.append(('sha1', abspath))
1628
 
        return osutils.sha_file_by_name(abspath)
 
1629
        return filters.sha_file_by_name(abspath, filters_)
1629
1630
 
1630
1631
    def _read_link(self, abspath, old_link):
1631
1632
        self._log.append(('read_link', abspath, old_link))