66
67
entirely in memory.
68
69
For now, we are not treating MutableTree as an interface to provide
69
conformance tests for - rather we are testing MemoryTree specifically, and
70
conformance tests for - rather we are testing MemoryTree specifically, and
70
71
interface testing implementations of WorkingTree.
72
73
A mutable tree always has an associated Branch and BzrDir object - the
73
74
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
82
77
@needs_tree_write_lock
83
78
def add(self, files, ids=None, kinds=None):
117
108
ids = [None] * len(files)
119
if not (len(ids) == len(files)):
120
raise AssertionError()
110
assert(len(ids) == len(files))
111
ids = [osutils.safe_file_id(file_id) for file_id in ids]
121
113
if kinds is None:
122
114
kinds = [None] * len(files)
123
elif not len(kinds) == len(files):
124
raise AssertionError()
116
assert(len(kinds) == len(files))
126
118
# generic constraint checks:
127
119
if self.is_control_filename(f):
128
120
raise errors.ForbiddenControlFileError(filename=f)
129
fp = osutils.splitpath(f)
130
# fill out file kinds for all files [not needed when we stop
122
# fill out file kinds for all files [not needed when we stop
131
123
# caring about the instantaneous file kind within a uncommmitted tree
133
125
self._gather_kinds(files, kinds)
167
159
def apply_inventory_delta(self, changes):
168
160
"""Apply changes to the inventory as an atomic operation.
170
:param changes: An inventory delta to apply to the working tree's
173
:seealso Inventory.apply_delta: For details on the changes parameter.
162
The argument is a set of changes to apply. It must describe a
163
valid result, but the order is not important. Specifically,
164
intermediate stages *may* be invalid, such as when two files
167
The changes should be structured as a list of tuples, of the form
168
(old_path, new_path, file_id, new_entry). For creation, old_path
169
must be None. For deletion, new_path and new_entry must be None.
170
file_id is always non-None. For renames and other mutations, all
171
values must be non-None.
173
If the new_entry is a directory, its children should be an empty
174
dict. Children are handled by apply_inventory_delta itself.
176
:param changes: A list of tuples for the change to apply:
177
[(old_path, new_path, file_id, new_inventory_entry), ...]
176
180
inv = self.inventory
177
inv.apply_delta(changes)
182
for old_path, file_id in sorted(((op, f) for op, np, f, e in changes
183
if op is not None), reverse=True):
184
if file_id not in inv:
186
children[file_id] = getattr(inv[file_id], 'children', {})
187
inv.remove_recursive_id(file_id)
188
for new_path, new_entry in sorted((np, e) for op, np, f, e in
189
changes if np is not None):
190
if getattr(new_entry, 'children', None) is not None:
191
new_entry.children = children.get(new_entry.file_id, {})
178
193
self._write_inventory(inv)
180
195
@needs_write_lock
184
199
from bzrlib import commit
185
200
if revprops is None:
187
possible_master_transports=[]
188
202
if not 'branch-nick' in revprops:
189
revprops['branch-nick'] = self.branch._get_nick(
190
kwargs.get('local', False),
191
possible_master_transports)
192
authors = kwargs.pop('authors', None)
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)
207
if author is not None:
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:
212
# XXX: maybe we should just accept one of them?
213
raise AssertionError('author property given twice')
215
raise AssertionError('\\n is not a valid character '
216
'in an author identity')
217
revprops['authors'] = author
203
revprops['branch-nick'] = self.branch.nick
218
204
# args for wt.commit start at message from the Commit.commit method,
219
205
args = (message, ) + args
220
for hook in MutableTree.hooks['start_commit']:
222
206
committed_id = commit.Commit().commit(working_tree=self,
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)
207
revprops=revprops, *args, **kwargs)
229
208
return committed_id
231
210
def _gather_kinds(self, files, kinds):
233
212
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
215
def last_revision(self):
262
216
"""Return the revision id of the last commit performed in this tree.
264
218
In early tree formats the result of last_revision is the same as the
265
219
branch last_revision, but that is no longer the case for modern tree
268
222
last_revision returns the left most parent id, or None if there are no
304
258
raise NotImplementedError(self.mkdir)
306
def _observed_sha1(self, file_id, path, (sha1, stat_value)):
307
"""Tell the tree we have observed a paths sha1.
309
The intent of this function is to allow trees that have a hashcache to
310
update the hashcache during commit. If the observed file is too new
311
(based on the stat_value) to be safely hash-cached the tree will ignore
314
The default implementation does nothing.
316
:param file_id: The file id
317
:param path: The file path
318
:param sha1: The sha 1 that was observed.
319
:param stat_value: A stat result for the file the sha1 was read from.
323
def _fix_case_of_inventory_path(self, path):
324
"""If our tree isn't case sensitive, return the canonical path"""
325
if not self.case_sensitive:
326
path = self.get_canonical_inventory_path(path)
330
def put_file_bytes_non_atomic(self, file_id, bytes):
331
"""Update the content of a file in the tree.
333
Note that the file is written in-place rather than being
334
written to a temporary location and renamed. As a consequence,
335
readers can potentially see the file half-written.
337
:param file_id: file-id of the file
338
:param bytes: the new file contents
340
raise NotImplementedError(self.put_file_bytes_non_atomic)
342
260
def set_parent_ids(self, revision_ids, allow_leftmost_as_ghost=False):
343
261
"""Set the parents ids of the working tree.
389
308
user_dirs = set()
391
# validate user file paths and convert all paths to tree
310
# validate user file paths and convert all paths to tree
392
311
# relative : it's cheaper to make a tree relative path an abspath
393
# than to convert an abspath to tree relative, and it's cheaper to
394
# perform the canonicalization in bulk.
395
for filepath in osutils.canonical_relpaths(self.basedir, file_list):
396
rf = _FastPath(filepath)
397
# validate user parameters. Our recursive code avoids adding new
398
# files that need such validation
312
# than to convert an abspath to tree relative.
313
for filepath in file_list:
314
rf = _FastPath(self.relpath(filepath))
315
# validate user parameters. Our recursive code avoids adding new files
316
# that need such validation
399
317
if self.is_control_filename(rf.raw_path):
400
318
raise errors.ForbiddenControlFileError(filename=rf.raw_path)
402
320
abspath = self.abspath(rf.raw_path)
403
321
kind = osutils.file_kind(abspath)
404
322
if kind == 'directory':
408
326
if not InventoryEntry.versionable_kind(kind):
409
327
raise errors.BadFileKindError(filename=abspath, kind=kind)
410
# ensure the named path is added, so that ignore rules in the later
411
# directory walk dont skip it.
412
# we dont have a parent ie known yet.: use the relatively slower
413
# inventory probing method
328
# ensure the named path is added, so that ignore rules in the later directory
330
# we dont have a parent ie known yet.: use the relatively slower inventory
414
332
versioned = inv.has_filename(rf.raw_path)
447
364
kind = osutils.file_kind(abspath)
449
366
if not InventoryEntry.versionable_kind(kind):
450
trace.warning("skipping %s (can't add file of kind '%s')",
453
if illegalpath_re.search(directory.raw_path):
454
trace.warning("skipping %r (contains \\n or \\r)" % abspath)
367
warning("skipping %s (can't add file of kind '%s')", abspath, kind)
457
370
if parent_ie is not None:
458
371
versioned = directory.base_path in parent_ie.children
460
# without the parent ie, use the relatively slower inventory
373
# without the parent ie, use the relatively slower inventory
462
versioned = inv.has_filename(
463
self._fix_case_of_inventory_path(directory.raw_path))
375
versioned = inv.has_filename(directory.raw_path)
465
377
if kind == 'directory':
481
393
# mutter("%r is already versioned", abspath)
483
# XXX: This is wrong; people *might* reasonably be trying to
484
# add subtrees as subtrees. This should probably only be done
485
# in formats which can represent subtrees, and even then
486
# perhaps only when the user asked to add subtrees. At the
487
# moment you can add them specially through 'join --reference',
488
# which is perhaps reasonable: adding a new reference is a
489
# special operation and can have a special behaviour. mbp
491
trace.mutter("%r is a nested bzr tree", abspath)
395
# XXX: This is wrong; people *might* reasonably be trying to add
396
# subtrees as subtrees. This should probably only be done in formats
397
# which can represent subtrees, and even then perhaps only when
398
# the user asked to add subtrees. At the moment you can add them
399
# specially through 'join --reference', which is perhaps
400
# reasonable: adding a new reference is a special operation and
401
# can have a special behaviour. mbp 20070306
402
mutter("%r is a nested bzr tree", abspath)
493
404
_add_one(self, inv, parent_ie, directory, kind, action)
494
405
added.append(directory.raw_path)
498
409
# must be present:
499
410
this_ie = parent_ie.children[directory.base_path]
501
# without the parent ie, use the relatively slower inventory
412
# without the parent ie, use the relatively slower inventory
503
this_id = inv.path2id(
504
self._fix_case_of_inventory_path(directory.raw_path))
414
this_id = inv.path2id(directory.raw_path)
505
415
if this_id is None:
508
418
this_ie = inv[this_id]
510
420
for subf in sorted(os.listdir(abspath)):
511
# here we could use TreeDirectory rather than
421
# here we could use TreeDirectory rather than
512
422
# string concatenation.
513
423
subp = osutils.pathjoin(directory.raw_path, subf)
514
# TODO: is_control_filename is very slow. Make it faster.
515
# TreeDirectory.is_control_filename could also make this
516
# faster - its impossible for a non root dir to have a
424
# TODO: is_control_filename is very slow. Make it faster.
425
# TreeDirectory.is_control_filename could also make this
426
# faster - its impossible for a non root dir to have a
518
428
if self.is_control_filename(subp):
519
trace.mutter("skip control directory %r", subp)
429
mutter("skip control directory %r", subp)
520
430
elif subf in this_ie.children:
521
431
# recurse into this already versioned subdir.
522
432
dirs_to_add.append((_FastPath(subp, subf), this_ie))
539
449
self.read_working_inventory()
540
450
return added, ignored
542
def update_basis_by_delta(self, new_revid, delta):
543
"""Update the parents of this tree after a commit.
545
This gives the tree one parent, with revision id new_revid. The
546
inventory delta is applied to the current basis tree to generate the
547
inventory for the parent new_revid, and all other parent trees are
550
All the changes in the delta should be changes synchronising the basis
551
tree with some or all of the working tree, with a change to a directory
552
requiring that its contents have been recursively included. That is,
553
this is not a general purpose tree modification routine, but a helper
554
for commit which is not required to handle situations that do not arise
557
See the inventory developers documentation for the theory behind
560
:param new_revid: The new revision id for the trees parent.
561
:param delta: An inventory delta (see apply_inventory_delta) describing
562
the changes from the current left most parent revision to new_revid.
564
# if the tree is updated by a pull to the branch, as happens in
565
# WorkingTree2, when there was no separation between branch and tree,
566
# then just clear merges, efficiency is not a concern for now as this
567
# is legacy environments only, and they are slow regardless.
568
if self.last_revision() == new_revid:
569
self.set_parent_ids([new_revid])
571
# generic implementation based on Inventory manipulation. See
572
# WorkingTree classes for optimised versions for specific format trees.
573
basis = self.basis_tree()
575
# TODO: Consider re-evaluating the need for this with CHKInventory
576
# we don't strictly need to mutate an inventory for this
577
# it only makes sense when apply_delta is cheaper than get_inventory()
578
inventory = basis.inventory._get_mutable_inventory()
580
inventory.apply_delta(delta)
581
rev_tree = revisiontree.RevisionTree(self.branch.repository,
582
inventory, new_revid)
583
self.set_parent_trees([(new_revid, rev_tree)])
586
class MutableTreeHooks(hooks.Hooks):
587
"""A dictionary mapping a hook name to a list of callables for mutabletree
592
"""Create the default hooks.
595
hooks.Hooks.__init__(self)
596
self.create_hook(hooks.HookPoint('start_commit',
597
"Called before a commit is performed on a tree. The start commit "
598
"hook is able to change the tree before the commit takes place. "
599
"start_commit is called with the bzrlib.mutabletree.MutableTree "
600
"that the commit is being performed on.", (1, 4), None))
601
self.create_hook(hooks.HookPoint('post_commit',
602
"Called after a commit is performed on a tree. The hook is "
603
"called with a bzrlib.mutabletree.PostCommitHookParams object. "
604
"The mutable tree the commit was performed on is available via "
605
"the mutable_tree attribute of that object.", (2, 0), None))
608
# install the default hooks into the MutableTree class.
609
MutableTree.hooks = MutableTreeHooks()
612
class PostCommitHookParams(object):
613
"""Parameters for the post_commit hook.
615
To access the parameters, use the following attributes:
617
* mutable_tree - the MutableTree object
620
def __init__(self, mutable_tree):
621
"""Create the parameters for the post_commit hook."""
622
self.mutable_tree = mutable_tree
625
453
class _FastPath(object):
626
454
"""A path object with fast accessors for things like basename."""
663
491
# slower but does not need parent_ie
664
if inv.has_filename(tree._fix_case_of_inventory_path(path.raw_path)):
492
if inv.has_filename(path.raw_path):
666
494
# its really not there : add the parent
667
495
# note that the dirname use leads to some extra str copying etc but as
668
496
# there are a limited number of dirs we can be nested under, it should
669
497
# generally find it very fast and not recurse after that.
670
498
added = _add_one_and_parent(tree, inv, None,
671
_FastPath(osutils.dirname(path.raw_path)), 'directory', action)
672
parent_id = inv.path2id(osutils.dirname(path.raw_path))
499
_FastPath(dirname(path.raw_path)), 'directory', action)
500
parent_id = inv.path2id(dirname(path.raw_path))
673
501
parent_ie = inv[parent_id]
674
502
_add_one(tree, inv, parent_ie, path, kind, action)
675
503
return added + [path.raw_path]