/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
2255.2.158 by Martin Pool
Most of the integration of dirstate and subtree
1
# Copyright (C) 2006, 2007 Canonical Ltd
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
2
#
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
7
#
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
12
#
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
17
"""MutableTree object.
18
19
See MutableTree for more details.
20
"""
21
22
2568.2.4 by Robert Collins
* ``bzrlib.add.smart_add`` and ``bzrlib.add.smart_add_tree`` are now
23
from bzrlib.lazy_import import lazy_import
24
lazy_import(globals(), """
25
import os
26
2568.2.6 by Robert Collins
Review feedback.
27
from bzrlib import (
28
    add,
29
    bzrdir,
30
    )
2568.2.4 by Robert Collins
* ``bzrlib.add.smart_add`` and ``bzrlib.add.smart_add_tree`` are now
31
from bzrlib.osutils import dirname
2568.2.9 by Robert Collins
Really honestly finally fix tests.
32
from bzrlib.trace import mutter, warning
2568.2.4 by Robert Collins
* ``bzrlib.add.smart_add`` and ``bzrlib.add.smart_add_tree`` are now
33
""")
34
2100.3.27 by Aaron Bentley
Enable nested commits
35
from bzrlib import (
36
    errors,
2294.1.10 by John Arbash Meinel
Switch all apis over to utf8 file ids. All tests pass
37
    osutils,
2100.3.27 by Aaron Bentley
Enable nested commits
38
    tree,
39
    )
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
40
from bzrlib.decorators import needs_read_lock, needs_write_lock
41
from bzrlib.osutils import splitpath
42
from bzrlib.symbol_versioning import DEPRECATED_PARAMETER
43
44
1986.1.8 by Robert Collins
Update to bzr.dev, which involves adding lock_tree_write to MutableTree and MemoryTree.
45
def needs_tree_write_lock(unbound):
46
    """Decorate unbound to take out and release a tree_write lock."""
47
    def tree_write_locked(self, *args, **kwargs):
48
        self.lock_tree_write()
49
        try:
50
            return unbound(self, *args, **kwargs)
51
        finally:
52
            self.unlock()
53
    tree_write_locked.__doc__ = unbound.__doc__
54
    tree_write_locked.__name__ = unbound.__name__
55
    return tree_write_locked
56
57
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
58
class MutableTree(tree.Tree):
59
    """A MutableTree is a specialisation of Tree which is able to be mutated.
60
61
    Generally speaking these mutations are only possible within a lock_write
62
    context, and will revert if the lock is broken abnormally - but this cannot
63
    be guaranteed - depending on the exact implementation of the mutable state.
64
65
    The most common form of Mutable Tree is WorkingTree, see bzrlib.workingtree.
66
    For tests we also have MemoryTree which is a MutableTree whose contents are
67
    entirely in memory.
68
69
    For now, we are not treating MutableTree as an interface to provide
70
    conformance tests for - rather we are testing MemoryTree specifically, and 
71
    interface testing implementations of WorkingTree.
72
73
    A mutable tree always has an associated Branch and BzrDir object - the
74
    branch and bzrdir attributes.
75
    """
76
2255.7.66 by Robert Collins
MutableTree.add only needs a tree write lock.
77
    @needs_tree_write_lock
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
78
    def add(self, files, ids=None, kinds=None):
79
        """Add paths to the set of versioned paths.
80
81
        Note that the command line normally calls smart_add instead,
82
        which can automatically recurse.
83
84
        This adds the files to the inventory, so that they will be
85
        recorded by the next commit.
86
87
        :param files: List of paths to add, relative to the base of the tree.
88
        :param ids: If set, use these instead of automatically generated ids.
89
            Must be the same length as the list of files, but may
90
            contain None for ids that are to be autogenerated.
91
        :param kinds: Optional parameter to specify the kinds to be used for
92
            each file.
93
94
        TODO: Perhaps callback with the ids and paths as they're added.
95
        """
96
        if isinstance(files, basestring):
97
            assert(ids is None or isinstance(ids, basestring))
98
            assert(kinds is None or isinstance(kinds, basestring))
99
            files = [files]
100
            if ids is not None:
101
                ids = [ids]
102
            if kinds is not None:
103
                kinds = [kinds]
