/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 bzrlib/workingtree.py

  • Committer: Jelmer Vernooij
  • Date: 2011-04-01 11:23:10 UTC
  • mto: This revision was merged to the branch mainline in revision 5770.
  • Revision ID: jelmer@samba.org-20110401112310-q4a40fzvdv1qxctd
Add filters to import tariff blacklist.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
51
51
    conflicts as _mod_conflicts,
52
52
    controldir,
53
53
    errors,
 
54
    filters as _mod_filters,
54
55
    generate_ids,
55
56
    globbing,
56
57
    graph as _mod_graph,
94
95
    splitpath,
95
96
    supports_executable,
96
97
    )
97
 
from bzrlib.filters import filtered_input_file
98
98
from bzrlib.trace import mutter, note
99
99
from bzrlib.transport.local import LocalTransport
100
100
from bzrlib.revision import CURRENT_REVISION
534
534
        stat_value = _fstat(file_obj.fileno())
535
535
        if filtered and self.supports_content_filtering():
536
536
            filters = self._content_filter_stack(path)
537
 
            file_obj = filtered_input_file(file_obj, filters)
 
537
            file_obj = _mod_filters.filtered_input_file(file_obj, filters)
538
538
        return (file_obj, stat_value)
539
539
 
540
540
    def get_file_text(self, file_id, path=None, filtered=True):
549
549
        f = file(path, 'rb')
550
550
        if filtered and self.supports_content_filtering():
551
551
            filters = self._content_filter_stack(filename)
552
 
            return filtered_input_file(f, filters)
 
552
            return _mod_filters.filtered_input_file(f, filters)
553
553
        else:
554
554
            return f
555
555