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

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2020-11-19 19:46:23 UTC
  • mfrom: (7524.2.5 merge-3.1)
  • Revision ID: breezy.the.bot@gmail.com-20201119194623-5tfi4z6ktdzo0z3y
Merge lp:brz/3.1.

Merged from https://code.launchpad.net/~jelmer/brz/merge-3.1/+merge/394038

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/weave_fmt/workingtree.py
24
24
    lock,
25
25
    osutils,
26
26
    revision as _mod_revision,
27
 
    transform,
28
27
    )
29
28
from ...bzr import (
30
29
    conflicts as _mod_bzr_conflicts,
31
30
    inventory,
 
31
    transform as bzr_transform,
32
32
    xml5,
33
33
    )
34
34
from ...mutabletree import MutableTree
113
113
        else:
114
114
            parent_trees = [(revision_id, basis_tree)]
115
115
        wt.set_parent_trees(parent_trees)
116
 
        transform.build_tree(basis_tree, wt)
 
116
        bzr_transform.build_tree(basis_tree, wt)
117
117
        for hook in MutableTree.hooks['post_build_tree']:
118
118
            hook(wt)
119
119
        return wt