104
2323.4.2 by Robert Collins
Fix the behaviour of dirstate optimised iter_changes recursing its disk iterator into subtrees inappropriately.
105
        files = [path.strip('/') for path in files]
106
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
107
        if ids is None:
108
            ids = [None] * len(files)
109
        else:
110
            assert(len(ids) == len(files))
111
        if kinds is None:
112
            kinds = [None] * len(files)
113
        else:
114
            assert(len(kinds) == len(files))
115
        for f in files:
116
            # generic constraint checks:
117
            if self.is_control_filename(f):
118
                raise errors.ForbiddenControlFileError(filename=f)
119
            fp = splitpath(f)
120
        # fill out file kinds for all files [not needed when we stop 
121
        # caring about the instantaneous file kind within a uncommmitted tree
122
        #
123
        self._gather_kinds(files, kinds)
124
        self._add(files, ids, kinds)
125
2255.6.8 by Aaron Bentley
Merge refactoring of add_reference
126
    def add_reference(self, sub_tree):
127
        """Add a TreeReference to the tree, pointing at sub_tree"""
128
        raise errors.UnsupportedOperation(self.add_reference, self)
129
130
    def _add_reference(self, sub_tree):
131
        """Standard add_reference implementation, for use by subclasses"""
132
        try:
133
            sub_tree_path = self.relpath(sub_tree.basedir)
134
        except errors.PathNotChild:
135
            raise errors.BadReferenceTarget(self, sub_tree,
136
                                            'Target not inside tree.')
137
        sub_tree_id = sub_tree.get_root_id()
138
        if sub_tree_id == self.get_root_id():
139
            raise errors.BadReferenceTarget(self, sub_tree,
140
                                     'Trees have the same root id.')
141
        if sub_tree_id in self.inventory:
142
            raise errors.BadReferenceTarget(self, sub_tree,
143
                                            'Root id already present in tree')
144
        self._add([sub_tree_path], [sub_tree_id], ['tree-reference'])
145
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
146
    def _add(self, files, ids, kinds):
2255.6.8 by Aaron Bentley
Merge refactoring of add_reference
147
        """Helper function for add - updates the inventory.
148
149
        :param files: sequence of pathnames, relative to the tree root
150
        :param ids: sequence of suggested ids for the files (may be None)
151
        :param kinds: sequence of  inventory kinds of the files (i.e. may
152
            contain "tree-reference")
153
        """
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
154
        raise NotImplementedError(self._add)
155
2376.2.2 by Aaron Bentley
Reduce lock to tree lock
156
    @needs_tree_write_lock
2376.2.1 by Aaron Bentley
Implement MutableTree.apply_inventory_delta
157
    def apply_inventory_delta(self, changes):
158
        """Apply changes to the inventory as an atomic operation.
159
160
        The argument is a set of changes to apply.  It must describe a
161
        valid result, but the order is not important.  Specifically,
162
        intermediate stages *may* be invalid, such as when two files
163
        swap names.
164
165
        The changes should be structured as a list of tuples, of the form
166
        (old_path, new_path, file_id, new_entry).  For creation, old_path
167
        must be None.  For deletion, new_path and new_entry must be None.
168
        file_id is always non-None.  For renames and other mutations, all
169
        values must be non-None.
170
171
        If the new_entry is a directory, its children should be an empty
172
        dict.  Children are handled by apply_inventory_delta itself.
173
2376.2.9 by Aaron Bentley
Cleanup from review
174
        :param changes: A list of tuples for the change to apply:
175
            [(old_path, new_path, file_id, new_inventory_entry), ...]
176
        """
2376.2.1 by Aaron Bentley
Implement MutableTree.apply_inventory_delta
177
        self.flush()
178
        inv = self.inventory
179
        children = {}
180
        for old_path, file_id in sorted(((op, f) for op, np, f, e in changes
181
                                        if op is not None), reverse=True):
2376.2.2 by Aaron Bentley
Reduce lock to tree lock
182
            if file_id not in inv:
183
                continue
2376.2.1 by Aaron Bentley
Implement MutableTree.apply_inventory_delta
184
            children[file_id] = getattr(inv[file_id], 'children', {})
185
            inv.remove_recursive_id(file_id)
