← 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-03-15 02:42:48 UTC
  • mto: This revision was merged to the branch mainline in revision 6510.
  • Revision ID: jelmer@samba.org-20120315024248-7nyk2zxc52i1u8gj
extention -> extension.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/add.py
16
16
 
17
17
"""Helper functions for adding files to working trees."""
18
18
 
 
19
from __future__ import absolute_import
 
20
 
19
21
import sys
20
22
import os
21
23
 
73
75
class AddWithSkipLargeAction(AddAction):
74
76
    """A class that can decide to skip a file if it's considered too large"""
75
77
 
76
 
    # default 20 MB
77
 
    _DEFAULT_MAX_FILE_SIZE = 20000000
78
 
    _optionName = 'add.maximum_file_size'
79
78
    _maxSize = None
80
79
 
81
80
    def skip_file(self, tree, path, kind, stat_value = None):
82
81
        if kind != 'file':
83
 
            return False            
 
82
            return False
 
83
        opt_name = 'add.maximum_file_size'
84
84
        if self._maxSize is None:
85
 
            config = tree.branch.get_config()
86
 
            self._maxSize = config.get_user_option_as_int_from_SI(
87
 
                self._optionName,  
88
 
                self._DEFAULT_MAX_FILE_SIZE)
 
85
            config = tree.get_config_stack()
 
86
            self._maxSize = config.get(opt_name)
89
87
        if stat_value is None:
90
88
            file_size = os.path.getsize(path);
91
89
        else:
93
91
        if self._maxSize > 0 and file_size > self._maxSize:
94
92
            ui.ui_factory.show_warning(gettext(
95
93
                "skipping {0} (larger than {1} of {2} bytes)").format(
96
 
                path, self._optionName,  self._maxSize))
 
94
                path, opt_name,  self._maxSize))
97
95
            return True
98
96
        return False
99
97
 
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: