/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-08 22:51:59 UTC
  • mfrom: (5775 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5777.
  • Revision ID: jelmer@samba.org-20110408225159-fjhp0fzaketco3p9
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

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