← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree_4.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2011-04-11 02:01:01 UTC
  • mfrom: (5777.1.4 tree-trivial)
  • Revision ID: pqm@pqm.ubuntu.com-20110411020101-orzxkwkibj496n91
(jelmer) Two trivial fixes for bzrlib.tree and bzrlib.workingtree. (Jelmer
 Vernooij)

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