/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/export/__init__.py

  • Committer: Martin Pool
  • Date: 2011-07-04 21:55:35 UTC
  • mto: (6034.1.1 filter-tree)
  • mto: This revision was merged to the branch mainline in revision 6035.
  • Revision ID: mbp@canonical.com-20110704215535-zte1l6ka1siz3yyq
Remove duplicated content-filtering code from exporters

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/export/__init__.py
60
60
 
61
61
    When requesting a specific type of export, load the respective path.
62
62
    """
63
 
    def _loader(tree, dest, root, subdir, filtered, force_mtime, fileobj):
 
63
    def _loader(tree, dest, root, subdir, force_mtime, fileobj):
64
64
        func = pyutils.get_named_object(module, funcname)
65
 
        return func(tree, dest, root, subdir, filtered=filtered,
66
 
                    force_mtime=force_mtime, fileobj=fileobj)
 
65
        return func(tree, dest, root, subdir, force_mtime=force_mtime,
 
66
            fileobj=fileobj)
67
67
 
68
68
    register_exporter(scheme, extensions, _loader)
69
69
 
131
131
            "passing filtered=True to export is deprecated in bzr 2.4",
132
132
            stacklevel=2)
133
133
        tree = ContentFilterTree(tree, tree._content_filter_stack)
 
134
        # We don't want things re-filtered by the specific exporter.
 
135
        filtered = False
 
136
 
 
137
    tree.lock_read()
 
138
    if filtered:
 
139
        from bzrlib.filter_tree import ContentFilterTree
 
140
        warnings.warn(
 
141
            "passing filtered=True to export is deprecated in bzr 2.4",
 
142
            stacklevel=2)
 
143
        tree = ContentFilterTree(tree, tree._content_filter_stack)
134
144
 
135
145
    tree.lock_read()
136
146
    try:
137
147
        for _ in _exporters[format](
138
 
            tree, dest, root, subdir, filtered=filtered,
 
148
            tree, dest, root, subdir,
139
149
            force_mtime=force_mtime, fileobj=fileobj):
140
150
            yield
141
151
    finally: