← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: Patch Queue Manager
  • Date: 2011-12-22 18:52:58 UTC
  • mfrom: (6213.1.55 feature-flags)
  • Revision ID: pqm@pqm.ubuntu.com-20111222185258-wgcba8590pbw5sf1
(jelmer) Add support for feature flags in bzr formats. (Jelmer Vernooij)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
47
47
 
48
48
from bzrlib import (
49
49
    branch,
50
 
    bzrdir,
51
50
    conflicts as _mod_conflicts,
52
51
    controldir,
53
52
    errors,
72
71
 
73
72
# Explicitly import bzrlib.bzrdir so that the BzrProber
74
73
# is guaranteed to be registered.
75
 
import bzrlib.bzrdir
 
74
from bzrlib import (
 
75
    bzrdir,
 
76
    symbol_versioning,
 
77
    )
76
78
 
77
 
from bzrlib import symbol_versioning
78
79
from bzrlib.decorators import needs_read_lock, needs_write_lock
79
80
from bzrlib.i18n import gettext
80
81
from bzrlib.lock import LogicalLockResult
3133
3134
        return self._matchingbzrdir
3134
3135
 
3135
3136
 
3136
 
class WorkingTreeFormatMetaDir(bzrdir.BzrDirMetaComponentFormat, WorkingTreeFormat):
 
3137
class WorkingTreeFormatMetaDir(bzrdir.BzrFormat, WorkingTreeFormat):
3137
3138
    """Base class for working trees that live in bzr meta directories."""
3138
3139
 
3139
3140
    def __init__(self):
3140
3141
        WorkingTreeFormat.__init__(self)
3141
 
        bzrdir.BzrDirMetaComponentFormat.__init__(self)
 
3142
        bzrdir.BzrFormat.__init__(self)
3142
3143
 
3143
3144
    @classmethod
3144
3145
    def find_format_string(klass, controldir):
3156
3157
        return klass._find_format(format_registry, 'working tree',
3157
3158
                format_string)
3158
3159
 
 
3160
    def check_support_status(self, allow_unsupported, recommend_upgrade=True,
 
3161
            basedir=None):
 
3162
        WorkingTreeFormat.check_support_status(self,
 
3163
            allow_unsupported=allow_unsupported, recommend_upgrade=recommend_upgrade,
 
3164
            basedir=basedir)
 
3165
        bzrdir.BzrFormat.check_support_status(self, allow_unsupported=allow_unsupported,
 
3166
            recommend_upgrade=recommend_upgrade, basedir=basedir)
 
3167
 
3159
3168
 
3160
3169
format_registry.register_lazy("Bazaar Working Tree Format 4 (bzr 0.15)\n",
3161
3170
    "bzrlib.workingtree_4", "WorkingTreeFormat4")