← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree_2.py

  • Committer: Jelmer Vernooij
  • Date: 2011-03-10 13:52:27 UTC
  • mto: (5712.4.5 bzrdir-weave)
  • mto: This revision was merged to the branch mainline in revision 5716.
  • Revision ID: jelmer@samba.org-20110310135227-ufcw0utlwsp8r6k6
Revert registry changes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree_2.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,
 
34
    WorkingTree,
35
35
    )
36
36
 
37
37
 
111
111
 
112
112
    def __init__(self):
113
113
        super(WorkingTreeFormat2, self).__init__()
114
 
        from bzrlib.plugins.weave_fmt.bzrdir import BzrDirFormat6
 
114
        from bzrlib.bzrdir import BzrDirFormat6
115
115
        self._matchingbzrdir = BzrDirFormat6()
116
116
 
117
117
    def open(self, a_bzrdir, _found=False):
133
133
        return wt
134
134
 
135
135
 
136
 
class WorkingTree2(InventoryWorkingTree):
 
136
class WorkingTree2(WorkingTree):
137
137
    """This is the Format 2 working tree.
138
138
 
139
139
    This was the first weave based working tree.
227
227
                             file_id=self.path2id(conflicted)))
228
228
        return conflicts
229
229
 
230
 
    def set_conflicts(self, arg):
231
 
        raise errors.UnsupportedOperation(self.set_conflicts, self)
232
230
 
233
 
    def add_conflicts(self, arg):
234
 
        raise errors.UnsupportedOperation(self.add_conflicts, self)