13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
17
17
"""MutableTree object.
69
67
entirely in memory.
71
69
For now, we are not treating MutableTree as an interface to provide
72
conformance tests for - rather we are testing MemoryTree specifically, and
70
conformance tests for - rather we are testing MemoryTree specifically, and
73
71
interface testing implementations of WorkingTree.
75
73
A mutable tree always has an associated Branch and BzrDir object - the
76
74
branch and bzrdir attributes.
78
def __init__(self, *args, **kw):
79
super(MutableTree, self).__init__(*args, **kw)
80
# Is this tree on a case-insensitive or case-preserving file-system?
81
# Sub-classes may initialize to False if they detect they are being
82
# used on media which doesn't differentiate the case of names.
83
self.case_sensitive = True
85
77
@needs_tree_write_lock
86
78
def add(self, files, ids=None, kinds=None):
102
94
TODO: Perhaps callback with the ids and paths as they're added.
104
96
if isinstance(files, basestring):
105
# XXX: Passing a single string is inconsistent and should be
107
if not (ids is None or isinstance(ids, basestring)):
108
raise AssertionError()
109
if not (kinds is None or isinstance(kinds, basestring)):
110
raise AssertionError()
97
assert(ids is None or isinstance(ids, basestring))
98
assert(kinds is None or isinstance(kinds, basestring))
112
100
if ids is not None:
120
108
ids = [None] * len(files)
122
if not (len(ids) == len(files)):
123
raise AssertionError()
110
assert(len(ids) == len(files))
111
ids = [osutils.safe_file_id(file_id) for file_id in ids]
124
113
if kinds is None:
125
114
kinds = [None] * len(files)
126
elif not len(kinds) == len(files):
127
raise AssertionError()
116
assert(len(kinds) == len(files))
129
118
# generic constraint checks:
130
119
if self.is_control_filename(f):
131
120
raise errors.ForbiddenControlFileError(filename=f)
132
121
fp = splitpath(f)
133
# 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
134
123
# caring about the instantaneous file kind within a uncommmitted tree
136
125
self._gather_kinds(files, kinds)
170
159
def apply_inventory_delta(self, changes):
171
160
"""Apply changes to the inventory as an atomic operation.
173
:param changes: An inventory delta to apply to the working tree's
176
: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), ...]
179
180
inv = self.inventory
180
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, {})
181
193
self._write_inventory(inv)
183
195
@needs_write_lock
187
199
from bzrlib import commit
188
200
if revprops is None:
190
possible_master_transports=[]
191
202
if not 'branch-nick' in revprops:
192
revprops['branch-nick'] = self.branch._get_nick(
193
kwargs.get('local', False),
194
possible_master_transports)
195
authors = kwargs.pop('authors', None)
196
author = kwargs.pop('author', None)
197
if authors is not None:
198
if author is not None:
199
raise AssertionError('Specifying both author and authors '
200
'is not allowed. Specify just authors instead')
201
if 'author' in revprops or 'authors' in revprops:
202
# XXX: maybe we should just accept one of them?
203
raise AssertionError('author property given twice')
205
for individual in authors:
206
if '\n' in individual:
207
raise AssertionError('\\n is not a valid character '
208
'in an author identity')
209
revprops['authors'] = '\n'.join(authors)
210
if author is not None:
211
symbol_versioning.warn('The parameter author was deprecated'
212
' in version 1.13. Use authors instead',
214
if 'author' in revprops or 'authors' in revprops:
215
# XXX: maybe we should just accept one of them?
216
raise AssertionError('author property given twice')
218
raise AssertionError('\\n is not a valid character '
219
'in an author identity')
220
revprops['authors'] = author
203
revprops['branch-nick'] = self.branch.nick
221
204
# args for wt.commit start at message from the Commit.commit method,
222
205
args = (message, ) + args
223
for hook in MutableTree.hooks['start_commit']:
225
206
committed_id = commit.Commit().commit(working_tree=self,
227
possible_master_transports=possible_master_transports,
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):
237
"""Quickly check that the tree contains at least one change.
239
:return: True if a change is found. False otherwise
241
changes = self.iter_changes(from_tree)
243
change = changes.next()
244
# Exclude root (talk about black magic... --vila 20090629)
245
if change[4] == (None, None):
246
change = changes.next()
248
except StopIteration:
253
215
def last_revision(self):
254
216
"""Return the revision id of the last commit performed in this tree.
256
218
In early tree formats the result of last_revision is the same as the
257
219
branch last_revision, but that is no longer the case for modern tree
260
222
last_revision returns the left most parent id, or None if there are no
296
258
raise NotImplementedError(self.mkdir)
298
def _observed_sha1(self, file_id, path, (sha1, stat_value)):
299
"""Tell the tree we have observed a paths sha1.
301
The intent of this function is to allow trees that have a hashcache to
302
update the hashcache during commit. If the observed file is too new
303
(based on the stat_value) to be safely hash-cached the tree will ignore
306
The default implementation does nothing.
308
:param file_id: The file id
309
:param path: The file path
310
:param sha1: The sha 1 that was observed.
311
:param stat_value: A stat result for the file the sha1 was read from.
315
def _fix_case_of_inventory_path(self, path):
316
"""If our tree isn't case sensitive, return the canonical path"""
317
if not self.case_sensitive:
318
path = self.get_canonical_inventory_path(path)
322
def put_file_bytes_non_atomic(self, file_id, bytes):
323
"""Update the content of a file in the tree.
325
Note that the file is written in-place rather than being
326
written to a temporary location and renamed. As a consequence,
327
readers can potentially see the file half-written.
329
:param file_id: file-id of the file
330
:param bytes: the new file contents
332
raise NotImplementedError(self.put_file_bytes_non_atomic)
334
260
def set_parent_ids(self, revision_ids, allow_leftmost_as_ghost=False):
335
261
"""Set the parents ids of the working tree.
341
267
def set_parent_trees(self, parents_list, allow_leftmost_as_ghost=False):
342
268
"""Set the parents of the working tree.
344
:param parents_list: A list of (revision_id, tree) tuples.
270
:param parents_list: A list of (revision_id, tree) tuples.
345
271
If tree is None, then that element is treated as an unreachable
346
272
parent tree - i.e. a ghost.
355
281
For the specific behaviour see the help for cmd_add().
357
283
:param action: A reporter to be called with the inventory, parent_ie,
358
path and kind of the path being added. It may return a file_id if
284
path and kind of the path being added. It may return a file_id if
359
285
a specific one should be used.
360
286
:param save: Save the inventory after completing the adds. If False
361
287
this provides dry-run functionality by doing the add and not saving
381
308
user_dirs = set()
383
# validate user file paths and convert all paths to tree
310
# validate user file paths and convert all paths to tree
384
311
# relative : it's cheaper to make a tree relative path an abspath
385
# than to convert an abspath to tree relative, and it's cheaper to
386
# perform the canonicalization in bulk.
387
for filepath in osutils.canonical_relpaths(self.basedir, file_list):
388
rf = _FastPath(filepath)
312
# than to convert an abspath to tree relative.
313
for filepath in file_list:
314
rf = _FastPath(self.relpath(filepath))
389
315
# validate user parameters. Our recursive code avoids adding new files
390
# that need such validation
316
# that need such validation
391
317
if self.is_control_filename(rf.raw_path):
392
318
raise errors.ForbiddenControlFileError(filename=rf.raw_path)
394
320
abspath = self.abspath(rf.raw_path)
395
321
kind = osutils.file_kind(abspath)
396
322
if kind == 'directory':
444
370
if parent_ie is not None:
445
371
versioned = directory.base_path in parent_ie.children
447
# without the parent ie, use the relatively slower inventory
373
# without the parent ie, use the relatively slower inventory
449
versioned = inv.has_filename(
450
self._fix_case_of_inventory_path(directory.raw_path))
375
versioned = inv.has_filename(directory.raw_path)
452
377
if kind == 'directory':
468
393
# mutter("%r is already versioned", abspath)
470
395
# XXX: This is wrong; people *might* reasonably be trying to add
471
# subtrees as subtrees. This should probably only be done in formats
396
# subtrees as subtrees. This should probably only be done in formats
472
397
# which can represent subtrees, and even then perhaps only when
473
398
# the user asked to add subtrees. At the moment you can add them
474
399
# specially through 'join --reference', which is perhaps
484
409
# must be present:
485
410
this_ie = parent_ie.children[directory.base_path]
487
# without the parent ie, use the relatively slower inventory
412
# without the parent ie, use the relatively slower inventory
489
this_id = inv.path2id(
490
self._fix_case_of_inventory_path(directory.raw_path))
414
this_id = inv.path2id(directory.raw_path)
491
415
if this_id is None:
494
418
this_ie = inv[this_id]
496
420
for subf in sorted(os.listdir(abspath)):
497
# here we could use TreeDirectory rather than
421
# here we could use TreeDirectory rather than
498
422
# string concatenation.
499
423
subp = osutils.pathjoin(directory.raw_path, subf)
500
# TODO: is_control_filename is very slow. Make it faster.
501
# TreeDirectory.is_control_filename could also make this
502
# 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
504
428
if self.is_control_filename(subp):
505
429
mutter("skip control directory %r", subp)
525
449
self.read_working_inventory()
526
450
return added, ignored
528
def update_basis_by_delta(self, new_revid, delta):
529
"""Update the parents of this tree after a commit.
531
This gives the tree one parent, with revision id new_revid. The
532
inventory delta is applied to the current basis tree to generate the
533
inventory for the parent new_revid, and all other parent trees are
536
All the changes in the delta should be changes synchronising the basis
537
tree with some or all of the working tree, with a change to a directory
538
requiring that its contents have been recursively included. That is,
539
this is not a general purpose tree modification routine, but a helper
540
for commit which is not required to handle situations that do not arise
543
See the inventory developers documentation for the theory behind
546
:param new_revid: The new revision id for the trees parent.
547
:param delta: An inventory delta (see apply_inventory_delta) describing
548
the changes from the current left most parent revision to new_revid.
550
# if the tree is updated by a pull to the branch, as happens in
551
# WorkingTree2, when there was no separation between branch and tree,
552
# then just clear merges, efficiency is not a concern for now as this
553
# is legacy environments only, and they are slow regardless.
554
if self.last_revision() == new_revid:
555
self.set_parent_ids([new_revid])
557
# generic implementation based on Inventory manipulation. See
558
# WorkingTree classes for optimised versions for specific format trees.
559
basis = self.basis_tree()
561
# TODO: Consider re-evaluating the need for this with CHKInventory
562
# we don't strictly need to mutate an inventory for this
563
# it only makes sense when apply_delta is cheaper than get_inventory()
564
inventory = basis.inventory._get_mutable_inventory()
566
inventory.apply_delta(delta)
567
rev_tree = RevisionTree(self.branch.repository, inventory, new_revid)
568
self.set_parent_trees([(new_revid, rev_tree)])
571
class MutableTreeHooks(hooks.Hooks):
572
"""A dictionary mapping a hook name to a list of callables for mutabletree
577
"""Create the default hooks.
580
hooks.Hooks.__init__(self)
581
self.create_hook(hooks.HookPoint('start_commit',
582
"Called before a commit is performed on a tree. The start commit "
583
"hook is able to change the tree before the commit takes place. "
584
"start_commit is called with the bzrlib.tree.MutableTree that the "
585
"commit is being performed on.", (1, 4), None))
588
# install the default hooks into the MutableTree class.
589
MutableTree.hooks = MutableTreeHooks()
592
453
class _FastPath(object):
593
454
"""A path object with fast accessors for things like basename."""
added
removed
bzrlib/mutabletree.py
