1
# Copyright (C) 2006-2010 Canonical Ltd
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11
# GNU General Public License for more details.
13
# You should have received a copy of the GNU General Public License
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
17
"""MutableTree object.
19
See MutableTree for more details.
23
from bzrlib.lazy_import import lazy_import
24
lazy_import(globals(), """
41
from bzrlib.decorators import needs_read_lock, needs_write_lock
44
def needs_tree_write_lock(unbound):
45
"""Decorate unbound to take out and release a tree_write lock."""
46
def tree_write_locked(self, *args, **kwargs):
47
self.lock_tree_write()
49
return unbound(self, *args, **kwargs)
52
tree_write_locked.__doc__ = unbound.__doc__
53
tree_write_locked.__name__ = unbound.__name__
54
return tree_write_locked
57
class MutableTree(tree.Tree):
58
"""A MutableTree is a specialisation of Tree which is able to be mutated.
60
Generally speaking these mutations are only possible within a lock_write
61
context, and will revert if the lock is broken abnormally - but this cannot
62
be guaranteed - depending on the exact implementation of the mutable state.
64
The most common form of Mutable Tree is WorkingTree, see bzrlib.workingtree.
65
For tests we also have MemoryTree which is a MutableTree whose contents are
68
For now, we are not treating MutableTree as an interface to provide
69
conformance tests for - rather we are testing MemoryTree specifically, and
70
interface testing implementations of WorkingTree.
72
A mutable tree always has an associated Branch and BzrDir object - the
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
82
@needs_tree_write_lock
83
def add(self, files, ids=None, kinds=None):
84
"""Add paths to the set of versioned paths.
86
Note that the command line normally calls smart_add instead,
87
which can automatically recurse.
89
This adds the files to the inventory, so that they will be
90
recorded by the next commit.
92
:param files: List of paths to add, relative to the base of the tree.
93
:param ids: If set, use these instead of automatically generated ids.
94
Must be the same length as the list of files, but may
95
contain None for ids that are to be autogenerated.
96
:param kinds: Optional parameter to specify the kinds to be used for
99
TODO: Perhaps callback with the ids and paths as they're added.
101
if isinstance(files, basestring):
102
# XXX: Passing a single string is inconsistent and should be
104
if not (ids is None or isinstance(ids, basestring)):
105
raise AssertionError()
106
if not (kinds is None or isinstance(kinds, basestring)):
107
raise AssertionError()
111
if kinds is not None:
114
files = [path.strip('/') for path in files]
117
ids = [None] * len(files)
119
if not (len(ids) == len(files)):
120
raise AssertionError()
122
kinds = [None] * len(files)
123
elif not len(kinds) == len(files):
124
raise AssertionError()
126
# generic constraint checks:
127
if self.is_control_filename(f):
128
raise errors.ForbiddenControlFileError(filename=f)
129
fp = osutils.splitpath(f)
130
# fill out file kinds for all files [not needed when we stop
131
# caring about the instantaneous file kind within a uncommmitted tree
133
self._gather_kinds(files, kinds)
134
self._add(files, ids, kinds)
136
def add_reference(self, sub_tree):
137
"""Add a TreeReference to the tree, pointing at sub_tree"""
138
raise errors.UnsupportedOperation(self.add_reference, self)
140
def _add_reference(self, sub_tree):
141
"""Standard add_reference implementation, for use by subclasses"""
143
sub_tree_path = self.relpath(sub_tree.basedir)
144
except errors.PathNotChild:
145
raise errors.BadReferenceTarget(self, sub_tree,
146
'Target not inside tree.')
147
sub_tree_id = sub_tree.get_root_id()
148
if sub_tree_id == self.get_root_id():
149
raise errors.BadReferenceTarget(self, sub_tree,
150
'Trees have the same root id.')
151
if sub_tree_id in self.inventory:
152
raise errors.BadReferenceTarget(self, sub_tree,
153
'Root id already present in tree')
154
self._add([sub_tree_path], [sub_tree_id], ['tree-reference'])
156
def _add(self, files, ids, kinds):
157
"""Helper function for add - updates the inventory.
159
:param files: sequence of pathnames, relative to the tree root
160
:param ids: sequence of suggested ids for the files (may be None)
161
:param kinds: sequence of inventory kinds of the files (i.e. may
162
contain "tree-reference")
164
raise NotImplementedError(self._add)
166
@needs_tree_write_lock
167
def apply_inventory_delta(self, changes):
168
"""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.
177
inv.apply_delta(changes)
178
self._write_inventory(inv)
181
def commit(self, message=None, revprops=None, *args,
183
# avoid circular imports
184
from bzrlib import commit
187
possible_master_transports=[]
188
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
218
# args for wt.commit start at message from the Commit.commit method,
219
args = (message, ) + args
220
for hook in MutableTree.hooks['start_commit']:
222
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)
231
def _gather_kinds(self, files, kinds):
232
"""Helper function for add - sets the entries of kinds."""
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
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())
294
def last_revision(self):
295
"""Return the revision id of the last commit performed in this tree.
297
In early tree formats the result of last_revision is the same as the
298
branch last_revision, but that is no longer the case for modern tree
301
last_revision returns the left most parent id, or None if there are no
304
last_revision was deprecated as of 0.11. Please use get_parent_ids
307
raise NotImplementedError(self.last_revision)
309
def lock_tree_write(self):
310
"""Lock the working tree for write, and the branch for read.
312
This is useful for operations which only need to mutate the working
313
tree. Taking out branch write locks is a relatively expensive process
314
and may fail if the branch is on read only media. So branch write locks
315
should only be taken out when we are modifying branch data - such as in
316
operations like commit, pull, uncommit and update.
318
raise NotImplementedError(self.lock_tree_write)
320
def lock_write(self):
321
"""Lock the tree and its branch. This allows mutating calls to be made.
323
Some mutating methods will take out implicit write locks, but in
324
general you should always obtain a write lock before calling mutating
327
raise NotImplementedError(self.lock_write)
330
def mkdir(self, path, file_id=None):
331
"""Create a directory in the tree. if file_id is None, one is assigned.
333
:param path: A unicode file path.
334
:param file_id: An optional file-id.
335
:return: the file id of the new directory.
337
raise NotImplementedError(self.mkdir)
339
def _observed_sha1(self, file_id, path, (sha1, stat_value)):
340
"""Tell the tree we have observed a paths sha1.
342
The intent of this function is to allow trees that have a hashcache to
343
update the hashcache during commit. If the observed file is too new
344
(based on the stat_value) to be safely hash-cached the tree will ignore
347
The default implementation does nothing.
349
:param file_id: The file id
350
:param path: The file path
351
:param sha1: The sha 1 that was observed.
352
:param stat_value: A stat result for the file the sha1 was read from.
356
def _fix_case_of_inventory_path(self, path):
357
"""If our tree isn't case sensitive, return the canonical path"""
358
if not self.case_sensitive:
359
path = self.get_canonical_inventory_path(path)
363
def put_file_bytes_non_atomic(self, file_id, bytes):
364
"""Update the content of a file in the tree.
366
Note that the file is written in-place rather than being
367
written to a temporary location and renamed. As a consequence,
368
readers can potentially see the file half-written.
370
:param file_id: file-id of the file
371
:param bytes: the new file contents
373
raise NotImplementedError(self.put_file_bytes_non_atomic)
375
def set_parent_ids(self, revision_ids, allow_leftmost_as_ghost=False):
376
"""Set the parents ids of the working tree.
378
:param revision_ids: A list of revision_ids.
380
raise NotImplementedError(self.set_parent_ids)
382
def set_parent_trees(self, parents_list, allow_leftmost_as_ghost=False):
383
"""Set the parents of the working tree.
385
:param parents_list: A list of (revision_id, tree) tuples.
386
If tree is None, then that element is treated as an unreachable
387
parent tree - i.e. a ghost.
389
raise NotImplementedError(self.set_parent_trees)
391
@needs_tree_write_lock
392
def smart_add(self, file_list, recurse=True, action=None, save=True):
393
"""Version file_list, optionally recursing into directories.
395
This is designed more towards DWIM for humans than API clarity.
396
For the specific behaviour see the help for cmd_add().
398
:param action: A reporter to be called with the inventory, parent_ie,
399
path and kind of the path being added. It may return a file_id if
400
a specific one should be used.
401
:param save: Save the inventory after completing the adds. If False
402
this provides dry-run functionality by doing the add and not saving
404
:return: A tuple - files_added, ignored_files. files_added is the count
405
of added files, and ignored_files is a dict mapping files that were
406
ignored to the rule that caused them to be ignored.
408
# not in an inner loop; and we want to remove direct use of this,
409
# so here as a reminder for now. RBC 20070703
410
from bzrlib.inventory import InventoryEntry
412
action = add.AddAction()
415
# no paths supplied: add the entire tree.
416
# FIXME: this assumes we are running in a working tree subdir :-/
419
# mutter("smart add of %r")
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())
434
# validate user file paths and convert all paths to tree
435
# relative : it's cheaper to make a tree relative path an abspath
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
442
if self.is_control_filename(rf.raw_path):
443
raise errors.ForbiddenControlFileError(filename=rf.raw_path)
445
abspath = self.abspath(rf.raw_path)
446
kind = osutils.file_kind(abspath)
447
if kind == 'directory':
448
# schedule the dir for scanning
451
if not InventoryEntry.versionable_kind(kind):
452
raise errors.BadFileKindError(filename=abspath, kind=kind)
453
# ensure the named path is added, so that ignore rules in the later
454
# directory walk dont skip it.
455
# we dont have a parent ie known yet.: use the relatively slower
456
# inventory probing method
457
versioned = inv.has_filename(rf.raw_path)
460
added.extend(_add_one_and_parent(self, inv, None, rf, kind, action))
463
# no need to walk any directories at all.
464
if len(added) > 0 and save:
465
self._write_inventory(inv)
466
return added, ignored
468
# only walk the minimal parents needed: we have user_dirs to override
472
is_inside = osutils.is_inside_or_parent_of_any
473
for path in sorted(user_dirs):
474
if (prev_dir is None or not is_inside([prev_dir], path.raw_path)):
475
dirs_to_add.append((path, None))
476
prev_dir = path.raw_path
478
illegalpath_re = re.compile(r'[\r\n]')
479
# dirs_to_add is initialised to a list of directories, but as we scan
480
# directories we append files to it.
481
# XXX: We should determine kind of files when we scan them rather than
482
# adding to this list. RBC 20070703
483
for directory, parent_ie in dirs_to_add:
484
# directory is tree-relative
485
abspath = self.abspath(directory.raw_path)
487
# get the contents of this directory.
489
# find the kind of the path being added.
490
kind = osutils.file_kind(abspath)
492
if not InventoryEntry.versionable_kind(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)',
507
if parent_ie is not None:
508
versioned = directory.base_path in parent_ie.children
510
# without the parent ie, use the relatively slower inventory
512
versioned = inv.has_filename(
513
self._fix_case_of_inventory_path(directory.raw_path))
515
if kind == 'directory':
517
sub_branch = bzrdir.BzrDir.open(abspath)
519
except errors.NotBranchError:
521
except errors.UnsupportedFormatError:
526
if directory.raw_path == '':
527
# mutter("tree root doesn't need to be added")
531
# mutter("%r is already versioned", 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)
543
_add_one(self, inv, parent_ie, directory, kind, action)
544
added.append(directory.raw_path)
546
if kind == 'directory' and not sub_tree:
547
if parent_ie is not None:
549
this_ie = parent_ie.children[directory.base_path]
551
# without the parent ie, use the relatively slower inventory
553
this_id = inv.path2id(
554
self._fix_case_of_inventory_path(directory.raw_path))
558
this_ie = inv[this_id]
560
for subf in sorted(os.listdir(abspath)):
561
# here we could use TreeDirectory rather than
562
# string concatenation.
563
subp = osutils.pathjoin(directory.raw_path, subf)
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
568
if self.is_control_filename(subp):
569
trace.mutter("skip control directory %r", subp)
570
elif subf in this_ie.children:
571
# recurse into this already versioned subdir.
572
dirs_to_add.append((_FastPath(subp, subf), this_ie))
574
# user selection overrides ignoes
575
# ignore while selecting files - if we globbed in the
576
# outer loop we would ignore user files.
577
ignore_glob = self.is_ignored(subp)
578
if ignore_glob is not None:
579
# mutter("skip ignored sub-file %r", subp)
580
ignored.setdefault(ignore_glob, []).append(subp)
582
#mutter("queue to add sub-file %r", subp)
583
dirs_to_add.append((_FastPath(subp, subf), this_ie))
587
self._write_inventory(inv)
589
self.read_working_inventory()
590
return added, ignored
592
def update_basis_by_delta(self, new_revid, delta):
593
"""Update the parents of this tree after a commit.
595
This gives the tree one parent, with revision id new_revid. The
596
inventory delta is applied to the current basis tree to generate the
597
inventory for the parent new_revid, and all other parent trees are
600
All the changes in the delta should be changes synchronising the basis
601
tree with some or all of the working tree, with a change to a directory
602
requiring that its contents have been recursively included. That is,
603
this is not a general purpose tree modification routine, but a helper
604
for commit which is not required to handle situations that do not arise
607
See the inventory developers documentation for the theory behind
610
:param new_revid: The new revision id for the trees parent.
611
:param delta: An inventory delta (see apply_inventory_delta) describing
612
the changes from the current left most parent revision to new_revid.
614
# if the tree is updated by a pull to the branch, as happens in
615
# WorkingTree2, when there was no separation between branch and tree,
616
# then just clear merges, efficiency is not a concern for now as this
617
# is legacy environments only, and they are slow regardless.
618
if self.last_revision() == new_revid:
619
self.set_parent_ids([new_revid])
621
# generic implementation based on Inventory manipulation. See
622
# WorkingTree classes for optimised versions for specific format trees.
623
basis = self.basis_tree()
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()
630
inventory.apply_delta(delta)
631
rev_tree = revisiontree.RevisionTree(self.branch.repository,
632
inventory, new_revid)
633
self.set_parent_trees([(new_revid, rev_tree)])
636
class MutableTreeHooks(hooks.Hooks):
637
"""A dictionary mapping a hook name to a list of callables for mutabletree
642
"""Create the default hooks.
645
hooks.Hooks.__init__(self)
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))
658
# install the default hooks into the MutableTree class.
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
675
class _FastPath(object):
676
"""A path object with fast accessors for things like basename."""
678
__slots__ = ['raw_path', 'base_path']
680
def __init__(self, path, base_path=None):
681
"""Construct a FastPath from path."""
682
if base_path is None:
683
self.base_path = osutils.basename(path)
685
self.base_path = base_path
688
def __cmp__(self, other):
689
return cmp(self.raw_path, other.raw_path)
692
return hash(self.raw_path)
695
def _add_one_and_parent(tree, inv, parent_ie, path, kind, action):
696
"""Add a new entry to the inventory and automatically add unversioned parents.
698
:param inv: Inventory which will receive the new entry.
699
:param parent_ie: Parent inventory entry if known, or None. If
700
None, the parent is looked up by name and used if present, otherwise it
701
is recursively added.
702
:param kind: Kind of new entry (file, directory, etc)
703
:param action: callback(inv, parent_ie, path, kind); return ignored.
704
:return: A list of paths which have been added.
706
# Nothing to do if path is already versioned.
707
# This is safe from infinite recursion because the tree root is
709
if parent_ie is not None:
710
# we have a parent ie already
713
# slower but does not need parent_ie
714
if inv.has_filename(tree._fix_case_of_inventory_path(path.raw_path)):
716
# its really not there : add the parent
717
# note that the dirname use leads to some extra str copying etc but as
718
# there are a limited number of dirs we can be nested under, it should
719
# generally find it very fast and not recurse after that.
720
added = _add_one_and_parent(tree, inv, None,
721
_FastPath(osutils.dirname(path.raw_path)), 'directory', action)
722
parent_id = inv.path2id(osutils.dirname(path.raw_path))
723
parent_ie = inv[parent_id]
724
_add_one(tree, inv, parent_ie, path, kind, action)
725
return added + [path.raw_path]
728
def _add_one(tree, inv, parent_ie, path, kind, file_id_callback):
729
"""Add a new entry to the inventory.
731
:param inv: Inventory which will receive the new entry.
732
:param parent_ie: Parent inventory entry.
733
:param kind: Kind of new entry (file, directory, etc)
734
:param file_id_callback: callback(inv, parent_ie, path, kind); return a
735
file_id or None to generate a new file id
738
file_id = file_id_callback(inv, parent_ie, path, kind)
739
entry = inv.make_entry(kind, path.base_path, parent_ie.file_id,
added
removed
bzrlib/mutabletree.py
