260
272
parent tree - i.e. a ghost.
262
274
raise NotImplementedError(self.set_parent_trees)
276
@needs_tree_write_lock
277
def smart_add(self, file_list, recurse=True, action=None, save=True):
278
"""Version file_list, optionally recursing into directories.
280
This is designed more towards DWIM for humans than API clarity.
281
For the specific behaviour see the help for cmd_add().
283
:param action: A reporter to be called with the inventory, parent_ie,
284
path and kind of the path being added. It may return a file_id if
285
a specific one should be used.
286
:param save: Save the inventory after completing the adds. If False
287
this provides dry-run functionality by doing the add and not saving
289
:return: A tuple - files_added, ignored_files. files_added is the count
290
of added files, and ignored_files is a dict mapping files that were
291
ignored to the rule that caused them to be ignored.
293
# not in an inner loop; and we want to remove direct use of this,
294
# so here as a reminder for now. RBC 20070703
295
from bzrlib.inventory import InventoryEntry
296
assert isinstance(recurse, bool)
298
action = add.AddAction()
301
# no paths supplied: add the entire tree.
303
# mutter("smart add of %r")
310
# validate user file paths and convert all paths to tree
311
# relative : it's cheaper to make a tree relative path an abspath
312
# than to convert an abspath to tree relative.
313
for filepath in file_list:
314
rf = _FastPath(self.relpath(filepath))
315
# validate user parameters. Our recursive code avoids adding new files
316
# that need such validation
317
if self.is_control_filename(rf.raw_path):
318
raise errors.ForbiddenControlFileError(filename=rf.raw_path)
320
abspath = self.abspath(rf.raw_path)
321
kind = osutils.file_kind(abspath)
322
if kind == 'directory':
323
# schedule the dir for scanning
326
if not InventoryEntry.versionable_kind(kind):
327
raise errors.BadFileKindError(filename=abspath, kind=kind)
328
# ensure the named path is added, so that ignore rules in the later directory
330
# we dont have a parent ie known yet.: use the relatively slower inventory
332
versioned = inv.has_filename(rf.raw_path)
335
added.extend(_add_one_and_parent(self, inv, None, rf, kind, action))
338
# no need to walk any directories at all.
339
if len(added) > 0 and save:
340
self._write_inventory(inv)
341
return added, ignored
343
# only walk the minimal parents needed: we have user_dirs to override
347
is_inside = osutils.is_inside_or_parent_of_any
348
for path in sorted(user_dirs):
349
if (prev_dir is None or not is_inside([prev_dir], path.raw_path)):
350
dirs_to_add.append((path, None))
351
prev_dir = path.raw_path
353
# dirs_to_add is initialised to a list of directories, but as we scan
354
# directories we append files to it.
355
# XXX: We should determine kind of files when we scan them rather than
356
# adding to this list. RBC 20070703
357
for directory, parent_ie in dirs_to_add:
358
# directory is tree-relative
359
abspath = self.abspath(directory.raw_path)
361
# get the contents of this directory.
363
# find the kind of the path being added.
364
kind = osutils.file_kind(abspath)
366
if not InventoryEntry.versionable_kind(kind):
367
warning("skipping %s (can't add file of kind '%s')", abspath, kind)
370
if parent_ie is not None:
371
versioned = directory.base_path in parent_ie.children
373
# without the parent ie, use the relatively slower inventory
375
versioned = inv.has_filename(directory.raw_path)
377
if kind == 'directory':
379
sub_branch = bzrdir.BzrDir.open(abspath)
381
except errors.NotBranchError:
383
except errors.UnsupportedFormatError:
388
if directory.raw_path == '':
389
# mutter("tree root doesn't need to be added")
393
# mutter("%r is already versioned", abspath)
395
# XXX: This is wrong; people *might* reasonably be trying to add
396
# subtrees as subtrees. This should probably only be done in formats
397
# which can represent subtrees, and even then perhaps only when
398
# the user asked to add subtrees. At the moment you can add them
399
# specially through 'join --reference', which is perhaps
400
# reasonable: adding a new reference is a special operation and
401
# can have a special behaviour. mbp 20070306
402
mutter("%r is a nested bzr tree", abspath)
404
_add_one(self, inv, parent_ie, directory, kind, action)
405
added.append(directory.raw_path)
407
if kind == 'directory' and not sub_tree:
408
if parent_ie is not None:
410
this_ie = parent_ie.children[directory.base_path]
412
# without the parent ie, use the relatively slower inventory
414
this_id = inv.path2id(directory.raw_path)
418
this_ie = inv[this_id]
420
for subf in sorted(os.listdir(abspath)):
421
# here we could use TreeDirectory rather than
422
# string concatenation.
423
subp = osutils.pathjoin(directory.raw_path, subf)
424
# TODO: is_control_filename is very slow. Make it faster.
425
# TreeDirectory.is_control_filename could also make this
426
# faster - its impossible for a non root dir to have a
428
if self.is_control_filename(subp):
429
mutter("skip control directory %r", subp)
430
elif subf in this_ie.children:
431
# recurse into this already versioned subdir.
432
dirs_to_add.append((_FastPath(subp, subf), this_ie))
434
# user selection overrides ignoes
435
# ignore while selecting files - if we globbed in the
436
# outer loop we would ignore user files.
437
ignore_glob = self.is_ignored(subp)
438
if ignore_glob is not None:
439
# mutter("skip ignored sub-file %r", subp)
440
ignored.setdefault(ignore_glob, []).append(subp)
442
#mutter("queue to add sub-file %r", subp)
443
dirs_to_add.append((_FastPath(subp, subf), this_ie))
447
self._write_inventory(inv)
449
self.read_working_inventory()
450
return added, ignored
453
class _FastPath(object):
454
"""A path object with fast accessors for things like basename."""
456
__slots__ = ['raw_path', 'base_path']
458
def __init__(self, path, base_path=None):
459
"""Construct a FastPath from path."""
460
if base_path is None:
461
self.base_path = osutils.basename(path)
463
self.base_path = base_path
466
def __cmp__(self, other):
467
return cmp(self.raw_path, other.raw_path)
470
return hash(self.raw_path)
473
def _add_one_and_parent(tree, inv, parent_ie, path, kind, action):
474
"""Add a new entry to the inventory and automatically add unversioned parents.
476
:param inv: Inventory which will receive the new entry.
477
:param parent_ie: Parent inventory entry if known, or None. If
478
None, the parent is looked up by name and used if present, otherwise it
479
is recursively added.
480
:param kind: Kind of new entry (file, directory, etc)
481
:param action: callback(inv, parent_ie, path, kind); return ignored.
482
:return: A list of paths which have been added.
484
# Nothing to do if path is already versioned.
485
# This is safe from infinite recursion because the tree root is
487
if parent_ie is not None:
488
# we have a parent ie already
491
# slower but does not need parent_ie
492
if inv.has_filename(path.raw_path):
494
# its really not there : add the parent
495
# note that the dirname use leads to some extra str copying etc but as
496
# there are a limited number of dirs we can be nested under, it should
497
# generally find it very fast and not recurse after that.
498
added = _add_one_and_parent(tree, inv, None,
499
_FastPath(dirname(path.raw_path)), 'directory', action)
500
parent_id = inv.path2id(dirname(path.raw_path))
501
parent_ie = inv[parent_id]
502
_add_one(tree, inv, parent_ie, path, kind, action)
503
return added + [path.raw_path]
506
def _add_one(tree, inv, parent_ie, path, kind, file_id_callback):
507
"""Add a new entry to the inventory.
509
:param inv: Inventory which will receive the new entry.
510
:param parent_ie: Parent inventory entry.
511
:param kind: Kind of new entry (file, directory, etc)
512
:param file_id_callback: callback(inv, parent_ie, path, kind); return a
513
file_id or None to generate a new file id
516
file_id = file_id_callback(inv, parent_ie, path, kind)
517
entry = inv.make_entry(kind, path.base_path, parent_ie.file_id,
added
removed
bzrlib/mutabletree.py
