← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/plugins/weave_fmt/workingtree.py

  • Committer: Jelmer Vernooij
  • Date: 2011-09-26 11:00:20 UTC
  • mfrom: (6167 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6169.
  • Revision ID: jelmer@samba.org-20110926110020-g86tgisgnuajlc2n
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/plugins/weave_fmt/workingtree.py
30
30
from bzrlib.decorators import needs_read_lock
31
31
from bzrlib.transport.local import LocalTransport
32
32
from bzrlib.workingtree import (
33
 
    InventoryWorkingTree,
34
33
    WorkingTreeFormat,
35
34
    )
 
35
from bzrlib.workingtree_3 import (
 
36
    PreDirStateWorkingTree,
 
37
    )
36
38
 
37
39
 
38
40
def get_conflicted_stem(path):
135
137
        return wt
136
138
 
137
139
 
138
 
class WorkingTree2(InventoryWorkingTree):
 
140
class WorkingTree2(PreDirStateWorkingTree):
139
141
    """This is the Format 2 working tree.
140
142
 
141
143
    This was the first weave based working tree.
143
145
     - uses the branch last-revision.
144
146
    """
145
147
 
146
 
    def __init__(self, *args, **kwargs):
147
 
        super(WorkingTree2, self).__init__(*args, **kwargs)
 
148
    def __init__(self, basedir, *args, **kwargs):
 
149
        super(WorkingTree2, self).__init__(basedir, *args, **kwargs)
148
150
        # WorkingTree2 has more of a constraint that self._inventory must
149
151
        # exist. Because this is an older format, we don't mind the overhead
150
152
        # caused by the extra computation here.
158
160
        """Return the references needed to perform a check of this tree."""
159
161
        return [('trees', self.last_revision())]
160
162
 
 
163
 
161
164
    def lock_tree_write(self):
162
165
        """See WorkingTree.lock_tree_write().
163
166