← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree_4.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2011-08-17 05:34:42 UTC
  • mfrom: (6059.4.8 migrate-config-options)
  • Revision ID: pqm@pqm.ubuntu.com-20110817053442-pz1w7iw2w0w78ewy
(vila) More options migrated to the stack-based config. (Vincent Ladeuil)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree_4.py
34
34
from bzrlib import (
35
35
    bzrdir,
36
36
    cache_utf8,
 
37
    config,
37
38
    conflicts as _mod_conflicts,
38
39
    debug,
39
40
    dirstate,
76
77
 
77
78
class DirStateWorkingTree(InventoryWorkingTree):
78
79
 
79
 
    _DEFAULT_WORTH_SAVING_LIMIT = 10
80
 
 
81
80
    def __init__(self, basedir,
82
81
                 branch,
83
82
                 _control_files=None,
251
250
 
252
251
        :return: an integer. -1 means never save.
253
252
        """
254
 
        config = self.branch.get_config()
255
 
        val = config.get_user_option('bzr.workingtree.worth_saving_limit')
256
 
        if val is None:
257
 
            val = self._DEFAULT_WORTH_SAVING_LIMIT
258
 
        else:
259
 
            try:
260
 
                val = int(val)
261
 
            except ValueError, e:
262
 
                trace.warning('Invalid config value for'
263
 
                              ' "bzr.workingtree.worth_saving_limit"'
264
 
                              ' value %r is not an integer.'
265
 
                              % (val,))
266
 
                val = self._DEFAULT_WORTH_SAVING_LIMIT
267
 
        return val
 
253
        # FIXME: We want a WorkingTreeStack here -- vila 20110812
 
254
        conf = config.BranchStack(self.branch)
 
255
        return conf.get('bzr.workingtree.worth_saving_limit')
268
256
 
269
257
    def filter_unversioned_files(self, paths):
270
258
        """Filter out paths that are versioned.