← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree_4.py

  • Committer: Jelmer Vernooij
  • Date: 2012-01-30 14:18:22 UTC
  • mfrom: (6456 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6464.
  • Revision ID: jelmer@samba.org-20120130141822-u4fqwswoyew4a14a
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree_4.py
68
68
    realpath,
69
69
    safe_unicode,
70
70
    )
71
 
from bzrlib.symbol_versioning import (
72
 
    deprecated_in,
73
 
    deprecated_method,
74
 
    )
75
71
from bzrlib.transport.local import LocalTransport
76
72
from bzrlib.tree import (
77
73
    InterTree,
259
255
 
260
256
        :return: an integer. -1 means never save.
261
257
        """
262
 
        # FIXME: We want a WorkingTreeStack here -- vila 20110812
263
 
        conf = config.BranchStack(self.branch)
 
258
        conf = self.get_config_stack()
264
259
        return conf.get('bzr.workingtree.worth_saving_limit')
265
260
 
266
261
    def filter_unversioned_files(self, paths):
1610
1605
        """Overrideable method to get a bzrdir for testing."""
1611
1606
        # please test against something that will let us do tree references
1612
1607
        return bzrdir.format_registry.make_bzrdir(
1613
 
            'dirstate-with-subtree')
 
1608
            'development-subtree')
1614
1609
 
1615
1610
    _matchingbzrdir = property(__get_matchingbzrdir)
1616
1611