← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree_4.py

  • Committer: Jelmer Vernooij
  • Date: 2011-04-09 19:25:42 UTC
  • mto: (5777.5.1 inventoryworkingtree)
  • mto: This revision was merged to the branch mainline in revision 5781.
  • Revision ID: jelmer@samba.org-20110409192542-8bbedp36s7nj928e
Split InventoryTree out of Tree.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree_4.py
60
60
    safe_unicode,
61
61
    )
62
62
from bzrlib.transport.local import LocalTransport
63
 
from bzrlib.tree import InterTree
64
 
from bzrlib.tree import Tree
65
 
from bzrlib.workingtree import WorkingTree, WorkingTree3, WorkingTreeFormat3
 
63
from bzrlib.tree import (
 
64
    InterTree,
 
65
    InventoryTree,
 
66
    )
 
67
from bzrlib.workingtree import (
 
68
    WorkingTree,
 
69
    WorkingTree3,
 
70
    WorkingTreeFormat3,
 
71
    )
66
72
 
67
73
 
68
74
class DirStateWorkingTree(WorkingTree3):
 
75
 
69
76
    def __init__(self, basedir,
70
77
                 branch,
71
78
                 _control_files=None,
1250
1257
    def rename_one(self, from_rel, to_rel, after=False):
1251
1258
        """See WorkingTree.rename_one"""
1252
1259
        self.flush()
1253
 
        WorkingTree.rename_one(self, from_rel, to_rel, after)
 
1260
        super(DirStateWorkingTree, self).rename_one(from_rel, to_rel, after)
1254
1261
 
1255
1262
    @needs_tree_write_lock
1256
1263
    def apply_inventory_delta(self, changes):
1604
1611
        return True
1605
1612
 
1606
1613
 
1607
 
class DirStateRevisionTree(Tree):
 
1614
class DirStateRevisionTree(InventoryTree):
1608
1615
    """A revision tree pulling the inventory from a dirstate.
1609
1616
    
1610
1617
    Note that this is one of the historical (ie revision) trees cached in the