186
        for new_path, new_entry in sorted((np, e) for op, np, f, e in
187
                                          changes if np is not None):
188
            if getattr(new_entry, 'children', None) is not None:
189
                new_entry.children = children.get(new_entry.file_id, {})
190
            inv.add(new_entry)
191
        self._write_inventory(inv)
192
193
    @needs_write_lock
2255.2.218 by Robert Collins
Make the nested tree commit smoke test be more rigourous.
194
    def commit(self, message=None, revprops=None, *args,
2100.3.27 by Aaron Bentley
Enable nested commits
195
               **kwargs):
1986.1.3 by Robert Collins
Merge bzr.dev.
196
        # avoid circular imports
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
197
        from bzrlib import commit
198
        if revprops is None:
199
            revprops = {}
200
        if not 'branch-nick' in revprops:
201
            revprops['branch-nick'] = self.branch.nick
2671.2.2 by Lukáš Lalinský
Move setting of the author revision property to MutableTree.commit. Don't use try/except KeyError in LongLogFormatter to display authors and branch-nicks. Removed warning about missing e-mail in the authors name.
202
        author = kwargs.pop('author', None)
2671.2.5 by Lukáš Lalinský
Fixes for comments from the mailing list.
203
        if author is not None:
204
            assert 'author' not in revprops
2671.2.2 by Lukáš Lalinský
Move setting of the author revision property to MutableTree.commit. Don't use try/except KeyError in LongLogFormatter to display authors and branch-nicks. Removed warning about missing e-mail in the authors name.
205
            revprops['author'] = author
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
206
        # args for wt.commit start at message from the Commit.commit method,
2367.2.1 by Robert Collins
Remove bzrlib 0.8 compatability where it was making the code unclear or messy. (Robert Collins)
207
        args = (message, ) + args
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
208
        committed_id = commit.Commit().commit(working_tree=self,
1986.1.3 by Robert Collins
Merge bzr.dev.
209
            revprops=revprops, *args, **kwargs)
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
210
        return committed_id
211
212
    def _gather_kinds(self, files, kinds):
213
        """Helper function for add - sets the entries of kinds."""
214
        raise NotImplementedError(self._gather_kinds)
215
1986.1.6 by Robert Collins
Add MemoryTree.last_revision.
216
    @needs_read_lock
217
    def last_revision(self):
1986.1.7 by Robert Collins
Merge bzr.dev.
218
        """Return the revision id of the last commit performed in this tree.
219
220
        In early tree formats the result of last_revision is the same as the
221
        branch last_revision, but that is no longer the case for modern tree
222
        formats.
223
        
224
        last_revision returns the left most parent id, or None if there are no
225
        parents.
226
227
        last_revision was deprecated as of 0.11. Please use get_parent_ids
228
        instead.
229
        """
1986.1.6 by Robert Collins
Add MemoryTree.last_revision.
230
        raise NotImplementedError(self.last_revision)
231
1986.1.8 by Robert Collins
Update to bzr.dev, which involves adding lock_tree_write to MutableTree and MemoryTree.
232
    def lock_tree_write(self):
233
        """Lock the working tree for write, and the branch for read.
234
235
        This is useful for operations which only need to mutate the working
236
        tree. Taking out branch write locks is a relatively expensive process
237
        and may fail if the branch is on read only media. So branch write locks
238
        should only be taken out when we are modifying branch data - such as in
239
        operations like commit, pull, uncommit and update.
240
        """
241
        raise NotImplementedError(self.lock_tree_write)
242
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
243
    def lock_write(self):
244
        """Lock the tree and its branch. This allows mutating calls to be made.
245
246
        Some mutating methods will take out implicit write locks, but in 
247
        general you should always obtain a write lock before calling mutating
248
        methods on a tree.
249
        """
250
        raise NotImplementedError(self.lock_write)
251
252
    @needs_write_lock
253
    def mkdir(self, path, file_id=None):
254
        """Create a directory in the tree. if file_id is None, one is assigned.
255
256
        :param path: A unicode file path.
257
        :param file_id: An optional file-id.
258
        :return: the file id of the new directory.
259
        """
260
        raise NotImplementedError(self.mkdir)
