← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/add.py

Merge lp:bzr.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/add.py
82
82
            return False
83
83
        opt_name = 'add.maximum_file_size'
84
84
        if self._maxSize is None:
85
 
            # FIXME: We use the branch config as there is no tree config
86
 
            # -- vila 2011-12-16
87
 
            config = tree.branch.get_config_stack()
 
85
            config = tree.get_config_stack()
88
86
            self._maxSize = config.get(opt_name)
89
87
        if stat_value is None:
90
88
            file_size = os.path.getsize(path);
131
129
        """
132
130
 
133
131
        if self.base_tree.has_id(parent_ie.file_id):
134
 
            base_parent_ie = self.base_tree.inventory[parent_ie.file_id]
 
132
            # FIXME: Handle nested trees
 
133
            base_parent_ie = self.base_tree.root_inventory[parent_ie.file_id]
135
134
            base_child_ie = base_parent_ie.children.get(
136
135
                osutils.basename(path))
137
136
            if base_child_ie is not None: