/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 Packman
  • Date: 2012-01-05 09:50:04 UTC
  • mfrom: (6424 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6426.
  • Revision ID: martin.packman@canonical.com-20120105095004-mia9xb7y0efmto0v
Merge bzr.dev to resolve conflicts in bzrlib.builtins

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/export/__init__.py
17
17
"""Export trees to tarballs, non-controlled directories, zipfiles, etc.
18
18
"""
19
19
 
 
20
from __future__ import absolute_import
 
21
 
20
22
import os
21
23
import time
22
24
import warnings
195
197
    :param tree: A tree object.
196
198
    :param subdir: None or the path of an entry to start exporting from.
197
199
    :param skip_special: Whether to skip .bzr files.
 
200
    :return: iterator over tuples with final path, tree path and inventory
 
201
        entry for each entry to export
198
202
    """
199
203
    if subdir == '':
200
204
        subdir = None
221
225
        if not tree.has_filename(path):
222
226
            continue
223
227
 
224
 
        yield final_path, entry
 
228
        yield final_path, path, entry
225
229
 
226
230
 
227
231
register_lazy_exporter(None, [], 'bzrlib.export.dir_exporter',