261
2418.5.1 by John Arbash Meinel
Make a Branch helper which can create a very basic MemoryTree with history.
262
    def set_parent_ids(self, revision_ids, allow_leftmost_as_ghost=False):
263
        """Set the parents ids of the working tree.
264
265
        :param revision_ids: A list of revision_ids.
266
        """
267
        raise NotImplementedError(self.set_parent_ids)
268
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
269
    def set_parent_trees(self, parents_list, allow_leftmost_as_ghost=False):
270
        """Set the parents of the working tree.
271
272
        :param parents_list: A list of (revision_id, tree) tuples. 
273
            If tree is None, then that element is treated as an unreachable
274
            parent tree - i.e. a ghost.
275
        """
276
        raise NotImplementedError(self.set_parent_trees)
2568.2.4 by Robert Collins
* ``bzrlib.add.smart_add`` and ``bzrlib.add.smart_add_tree`` are now
277
278
    @needs_tree_write_lock
279
    def smart_add(self, file_list, recurse=True, action=None, save=True):
280
        """Version file_list, optionally recursing into directories.
281
282
        This is designed more towards DWIM for humans than API clarity.
283
        For the specific behaviour see the help for cmd_add().
284
285
        :param action: A reporter to be called with the inventory, parent_ie,
286
            path and kind of the path being added. It may return a file_id if 
287
            a specific one should be used.
288
        :param save: Save the inventory after completing the adds. If False
289
            this provides dry-run functionality by doing the add and not saving
2585.1.1 by Aaron Bentley
Unify MutableTree.smart_add behavior by disabling quirky memory-only Inventory
290
            the inventory.
2568.2.6 by Robert Collins
Review feedback.
291
        :return: A tuple - files_added, ignored_files. files_added is the count
292
            of added files, and ignored_files is a dict mapping files that were
293
            ignored to the rule that caused them to be ignored.
2568.2.4 by Robert Collins
* ``bzrlib.add.smart_add`` and ``bzrlib.add.smart_add_tree`` are now
294
        """
295
        # not in an inner loop; and we want to remove direct use of this,
296
        # so here as a reminder for now. RBC 20070703
297
        from bzrlib.inventory import InventoryEntry
298
        assert isinstance(recurse, bool)
299
        if action is None:
300
            action = add.AddAction()
301
        
302
        if not file_list:
303
            # no paths supplied: add the entire tree.
304
            file_list = [u'.']
305
        # mutter("smart add of %r")
306
        inv = self.inventory
307
        added = []
308
        ignored = {}
309
        dirs_to_add = []
310
        user_dirs = set()
311
312
        # validate user file paths and convert all paths to tree 
2568.2.6 by Robert Collins
Review feedback.
313
        # relative : it's cheaper to make a tree relative path an abspath
2568.2.4 by Robert Collins
* ``bzrlib.add.smart_add`` and ``bzrlib.add.smart_add_tree`` are now
314
        # than to convert an abspath to tree relative.
315
        for filepath in file_list:
2568.2.5 by Robert Collins
* ``bzrlib.add.FastPath`` is now private and moved to
316
            rf = _FastPath(self.relpath(filepath))
2568.2.4 by Robert Collins
* ``bzrlib.add.smart_add`` and ``bzrlib.add.smart_add_tree`` are now
317
            # validate user parameters. Our recursive code avoids adding new files
318
            # that need such validation 
319
            if self.is_control_filename(rf.raw_path):
320
                raise errors.ForbiddenControlFileError(filename=rf.raw_path)
321
            
322
            abspath = self.abspath(rf.raw_path)
323
            kind = osutils.file_kind(abspath)
324
            if kind == 'directory':
325
                # schedule the dir for scanning
326
                user_dirs.add(rf)
327
            else:
328
                if not InventoryEntry.versionable_kind(kind):
329
                    raise errors.BadFileKindError(filename=abspath, kind=kind)
330
            # ensure the named path is added, so that ignore rules in the later directory
331
            # walk dont skip it.
332
            # we dont have a parent ie known yet.: use the relatively slower inventory 
333
            # probing method
334
            versioned = inv.has_filename(rf.raw_path)
335
            if versioned:
336
                continue
337
            added.extend(_add_one_and_parent(self, inv, None, rf, kind, action))
338
339
        if not recurse:
340
            # no need to walk any directories at all.
