← 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: 2011-08-10 23:27:14 UTC
  • mto: (5268.7.8 transport-segments)
  • mto: This revision was merged to the branch mainline in revision 6062.
  • Revision ID: jelmer@samba.org-20110810232714-ifyj77n3sc251b7f
Fix tests.

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,
38
37
    conflicts as _mod_conflicts,
39
38
    debug,
40
39
    dirstate,
77
76
 
78
77
class DirStateWorkingTree(InventoryWorkingTree):
79
78
 
 
79
    _DEFAULT_WORTH_SAVING_LIMIT = 10
 
80
 
80
81
    def __init__(self, basedir,
81
82
                 branch,
82
83
                 _control_files=None,
250
251
 
251
252
        :return: an integer. -1 means never save.
252
253
        """
253
 
        # FIXME: We want a WorkingTreeStack here -- vila 20110812
254
 
        conf = config.BranchStack(self.branch)
255
 
        return conf.get('bzr.workingtree.worth_saving_limit')
 
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
256
268
 
257
269
    def filter_unversioned_files(self, paths):
258
270
        """Filter out paths that are versioned.
1849
1861
        # Make sure the file exists
1850
1862
        entry = self._get_entry(file_id, path=path)
1851
1863
        if entry == (None, None): # do we raise?
1852
 
            raise errors.NoSuchId(self, file_id)
 
1864
            return None
1853
1865
        parent_index = self._get_parent_index()
1854
1866
        last_changed_revision = entry[1][parent_index][4]
1855
1867
        try: