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

Improve the API for Transform.

Merged from https://code.launchpad.net/~jelmer/brz/transform/+merge/386855

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/git/workingtree.py
56
56
    controldir as _mod_controldir,
57
57
    globbing,
58
58
    lock,
59
 
    merge,
60
59
    osutils,
61
60
    revision as _mod_revision,
62
61
    trace,
1208
1207
            show_base=False):
1209
1208
        basis_tree = self.revision_tree(old_revision)
1210
1209
        if new_revision != old_revision:
 
1210
            from .. import merge
1211
1211
            with basis_tree.lock_read():
1212
1212
                new_basis_tree = self.branch.basis_tree()
1213
1213
                merge.merge_inner(
1316
1316
 
1317
1317
    def copy_content_into(self, tree, revision_id=None):
1318
1318
        """Copy the current content and user files of this tree into tree."""
 
1319
        from .. import merge
1319
1320
        with self.lock_read():
1320
1321
            if revision_id is None:
1321
1322
                merge.transform_tree(tree, self)