~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: Aaron Bentley
  • Date: 2006-12-22 05:14:34 UTC
  • mto: (2255.6.1 dirstate)
  • mto: This revision was merged to the branch mainline in revision 2322.
  • Revision ID: aaron.bentley@utoronto.ca-20061222051434-mv7zhuh0wp8hhfi8
get test suite passing

Show diffs side-by-side

added added

removed removed

Lines of Context:
2194
2194
    _lock_class = LockDir
2195
2195
    _tree_class = WorkingTree3
2196
2196
 
 
2197
    def __get_matchingbzrdir(self):
 
2198
        return bzrdir.BzrDirMetaFormat1()
 
2199
 
 
2200
    _matchingbzrdir = property(__get_matchingbzrdir)
 
2201
 
2197
2202
    def _open_control_files(self, a_bzrdir):
2198
2203
        transport = a_bzrdir.get_workingtree_transport(None)
2199
2204
        return LockableFiles(transport, self._lock_file_name, 
2246
2251
 
2247
2252
    def __init__(self):
2248
2253
        super(WorkingTreeFormat3, self).__init__()
2249
 
        self._matchingbzrdir = bzrdir.BzrDirMetaFormat1()
2250
2254
 
2251
2255
    def open(self, a_bzrdir, _found=False):
2252
2256
        """Return the WorkingTree object for a_bzrdir
2285
2289
 
2286
2290
    requires_rich_root = True
2287
2291
 
 
2292
    def __init__(self):
 
2293
        WorkingTreeFormat3.__init__(self)
 
2294
        
 
2295
    def __get_matchingbzrdir(self):
 
2296
        return bzrdir.get_knit3_format()
 
2297
 
 
2298
    _matchingbzrdir = property(__get_matchingbzrdir)
 
2299
 
2288
2300
    def get_format_string(self):
2289
2301
        """See WorkingTreeFormat.get_format_string()."""
2290
2302
        return "Bazaar-NG Working Tree format 4"