← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/add.py

  • Committer: Jelmer Vernooij
  • Date: 2012-04-16 11:08:11 UTC
  • mfrom: (6521 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6522.
  • Revision ID: jelmer@samba.org-20120416110811-0y996ihqy9o2bb1t
Merge bzr.dev.

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);
129
127
        we look for a file with the same name in that directory.
130
128
        Else, we look for an entry in the base tree with the same path.
131
129
        """
132
 
 
133
130
        if self.base_tree.has_id(parent_ie.file_id):
134
 
            base_parent_ie = self.base_tree.inventory[parent_ie.file_id]
135
 
            base_child_ie = base_parent_ie.children.get(
 
131
            base_path = osutils.pathjoin(
 
132
                self.base_tree.id2path(parent_ie.file_id),
136
133
                osutils.basename(path))
137
 
            if base_child_ie is not None:
138
 
                return (base_child_ie.file_id,
139
 
                        self.base_tree.id2path(base_child_ie.file_id))
 
134
            base_id = self.base_tree.path2id(base_path)
 
135
            if base_id is not None:
 
136
                return (base_id, base_path)
140
137
        full_base_path = osutils.pathjoin(self.base_path, path)
141
138
        # This may return None, but it is our last attempt
142
139
        return self.base_tree.path2id(full_base_path), full_base_path