260
252
parent tree - i.e. a ghost.
262
254
raise NotImplementedError(self.set_parent_trees)
256
@needs_tree_write_lock
257
def smart_add(self, file_list, recurse=True, action=None, save=True):
258
"""Version file_list, optionally recursing into directories.
260
This is designed more towards DWIM for humans than API clarity.
261
For the specific behaviour see the help for cmd_add().
263
:param action: A reporter to be called with the inventory, parent_ie,
264
path and kind of the path being added. It may return a file_id if
265
a specific one should be used.
266
:param save: Save the inventory after completing the adds. If False
267
this provides dry-run functionality by doing the add and not saving
269
:return: A tuple - files_added, ignored_files. files_added is the count
270
of added files, and ignored_files is a dict mapping files that were
271
ignored to the rule that caused them to be ignored.
273
# not in an inner loop; and we want to remove direct use of this,
274
# so here as a reminder for now. RBC 20070703
275
from bzrlib.inventory import InventoryEntry
276
assert isinstance(recurse, bool)
278
action = add.AddAction()
281
# no paths supplied: add the entire tree.
283
# mutter("smart add of %r")
290
# validate user file paths and convert all paths to tree
291
# relative : it's cheaper to make a tree relative path an abspath
292
# than to convert an abspath to tree relative.
293
for filepath in file_list:
294
rf = _FastPath(self.relpath(filepath))
295
# validate user parameters. Our recursive code avoids adding new files
296
# that need such validation
297
if self.is_control_filename(rf.raw_path):
298
raise errors.ForbiddenControlFileError(filename=rf.raw_path)
300
abspath = self.abspath(rf.raw_path)
301
kind = osutils.file_kind(abspath)
302
if kind == 'directory':
303
# schedule the dir for scanning
306
if not InventoryEntry.versionable_kind(kind):
307
raise errors.BadFileKindError(filename=abspath, kind=kind)
308
# ensure the named path is added, so that ignore rules in the later directory
310
# we dont have a parent ie known yet.: use the relatively slower inventory
312
versioned = inv.has_filename(rf.raw_path)
315
added.extend(_add_one_and_parent(self, inv, None, rf, kind, action))
318
# no need to walk any directories at all.
319
if len(added) > 0 and save:
320
self._write_inventory(inv)
321
return added, ignored
323
# only walk the minimal parents needed: we have user_dirs to override
327
is_inside = osutils.is_inside_or_parent_of_any
328
for path in sorted(user_dirs):
329
if (prev_dir is None or not is_inside([prev_dir], path.raw_path)):
330
dirs_to_add.append((path, None))
331
prev_dir = path.raw_path
333
# dirs_to_add is initialised to a list of directories, but as we scan
334
# directories we append files to it.
335
# XXX: We should determine kind of files when we scan them rather than
336
# adding to this list. RBC 20070703
337
for directory, parent_ie in dirs_to_add:
338
# directory is tree-relative
339
abspath = self.abspath(directory.raw_path)
341
# get the contents of this directory.
343
# find the kind of the path being added.
344
kind = osutils.file_kind(abspath)
346
if not InventoryEntry.versionable_kind(kind):
347
warning("skipping %s (can't add file of kind '%s')", abspath, kind)
350
if parent_ie is not None:
351
versioned = directory.base_path in parent_ie.children
353
# without the parent ie, use the relatively slower inventory
355
versioned = inv.has_filename(directory.raw_path)
357
if kind == 'directory':
359
sub_branch = bzrdir.BzrDir.open(abspath)
361
except errors.NotBranchError:
363
except errors.UnsupportedFormatError:
368
if directory.raw_path == '':
369
# mutter("tree root doesn't need to be added")
373
# mutter("%r is already versioned", abspath)
375
# XXX: This is wrong; people *might* reasonably be trying to add
376
# subtrees as subtrees. This should probably only be done in formats
377
# which can represent subtrees, and even then perhaps only when
378
# the user asked to add subtrees. At the moment you can add them
379
# specially through 'join --reference', which is perhaps
380
# reasonable: adding a new reference is a special operation and
381
# can have a special behaviour. mbp 20070306
382
mutter("%r is a nested bzr tree", abspath)
384
_add_one(self, inv, parent_ie, directory, kind, action)
385
added.append(directory.raw_path)
387
if kind == 'directory' and not sub_tree:
388
if parent_ie is not None:
390
this_ie = parent_ie.children[directory.base_path]
392
# without the parent ie, use the relatively slower inventory
394
this_id = inv.path2id(directory.raw_path)
398
this_ie = inv[this_id]
400
for subf in sorted(os.listdir(abspath)):
401
# here we could use TreeDirectory rather than
402
# string concatenation.
403
subp = osutils.pathjoin(directory.raw_path, subf)
404
# TODO: is_control_filename is very slow. Make it faster.
405
# TreeDirectory.is_control_filename could also make this
406
# faster - its impossible for a non root dir to have a
408
if self.is_control_filename(subp):
409
mutter("skip control directory %r", subp)
410
elif subf in this_ie.children:
411
# recurse into this already versioned subdir.
412
dirs_to_add.append((_FastPath(subp, subf), this_ie))
414
# user selection overrides ignoes
415
# ignore while selecting files - if we globbed in the
416
# outer loop we would ignore user files.
417
ignore_glob = self.is_ignored(subp)
418
if ignore_glob is not None:
419
# mutter("skip ignored sub-file %r", subp)
420
ignored.setdefault(ignore_glob, []).append(subp)
422
#mutter("queue to add sub-file %r", subp)
423
dirs_to_add.append((_FastPath(subp, subf), this_ie))
427
self._write_inventory(inv)
429
self.read_working_inventory()
430
return added, ignored
432
def update_basis_by_delta(self, new_revid, delta):
433
"""Update the parents of this tree after a commit.
435
This gives the tree one parent, with revision id new_revid. The
436
inventory delta is applied to the current basis tree to generate the
437
inventory for the parent new_revid, and all other parent trees are
440
All the changes in the delta should be changes synchronising the basis
441
tree with some or all of the working tree, with a change to a directory
442
requiring that its contents have been recursively included. That is,
443
this is not a general purpose tree modification routine, but a helper
444
for commit which is not required to handle situations that do not arise
447
:param new_revid: The new revision id for the trees parent.
448
:param delta: An inventory delta (see apply_inventory_delta) describing
449
the changes from the current left most parent revision to new_revid.
451
# if the tree is updated by a pull to the branch, as happens in
452
# WorkingTree2, when there was no separation between branch and tree,
453
# then just clear merges, efficiency is not a concern for now as this
454
# is legacy environments only, and they are slow regardless.
455
if self.last_revision() == new_revid:
456
self.set_parent_ids([new_revid])
458
# generic implementation based on Inventory manipulation. See
459
# WorkingTree classes for optimised versions for specific format trees.
460
basis = self.basis_tree()
462
inventory = basis.inventory
464
inventory.apply_delta(delta)
465
rev_tree = RevisionTree(self.branch.repository, inventory, new_revid)
466
self.set_parent_trees([(new_revid, rev_tree)])
469
class _FastPath(object):
470
"""A path object with fast accessors for things like basename."""
472
__slots__ = ['raw_path', 'base_path']
474
def __init__(self, path, base_path=None):
475
"""Construct a FastPath from path."""
476
if base_path is None:
477
self.base_path = osutils.basename(path)
479
self.base_path = base_path
482
def __cmp__(self, other):
483
return cmp(self.raw_path, other.raw_path)
486
return hash(self.raw_path)
489
def _add_one_and_parent(tree, inv, parent_ie, path, kind, action):
490
"""Add a new entry to the inventory and automatically add unversioned parents.
492
:param inv: Inventory which will receive the new entry.
493
:param parent_ie: Parent inventory entry if known, or None. If
494
None, the parent is looked up by name and used if present, otherwise it
495
is recursively added.
496
:param kind: Kind of new entry (file, directory, etc)
497
:param action: callback(inv, parent_ie, path, kind); return ignored.
498
:return: A list of paths which have been added.
500
# Nothing to do if path is already versioned.
501
# This is safe from infinite recursion because the tree root is
503
if parent_ie is not None:
504
# we have a parent ie already
507
# slower but does not need parent_ie
508
if inv.has_filename(path.raw_path):
510
# its really not there : add the parent
511
# note that the dirname use leads to some extra str copying etc but as
512
# there are a limited number of dirs we can be nested under, it should
513
# generally find it very fast and not recurse after that.
514
added = _add_one_and_parent(tree, inv, None,
515
_FastPath(dirname(path.raw_path)), 'directory', action)
516
parent_id = inv.path2id(dirname(path.raw_path))
517
parent_ie = inv[parent_id]
518
_add_one(tree, inv, parent_ie, path, kind, action)
519
return added + [path.raw_path]
522
def _add_one(tree, inv, parent_ie, path, kind, file_id_callback):
523
"""Add a new entry to the inventory.
525
:param inv: Inventory which will receive the new entry.
526
:param parent_ie: Parent inventory entry.
527
:param kind: Kind of new entry (file, directory, etc)
528
:param file_id_callback: callback(inv, parent_ie, path, kind); return a
529
file_id or None to generate a new file id
532
file_id = file_id_callback(inv, parent_ie, path, kind)
533
entry = inv.make_entry(kind, path.base_path, parent_ie.file_id,
added
removed
bzrlib/mutabletree.py
