← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree_3.py

  • Committer: Jelmer Vernooij
  • Date: 2012-01-06 22:44:57 UTC
  • mfrom: (6436 +trunk)
  • mto: (6437.3.11 2.5)
  • mto: This revision was merged to the branch mainline in revision 6444.
  • Revision ID: jelmer@samba.org-20120106224457-re0pcy0fz31xob77
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree_3.py
18
18
 
19
19
"""
20
20
 
 
21
from __future__ import absolute_import
 
22
 
21
23
import errno
22
24
 
23
25
from bzrlib import (
34
36
    )
35
37
from bzrlib.lockable_files import LockableFiles
36
38
from bzrlib.lockdir import LockDir
 
39
from bzrlib.mutabletree import MutableTree
37
40
from bzrlib.transport.local import LocalTransport
38
41
from bzrlib.workingtree import (
39
42
    InventoryWorkingTree,
193
196
        control_files = self._open_control_files(a_bzrdir)
194
197
        control_files.create_lock()
195
198
        control_files.lock_write()
196
 
        transport.put_bytes('format', self.get_format_string(),
 
199
        transport.put_bytes('format', self.as_string(),
197
200
            mode=a_bzrdir._get_file_mode())
198
201
        if from_branch is not None:
199
202
            branch = from_branch
225
228
            else:
226
229
                wt.set_parent_trees([(revision_id, basis_tree)])
227
230
            transform.build_tree(basis_tree, wt)
 
231
            for hook in MutableTree.hooks['post_build_tree']:
 
232
                hook(wt)
228
233
        finally:
229
234
            # Unlock in this order so that the unlock-triggers-flush in
230
235
            # WorkingTree is given a chance to fire.