341
            if len(added) > 0 and save:
342
                self._write_inventory(inv)
343
            return added, ignored
344
345
        # only walk the minimal parents needed: we have user_dirs to override
346
        # ignores.
347
        prev_dir = None
348
349
        is_inside = osutils.is_inside_or_parent_of_any
350
        for path in sorted(user_dirs):
351
            if (prev_dir is None or not is_inside([prev_dir], path.raw_path)):
352
                dirs_to_add.append((path, None))
353
            prev_dir = path.raw_path
354
355
        # dirs_to_add is initialised to a list of directories, but as we scan
356
        # directories we append files to it.
357
        # XXX: We should determine kind of files when we scan them rather than
358
        # adding to this list. RBC 20070703
359
        for directory, parent_ie in dirs_to_add:
360
            # directory is tree-relative
361
            abspath = self.abspath(directory.raw_path)
362
363
            # get the contents of this directory.
364
365
            # find the kind of the path being added.
366
            kind = osutils.file_kind(abspath)
367
368
            if not InventoryEntry.versionable_kind(kind):
369
                warning("skipping %s (can't add file of kind '%s')", abspath, kind)
370
                continue
371
372
            if parent_ie is not None:
373
                versioned = directory.base_path in parent_ie.children
374
            else:
375
                # without the parent ie, use the relatively slower inventory 
376
                # probing method
377
                versioned = inv.has_filename(directory.raw_path)
378
379
            if kind == 'directory':
380
                try:
381
                    sub_branch = bzrdir.BzrDir.open(abspath)
382
                    sub_tree = True
383
                except errors.NotBranchError:
384
                    sub_tree = False
385
                except errors.UnsupportedFormatError:
386
                    sub_tree = True
387
            else:
388
                sub_tree = False
389
390
            if directory.raw_path == '':
391
                # mutter("tree root doesn't need to be added")
392
                sub_tree = False
393
            elif versioned:
394
                pass
395
                # mutter("%r is already versioned", abspath)
396
            elif sub_tree:
397
                # XXX: This is wrong; people *might* reasonably be trying to add
398
                # subtrees as subtrees.  This should probably only be done in formats 
399
                # which can represent subtrees, and even then perhaps only when
400
                # the user asked to add subtrees.  At the moment you can add them
401
                # specially through 'join --reference', which is perhaps
402
                # reasonable: adding a new reference is a special operation and
403
                # can have a special behaviour.  mbp 20070306
404
                mutter("%r is a nested bzr tree", abspath)
405
            else:
406
                _add_one(self, inv, parent_ie, directory, kind, action)
407
                added.append(directory.raw_path)
408
409
            if kind == 'directory' and not sub_tree:
410
                if parent_ie is not None:
411
                    # must be present:
412
                    this_ie = parent_ie.children[directory.base_path]
413
                else:
414
                    # without the parent ie, use the relatively slower inventory 
415
                    # probing method
416
                    this_id = inv.path2id(directory.raw_path)
417
                    if this_id is None:
418
                        this_ie = None
419
                    else:
420
                        this_ie = inv[this_id]
421
422
                for subf in sorted(os.listdir(abspath)):
423
                    # here we could use TreeDirectory rather than 
424
                    # string concatenation.
425
                    subp = osutils.pathjoin(directory.raw_path, subf)
426
                    # TODO: is_control_filename is very slow. Make it faster. 
427
                    # TreeDirectory.is_control_filename could also make this 
428
                    # faster - its impossible for a non root dir to have a 
429
                    # control file.
430
                    if self.is_control_filename(subp):
431
                        mutter("skip control directory %r", subp)
432
                    elif subf in this_ie.children:
433
                        # recurse into this already versioned subdir.
2568.2.5 by Robert Collins
* ``bzrlib.add.FastPath`` is now private and moved to
434
                        dirs_to_add.append((_FastPath(subp, subf), this_ie))
2568.2.4 by Robert Collins
* ``bzrlib.add.smart_add`` and ``bzrlib.add.smart_add_tree`` are now
435
                    else:
436
                        # user selection overrides ignoes
437
                        # ignore while selecting files - if we globbed in the
438
                        # outer loop we would ignore user files.
439
                        ignore_glob = self.is_ignored(subp)
