460
438
of added files, and ignored_files is a dict mapping files that were
461
439
ignored to the rule that caused them to be ignored.
463
# not in an inner loop; and we want to remove direct use of this,
464
# so here as a reminder for now. RBC 20070703
465
from bzrlib.inventory import InventoryEntry
467
action = add.AddAction()
470
# no paths supplied: add the entire tree.
471
# FIXME: this assumes we are running in a working tree subdir :-/
474
# mutter("smart add of %r")
480
conflicts_related = set()
481
441
# Not all mutable trees can have conflicts
482
442
if getattr(self, 'conflicts', None) is not None:
483
443
# Collect all related files without checking whether they exist or
484
444
# are versioned. It's cheaper to do that once for all conflicts
485
445
# than trying to find the relevant conflict for each added file.
446
conflicts_related = set()
486
447
for c in self.conflicts():
487
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
458
def update_basis_by_delta(self, new_revid, delta):
459
"""Update the parents of this tree after a commit.
461
This gives the tree one parent, with revision id new_revid. The
462
inventory delta is applied to the current basis tree to generate the
463
inventory for the parent new_revid, and all other parent trees are
466
All the changes in the delta should be changes synchronising the basis
467
tree with some or all of the working tree, with a change to a directory
468
requiring that its contents have been recursively included. That is,
469
this is not a general purpose tree modification routine, but a helper
470
for commit which is not required to handle situations that do not arise
473
See the inventory developers documentation for the theory behind
476
:param new_revid: The new revision id for the trees parent.
477
:param delta: An inventory delta (see apply_inventory_delta) describing
478
the changes from the current left most parent revision to new_revid.
480
# if the tree is updated by a pull to the branch, as happens in
481
# WorkingTree2, when there was no separation between branch and tree,
482
# then just clear merges, efficiency is not a concern for now as this
483
# is legacy environments only, and they are slow regardless.
484
if self.last_revision() == new_revid:
485
self.set_parent_ids([new_revid])
487
# generic implementation based on Inventory manipulation. See
488
# WorkingTree classes for optimised versions for specific format trees.
489
basis = self.basis_tree()
491
# TODO: Consider re-evaluating the need for this with CHKInventory
492
# we don't strictly need to mutate an inventory for this
493
# it only makes sense when apply_delta is cheaper than get_inventory()
494
inventory = _mod_inventory.mutable_inventory_from_tree(basis)
496
inventory.apply_delta(delta)
497
rev_tree = revisiontree.InventoryRevisionTree(self.branch.repository,
498
inventory, new_revid)
499
self.set_parent_trees([(new_revid, rev_tree)])
502
class MutableTreeHooks(hooks.Hooks):
503
"""A dictionary mapping a hook name to a list of callables for mutabletree
508
"""Create the default hooks.
511
hooks.Hooks.__init__(self, "bzrlib.mutabletree", "MutableTree.hooks")
512
self.add_hook('start_commit',
513
"Called before a commit is performed on a tree. The start commit "
514
"hook is able to change the tree before the commit takes place. "
515
"start_commit is called with the bzrlib.mutabletree.MutableTree "
516
"that the commit is being performed on.", (1, 4))
517
self.add_hook('post_commit',
518
"Called after a commit is performed on a tree. The hook is "
519
"called with a bzrlib.mutabletree.PostCommitHookParams object. "
520
"The mutable tree the commit was performed on is available via "
521
"the mutable_tree attribute of that object.", (2, 0))
524
# install the default hooks into the MutableTree class.
525
MutableTree.hooks = MutableTreeHooks()
528
class PostCommitHookParams(object):
529
"""Parameters for the post_commit hook.
531
To access the parameters, use the following attributes:
533
* mutable_tree - the MutableTree object
536
def __init__(self, mutable_tree):
537
"""Create the parameters for the post_commit hook."""
538
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 :-/
489
654
# expand any symlinks in the directory part, while leaving the
492
657
if osutils.has_symlinks():
493
658
file_list = map(osutils.normalizepath, file_list)
495
661
# validate user file paths and convert all paths to tree
496
662
# relative : it's cheaper to make a tree relative path an abspath
497
663
# than to convert an abspath to tree relative, and it's cheaper to
498
664
# perform the canonicalization in bulk.
499
for filepath in osutils.canonical_relpaths(self.basedir, file_list):
500
rf = _FastPath(filepath)
665
for filepath in osutils.canonical_relpaths(self.tree.basedir, file_list):
501
666
# validate user parameters. Our recursive code avoids adding new
502
667
# files that need such validation
503
if self.is_control_filename(rf.raw_path):
504
raise errors.ForbiddenControlFileError(filename=rf.raw_path)
668
if self.tree.is_control_filename(filepath):
669
raise errors.ForbiddenControlFileError(filename=filepath)
506
abspath = self.abspath(rf.raw_path)
671
abspath = self.tree.abspath(filepath)
507
672
kind = osutils.file_kind(abspath)
508
if kind == 'directory':
509
# schedule the dir for scanning
512
if not InventoryEntry.versionable_kind(kind):
513
raise errors.BadFileKindError(filename=abspath, kind=kind)
514
673
# ensure the named path is added, so that ignore rules in the later
515
674
# directory walk dont skip it.
516
675
# we dont have a parent ie known yet.: use the relatively slower
517
676
# inventory probing method
518
versioned = inv.has_filename(rf.raw_path)
521
added.extend(_add_one_and_parent(self, inv, None, rf, kind, action))
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)
524
686
# no need to walk any directories at all.
525
if len(added) > 0 and save:
526
self._write_inventory(inv)
527
return added, ignored
529
# only walk the minimal parents needed: we have user_dirs to override
533
is_inside = osutils.is_inside_or_parent_of_any
534
for path in sorted(user_dirs):
535
if (prev_dir is None or not is_inside([prev_dir], path.raw_path)):
536
dirs_to_add.append((path, None))
537
prev_dir = path.raw_path
689
things_to_add = list(self._gather_dirs_to_add(user_dirs))
539
691
illegalpath_re = re.compile(r'[\r\n]')
540
# dirs_to_add is initialised to a list of directories, but as we scan
541
# directories we append files to it.
542
# XXX: We should determine kind of files when we scan them rather than
543
# adding to this list. RBC 20070703
544
for directory, parent_ie in dirs_to_add:
692
for directory, inv_path, this_ie, parent_ie in things_to_add:
545
693
# directory is tree-relative
546
abspath = self.abspath(directory.raw_path)
694
abspath = self.tree.abspath(directory)
548
696
# get the contents of this directory.
550
698
# find the kind of the path being added.
551
kind = osutils.file_kind(abspath)
700
kind = osutils.file_kind(abspath)
553
704
if not InventoryEntry.versionable_kind(kind):
554
705
trace.warning("skipping %s (can't add file of kind '%s')",
557
if illegalpath_re.search(directory.raw_path):
708
if illegalpath_re.search(directory):
558
709
trace.warning("skipping %r (contains \\n or \\r)" % abspath)
560
if directory.raw_path in conflicts_related:
711
if directory in self.conflicts_related:
561
712
# If the file looks like one generated for a conflict, don't
602
742
trace.mutter("%r is a nested bzr tree", abspath)
604
_add_one(self, inv, parent_ie, directory, kind, action)
605
added.append(directory.raw_path)
744
this_ie = self._add_one_and_parent(parent_ie, directory, kind, inv_path)
607
746
if kind == 'directory' and not sub_tree:
608
if parent_ie is not None:
610
this_ie = parent_ie.children[directory.base_path]
612
# without the parent ie, use the relatively slower inventory
614
this_id = inv.path2id(
615
self._fix_case_of_inventory_path(directory.raw_path))
619
this_ie = inv[this_id]
620
# Same as in _add_one below, if the inventory doesn't
621
# think this is a directory, update the inventory
622
if this_ie.kind != 'directory':
623
this_ie = _mod_inventory.make_entry('directory',
624
this_ie.name, this_ie.parent_id, this_id)
747
if this_ie.kind != 'directory':
748
this_ie = self._convert_to_directory(this_ie, inv_path)
628
750
for subf in sorted(os.listdir(abspath)):
751
inv_f, _ = osutils.normalized_filename(subf)
629
752
# here we could use TreeDirectory rather than
630
753
# string concatenation.
631
subp = osutils.pathjoin(directory.raw_path, subf)
754
subp = osutils.pathjoin(directory, subf)
632
755
# TODO: is_control_filename is very slow. Make it faster.
633
756
# TreeDirectory.is_control_filename could also make this
634
757
# faster - its impossible for a non root dir to have a
636
if self.is_control_filename(subp):
759
if self.tree.is_control_filename(subp):
637
760
trace.mutter("skip control directory %r", subp)
638
elif subf in this_ie.children:
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:
639
769
# recurse into this already versioned subdir.
640
dirs_to_add.append((_FastPath(subp, subf), this_ie))
770
things_to_add.append((subp, sub_invp, sub_ie, this_ie))
642
772
# user selection overrides ignoes
643
773
# ignore while selecting files - if we globbed in the
644
774
# outer loop we would ignore user files.
645
ignore_glob = self.is_ignored(subp)
775
ignore_glob = self.tree.is_ignored(subp)
646
776
if ignore_glob is not None:
647
# mutter("skip ignored sub-file %r", subp)
648
ignored.setdefault(ignore_glob, []).append(subp)
777
self.ignored.setdefault(ignore_glob, []).append(subp)
650
#mutter("queue to add sub-file %r", subp)
651
dirs_to_add.append((_FastPath(subp, subf), this_ie))
655
self._write_inventory(inv)
657
self.read_working_inventory()
658
return added, ignored
660
def update_basis_by_delta(self, new_revid, delta):
661
"""Update the parents of this tree after a commit.
663
This gives the tree one parent, with revision id new_revid. The
664
inventory delta is applied to the current basis tree to generate the
665
inventory for the parent new_revid, and all other parent trees are
668
All the changes in the delta should be changes synchronising the basis
669
tree with some or all of the working tree, with a change to a directory
670
requiring that its contents have been recursively included. That is,
671
this is not a general purpose tree modification routine, but a helper
672
for commit which is not required to handle situations that do not arise
675
See the inventory developers documentation for the theory behind
678
:param new_revid: The new revision id for the trees parent.
679
:param delta: An inventory delta (see apply_inventory_delta) describing
680
the changes from the current left most parent revision to new_revid.
682
# if the tree is updated by a pull to the branch, as happens in
683
# WorkingTree2, when there was no separation between branch and tree,
684
# then just clear merges, efficiency is not a concern for now as this
685
# is legacy environments only, and they are slow regardless.
686
if self.last_revision() == new_revid:
687
self.set_parent_ids([new_revid])
689
# generic implementation based on Inventory manipulation. See
690
# WorkingTree classes for optimised versions for specific format trees.
691
basis = self.basis_tree()
693
# TODO: Consider re-evaluating the need for this with CHKInventory
694
# we don't strictly need to mutate an inventory for this
695
# it only makes sense when apply_delta is cheaper than get_inventory()
696
inventory = _mod_inventory.mutable_inventory_from_tree(basis)
698
inventory.apply_delta(delta)
699
rev_tree = revisiontree.InventoryRevisionTree(self.branch.repository,
700
inventory, new_revid)
701
self.set_parent_trees([(new_revid, rev_tree)])
704
class MutableTreeHooks(hooks.Hooks):
705
"""A dictionary mapping a hook name to a list of callables for mutabletree
710
"""Create the default hooks.
713
hooks.Hooks.__init__(self, "bzrlib.mutabletree", "MutableTree.hooks")
714
self.add_hook('start_commit',
715
"Called before a commit is performed on a tree. The start commit "
716
"hook is able to change the tree before the commit takes place. "
717
"start_commit is called with the bzrlib.mutabletree.MutableTree "
718
"that the commit is being performed on.", (1, 4))
719
self.add_hook('post_commit',
720
"Called after a commit is performed on a tree. The hook is "
721
"called with a bzrlib.mutabletree.PostCommitHookParams object. "
722
"The mutable tree the commit was performed on is available via "
723
"the mutable_tree attribute of that object.", (2, 0))
726
# install the default hooks into the MutableTree class.
727
MutableTree.hooks = MutableTreeHooks()
730
class PostCommitHookParams(object):
731
"""Parameters for the post_commit hook.
733
To access the parameters, use the following attributes:
735
* mutable_tree - the MutableTree object
738
def __init__(self, mutable_tree):
739
"""Create the parameters for the post_commit hook."""
740
self.mutable_tree = mutable_tree
743
class _FastPath(object):
744
"""A path object with fast accessors for things like basename."""
746
__slots__ = ['raw_path', 'base_path']
748
def __init__(self, path, base_path=None):
749
"""Construct a FastPath from path."""
750
if base_path is None:
751
self.base_path = osutils.basename(path)
753
self.base_path = base_path
756
def __cmp__(self, other):
757
return cmp(self.raw_path, other.raw_path)
760
return hash(self.raw_path)
763
def _add_one_and_parent(tree, inv, parent_ie, path, kind, action):
764
"""Add a new entry to the inventory and automatically add unversioned parents.
766
:param inv: Inventory which will receive the new entry.
767
:param parent_ie: Parent inventory entry if known, or None. If
768
None, the parent is looked up by name and used if present, otherwise it
769
is recursively added.
770
:param kind: Kind of new entry (file, directory, etc)
771
:param action: callback(inv, parent_ie, path, kind); return ignored.
772
:return: A list of paths which have been added.
774
# Nothing to do if path is already versioned.
775
# This is safe from infinite recursion because the tree root is
777
if parent_ie is not None:
778
# we have a parent ie already
781
# slower but does not need parent_ie
782
if inv.has_filename(tree._fix_case_of_inventory_path(path.raw_path)):
784
# its really not there : add the parent
785
# note that the dirname use leads to some extra str copying etc but as
786
# there are a limited number of dirs we can be nested under, it should
787
# generally find it very fast and not recurse after that.
788
added = _add_one_and_parent(tree, inv, None,
789
_FastPath(osutils.dirname(path.raw_path)), 'directory', action)
790
parent_id = inv.path2id(osutils.dirname(path.raw_path))
791
parent_ie = inv[parent_id]
792
_add_one(tree, inv, parent_ie, path, kind, action)
793
return added + [path.raw_path]
796
def _add_one(tree, inv, parent_ie, path, kind, file_id_callback):
797
"""Add a new entry to the inventory.
799
:param inv: Inventory which will receive the new entry.
800
:param parent_ie: Parent inventory entry.
801
:param kind: Kind of new entry (file, directory, etc)
802
:param file_id_callback: callback(inv, parent_ie, path, kind); return a
803
file_id or None to generate a new file id
806
# if the parent exists, but isn't a directory, we have to do the
807
# kind change now -- really the inventory shouldn't pretend to know
808
# the kind of wt files, but it does.
809
if parent_ie.kind != 'directory':
810
# nb: this relies on someone else checking that the path we're using
811
# doesn't contain symlinks.
812
new_parent_ie = _mod_inventory.make_entry('directory', parent_ie.name,
813
parent_ie.parent_id, parent_ie.file_id)
814
del inv[parent_ie.file_id]
815
inv.add(new_parent_ie)
816
parent_ie = new_parent_ie
817
file_id = file_id_callback(inv, parent_ie, path, kind)
818
entry = inv.make_entry(kind, path.base_path, parent_ie.file_id,
779
things_to_add.append((subp, sub_invp, None, this_ie))
added
removed
bzrlib/mutabletree.py
