385
392
of added files, and ignored_files is a dict mapping files that were
386
393
ignored to the rule that caused them to be ignored.
388
# not in an inner loop; and we want to remove direct use of this,
389
# so here as a reminder for now. RBC 20070703
390
from bzrlib.inventory import InventoryEntry
392
action = add.AddAction()
395
# no paths supplied: add the entire tree.
396
# FIXME: this assumes we are running in a working tree subdir :-/
399
# 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.
400
410
inv = self.inventory
405
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.
406
441
# Not all mutable trees can have conflicts
407
442
if getattr(self, 'conflicts', None) is not None:
408
443
# Collect all related files without checking whether they exist or
409
444
# are versioned. It's cheaper to do that once for all conflicts
410
445
# than trying to find the relevant conflict for each added file.
446
conflicts_related = set()
411
447
for c in self.conflicts():
412
448
conflicts_related.update(c.associated_filenames())
414
# validate user file paths and convert all paths to tree
415
# relative : it's cheaper to make a tree relative path an abspath
416
# than to convert an abspath to tree relative, and it's cheaper to
417
# perform the canonicalization in bulk.
418
for filepath in osutils.canonical_relpaths(self.basedir, file_list):
419
rf = _FastPath(filepath)
420
# validate user parameters. Our recursive code avoids adding new
421
# files that need such validation
422
if self.is_control_filename(rf.raw_path):
423
raise errors.ForbiddenControlFileError(filename=rf.raw_path)
425
abspath = self.abspath(rf.raw_path)
426
kind = osutils.file_kind(abspath)
427
if kind == 'directory':
428
# schedule the dir for scanning
431
if not InventoryEntry.versionable_kind(kind):
432
raise errors.BadFileKindError(filename=abspath, kind=kind)
433
# ensure the named path is added, so that ignore rules in the later
434
# directory walk dont skip it.
435
# we dont have a parent ie known yet.: use the relatively slower
436
# inventory probing method
437
versioned = inv.has_filename(rf.raw_path)
440
added.extend(_add_one_and_parent(self, inv, None, rf, kind, action))
443
# no need to walk any directories at all.
444
if len(added) > 0 and save:
445
self._write_inventory(inv)
446
return added, ignored
448
# only walk the minimal parents needed: we have user_dirs to override
452
is_inside = osutils.is_inside_or_parent_of_any
453
for path in sorted(user_dirs):
454
if (prev_dir is None or not is_inside([prev_dir], path.raw_path)):
455
dirs_to_add.append((path, None))
456
prev_dir = path.raw_path
458
illegalpath_re = re.compile(r'[\r\n]')
459
# dirs_to_add is initialised to a list of directories, but as we scan
460
# directories we append files to it.
461
# XXX: We should determine kind of files when we scan them rather than
462
# adding to this list. RBC 20070703
463
for directory, parent_ie in dirs_to_add:
464
# directory is tree-relative
465
abspath = self.abspath(directory.raw_path)
467
# get the contents of this directory.
469
# find the kind of the path being added.
470
kind = osutils.file_kind(abspath)
472
if not InventoryEntry.versionable_kind(kind):
473
trace.warning("skipping %s (can't add file of kind '%s')",
476
if illegalpath_re.search(directory.raw_path):
477
trace.warning("skipping %r (contains \\n or \\r)" % abspath)
479
if directory.raw_path in conflicts_related:
480
# If the file looks like one generated for a conflict, don't
483
'skipping %s (generated to help resolve conflicts)',
487
if parent_ie is not None:
488
versioned = directory.base_path in parent_ie.children
490
# without the parent ie, use the relatively slower inventory
492
versioned = inv.has_filename(
493
self._fix_case_of_inventory_path(directory.raw_path))
495
if kind == 'directory':
497
sub_branch = bzrdir.BzrDir.open(abspath)
499
except errors.NotBranchError:
501
except errors.UnsupportedFormatError:
506
if directory.raw_path == '':
507
# mutter("tree root doesn't need to be added")
511
# mutter("%r is already versioned", abspath)
513
# XXX: This is wrong; people *might* reasonably be trying to
514
# add subtrees as subtrees. This should probably only be done
515
# in formats which can represent subtrees, and even then
516
# perhaps only when the user asked to add subtrees. At the
517
# moment you can add them specially through 'join --reference',
518
# which is perhaps reasonable: adding a new reference is a
519
# special operation and can have a special behaviour. mbp
521
trace.mutter("%r is a nested bzr tree", abspath)
523
_add_one(self, inv, parent_ie, directory, kind, action)
524
added.append(directory.raw_path)
526
if kind == 'directory' and not sub_tree:
527
if parent_ie is not None:
529
this_ie = parent_ie.children[directory.base_path]
531
# without the parent ie, use the relatively slower inventory
533
this_id = inv.path2id(
534
self._fix_case_of_inventory_path(directory.raw_path))
538
this_ie = inv[this_id]
540
for subf in sorted(os.listdir(abspath)):
541
# here we could use TreeDirectory rather than
542
# string concatenation.
543
subp = osutils.pathjoin(directory.raw_path, subf)
544
# TODO: is_control_filename is very slow. Make it faster.
545
# TreeDirectory.is_control_filename could also make this
546
# faster - its impossible for a non root dir to have a
548
if self.is_control_filename(subp):
549
trace.mutter("skip control directory %r", subp)
550
elif subf in this_ie.children:
551
# recurse into this already versioned subdir.
552
dirs_to_add.append((_FastPath(subp, subf), this_ie))
554
# user selection overrides ignoes
555
# ignore while selecting files - if we globbed in the
556
# outer loop we would ignore user files.
557
ignore_glob = self.is_ignored(subp)
558
if ignore_glob is not None:
559
# mutter("skip ignored sub-file %r", subp)
560
ignored.setdefault(ignore_glob, []).append(subp)
562
#mutter("queue to add sub-file %r", subp)
563
dirs_to_add.append((_FastPath(subp, subf), this_ie))
567
self._write_inventory(inv)
569
self.read_working_inventory()
570
return added, ignored
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
572
458
def update_basis_by_delta(self, new_revid, delta):
573
459
"""Update the parents of this tree after a commit.
652
538
self.mutable_tree = mutable_tree
655
class _FastPath(object):
656
"""A path object with fast accessors for things like basename."""
658
__slots__ = ['raw_path', 'base_path']
660
def __init__(self, path, base_path=None):
661
"""Construct a FastPath from path."""
662
if base_path is None:
663
self.base_path = osutils.basename(path)
665
self.base_path = base_path
668
def __cmp__(self, other):
669
return cmp(self.raw_path, other.raw_path)
672
return hash(self.raw_path)
675
def _add_one_and_parent(tree, inv, parent_ie, path, kind, action):
676
"""Add a new entry to the inventory and automatically add unversioned parents.
678
:param inv: Inventory which will receive the new entry.
679
:param parent_ie: Parent inventory entry if known, or None. If
680
None, the parent is looked up by name and used if present, otherwise it
681
is recursively added.
682
:param kind: Kind of new entry (file, directory, etc)
683
:param action: callback(inv, parent_ie, path, kind); return ignored.
684
:return: A list of paths which have been added.
686
# Nothing to do if path is already versioned.
687
# This is safe from infinite recursion because the tree root is
689
if parent_ie is not None:
690
# we have a parent ie already
693
# slower but does not need parent_ie
694
if inv.has_filename(tree._fix_case_of_inventory_path(path.raw_path)):
696
# its really not there : add the parent
697
# note that the dirname use leads to some extra str copying etc but as
698
# there are a limited number of dirs we can be nested under, it should
699
# generally find it very fast and not recurse after that.
700
added = _add_one_and_parent(tree, inv, None,
701
_FastPath(osutils.dirname(path.raw_path)), 'directory', action)
702
parent_id = inv.path2id(osutils.dirname(path.raw_path))
703
parent_ie = inv[parent_id]
704
_add_one(tree, inv, parent_ie, path, kind, action)
705
return added + [path.raw_path]
708
def _add_one(tree, inv, parent_ie, path, kind, file_id_callback):
709
"""Add a new entry to the inventory.
711
:param inv: Inventory which will receive the new entry.
712
:param parent_ie: Parent inventory entry.
713
:param kind: Kind of new entry (file, directory, etc)
714
:param file_id_callback: callback(inv, parent_ie, path, kind); return a
715
file_id or None to generate a new file id
718
file_id = file_id_callback(inv, parent_ie, path, kind)
719
entry = inv.make_entry(kind, path.base_path, parent_ie.file_id,
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.
586
:param kind: Kind of new entry (file, directory, etc)
588
:return: Inventory entry for path and a list of paths which have been added.
590
# Nothing to do if path is already versioned.
591
# This is safe from infinite recursion because the tree root is
593
inv_dirname = osutils.dirname(inv_path)
594
dirname, basename = osutils.split(path)
595
if parent_ie is None:
596
# slower but does not need parent_ie
597
this_ie = self._get_ie(inv_path)
598
if this_ie is not None:
600
# its really not there : add the parent
601
# note that the dirname use leads to some extra str copying etc but as
602
# there are a limited number of dirs we can be nested under, it should
603
# generally find it very fast and not recurse after that.
604
parent_ie = self._add_one_and_parent(None,
605
dirname, 'directory',
607
# if the parent exists, but isn't a directory, we have to do the
608
# kind change now -- really the inventory shouldn't pretend to know
609
# the kind of wt files, but it does.
610
if parent_ie.kind != 'directory':
611
# nb: this relies on someone else checking that the path we're using
612
# doesn't contain symlinks.
613
parent_ie = self._convert_to_directory(parent_ie, inv_dirname)
614
file_id = self.action(self.tree.inventory, parent_ie, path, kind)
615
entry = _mod_inventory.make_entry(kind, basename, parent_ie.file_id,
617
self._invdelta[inv_path] = (None, inv_path, entry.file_id, entry)
618
self.added.append(inv_path)
621
def _gather_dirs_to_add(self, user_dirs):
622
# only walk the minimal parents needed: we have user_dirs to override
626
is_inside = osutils.is_inside_or_parent_of_any
627
for path, (inv_path, this_ie) in sorted(
628
user_dirs.iteritems(), key=operator.itemgetter(0)):
629
if (prev_dir is None or not is_inside([prev_dir], path)):
630
yield (path, inv_path, this_ie, None)
633
def __init__(self, tree, action, conflicts_related=None):
636
self.action = add.AddAction()
642
if conflicts_related is None:
643
self.conflicts_related = frozenset()
645
self.conflicts_related = conflicts_related
647
def add(self, file_list, recurse=True):
648
from bzrlib.inventory import InventoryEntry
650
# no paths supplied: add the entire tree.
651
# FIXME: this assumes we are running in a working tree subdir :-/
655
# expand any symlinks in the directory part, while leaving the
657
# only expanding if symlinks are supported avoids windows path bugs
658
if osutils.has_symlinks():
659
file_list = map(osutils.normalizepath, file_list)
662
# validate user file paths and convert all paths to tree
663
# relative : it's cheaper to make a tree relative path an abspath
664
# than to convert an abspath to tree relative, and it's cheaper to
665
# perform the canonicalization in bulk.
666
for filepath in osutils.canonical_relpaths(self.tree.basedir, file_list):
667
# validate user parameters. Our recursive code avoids adding new
668
# files that need such validation
669
if self.tree.is_control_filename(filepath):
670
raise errors.ForbiddenControlFileError(filename=filepath)
672
abspath = self.tree.abspath(filepath)
673
kind = osutils.file_kind(abspath)
674
# ensure the named path is added, so that ignore rules in the later
675
# directory walk dont skip it.
676
# we dont have a parent ie known yet.: use the relatively slower
677
# inventory probing method
678
inv_path, _ = osutils.normalized_filename(filepath)
679
this_ie = self._get_ie(inv_path)
681
this_ie = self._add_one_and_parent(None, filepath, kind, inv_path)
682
if kind == 'directory':
683
# schedule the dir for scanning
684
user_dirs[filepath] = (inv_path, this_ie)
687
# no need to walk any directories at all.
690
things_to_add = list(self._gather_dirs_to_add(user_dirs))
692
illegalpath_re = re.compile(r'[\r\n]')
693
for directory, inv_path, this_ie, parent_ie in things_to_add:
694
# directory is tree-relative
695
abspath = self.tree.abspath(directory)
697
# get the contents of this directory.
699
# find the kind of the path being added, and save stat_value
703
stat_value = osutils.file_stat(abspath)
704
kind = osutils.file_kind_from_stat_mode(stat_value.st_mode)
708
# allow AddAction to skip this file
709
if self.action.skip_file(self.tree, abspath, kind, stat_value):
711
if not InventoryEntry.versionable_kind(kind):
712
trace.warning("skipping %s (can't add file of kind '%s')",
715
if illegalpath_re.search(directory):
716
trace.warning("skipping %r (contains \\n or \\r)" % abspath)
718
if directory in self.conflicts_related:
719
# If the file looks like one generated for a conflict, don't
722
'skipping %s (generated to help resolve conflicts)',
726
if kind == 'directory' and directory != '':
728
transport = _mod_transport.get_transport_from_path(abspath)
729
controldir.ControlDirFormat.find_format(transport)
731
except errors.NotBranchError:
733
except errors.UnsupportedFormatError:
738
if this_ie is not None:
741
# XXX: This is wrong; people *might* reasonably be trying to
742
# add subtrees as subtrees. This should probably only be done
743
# in formats which can represent subtrees, and even then
744
# perhaps only when the user asked to add subtrees. At the
745
# moment you can add them specially through 'join --reference',
746
# which is perhaps reasonable: adding a new reference is a
747
# special operation and can have a special behaviour. mbp
749
trace.warning("skipping nested tree %r", abspath)
751
this_ie = self._add_one_and_parent(parent_ie, directory, kind,
754
if kind == 'directory' and not sub_tree:
755
if this_ie.kind != 'directory':
756
this_ie = self._convert_to_directory(this_ie, inv_path)
758
for subf in sorted(os.listdir(abspath)):
759
inv_f, _ = osutils.normalized_filename(subf)
760
# here we could use TreeDirectory rather than
761
# string concatenation.
762
subp = osutils.pathjoin(directory, subf)
763
# TODO: is_control_filename is very slow. Make it faster.
764
# TreeDirectory.is_control_filename could also make this
765
# faster - its impossible for a non root dir to have a
767
if self.tree.is_control_filename(subp):
768
trace.mutter("skip control directory %r", subp)
770
sub_invp = osutils.pathjoin(inv_path, inv_f)
771
entry = self._invdelta.get(sub_invp)
772
if entry is not None:
775
sub_ie = this_ie.children.get(inv_f)
776
if sub_ie is not None:
777
# recurse into this already versioned subdir.
778
things_to_add.append((subp, sub_invp, sub_ie, this_ie))
780
# user selection overrides ignores
781
# ignore while selecting files - if we globbed in the
782
# outer loop we would ignore user files.
783
ignore_glob = self.tree.is_ignored(subp)
784
if ignore_glob is not None:
785
self.ignored.setdefault(ignore_glob, []).append(subp)
787
things_to_add.append((subp, sub_invp, None, this_ie))
added
removed
bzrlib/mutabletree.py
