69
66
entirely in memory.
71
68
For now, we are not treating MutableTree as an interface to provide
72
conformance tests for - rather we are testing MemoryTree specifically, and
69
conformance tests for - rather we are testing MemoryTree specifically, and
73
70
interface testing implementations of WorkingTree.
75
72
A mutable tree always has an associated Branch and BzrDir object - the
76
73
branch and bzrdir attributes.
75
def __init__(self, *args, **kw):
76
super(MutableTree, self).__init__(*args, **kw)
77
# Is this tree on a case-insensitive or case-preserving file-system?
78
# Sub-classes may initialize to False if they detect they are being
79
# used on media which doesn't differentiate the case of names.
80
self.case_sensitive = True
79
82
@needs_tree_write_lock
80
83
def add(self, files, ids=None, kinds=None):
181
184
from bzrlib import commit
182
185
if revprops is None:
187
possible_master_transports=[]
184
188
if not 'branch-nick' in revprops:
185
revprops['branch-nick'] = self.branch.nick
189
revprops['branch-nick'] = self.branch._get_nick(
190
kwargs.get('local', False),
191
possible_master_transports)
192
authors = kwargs.pop('authors', None)
186
193
author = kwargs.pop('author', None)
194
if authors is not None:
195
if author is not None:
196
raise AssertionError('Specifying both author and authors '
197
'is not allowed. Specify just authors instead')
198
if 'author' in revprops or 'authors' in revprops:
199
# XXX: maybe we should just accept one of them?
200
raise AssertionError('author property given twice')
202
for individual in authors:
203
if '\n' in individual:
204
raise AssertionError('\\n is not a valid character '
205
'in an author identity')
206
revprops['authors'] = '\n'.join(authors)
187
207
if author is not None:
188
if 'author' in revprops:
208
symbol_versioning.warn('The parameter author was deprecated'
209
' in version 1.13. Use authors instead',
211
if 'author' in revprops or 'authors' in revprops:
189
212
# XXX: maybe we should just accept one of them?
190
213
raise AssertionError('author property given twice')
191
revprops['author'] = author
215
raise AssertionError('\\n is not a valid character '
216
'in an author identity')
217
revprops['authors'] = author
192
218
# args for wt.commit start at message from the Commit.commit method,
193
219
args = (message, ) + args
194
220
for hook in MutableTree.hooks['start_commit']:
196
222
committed_id = commit.Commit().commit(working_tree=self,
197
revprops=revprops, *args, **kwargs)
224
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)
198
229
return committed_id
200
231
def _gather_kinds(self, files, kinds):
201
232
"""Helper function for add - sets the entries of kinds."""
202
233
raise NotImplementedError(self._gather_kinds)
204
def get_file_with_stat(self, file_id, path=None):
205
"""Get a file handle and stat object for file_id.
207
The default implementation returns (self.get_file, None) for backwards
210
:param file_id: The file id to read.
211
:param path: The path of the file, if it is known.
212
:return: A tuple (file_handle, stat_value_or_None). If the tree has
213
no stat facility, or need for a stat cache feedback during commit,
214
it may return None for the second element of the tuple.
216
return (self.get_file(file_id, path), None)
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
def warn_if_changed_or_out_of_date(self, strict, opt_name, more_msg):
262
"""Check the tree for uncommitted changes and branch synchronization.
264
If strict is None and not set in the config files, a warning is issued.
265
If strict is True, an error is raised.
266
If strict is False, no checks are done and no warning is issued.
268
:param strict: True, False or None, searched in branch config if None.
270
:param opt_name: strict option name to search in config file.
272
:param more_msg: Details about how to avoid the warnings.
275
strict = self.branch.get_config().get_user_option_as_bool(opt_name)
276
if strict is not False:
278
if (self.has_changes()):
279
err = errors.UncommittedChanges(self, more=more_msg)
280
elif self.last_revision() != self.branch.last_revision():
281
# The tree has lost sync with its branch, there is little
282
# chance that the user is aware of it but he can still force
283
# the action with --no-strict
284
err = errors.OutOfDateTree(self, more=more_msg)
287
# We don't want to interrupt the user if he expressed no
288
# preference about strict.
289
trace.warning('%s', err._format())
219
294
def last_revision(self):
341
424
user_dirs = set()
425
conflicts_related = set()
426
# Not all mutable trees can have conflicts
427
if getattr(self, 'conflicts', None) is not None:
428
# Collect all related files without checking whether they exist or
429
# are versioned. It's cheaper to do that once for all conflicts
430
# than trying to find the relevant conflict for each added file.
431
for c in self.conflicts():
432
conflicts_related.update(c.associated_filenames())
343
# validate user file paths and convert all paths to tree
434
# validate user file paths and convert all paths to tree
344
435
# relative : it's cheaper to make a tree relative path an abspath
345
# than to convert an abspath to tree relative.
346
for filepath in file_list:
347
rf = _FastPath(self.relpath(filepath))
348
# validate user parameters. Our recursive code avoids adding new files
349
# that need such validation
436
# than to convert an abspath to tree relative, and it's cheaper to
437
# perform the canonicalization in bulk.
438
for filepath in osutils.canonical_relpaths(self.basedir, file_list):
439
rf = _FastPath(filepath)
440
# validate user parameters. Our recursive code avoids adding new
441
# files that need such validation
350
442
if self.is_control_filename(rf.raw_path):
351
443
raise errors.ForbiddenControlFileError(filename=rf.raw_path)
353
445
abspath = self.abspath(rf.raw_path)
354
446
kind = osutils.file_kind(abspath)
355
447
if kind == 'directory':
397
490
kind = osutils.file_kind(abspath)
399
492
if not InventoryEntry.versionable_kind(kind):
400
warning("skipping %s (can't add file of kind '%s')", abspath, kind)
493
trace.warning("skipping %s (can't add file of kind '%s')",
496
if illegalpath_re.search(directory.raw_path):
497
trace.warning("skipping %r (contains \\n or \\r)" % abspath)
499
if directory.raw_path in conflicts_related:
500
# If the file looks like one generated for a conflict, don't
503
'skipping %s (generated to help resolve conflicts)',
403
507
if parent_ie is not None:
404
508
versioned = directory.base_path in parent_ie.children
406
# without the parent ie, use the relatively slower inventory
510
# without the parent ie, use the relatively slower inventory
408
versioned = inv.has_filename(directory.raw_path)
512
versioned = inv.has_filename(
513
self._fix_case_of_inventory_path(directory.raw_path))
410
515
if kind == 'directory':
426
531
# mutter("%r is already versioned", abspath)
428
# XXX: This is wrong; people *might* reasonably be trying to add
429
# subtrees as subtrees. This should probably only be done in formats
430
# which can represent subtrees, and even then perhaps only when
431
# the user asked to add subtrees. At the moment you can add them
432
# specially through 'join --reference', which is perhaps
433
# reasonable: adding a new reference is a special operation and
434
# can have a special behaviour. mbp 20070306
435
mutter("%r is a nested bzr tree", abspath)
533
# XXX: This is wrong; people *might* reasonably be trying to
534
# add subtrees as subtrees. This should probably only be done
535
# in formats which can represent subtrees, and even then
536
# perhaps only when the user asked to add subtrees. At the
537
# moment you can add them specially through 'join --reference',
538
# which is perhaps reasonable: adding a new reference is a
539
# special operation and can have a special behaviour. mbp
541
trace.mutter("%r is a nested bzr tree", abspath)
437
543
_add_one(self, inv, parent_ie, directory, kind, action)
438
544
added.append(directory.raw_path)
442
548
# must be present:
443
549
this_ie = parent_ie.children[directory.base_path]
445
# without the parent ie, use the relatively slower inventory
551
# without the parent ie, use the relatively slower inventory
447
this_id = inv.path2id(directory.raw_path)
553
this_id = inv.path2id(
554
self._fix_case_of_inventory_path(directory.raw_path))
448
555
if this_id is None:
451
558
this_ie = inv[this_id]
453
560
for subf in sorted(os.listdir(abspath)):
454
# here we could use TreeDirectory rather than
561
# here we could use TreeDirectory rather than
455
562
# string concatenation.
456
563
subp = osutils.pathjoin(directory.raw_path, subf)
457
# TODO: is_control_filename is very slow. Make it faster.
458
# TreeDirectory.is_control_filename could also make this
459
# faster - its impossible for a non root dir to have a
564
# TODO: is_control_filename is very slow. Make it faster.
565
# TreeDirectory.is_control_filename could also make this
566
# faster - its impossible for a non root dir to have a
461
568
if self.is_control_filename(subp):
462
mutter("skip control directory %r", subp)
569
trace.mutter("skip control directory %r", subp)
463
570
elif subf in this_ie.children:
464
571
# recurse into this already versioned subdir.
465
572
dirs_to_add.append((_FastPath(subp, subf), this_ie))
512
622
# WorkingTree classes for optimised versions for specific format trees.
513
623
basis = self.basis_tree()
514
624
basis.lock_read()
515
inventory = basis.inventory
625
# TODO: Consider re-evaluating the need for this with CHKInventory
626
# we don't strictly need to mutate an inventory for this
627
# it only makes sense when apply_delta is cheaper than get_inventory()
628
inventory = basis.inventory._get_mutable_inventory()
517
630
inventory.apply_delta(delta)
518
rev_tree = RevisionTree(self.branch.repository, inventory, new_revid)
631
rev_tree = revisiontree.RevisionTree(self.branch.repository,
632
inventory, new_revid)
519
633
self.set_parent_trees([(new_revid, rev_tree)])
522
636
class MutableTreeHooks(hooks.Hooks):
523
"""A dictionary mapping a hook name to a list of callables for mutabletree
637
"""A dictionary mapping a hook name to a list of callables for mutabletree
531
645
hooks.Hooks.__init__(self)
532
# Invoked before a commit is done in a tree. New in 1.4
533
self['start_commit'] = []
646
self.create_hook(hooks.HookPoint('start_commit',
647
"Called before a commit is performed on a tree. The start commit "
648
"hook is able to change the tree before the commit takes place. "
649
"start_commit is called with the bzrlib.mutabletree.MutableTree "
650
"that the commit is being performed on.", (1, 4), None))
651
self.create_hook(hooks.HookPoint('post_commit',
652
"Called after a commit is performed on a tree. The hook is "
653
"called with a bzrlib.mutabletree.PostCommitHookParams object. "
654
"The mutable tree the commit was performed on is available via "
655
"the mutable_tree attribute of that object.", (2, 0), None))
536
658
# install the default hooks into the MutableTree class.
537
659
MutableTree.hooks = MutableTreeHooks()
662
class PostCommitHookParams(object):
663
"""Parameters for the post_commit hook.
665
To access the parameters, use the following attributes:
667
* mutable_tree - the MutableTree object
670
def __init__(self, mutable_tree):
671
"""Create the parameters for the post_commit hook."""
672
self.mutable_tree = mutable_tree
540
675
class _FastPath(object):
541
676
"""A path object with fast accessors for things like basename."""
578
713
# slower but does not need parent_ie
579
if inv.has_filename(path.raw_path):
714
if inv.has_filename(tree._fix_case_of_inventory_path(path.raw_path)):
581
716
# its really not there : add the parent
582
717
# note that the dirname use leads to some extra str copying etc but as
583
718
# there are a limited number of dirs we can be nested under, it should
584
719
# generally find it very fast and not recurse after that.
585
720
added = _add_one_and_parent(tree, inv, None,
586
_FastPath(dirname(path.raw_path)), 'directory', action)
587
parent_id = inv.path2id(dirname(path.raw_path))
721
_FastPath(osutils.dirname(path.raw_path)), 'directory', action)
722
parent_id = inv.path2id(osutils.dirname(path.raw_path))
588
723
parent_ie = inv[parent_id]
589
724
_add_one(tree, inv, parent_ie, path, kind, action)
590
725
return added + [path.raw_path]
added
removed
bzrlib/mutabletree.py