440
                        if ignore_glob is not None:
441
                            # mutter("skip ignored sub-file %r", subp)
442
                            ignored.setdefault(ignore_glob, []).append(subp)
443
                        else:
444
                            #mutter("queue to add sub-file %r", subp)
2568.2.5 by Robert Collins
* ``bzrlib.add.FastPath`` is now private and moved to
445
                            dirs_to_add.append((_FastPath(subp, subf), this_ie))
2568.2.4 by Robert Collins
* ``bzrlib.add.smart_add`` and ``bzrlib.add.smart_add_tree`` are now
446
2585.1.1 by Aaron Bentley
Unify MutableTree.smart_add behavior by disabling quirky memory-only Inventory
447
        if len(added) > 0:
448
            if save:
449
                self._write_inventory(inv)
450
            else:
451
                self.read_working_inventory()
2568.2.4 by Robert Collins
* ``bzrlib.add.smart_add`` and ``bzrlib.add.smart_add_tree`` are now
452
        return added, ignored
453
454
2568.2.5 by Robert Collins
* ``bzrlib.add.FastPath`` is now private and moved to
455
class _FastPath(object):
2568.2.4 by Robert Collins
* ``bzrlib.add.smart_add`` and ``bzrlib.add.smart_add_tree`` are now
456
    """A path object with fast accessors for things like basename."""
457
458
    __slots__ = ['raw_path', 'base_path']
459
460
    def __init__(self, path, base_path=None):
461
        """Construct a FastPath from path."""
462
        if base_path is None:
463
            self.base_path = osutils.basename(path)
464
        else:
465
            self.base_path = base_path
466
        self.raw_path = path
467
468
    def __cmp__(self, other):
469
        return cmp(self.raw_path, other.raw_path)
470
471
    def __hash__(self):
472
        return hash(self.raw_path)
473
474
475
def _add_one_and_parent(tree, inv, parent_ie, path, kind, action):
476
    """Add a new entry to the inventory and automatically add unversioned parents.
477
478
    :param inv: Inventory which will receive the new entry.
479
    :param parent_ie: Parent inventory entry if known, or None.  If
480
        None, the parent is looked up by name and used if present, otherwise it
481
        is recursively added.
482
    :param kind: Kind of new entry (file, directory, etc)
483
    :param action: callback(inv, parent_ie, path, kind); return ignored.
484
    :return: A list of paths which have been added.
485
    """
486
    # Nothing to do if path is already versioned.
487
    # This is safe from infinite recursion because the tree root is
488
    # always versioned.
489
    if parent_ie is not None:
490
        # we have a parent ie already
491
        added = []
492
    else:
493
        # slower but does not need parent_ie
494
        if inv.has_filename(path.raw_path):
495
            return []
496
        # its really not there : add the parent
497
        # note that the dirname use leads to some extra str copying etc but as
498
        # there are a limited number of dirs we can be nested under, it should
499
        # generally find it very fast and not recurse after that.
2568.2.5 by Robert Collins
* ``bzrlib.add.FastPath`` is now private and moved to
500
        added = _add_one_and_parent(tree, inv, None,
501
            _FastPath(dirname(path.raw_path)), 'directory', action)
2568.2.4 by Robert Collins
* ``bzrlib.add.smart_add`` and ``bzrlib.add.smart_add_tree`` are now
502
        parent_id = inv.path2id(dirname(path.raw_path))
503
        parent_ie = inv[parent_id]
504
    _add_one(tree, inv, parent_ie, path, kind, action)
505
    return added + [path.raw_path]
506
507
508
def _add_one(tree, inv, parent_ie, path, kind, file_id_callback):
509
    """Add a new entry to the inventory.
510
511
    :param inv: Inventory which will receive the new entry.
512
    :param parent_ie: Parent inventory entry.
513
    :param kind: Kind of new entry (file, directory, etc)
514
    :param file_id_callback: callback(inv, parent_ie, path, kind); return a
515
        file_id or None to generate a new file id
516
    :returns: None
517
    """
518
    file_id = file_id_callback(inv, parent_ie, path, kind)
519
    entry = inv.make_entry(kind, path.base_path, parent_ie.file_id,
520
        file_id=file_id)
521
    inv.add(entry)