392
372
of added files, and ignored_files is a dict mapping files that were
393
373
ignored to the rule that caused them to be ignored.
395
raise NotImplementedError(self.smart_add)
398
class MutableInventoryTree(MutableTree, tree.InventoryTree):
400
@needs_tree_write_lock
401
def apply_inventory_delta(self, changes):
402
"""Apply changes to the inventory as an atomic operation.
404
:param changes: An inventory delta to apply to the working tree's
407
:seealso Inventory.apply_delta: For details on the changes parameter.
375
# not in an inner loop; and we want to remove direct use of this,
376
# so here as a reminder for now. RBC 20070703
377
from bzrlib.inventory import InventoryEntry
379
action = add.AddAction()
382
# no paths supplied: add the entire tree.
384
# mutter("smart add of %r")
410
385
inv = self.inventory
411
inv.apply_delta(changes)
412
self._write_inventory(inv)
414
def _fix_case_of_inventory_path(self, path):
415
"""If our tree isn't case sensitive, return the canonical path"""
416
if not self.case_sensitive:
417
path = self.get_canonical_inventory_path(path)
420
@needs_tree_write_lock
421
def smart_add(self, file_list, recurse=True, action=None, save=True):
422
"""Version file_list, optionally recursing into directories.
424
This is designed more towards DWIM for humans than API clarity.
425
For the specific behaviour see the help for cmd_add().
427
:param file_list: List of zero or more paths. *NB: these are
428
interpreted relative to the process cwd, not relative to the
429
tree.* (Add and most other tree methods use tree-relative
431
:param action: A reporter to be called with the inventory, parent_ie,
432
path and kind of the path being added. It may return a file_id if
433
a specific one should be used.
434
:param save: Save the inventory after completing the adds. If False
435
this provides dry-run functionality by doing the add and not saving
437
:return: A tuple - files_added, ignored_files. files_added is the count
438
of added files, and ignored_files is a dict mapping files that were
439
ignored to the rule that caused them to be ignored.
441
# Not all mutable trees can have conflicts
442
if getattr(self, 'conflicts', None) is not None:
443
# Collect all related files without checking whether they exist or
444
# are versioned. It's cheaper to do that once for all conflicts
445
# than trying to find the relevant conflict for each added file.
446
conflicts_related = set()
447
for c in self.conflicts():
448
conflicts_related.update(c.associated_filenames())
450
conflicts_related = None
451
adder = _SmartAddHelper(self, action, conflicts_related)
452
adder.add(file_list, recurse=recurse)
454
invdelta = adder.get_inventory_delta()
455
self.apply_inventory_delta(invdelta)
456
return adder.added, adder.ignored
391
# validate user file paths and convert all paths to tree
392
# relative : it's cheaper to make a tree relative path an abspath
393
# than to convert an abspath to tree relative, and it's cheaper to
394
# perform the canonicalization in bulk.
395
for filepath in osutils.canonical_relpaths(self.basedir, file_list):
396
rf = _FastPath(filepath)
397
# validate user parameters. Our recursive code avoids adding new
398
# files that need such validation
399
if self.is_control_filename(rf.raw_path):
400
raise errors.ForbiddenControlFileError(filename=rf.raw_path)
402
abspath = self.abspath(rf.raw_path)
403
kind = osutils.file_kind(abspath)
404
if kind == 'directory':
405
# schedule the dir for scanning
408
if not InventoryEntry.versionable_kind(kind):
409
raise errors.BadFileKindError(filename=abspath, kind=kind)
410
# ensure the named path is added, so that ignore rules in the later
411
# directory walk dont skip it.
412
# we dont have a parent ie known yet.: use the relatively slower
413
# inventory probing method
414
versioned = inv.has_filename(rf.raw_path)
417
added.extend(_add_one_and_parent(self, inv, None, rf, kind, action))
420
# no need to walk any directories at all.
421
if len(added) > 0 and save:
422
self._write_inventory(inv)
423
return added, ignored
425
# only walk the minimal parents needed: we have user_dirs to override
429
is_inside = osutils.is_inside_or_parent_of_any
430
for path in sorted(user_dirs):
431
if (prev_dir is None or not is_inside([prev_dir], path.raw_path)):
432
dirs_to_add.append((path, None))
433
prev_dir = path.raw_path
435
illegalpath_re = re.compile(r'[\r\n]')
436
# dirs_to_add is initialised to a list of directories, but as we scan
437
# directories we append files to it.
438
# XXX: We should determine kind of files when we scan them rather than
439
# adding to this list. RBC 20070703
440
for directory, parent_ie in dirs_to_add:
441
# directory is tree-relative
442
abspath = self.abspath(directory.raw_path)
444
# get the contents of this directory.
446
# find the kind of the path being added.
447
kind = osutils.file_kind(abspath)
449
if not InventoryEntry.versionable_kind(kind):
450
trace.warning("skipping %s (can't add file of kind '%s')",
453
if illegalpath_re.search(directory.raw_path):
454
trace.warning("skipping %r (contains \\n or \\r)" % abspath)
457
if parent_ie is not None:
458
versioned = directory.base_path in parent_ie.children
460
# without the parent ie, use the relatively slower inventory
462
versioned = inv.has_filename(
463
self._fix_case_of_inventory_path(directory.raw_path))
465
if kind == 'directory':
467
sub_branch = bzrdir.BzrDir.open(abspath)
469
except errors.NotBranchError:
471
except errors.UnsupportedFormatError:
476
if directory.raw_path == '':
477
# mutter("tree root doesn't need to be added")
481
# mutter("%r is already versioned", abspath)
483
# XXX: This is wrong; people *might* reasonably be trying to
484
# add subtrees as subtrees. This should probably only be done
485
# in formats which can represent subtrees, and even then
486
# perhaps only when the user asked to add subtrees. At the
487
# moment you can add them specially through 'join --reference',
488
# which is perhaps reasonable: adding a new reference is a
489
# special operation and can have a special behaviour. mbp
491
trace.mutter("%r is a nested bzr tree", abspath)
493
_add_one(self, inv, parent_ie, directory, kind, action)
494
added.append(directory.raw_path)
496
if kind == 'directory' and not sub_tree:
497
if parent_ie is not None:
499
this_ie = parent_ie.children[directory.base_path]
501
# without the parent ie, use the relatively slower inventory
503
this_id = inv.path2id(
504
self._fix_case_of_inventory_path(directory.raw_path))
508
this_ie = inv[this_id]
510
for subf in sorted(os.listdir(abspath)):
511
# here we could use TreeDirectory rather than
512
# string concatenation.
513
subp = osutils.pathjoin(directory.raw_path, subf)
514
# TODO: is_control_filename is very slow. Make it faster.
515
# TreeDirectory.is_control_filename could also make this
516
# faster - its impossible for a non root dir to have a
518
if self.is_control_filename(subp):
519
trace.mutter("skip control directory %r", subp)
520
elif subf in this_ie.children:
521
# recurse into this already versioned subdir.
522
dirs_to_add.append((_FastPath(subp, subf), this_ie))
524
# user selection overrides ignoes
525
# ignore while selecting files - if we globbed in the
526
# outer loop we would ignore user files.
527
ignore_glob = self.is_ignored(subp)
528
if ignore_glob is not None:
529
# mutter("skip ignored sub-file %r", subp)
530
ignored.setdefault(ignore_glob, []).append(subp)
532
#mutter("queue to add sub-file %r", subp)
533
dirs_to_add.append((_FastPath(subp, subf), this_ie))
537
self._write_inventory(inv)
539
self.read_working_inventory()
540
return added, ignored
458
542
def update_basis_by_delta(self, new_revid, delta):
459
543
"""Update the parents of this tree after a commit.
538
622
self.mutable_tree = mutable_tree
541
class _SmartAddHelper(object):
542
"""Helper for MutableTree.smart_add."""
544
def get_inventory_delta(self):
545
return self._invdelta.values()
547
def _get_ie(self, inv_path):
548
"""Retrieve the most up to date inventory entry for a path.
550
:param inv_path: Normalized inventory path
551
:return: Inventory entry (with possibly invalid .children for
554
entry = self._invdelta.get(inv_path)
555
if entry is not None:
557
# Find a 'best fit' match if the filesystem is case-insensitive
558
inv_path = self.tree._fix_case_of_inventory_path(inv_path)
559
file_id = self.tree.path2id(inv_path)
560
if file_id is not None:
561
return self.tree.iter_entries_by_dir([file_id]).next()[1]
564
def _convert_to_directory(self, this_ie, inv_path):
565
"""Convert an entry to a directory.
567
:param this_ie: Inventory entry
568
:param inv_path: Normalized path for the inventory entry
569
:return: The new inventory entry
571
# Same as in _add_one below, if the inventory doesn't
572
# think this is a directory, update the inventory
573
this_ie = _mod_inventory.InventoryDirectory(
574
this_ie.file_id, this_ie.name, this_ie.parent_id)
575
self._invdelta[inv_path] = (inv_path, inv_path, this_ie.file_id,
579
def _add_one_and_parent(self, parent_ie, path, kind, inv_path):
580
"""Add a new entry to the inventory and automatically add unversioned parents.
582
:param parent_ie: Parent inventory entry if known, or None. If
583
None, the parent is looked up by name and used if present, otherwise it
584
is recursively added.
585
:param kind: Kind of new entry (file, directory, etc)
586
:param action: callback(tree, parent_ie, path, kind); can return file_id
587
:return: Inventory entry for path and a list of paths which have been added.
589
# Nothing to do if path is already versioned.
590
# This is safe from infinite recursion because the tree root is
592
inv_dirname = osutils.dirname(inv_path)
593
dirname, basename = osutils.split(path)
594
if parent_ie is None:
595
# slower but does not need parent_ie
596
this_ie = self._get_ie(inv_path)
597
if this_ie is not None:
599
# its really not there : add the parent
600
# note that the dirname use leads to some extra str copying etc but as
601
# there are a limited number of dirs we can be nested under, it should
602
# generally find it very fast and not recurse after that.
603
parent_ie = self._add_one_and_parent(None,
604
dirname, 'directory',
606
# if the parent exists, but isn't a directory, we have to do the
607
# kind change now -- really the inventory shouldn't pretend to know
608
# the kind of wt files, but it does.
609
if parent_ie.kind != 'directory':
610
# nb: this relies on someone else checking that the path we're using
611
# doesn't contain symlinks.
612
parent_ie = self._convert_to_directory(parent_ie, inv_dirname)
613
file_id = self.action(self.tree.inventory, parent_ie, path, kind)
614
entry = _mod_inventory.make_entry(kind, basename, parent_ie.file_id,
616
self._invdelta[inv_path] = (None, inv_path, entry.file_id, entry)
617
self.added.append(inv_path)
620
def _gather_dirs_to_add(self, user_dirs):
621
# only walk the minimal parents needed: we have user_dirs to override
625
is_inside = osutils.is_inside_or_parent_of_any
626
for path, (inv_path, this_ie) in sorted(
627
user_dirs.iteritems(), key=operator.itemgetter(0)):
628
if (prev_dir is None or not is_inside([prev_dir], path)):
629
yield (path, inv_path, this_ie, None)
632
def __init__(self, tree, action, conflicts_related=None):
635
self.action = add.AddAction()
641
if conflicts_related is None:
642
self.conflicts_related = frozenset()
644
self.conflicts_related = conflicts_related
646
def add(self, file_list, recurse=True):
647
from bzrlib.inventory import InventoryEntry
649
# no paths supplied: add the entire tree.
650
# FIXME: this assumes we are running in a working tree subdir :-/
654
# expand any symlinks in the directory part, while leaving the
656
# only expanding if symlinks are supported avoids windows path bugs
657
if osutils.has_symlinks():
658
file_list = map(osutils.normalizepath, file_list)
661
# validate user file paths and convert all paths to tree
662
# relative : it's cheaper to make a tree relative path an abspath
663
# than to convert an abspath to tree relative, and it's cheaper to
664
# perform the canonicalization in bulk.
665
for filepath in osutils.canonical_relpaths(self.tree.basedir, file_list):
666
# validate user parameters. Our recursive code avoids adding new
667
# files that need such validation
668
if self.tree.is_control_filename(filepath):
669
raise errors.ForbiddenControlFileError(filename=filepath)
671
abspath = self.tree.abspath(filepath)
672
kind = osutils.file_kind(abspath)
673
# ensure the named path is added, so that ignore rules in the later
674
# directory walk dont skip it.
675
# we dont have a parent ie known yet.: use the relatively slower
676
# inventory probing method
677
inv_path, _ = osutils.normalized_filename(filepath)
678
this_ie = self._get_ie(inv_path)
680
this_ie = self._add_one_and_parent(None, filepath, kind, inv_path)
681
if kind == 'directory':
682
# schedule the dir for scanning
683
user_dirs[filepath] = (inv_path, this_ie)
686
# no need to walk any directories at all.
689
things_to_add = list(self._gather_dirs_to_add(user_dirs))
691
illegalpath_re = re.compile(r'[\r\n]')
692
for directory, inv_path, this_ie, parent_ie in things_to_add:
693
# directory is tree-relative
694
abspath = self.tree.abspath(directory)
696
# get the contents of this directory.
698
# find the kind of the path being added.
700
kind = osutils.file_kind(abspath)
704
if not InventoryEntry.versionable_kind(kind):
705
trace.warning("skipping %s (can't add file of kind '%s')",
708
if illegalpath_re.search(directory):
709
trace.warning("skipping %r (contains \\n or \\r)" % abspath)
711
if directory in self.conflicts_related:
712
# If the file looks like one generated for a conflict, don't
715
'skipping %s (generated to help resolve conflicts)',
719
if kind == 'directory' and directory != '':
721
transport = _mod_transport.get_transport(abspath)
722
controldir.ControlDirFormat.find_format(transport)
724
except errors.NotBranchError:
726
except errors.UnsupportedFormatError:
731
if this_ie is not None:
734
# XXX: This is wrong; people *might* reasonably be trying to
735
# add subtrees as subtrees. This should probably only be done
736
# in formats which can represent subtrees, and even then
737
# perhaps only when the user asked to add subtrees. At the
738
# moment you can add them specially through 'join --reference',
739
# which is perhaps reasonable: adding a new reference is a
740
# special operation and can have a special behaviour. mbp
742
trace.mutter("%r is a nested bzr tree", abspath)
744
this_ie = self._add_one_and_parent(parent_ie, directory, kind, inv_path)
746
if kind == 'directory' and not sub_tree:
747
if this_ie.kind != 'directory':
748
this_ie = self._convert_to_directory(this_ie, inv_path)
750
for subf in sorted(os.listdir(abspath)):
751
inv_f, _ = osutils.normalized_filename(subf)
752
# here we could use TreeDirectory rather than
753
# string concatenation.
754
subp = osutils.pathjoin(directory, subf)
755
# TODO: is_control_filename is very slow. Make it faster.
756
# TreeDirectory.is_control_filename could also make this
757
# faster - its impossible for a non root dir to have a
759
if self.tree.is_control_filename(subp):
760
trace.mutter("skip control directory %r", subp)
762
sub_invp = osutils.pathjoin(inv_path, inv_f)
763
entry = self._invdelta.get(sub_invp)
764
if entry is not None:
767
sub_ie = this_ie.children.get(inv_f)
768
if sub_ie is not None:
769
# recurse into this already versioned subdir.
770
things_to_add.append((subp, sub_invp, sub_ie, this_ie))
772
# user selection overrides ignoes
773
# ignore while selecting files - if we globbed in the
774
# outer loop we would ignore user files.
775
ignore_glob = self.tree.is_ignored(subp)
776
if ignore_glob is not None:
777
self.ignored.setdefault(ignore_glob, []).append(subp)
779
things_to_add.append((subp, sub_invp, None, this_ie))
625
class _FastPath(object):
626
"""A path object with fast accessors for things like basename."""
628
__slots__ = ['raw_path', 'base_path']
630
def __init__(self, path, base_path=None):
631
"""Construct a FastPath from path."""
632
if base_path is None:
633
self.base_path = osutils.basename(path)
635
self.base_path = base_path
638
def __cmp__(self, other):
639
return cmp(self.raw_path, other.raw_path)
642
return hash(self.raw_path)
645
def _add_one_and_parent(tree, inv, parent_ie, path, kind, action):
646
"""Add a new entry to the inventory and automatically add unversioned parents.
648
:param inv: Inventory which will receive the new entry.
649
:param parent_ie: Parent inventory entry if known, or None. If
650
None, the parent is looked up by name and used if present, otherwise it
651
is recursively added.
652
:param kind: Kind of new entry (file, directory, etc)
653
:param action: callback(inv, parent_ie, path, kind); return ignored.
654
:return: A list of paths which have been added.
656
# Nothing to do if path is already versioned.
657
# This is safe from infinite recursion because the tree root is
659
if parent_ie is not None:
660
# we have a parent ie already
663
# slower but does not need parent_ie
664
if inv.has_filename(tree._fix_case_of_inventory_path(path.raw_path)):
666
# its really not there : add the parent
667
# note that the dirname use leads to some extra str copying etc but as
668
# there are a limited number of dirs we can be nested under, it should
669
# generally find it very fast and not recurse after that.
670
added = _add_one_and_parent(tree, inv, None,
671
_FastPath(osutils.dirname(path.raw_path)), 'directory', action)
672
parent_id = inv.path2id(osutils.dirname(path.raw_path))
673
parent_ie = inv[parent_id]
674
_add_one(tree, inv, parent_ie, path, kind, action)
675
return added + [path.raw_path]
678
def _add_one(tree, inv, parent_ie, path, kind, file_id_callback):
679
"""Add a new entry to the inventory.
681
:param inv: Inventory which will receive the new entry.
682
:param parent_ie: Parent inventory entry.
683
:param kind: Kind of new entry (file, directory, etc)
684
:param file_id_callback: callback(inv, parent_ie, path, kind); return a
685
file_id or None to generate a new file id
688
file_id = file_id_callback(inv, parent_ie, path, kind)
689
entry = inv.make_entry(kind, path.base_path, parent_ie.file_id,
added
removed
bzrlib/mutabletree.py
