23
23
from bzrlib.lazy_import import lazy_import
24
24
lazy_import(globals(), """
28
27
from bzrlib import (
33
from bzrlib.osutils import dirname
34
from bzrlib.revisiontree import RevisionTree
35
from bzrlib.trace import mutter, warning
41
43
from bzrlib.decorators import needs_read_lock, needs_write_lock
44
from bzrlib.osutils import splitpath
44
47
def needs_tree_write_lock(unbound):
126
129
# generic constraint checks:
127
130
if self.is_control_filename(f):
128
131
raise errors.ForbiddenControlFileError(filename=f)
129
fp = osutils.splitpath(f)
130
133
# fill out file kinds for all files [not needed when we stop
131
134
# caring about the instantaneous file kind within a uncommmitted tree
223
226
revprops=revprops,
224
227
possible_master_transports=possible_master_transports,
226
post_hook_params = PostCommitHookParams(self)
227
for hook in MutableTree.hooks['post_commit']:
228
hook(post_hook_params)
229
229
return committed_id
231
231
def _gather_kinds(self, files, kinds):
233
233
raise NotImplementedError(self._gather_kinds)
236
def has_changes(self, _from_tree=None):
237
"""Quickly check that the tree contains at least one commitable change.
239
:param _from_tree: tree to compare against to find changes (default to
240
the basis tree and is intended to be used by tests).
242
:return: True if a change is found. False otherwise
244
# Check pending merges
245
if len(self.get_parent_ids()) > 1:
247
if _from_tree is None:
248
_from_tree = self.basis_tree()
249
changes = self.iter_changes(_from_tree)
251
change = changes.next()
252
# Exclude root (talk about black magic... --vila 20090629)
253
if change[4] == (None, None):
254
change = changes.next()
256
except StopIteration:
261
236
def last_revision(self):
262
237
"""Return the revision id of the last commit performed in this tree.
391
364
user_dirs = set()
392
conflicts_related = set()
393
# Not all mutable trees can have conflicts
394
if getattr(self, 'conflicts', None) is not None:
395
# Collect all related files without checking whether they exist or
396
# are versioned. It's cheaper to do that once for all conflicts
397
# than trying to find the relevant conflict for each added file.
398
for c in self.conflicts():
399
conflicts_related.update(c.associated_filenames())
401
366
# validate user file paths and convert all paths to tree
402
367
# relative : it's cheaper to make a tree relative path an abspath
404
369
# perform the canonicalization in bulk.
405
370
for filepath in osutils.canonical_relpaths(self.basedir, file_list):
406
371
rf = _FastPath(filepath)
407
# validate user parameters. Our recursive code avoids adding new
408
# files that need such validation
372
# validate user parameters. Our recursive code avoids adding new files
373
# that need such validation
409
374
if self.is_control_filename(rf.raw_path):
410
375
raise errors.ForbiddenControlFileError(filename=rf.raw_path)
418
383
if not InventoryEntry.versionable_kind(kind):
419
384
raise errors.BadFileKindError(filename=abspath, kind=kind)
420
# ensure the named path is added, so that ignore rules in the later
421
# directory walk dont skip it.
422
# we dont have a parent ie known yet.: use the relatively slower
423
# inventory probing method
385
# ensure the named path is added, so that ignore rules in the later directory
387
# we dont have a parent ie known yet.: use the relatively slower inventory
424
389
versioned = inv.has_filename(rf.raw_path)
442
407
dirs_to_add.append((path, None))
443
408
prev_dir = path.raw_path
445
illegalpath_re = re.compile(r'[\r\n]')
446
410
# dirs_to_add is initialised to a list of directories, but as we scan
447
411
# directories we append files to it.
448
412
# XXX: We should determine kind of files when we scan them rather than
457
421
kind = osutils.file_kind(abspath)
459
423
if not InventoryEntry.versionable_kind(kind):
460
trace.warning("skipping %s (can't add file of kind '%s')",
463
if illegalpath_re.search(directory.raw_path):
464
trace.warning("skipping %r (contains \\n or \\r)" % abspath)
466
if directory.raw_path in conflicts_related:
467
# If the file looks like one generated for a conflict, don't
470
'skipping %s (generated to help resolve conflicts)',
424
warning("skipping %s (can't add file of kind '%s')", abspath, kind)
474
427
if parent_ie is not None:
498
451
# mutter("%r is already versioned", abspath)
500
# XXX: This is wrong; people *might* reasonably be trying to
501
# add subtrees as subtrees. This should probably only be done
502
# in formats which can represent subtrees, and even then
503
# perhaps only when the user asked to add subtrees. At the
504
# moment you can add them specially through 'join --reference',
505
# which is perhaps reasonable: adding a new reference is a
506
# special operation and can have a special behaviour. mbp
508
trace.mutter("%r is a nested bzr tree", abspath)
453
# XXX: This is wrong; people *might* reasonably be trying to add
454
# subtrees as subtrees. This should probably only be done in formats
455
# which can represent subtrees, and even then perhaps only when
456
# the user asked to add subtrees. At the moment you can add them
457
# specially through 'join --reference', which is perhaps
458
# reasonable: adding a new reference is a special operation and
459
# can have a special behaviour. mbp 20070306
460
mutter("%r is a nested bzr tree", abspath)
510
462
_add_one(self, inv, parent_ie, directory, kind, action)
511
463
added.append(directory.raw_path)
533
485
# faster - its impossible for a non root dir to have a
535
487
if self.is_control_filename(subp):
536
trace.mutter("skip control directory %r", subp)
488
mutter("skip control directory %r", subp)
537
489
elif subf in this_ie.children:
538
490
# recurse into this already versioned subdir.
539
491
dirs_to_add.append((_FastPath(subp, subf), this_ie))
571
523
for commit which is not required to handle situations that do not arise
572
524
outside of commit.
574
See the inventory developers documentation for the theory behind
577
526
:param new_revid: The new revision id for the trees parent.
578
527
:param delta: An inventory delta (see apply_inventory_delta) describing
579
528
the changes from the current left most parent revision to new_revid.
595
544
inventory = basis.inventory._get_mutable_inventory()
597
546
inventory.apply_delta(delta)
598
rev_tree = revisiontree.RevisionTree(self.branch.repository,
599
inventory, new_revid)
547
rev_tree = RevisionTree(self.branch.repository, inventory, new_revid)
600
548
self.set_parent_trees([(new_revid, rev_tree)])
613
561
self.create_hook(hooks.HookPoint('start_commit',
614
562
"Called before a commit is performed on a tree. The start commit "
615
563
"hook is able to change the tree before the commit takes place. "
616
"start_commit is called with the bzrlib.mutabletree.MutableTree "
617
"that the commit is being performed on.", (1, 4), None))
618
self.create_hook(hooks.HookPoint('post_commit',
619
"Called after a commit is performed on a tree. The hook is "
620
"called with a bzrlib.mutabletree.PostCommitHookParams object. "
621
"The mutable tree the commit was performed on is available via "
622
"the mutable_tree attribute of that object.", (2, 0), None))
564
"start_commit is called with the bzrlib.tree.MutableTree that the "
565
"commit is being performed on.", (1, 4), None))
625
568
# install the default hooks into the MutableTree class.
626
569
MutableTree.hooks = MutableTreeHooks()
629
class PostCommitHookParams(object):
630
"""Parameters for the post_commit hook.
632
To access the parameters, use the following attributes:
634
* mutable_tree - the MutableTree object
637
def __init__(self, mutable_tree):
638
"""Create the parameters for the post_commit hook."""
639
self.mutable_tree = mutable_tree
642
572
class _FastPath(object):
643
573
"""A path object with fast accessors for things like basename."""
685
615
# there are a limited number of dirs we can be nested under, it should
686
616
# generally find it very fast and not recurse after that.
687
617
added = _add_one_and_parent(tree, inv, None,
688
_FastPath(osutils.dirname(path.raw_path)), 'directory', action)
689
parent_id = inv.path2id(osutils.dirname(path.raw_path))
618
_FastPath(dirname(path.raw_path)), 'directory', action)
619
parent_id = inv.path2id(dirname(path.raw_path))
690
620
parent_ie = inv[parent_id]
691
621
_add_one(tree, inv, parent_ie, path, kind, action)
692
622
return added + [path.raw_path]
added
removed
bzrlib/mutabletree.py
