410
392
of added files, and ignored_files is a dict mapping files that were
411
393
ignored to the rule that caused them to be ignored.
413
# not in an inner loop; and we want to remove direct use of this,
414
# so here as a reminder for now. RBC 20070703
415
from bzrlib.inventory import InventoryEntry
417
action = add.AddAction()
420
# no paths supplied: add the entire tree.
421
# FIXME: this assumes we are running in a working tree subdir :-/
424
# mutter("smart add of %r")
395
raise NotImplementedError(self.smart_add)
397
def update_basis_by_delta(self, new_revid, delta):
398
"""Update the parents of this tree after a commit.
400
This gives the tree one parent, with revision id new_revid. The
401
inventory delta is applied to the current basis tree to generate the
402
inventory for the parent new_revid, and all other parent trees are
405
All the changes in the delta should be changes synchronising the basis
406
tree with some or all of the working tree, with a change to a directory
407
requiring that its contents have been recursively included. That is,
408
this is not a general purpose tree modification routine, but a helper
409
for commit which is not required to handle situations that do not arise
412
See the inventory developers documentation for the theory behind
415
:param new_revid: The new revision id for the trees parent.
416
:param delta: An inventory delta (see apply_inventory_delta) describing
417
the changes from the current left most parent revision to new_revid.
419
raise NotImplementedError(self.update_basis_by_delta)
422
class MutableInventoryTree(MutableTree,tree.InventoryTree):
424
@needs_tree_write_lock
425
def apply_inventory_delta(self, changes):
426
"""Apply changes to the inventory as an atomic operation.
428
:param changes: An inventory delta to apply to the working tree's
431
:seealso Inventory.apply_delta: For details on the changes parameter.
425
434
inv = self.inventory
430
conflicts_related = set()
435
inv.apply_delta(changes)
436
self._write_inventory(inv)
438
def _fix_case_of_inventory_path(self, path):
439
"""If our tree isn't case sensitive, return the canonical path"""
440
if not self.case_sensitive:
441
path = self.get_canonical_inventory_path(path)
444
@needs_tree_write_lock
445
def smart_add(self, file_list, recurse=True, action=None, save=True):
446
"""Version file_list, optionally recursing into directories.
448
This is designed more towards DWIM for humans than API clarity.
449
For the specific behaviour see the help for cmd_add().
451
:param file_list: List of zero or more paths. *NB: these are
452
interpreted relative to the process cwd, not relative to the
453
tree.* (Add and most other tree methods use tree-relative
455
:param action: A reporter to be called with the inventory, parent_ie,
456
path and kind of the path being added. It may return a file_id if
457
a specific one should be used.
458
:param save: Save the inventory after completing the adds. If False
459
this provides dry-run functionality by doing the add and not saving
461
:return: A tuple - files_added, ignored_files. files_added is the count
462
of added files, and ignored_files is a dict mapping files that were
463
ignored to the rule that caused them to be ignored.
431
465
# Not all mutable trees can have conflicts
432
466
if getattr(self, 'conflicts', None) is not None:
433
467
# Collect all related files without checking whether they exist or
434
468
# are versioned. It's cheaper to do that once for all conflicts
435
469
# than trying to find the relevant conflict for each added file.
470
conflicts_related = set()
436
471
for c in self.conflicts():
437
472
conflicts_related.update(c.associated_filenames())
474
conflicts_related = None
475
adder = _SmartAddHelper(self, action, conflicts_related)
476
adder.add(file_list, recurse=recurse)
478
invdelta = adder.get_inventory_delta()
479
self.apply_inventory_delta(invdelta)
480
return adder.added, adder.ignored
482
def update_basis_by_delta(self, new_revid, delta):
483
"""Update the parents of this tree after a commit.
485
This gives the tree one parent, with revision id new_revid. The
486
inventory delta is applied to the current basis tree to generate the
487
inventory for the parent new_revid, and all other parent trees are
490
All the changes in the delta should be changes synchronising the basis
491
tree with some or all of the working tree, with a change to a directory
492
requiring that its contents have been recursively included. That is,
493
this is not a general purpose tree modification routine, but a helper
494
for commit which is not required to handle situations that do not arise
497
See the inventory developers documentation for the theory behind
500
:param new_revid: The new revision id for the trees parent.
501
:param delta: An inventory delta (see apply_inventory_delta) describing
502
the changes from the current left most parent revision to new_revid.
504
# if the tree is updated by a pull to the branch, as happens in
505
# WorkingTree2, when there was no separation between branch and tree,
506
# then just clear merges, efficiency is not a concern for now as this
507
# is legacy environments only, and they are slow regardless.
508
if self.last_revision() == new_revid:
509
self.set_parent_ids([new_revid])
511
# generic implementation based on Inventory manipulation. See
512
# WorkingTree classes for optimised versions for specific format trees.
513
basis = self.basis_tree()
515
# TODO: Consider re-evaluating the need for this with CHKInventory
516
# we don't strictly need to mutate an inventory for this
517
# it only makes sense when apply_delta is cheaper than get_inventory()
518
inventory = _mod_inventory.mutable_inventory_from_tree(basis)
520
inventory.apply_delta(delta)
521
rev_tree = revisiontree.InventoryRevisionTree(self.branch.repository,
522
inventory, new_revid)
523
self.set_parent_trees([(new_revid, rev_tree)])
526
class MutableTreeHooks(hooks.Hooks):
527
"""A dictionary mapping a hook name to a list of callables for mutabletree
532
"""Create the default hooks.
535
hooks.Hooks.__init__(self, "bzrlib.mutabletree", "MutableTree.hooks")
536
self.add_hook('start_commit',
537
"Called before a commit is performed on a tree. The start commit "
538
"hook is able to change the tree before the commit takes place. "
539
"start_commit is called with the bzrlib.mutabletree.MutableTree "
540
"that the commit is being performed on.", (1, 4))
541
self.add_hook('post_commit',
542
"Called after a commit is performed on a tree. The hook is "
543
"called with a bzrlib.mutabletree.PostCommitHookParams object. "
544
"The mutable tree the commit was performed on is available via "
545
"the mutable_tree attribute of that object.", (2, 0))
548
# install the default hooks into the MutableTree class.
549
MutableTree.hooks = MutableTreeHooks()
552
class PostCommitHookParams(object):
553
"""Parameters for the post_commit hook.
555
To access the parameters, use the following attributes:
557
* mutable_tree - the MutableTree object
560
def __init__(self, mutable_tree):
561
"""Create the parameters for the post_commit hook."""
562
self.mutable_tree = mutable_tree
565
class _SmartAddHelper(object):
566
"""Helper for MutableTree.smart_add."""
568
def get_inventory_delta(self):
569
return self._invdelta.values()
571
def _get_ie(self, inv_path):
572
"""Retrieve the most up to date inventory entry for a path.
574
:param inv_path: Normalized inventory path
575
:return: Inventory entry (with possibly invalid .children for
578
entry = self._invdelta.get(inv_path)
579
if entry is not None:
581
file_id = self.tree.inventory.path2id(inv_path)
582
if file_id is not None:
583
return self.tree.inventory[file_id]
586
def _ensure_directory(self, this_ie, inv_path):
587
"""Convert an entry to a directory.
589
:param this_ie: Inventory entry
590
:param inv_path: Normalized path for the inventory entry
591
:return: The new inventory entry
593
# Same as in _add_one below, if the inventory doesn't
594
# think this is a directory, update the inventory
595
this_ie = _mod_inventory.InventoryDirectory(
596
this_ie.file_id, this_ie.name, this_ie.parent_id)
597
self._invdelta[inv_path] = (inv_path, inv_path, this_ie.file_id,
601
def _add_one_and_parent(self, parent_ie, path, kind, inv_path):
602
"""Add a new entry to the inventory and automatically add unversioned parents.
604
:param parent_ie: Parent inventory entry if known, or None. If
605
None, the parent is looked up by name and used if present, otherwise it
606
is recursively added.
607
:param kind: Kind of new entry (file, directory, etc)
608
:param action: callback(tree, parent_ie, path, kind); can return file_id
609
:return: Inventory entry for path and a list of paths which have been added.
611
# Nothing to do if path is already versioned.
612
# This is safe from infinite recursion because the tree root is
614
inv_dirname = osutils.dirname(inv_path)
615
dirname, basename = osutils.split(path)
616
if parent_ie is None:
617
# slower but does not need parent_ie
618
this_ie = self._get_ie(inv_path)
619
if this_ie is not None:
621
# its really not there : add the parent
622
# note that the dirname use leads to some extra str copying etc but as
623
# there are a limited number of dirs we can be nested under, it should
624
# generally find it very fast and not recurse after that.
625
parent_ie = self._add_one_and_parent(None,
626
dirname, 'directory',
628
# if the parent exists, but isn't a directory, we have to do the
629
# kind change now -- really the inventory shouldn't pretend to know
630
# the kind of wt files, but it does.
631
if parent_ie.kind != 'directory':
632
# nb: this relies on someone else checking that the path we're using
633
# doesn't contain symlinks.
634
parent_ie = self._ensure_directory(parent_ie, inv_dirname)
635
file_id = self.action(self.tree.inventory, parent_ie, path, kind)
636
entry = _mod_inventory.make_entry(kind, basename, parent_ie.file_id,
638
self._invdelta[inv_path] = (None, inv_path, entry.file_id, entry)
639
self.added.append(inv_path)
642
def _gather_dirs_to_add(self, user_dirs):
643
# only walk the minimal parents needed: we have user_dirs to override
647
is_inside = osutils.is_inside_or_parent_of_any
648
for path, (inv_path, this_ie) in sorted(
649
user_dirs.iteritems(), key=operator.itemgetter(0)):
650
if (prev_dir is None or not is_inside([prev_dir], path)):
651
yield (path, inv_path, this_ie, None)
654
def __init__(self, tree, action, conflicts_related=None):
657
self.action = add.AddAction()
663
if conflicts_related is None:
664
self.conflicts_related = frozenset()
666
self.conflicts_related = conflicts_related
668
def add(self, file_list, recurse=True):
669
from bzrlib.inventory import InventoryEntry
671
# no paths supplied: add the entire tree.
672
# FIXME: this assumes we are running in a working tree subdir :-/
676
# expand any symlinks in the directory part, while leaving the
678
# only expanding if symlinks are supported avoids windows path bugs
679
if osutils.has_symlinks():
680
file_list = map(osutils.normalizepath, file_list)
439
683
# validate user file paths and convert all paths to tree
440
684
# relative : it's cheaper to make a tree relative path an abspath
441
685
# than to convert an abspath to tree relative, and it's cheaper to
442
686
# perform the canonicalization in bulk.
443
for filepath in osutils.canonical_relpaths(self.basedir, file_list):
444
rf = _FastPath(filepath)
687
for filepath in osutils.canonical_relpaths(self.tree.basedir, file_list):
445
688
# validate user parameters. Our recursive code avoids adding new
446
689
# files that need such validation
447
if self.is_control_filename(rf.raw_path):
448
raise errors.ForbiddenControlFileError(filename=rf.raw_path)
690
if self.tree.is_control_filename(filepath):
691
raise errors.ForbiddenControlFileError(filename=filepath)
450
abspath = self.abspath(rf.raw_path)
693
abspath = self.tree.abspath(filepath)
451
694
kind = osutils.file_kind(abspath)
452
if kind == 'directory':
453
# schedule the dir for scanning
456
if not InventoryEntry.versionable_kind(kind):
457
raise errors.BadFileKindError(filename=abspath, kind=kind)
458
695
# ensure the named path is added, so that ignore rules in the later
459
696
# directory walk dont skip it.
460
697
# we dont have a parent ie known yet.: use the relatively slower
461
698
# inventory probing method
462
versioned = inv.has_filename(rf.raw_path)
465
added.extend(_add_one_and_parent(self, inv, None, rf, kind, action))
699
inv_path, _ = osutils.normalized_filename(filepath)
700
this_ie = self._get_ie(inv_path)
702
this_ie = self._add_one_and_parent(None, filepath, kind, inv_path)
703
if kind == 'directory':
704
# schedule the dir for scanning
705
user_dirs[filepath] = (inv_path, this_ie)
468
708
# no need to walk any directories at all.
469
if len(added) > 0 and save:
470
self._write_inventory(inv)
471
return added, ignored
473
# only walk the minimal parents needed: we have user_dirs to override
477
is_inside = osutils.is_inside_or_parent_of_any
478
for path in sorted(user_dirs):
479
if (prev_dir is None or not is_inside([prev_dir], path.raw_path)):
480
dirs_to_add.append((path, None))
481
prev_dir = path.raw_path
711
things_to_add = list(self._gather_dirs_to_add(user_dirs))
483
713
illegalpath_re = re.compile(r'[\r\n]')
484
# dirs_to_add is initialised to a list of directories, but as we scan
485
# directories we append files to it.
486
# XXX: We should determine kind of files when we scan them rather than
487
# adding to this list. RBC 20070703
488
for directory, parent_ie in dirs_to_add:
714
for directory, inv_path, this_ie, parent_ie in things_to_add:
489
715
# directory is tree-relative
490
abspath = self.abspath(directory.raw_path)
716
abspath = self.tree.abspath(directory)
492
718
# get the contents of this directory.
494
720
# find the kind of the path being added.
495
kind = osutils.file_kind(abspath)
722
kind = osutils.file_kind(abspath)
497
726
if not InventoryEntry.versionable_kind(kind):
498
727
trace.warning("skipping %s (can't add file of kind '%s')",
501
if illegalpath_re.search(directory.raw_path):
730
if illegalpath_re.search(directory):
502
731
trace.warning("skipping %r (contains \\n or \\r)" % abspath)
504
if directory.raw_path in conflicts_related:
733
if directory in self.conflicts_related:
505
734
# If the file looks like one generated for a conflict, don't
546
764
trace.mutter("%r is a nested bzr tree", abspath)
548
_add_one(self, inv, parent_ie, directory, kind, action)
549
added.append(directory.raw_path)
766
this_ie = self._add_one_and_parent(parent_ie, directory, kind, inv_path)
551
768
if kind == 'directory' and not sub_tree:
552
if parent_ie is not None:
554
this_ie = parent_ie.children[directory.base_path]
556
# without the parent ie, use the relatively slower inventory
558
this_id = inv.path2id(
559
self._fix_case_of_inventory_path(directory.raw_path))
563
this_ie = inv[this_id]
769
if this_ie.kind != 'directory':
770
this_ie = self._ensure_directory(this_ie, inv_path)
565
772
for subf in sorted(os.listdir(abspath)):
773
inv_f, _ = osutils.normalized_filename(subf)
566
774
# here we could use TreeDirectory rather than
567
775
# string concatenation.
568
subp = osutils.pathjoin(directory.raw_path, subf)
776
subp = osutils.pathjoin(directory, subf)
569
777
# TODO: is_control_filename is very slow. Make it faster.
570
778
# TreeDirectory.is_control_filename could also make this
571
779
# faster - its impossible for a non root dir to have a
573
if self.is_control_filename(subp):
781
if self.tree.is_control_filename(subp):
574
782
trace.mutter("skip control directory %r", subp)
575
elif subf in this_ie.children:
784
sub_invp = osutils.pathjoin(inv_path, inv_f)
785
entry = self._invdelta.get(sub_invp)
786
if entry is not None:
789
sub_ie = this_ie.children.get(inv_f)
790
if sub_ie is not None:
576
791
# recurse into this already versioned subdir.
577
dirs_to_add.append((_FastPath(subp, subf), this_ie))
792
things_to_add.append((subp, sub_invp, sub_ie, this_ie))
579
794
# user selection overrides ignoes
580
795
# ignore while selecting files - if we globbed in the
581
796
# outer loop we would ignore user files.
582
ignore_glob = self.is_ignored(subp)
797
ignore_glob = self.tree.is_ignored(subp)
583
798
if ignore_glob is not None:
584
# mutter("skip ignored sub-file %r", subp)
585
ignored.setdefault(ignore_glob, []).append(subp)
799
self.ignored.setdefault(ignore_glob, []).append(subp)
587
#mutter("queue to add sub-file %r", subp)
588
dirs_to_add.append((_FastPath(subp, subf), this_ie))
592
self._write_inventory(inv)
594
self.read_working_inventory()
595
return added, ignored
597
def update_basis_by_delta(self, new_revid, delta):
598
"""Update the parents of this tree after a commit.
600
This gives the tree one parent, with revision id new_revid. The
601
inventory delta is applied to the current basis tree to generate the
602
inventory for the parent new_revid, and all other parent trees are
605
All the changes in the delta should be changes synchronising the basis
606
tree with some or all of the working tree, with a change to a directory
607
requiring that its contents have been recursively included. That is,
608
this is not a general purpose tree modification routine, but a helper
609
for commit which is not required to handle situations that do not arise
612
See the inventory developers documentation for the theory behind
615
:param new_revid: The new revision id for the trees parent.
616
:param delta: An inventory delta (see apply_inventory_delta) describing
617
the changes from the current left most parent revision to new_revid.
619
# if the tree is updated by a pull to the branch, as happens in
620
# WorkingTree2, when there was no separation between branch and tree,
621
# then just clear merges, efficiency is not a concern for now as this
622
# is legacy environments only, and they are slow regardless.
623
if self.last_revision() == new_revid:
624
self.set_parent_ids([new_revid])
626
# generic implementation based on Inventory manipulation. See
627
# WorkingTree classes for optimised versions for specific format trees.
628
basis = self.basis_tree()
630
# TODO: Consider re-evaluating the need for this with CHKInventory
631
# we don't strictly need to mutate an inventory for this
632
# it only makes sense when apply_delta is cheaper than get_inventory()
633
inventory = basis.inventory._get_mutable_inventory()
635
inventory.apply_delta(delta)
636
rev_tree = revisiontree.RevisionTree(self.branch.repository,
637
inventory, new_revid)
638
self.set_parent_trees([(new_revid, rev_tree)])
641
class MutableTreeHooks(hooks.Hooks):
642
"""A dictionary mapping a hook name to a list of callables for mutabletree
647
"""Create the default hooks.
650
hooks.Hooks.__init__(self)
651
self.create_hook(hooks.HookPoint('start_commit',
652
"Called before a commit is performed on a tree. The start commit "
653
"hook is able to change the tree before the commit takes place. "
654
"start_commit is called with the bzrlib.mutabletree.MutableTree "
655
"that the commit is being performed on.", (1, 4), None))
656
self.create_hook(hooks.HookPoint('post_commit',
657
"Called after a commit is performed on a tree. The hook is "
658
"called with a bzrlib.mutabletree.PostCommitHookParams object. "
659
"The mutable tree the commit was performed on is available via "
660
"the mutable_tree attribute of that object.", (2, 0), None))
663
# install the default hooks into the MutableTree class.
664
MutableTree.hooks = MutableTreeHooks()
667
class PostCommitHookParams(object):
668
"""Parameters for the post_commit hook.
670
To access the parameters, use the following attributes:
672
* mutable_tree - the MutableTree object
675
def __init__(self, mutable_tree):
676
"""Create the parameters for the post_commit hook."""
677
self.mutable_tree = mutable_tree
680
class _FastPath(object):
681
"""A path object with fast accessors for things like basename."""
683
__slots__ = ['raw_path', 'base_path']
685
def __init__(self, path, base_path=None):
686
"""Construct a FastPath from path."""
687
if base_path is None:
688
self.base_path = osutils.basename(path)
690
self.base_path = base_path
693
def __cmp__(self, other):
694
return cmp(self.raw_path, other.raw_path)
697
return hash(self.raw_path)
700
def _add_one_and_parent(tree, inv, parent_ie, path, kind, action):
701
"""Add a new entry to the inventory and automatically add unversioned parents.
703
:param inv: Inventory which will receive the new entry.
704
:param parent_ie: Parent inventory entry if known, or None. If
705
None, the parent is looked up by name and used if present, otherwise it
706
is recursively added.
707
:param kind: Kind of new entry (file, directory, etc)
708
:param action: callback(inv, parent_ie, path, kind); return ignored.
709
:return: A list of paths which have been added.
711
# Nothing to do if path is already versioned.
712
# This is safe from infinite recursion because the tree root is
714
if parent_ie is not None:
715
# we have a parent ie already
718
# slower but does not need parent_ie
719
if inv.has_filename(tree._fix_case_of_inventory_path(path.raw_path)):
721
# its really not there : add the parent
722
# note that the dirname use leads to some extra str copying etc but as
723
# there are a limited number of dirs we can be nested under, it should
724
# generally find it very fast and not recurse after that.
725
added = _add_one_and_parent(tree, inv, None,
726
_FastPath(osutils.dirname(path.raw_path)), 'directory', action)
727
parent_id = inv.path2id(osutils.dirname(path.raw_path))
728
parent_ie = inv[parent_id]
729
_add_one(tree, inv, parent_ie, path, kind, action)
730
return added + [path.raw_path]
733
def _add_one(tree, inv, parent_ie, path, kind, file_id_callback):
734
"""Add a new entry to the inventory.
736
:param inv: Inventory which will receive the new entry.
737
:param parent_ie: Parent inventory entry.
738
:param kind: Kind of new entry (file, directory, etc)
739
:param file_id_callback: callback(inv, parent_ie, path, kind); return a
740
file_id or None to generate a new file id
743
file_id = file_id_callback(inv, parent_ie, path, kind)
744
entry = inv.make_entry(kind, path.base_path, parent_ie.file_id,
801
things_to_add.append((subp, sub_invp, None, this_ie))
added
removed
bzrlib/mutabletree.py
