← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree_4.py

(vila) Provide a config section matcher respecting the file order. (Vincent
 Ladeuil)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree_4.py
57
57
from bzrlib.lock import LogicalLockResult
58
58
from bzrlib.lockable_files import LockableFiles
59
59
from bzrlib.lockdir import LockDir
60
 
from bzrlib.mutabletree import needs_tree_write_lock
 
60
from bzrlib.mutabletree import (
 
61
    MutableTree,
 
62
    needs_tree_write_lock,
 
63
    )
61
64
from bzrlib.osutils import (
62
65
    file_kind,
63
66
    isdir,
1478
1481
        control_files = self._open_control_files(a_bzrdir)
1479
1482
        control_files.create_lock()
1480
1483
        control_files.lock_write()
1481
 
        transport.put_bytes('format', self.get_format_string(),
 
1484
        transport.put_bytes('format', self.as_string(),
1482
1485
            mode=a_bzrdir._get_file_mode())
1483
1486
        if from_branch is not None:
1484
1487
            branch = from_branch
1544
1547
                transform.build_tree(basis, wt, accelerator_tree,
1545
1548
                                     hardlink=hardlink,
1546
1549
                                     delta_from_tree=delta_from_tree)
 
1550
                for hook in MutableTree.hooks['post_build_tree']:
 
1551
                    hook(wt)
1547
1552
            finally:
1548
1553
                basis.unlock()
1549
1554
        finally:
2260
2265
    def update_format(self, tree):
2261
2266
        """Change the format marker."""
2262
2267
        tree._transport.put_bytes('format',
2263
 
            self.target_format.get_format_string(),
 
2268
            self.target_format.as_string(),
2264
2269
            mode=tree.bzrdir._get_file_mode())
2265
2270
 
2266
2271
 
2283
2288
    def update_format(self, tree):
2284
2289
        """Change the format marker."""
2285
2290
        tree._transport.put_bytes('format',
2286
 
            self.target_format.get_format_string(),
 
2291
            self.target_format.as_string(),
2287
2292
            mode=tree.bzrdir._get_file_mode())
2288
2293
 
2289
2294
 
2312
2317
    def update_format(self, tree):
2313
2318
        """Change the format marker."""
2314
2319
        tree._transport.put_bytes('format',
2315
 
            self.target_format.get_format_string(),
 
2320
            self.target_format.as_string(),
2316
2321
            mode=tree.bzrdir._get_file_mode())