390
392
of added files, and ignored_files is a dict mapping files that were
391
393
ignored to the rule that caused them to be ignored.
393
# not in an inner loop; and we want to remove direct use of this,
394
# so here as a reminder for now. RBC 20070703
395
from bzrlib.inventory import InventoryEntry
397
action = add.AddAction()
400
# no paths supplied: add the entire tree.
401
# FIXME: this assumes we are running in a working tree subdir :-/
404
# mutter("smart add of %r")
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.
405
410
inv = self.inventory
410
conflicts_related = set()
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.
411
441
# Not all mutable trees can have conflicts
412
442
if getattr(self, 'conflicts', None) is not None:
413
443
# Collect all related files without checking whether they exist or
414
444
# are versioned. It's cheaper to do that once for all conflicts
415
445
# than trying to find the relevant conflict for each added file.
446
conflicts_related = set()
416
447
for c in self.conflicts():
417
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
file_id = self.tree.path2id(inv_path)
558
if file_id is not None:
559
return self.tree.iter_entries_by_dir([file_id]).next()[1]
562
def _convert_to_directory(self, this_ie, inv_path):
563
"""Convert an entry to a directory.
565
:param this_ie: Inventory entry
566
:param inv_path: Normalized path for the inventory entry
567
:return: The new inventory entry
569
# Same as in _add_one below, if the inventory doesn't
570
# think this is a directory, update the inventory
571
this_ie = _mod_inventory.InventoryDirectory(
572
this_ie.file_id, this_ie.name, this_ie.parent_id)
573
self._invdelta[inv_path] = (inv_path, inv_path, this_ie.file_id,
577
def _add_one_and_parent(self, parent_ie, path, kind, inv_path):
578
"""Add a new entry to the inventory and automatically add unversioned parents.
580
:param parent_ie: Parent inventory entry if known, or None. If
581
None, the parent is looked up by name and used if present, otherwise it
582
is recursively added.
583
:param kind: Kind of new entry (file, directory, etc)
584
:param action: callback(tree, parent_ie, path, kind); can return file_id
585
:return: Inventory entry for path and a list of paths which have been added.
587
# Nothing to do if path is already versioned.
588
# This is safe from infinite recursion because the tree root is
590
inv_dirname = osutils.dirname(inv_path)
591
dirname, basename = osutils.split(path)
592
if parent_ie is None:
593
# slower but does not need parent_ie
594
this_ie = self._get_ie(inv_path)
595
if this_ie is not None:
597
# its really not there : add the parent
598
# note that the dirname use leads to some extra str copying etc but as
599
# there are a limited number of dirs we can be nested under, it should
600
# generally find it very fast and not recurse after that.
601
parent_ie = self._add_one_and_parent(None,
602
dirname, 'directory',
604
# if the parent exists, but isn't a directory, we have to do the
605
# kind change now -- really the inventory shouldn't pretend to know
606
# the kind of wt files, but it does.
607
if parent_ie.kind != 'directory':
608
# nb: this relies on someone else checking that the path we're using
609
# doesn't contain symlinks.
610
parent_ie = self._convert_to_directory(parent_ie, inv_dirname)
611
file_id = self.action(self.tree.inventory, parent_ie, path, kind)
612
entry = _mod_inventory.make_entry(kind, basename, parent_ie.file_id,
614
self._invdelta[inv_path] = (None, inv_path, entry.file_id, entry)
615
self.added.append(inv_path)
618
def _gather_dirs_to_add(self, user_dirs):
619
# only walk the minimal parents needed: we have user_dirs to override
623
is_inside = osutils.is_inside_or_parent_of_any
624
for path, (inv_path, this_ie) in sorted(
625
user_dirs.iteritems(), key=operator.itemgetter(0)):
626
if (prev_dir is None or not is_inside([prev_dir], path)):
627
yield (path, inv_path, this_ie, None)
630
def __init__(self, tree, action, conflicts_related=None):
633
self.action = add.AddAction()
639
if conflicts_related is None:
640
self.conflicts_related = frozenset()
642
self.conflicts_related = conflicts_related
644
def add(self, file_list, recurse=True):
645
from bzrlib.inventory import InventoryEntry
647
# no paths supplied: add the entire tree.
648
# FIXME: this assumes we are running in a working tree subdir :-/
419
652
# expand any symlinks in the directory part, while leaving the
421
file_list = map(osutils.normalizepath, file_list)
654
# only expanding if symlinks are supported avoids windows path bugs
655
if osutils.has_symlinks():
656
file_list = map(osutils.normalizepath, file_list)
423
659
# validate user file paths and convert all paths to tree
424
660
# relative : it's cheaper to make a tree relative path an abspath
425
661
# than to convert an abspath to tree relative, and it's cheaper to
426
662
# perform the canonicalization in bulk.
427
for filepath in osutils.canonical_relpaths(self.basedir, file_list):
428
rf = _FastPath(filepath)
663
for filepath in osutils.canonical_relpaths(self.tree.basedir, file_list):
429
664
# validate user parameters. Our recursive code avoids adding new
430
665
# files that need such validation
431
if self.is_control_filename(rf.raw_path):
432
raise errors.ForbiddenControlFileError(filename=rf.raw_path)
666
if self.tree.is_control_filename(filepath):
667
raise errors.ForbiddenControlFileError(filename=filepath)
434
abspath = self.abspath(rf.raw_path)
669
abspath = self.tree.abspath(filepath)
435
670
kind = osutils.file_kind(abspath)
436
if kind == 'directory':
437
# schedule the dir for scanning
440
if not InventoryEntry.versionable_kind(kind):
441
raise errors.BadFileKindError(filename=abspath, kind=kind)
442
671
# ensure the named path is added, so that ignore rules in the later
443
672
# directory walk dont skip it.
444
673
# we dont have a parent ie known yet.: use the relatively slower
445
674
# inventory probing method
446
versioned = inv.has_filename(rf.raw_path)
449
added.extend(_add_one_and_parent(self, inv, None, rf, kind, action))
675
inv_path, _ = osutils.normalized_filename(filepath)
676
this_ie = self._get_ie(inv_path)
678
this_ie = self._add_one_and_parent(None, filepath, kind, inv_path)
679
if kind == 'directory':
680
# schedule the dir for scanning
681
user_dirs[filepath] = (inv_path, this_ie)
452
684
# no need to walk any directories at all.
453
if len(added) > 0 and save:
454
self._write_inventory(inv)
455
return added, ignored
457
# only walk the minimal parents needed: we have user_dirs to override
461
is_inside = osutils.is_inside_or_parent_of_any
462
for path in sorted(user_dirs):
463
if (prev_dir is None or not is_inside([prev_dir], path.raw_path)):
464
dirs_to_add.append((path, None))
465
prev_dir = path.raw_path
687
things_to_add = list(self._gather_dirs_to_add(user_dirs))
467
689
illegalpath_re = re.compile(r'[\r\n]')
468
# dirs_to_add is initialised to a list of directories, but as we scan
469
# directories we append files to it.
470
# XXX: We should determine kind of files when we scan them rather than
471
# adding to this list. RBC 20070703
472
for directory, parent_ie in dirs_to_add:
690
for directory, inv_path, this_ie, parent_ie in things_to_add:
473
691
# directory is tree-relative
474
abspath = self.abspath(directory.raw_path)
692
abspath = self.tree.abspath(directory)
476
694
# get the contents of this directory.
478
696
# find the kind of the path being added.
479
kind = osutils.file_kind(abspath)
698
kind = osutils.file_kind(abspath)
481
702
if not InventoryEntry.versionable_kind(kind):
482
703
trace.warning("skipping %s (can't add file of kind '%s')",
485
if illegalpath_re.search(directory.raw_path):
706
if illegalpath_re.search(directory):
486
707
trace.warning("skipping %r (contains \\n or \\r)" % abspath)
488
if directory.raw_path in conflicts_related:
709
if directory in self.conflicts_related:
489
710
# If the file looks like one generated for a conflict, don't
530
740
trace.mutter("%r is a nested bzr tree", abspath)
532
_add_one(self, inv, parent_ie, directory, kind, action)
533
added.append(directory.raw_path)
742
this_ie = self._add_one_and_parent(parent_ie, directory, kind, inv_path)
535
744
if kind == 'directory' and not sub_tree:
536
if parent_ie is not None:
538
this_ie = parent_ie.children[directory.base_path]
540
# without the parent ie, use the relatively slower inventory
542
this_id = inv.path2id(
543
self._fix_case_of_inventory_path(directory.raw_path))
547
this_ie = inv[this_id]
745
if this_ie.kind != 'directory':
746
this_ie = self._convert_to_directory(this_ie, inv_path)
549
748
for subf in sorted(os.listdir(abspath)):
749
inv_f, _ = osutils.normalized_filename(subf)
550
750
# here we could use TreeDirectory rather than
551
751
# string concatenation.
552
subp = osutils.pathjoin(directory.raw_path, subf)
752
subp = osutils.pathjoin(directory, subf)
553
753
# TODO: is_control_filename is very slow. Make it faster.
554
754
# TreeDirectory.is_control_filename could also make this
555
755
# faster - its impossible for a non root dir to have a
557
if self.is_control_filename(subp):
757
if self.tree.is_control_filename(subp):
558
758
trace.mutter("skip control directory %r", subp)
559
elif subf in this_ie.children:
760
sub_invp = osutils.pathjoin(inv_path, inv_f)
761
entry = self._invdelta.get(sub_invp)
762
if entry is not None:
765
sub_ie = this_ie.children.get(inv_f)
766
if sub_ie is not None:
560
767
# recurse into this already versioned subdir.
561
dirs_to_add.append((_FastPath(subp, subf), this_ie))
768
things_to_add.append((subp, sub_invp, sub_ie, this_ie))
563
770
# user selection overrides ignoes
564
771
# ignore while selecting files - if we globbed in the
565
772
# outer loop we would ignore user files.
566
ignore_glob = self.is_ignored(subp)
773
ignore_glob = self.tree.is_ignored(subp)
567
774
if ignore_glob is not None:
568
# mutter("skip ignored sub-file %r", subp)
569
ignored.setdefault(ignore_glob, []).append(subp)
775
self.ignored.setdefault(ignore_glob, []).append(subp)
571
#mutter("queue to add sub-file %r", subp)
572
dirs_to_add.append((_FastPath(subp, subf), this_ie))
576
self._write_inventory(inv)
578
self.read_working_inventory()
579
return added, ignored
581
def update_basis_by_delta(self, new_revid, delta):
582
"""Update the parents of this tree after a commit.
584
This gives the tree one parent, with revision id new_revid. The
585
inventory delta is applied to the current basis tree to generate the
586
inventory for the parent new_revid, and all other parent trees are
589
All the changes in the delta should be changes synchronising the basis
590
tree with some or all of the working tree, with a change to a directory
591
requiring that its contents have been recursively included. That is,
592
this is not a general purpose tree modification routine, but a helper
593
for commit which is not required to handle situations that do not arise
596
See the inventory developers documentation for the theory behind
599
:param new_revid: The new revision id for the trees parent.
600
:param delta: An inventory delta (see apply_inventory_delta) describing
601
the changes from the current left most parent revision to new_revid.
603
# if the tree is updated by a pull to the branch, as happens in
604
# WorkingTree2, when there was no separation between branch and tree,
605
# then just clear merges, efficiency is not a concern for now as this
606
# is legacy environments only, and they are slow regardless.
607
if self.last_revision() == new_revid:
608
self.set_parent_ids([new_revid])
610
# generic implementation based on Inventory manipulation. See
611
# WorkingTree classes for optimised versions for specific format trees.
612
basis = self.basis_tree()
614
# TODO: Consider re-evaluating the need for this with CHKInventory
615
# we don't strictly need to mutate an inventory for this
616
# it only makes sense when apply_delta is cheaper than get_inventory()
617
inventory = basis.inventory._get_mutable_inventory()
619
inventory.apply_delta(delta)
620
rev_tree = revisiontree.RevisionTree(self.branch.repository,
621
inventory, new_revid)
622
self.set_parent_trees([(new_revid, rev_tree)])
625
class MutableTreeHooks(hooks.Hooks):
626
"""A dictionary mapping a hook name to a list of callables for mutabletree
631
"""Create the default hooks.
634
hooks.Hooks.__init__(self)
635
self.create_hook(hooks.HookPoint('start_commit',
636
"Called before a commit is performed on a tree. The start commit "
637
"hook is able to change the tree before the commit takes place. "
638
"start_commit is called with the bzrlib.mutabletree.MutableTree "
639
"that the commit is being performed on.", (1, 4), None))
640
self.create_hook(hooks.HookPoint('post_commit',
641
"Called after a commit is performed on a tree. The hook is "
642
"called with a bzrlib.mutabletree.PostCommitHookParams object. "
643
"The mutable tree the commit was performed on is available via "
644
"the mutable_tree attribute of that object.", (2, 0), None))
647
# install the default hooks into the MutableTree class.
648
MutableTree.hooks = MutableTreeHooks()
651
class PostCommitHookParams(object):
652
"""Parameters for the post_commit hook.
654
To access the parameters, use the following attributes:
656
* mutable_tree - the MutableTree object
659
def __init__(self, mutable_tree):
660
"""Create the parameters for the post_commit hook."""
661
self.mutable_tree = mutable_tree
664
class _FastPath(object):
665
"""A path object with fast accessors for things like basename."""
667
__slots__ = ['raw_path', 'base_path']
669
def __init__(self, path, base_path=None):
670
"""Construct a FastPath from path."""
671
if base_path is None:
672
self.base_path = osutils.basename(path)
674
self.base_path = base_path
677
def __cmp__(self, other):
678
return cmp(self.raw_path, other.raw_path)
681
return hash(self.raw_path)
684
def _add_one_and_parent(tree, inv, parent_ie, path, kind, action):
685
"""Add a new entry to the inventory and automatically add unversioned parents.
687
:param inv: Inventory which will receive the new entry.
688
:param parent_ie: Parent inventory entry if known, or None. If
689
None, the parent is looked up by name and used if present, otherwise it
690
is recursively added.
691
:param kind: Kind of new entry (file, directory, etc)
692
:param action: callback(inv, parent_ie, path, kind); return ignored.
693
:return: A list of paths which have been added.
695
# Nothing to do if path is already versioned.
696
# This is safe from infinite recursion because the tree root is
698
if parent_ie is not None:
699
# we have a parent ie already
702
# slower but does not need parent_ie
703
if inv.has_filename(tree._fix_case_of_inventory_path(path.raw_path)):
705
# its really not there : add the parent
706
# note that the dirname use leads to some extra str copying etc but as
707
# there are a limited number of dirs we can be nested under, it should
708
# generally find it very fast and not recurse after that.
709
added = _add_one_and_parent(tree, inv, None,
710
_FastPath(osutils.dirname(path.raw_path)), 'directory', action)
711
parent_id = inv.path2id(osutils.dirname(path.raw_path))
712
parent_ie = inv[parent_id]
713
_add_one(tree, inv, parent_ie, path, kind, action)
714
return added + [path.raw_path]
717
def _add_one(tree, inv, parent_ie, path, kind, file_id_callback):
718
"""Add a new entry to the inventory.
720
:param inv: Inventory which will receive the new entry.
721
:param parent_ie: Parent inventory entry.
722
:param kind: Kind of new entry (file, directory, etc)
723
:param file_id_callback: callback(inv, parent_ie, path, kind); return a
724
file_id or None to generate a new file id
727
# if the parent exists, but isn't a directory, we have to do the
728
# kind change now -- really the inventory shouldn't pretend to know
729
# the kind of wt files, but it does.
730
if parent_ie.kind != 'directory':
731
# nb: this relies on someone else checking that the path we're using
732
# doesn't contain symlinks.
733
new_parent_ie = inventory.make_entry('directory', parent_ie.name,
734
parent_ie.parent_id, parent_ie.file_id)
735
del inv[parent_ie.file_id]
736
inv.add(new_parent_ie)
737
parent_ie = new_parent_ie
738
file_id = file_id_callback(inv, parent_ie, path, kind)
739
entry = inv.make_entry(kind, path.base_path, parent_ie.file_id,
777
things_to_add.append((subp, sub_invp, None, this_ie))
added
removed
bzrlib/mutabletree.py
