1
# Copyright (C) 2006-2010 Canonical Ltd
1
# Copyright (C) 2006, 2007 Canonical Ltd
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
28
28
from bzrlib import (
35
from bzrlib.osutils import dirname
36
from bzrlib.revisiontree import RevisionTree
37
from bzrlib.trace import mutter, warning
41
45
from bzrlib.decorators import needs_read_lock, needs_write_lock
46
from bzrlib.osutils import splitpath
44
49
def needs_tree_write_lock(unbound):
126
131
# generic constraint checks:
127
132
if self.is_control_filename(f):
128
133
raise errors.ForbiddenControlFileError(filename=f)
129
fp = osutils.splitpath(f)
130
135
# fill out file kinds for all files [not needed when we stop
131
136
# caring about the instantaneous file kind within a uncommmitted tree
233
238
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).
241
def has_changes(self, from_tree):
242
"""Quickly check that the tree contains at least one change.
242
244
: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)
246
changes = self.iter_changes(from_tree)
251
248
change = changes.next()
252
249
# Exclude root (talk about black magic... --vila 20090629)
261
def check_changed_or_out_of_date(self, strict, opt_name,
262
more_error, more_warning):
263
"""Check the tree for uncommitted changes and branch synchronization.
265
If strict is None and not set in the config files, a warning is issued.
266
If strict is True, an error is raised.
267
If strict is False, no checks are done and no warning is issued.
269
:param strict: True, False or None, searched in branch config if None.
271
:param opt_name: strict option name to search in config file.
273
:param more_error: Details about how to avoid the check.
275
:param more_warning: Details about what is happening.
278
strict = self.branch.get_config().get_user_option_as_bool(opt_name)
279
if strict is not False:
281
if (self.has_changes()):
282
err_class = errors.UncommittedChanges
283
elif self.last_revision() != self.branch.last_revision():
284
# The tree has lost sync with its branch, there is little
285
# chance that the user is aware of it but he can still force
286
# the action with --no-strict
287
err_class = errors.OutOfDateTree
288
if err_class is not None:
290
err = err_class(self, more=more_warning)
291
# We don't want to interrupt the user if he expressed no
292
# preference about strict.
293
trace.warning('%s', err._format())
295
err = err_class(self, more=more_error)
299
258
def last_revision(self):
300
259
"""Return the revision id of the last commit performed in this tree.
400
359
This is designed more towards DWIM for humans than API clarity.
401
360
For the specific behaviour see the help for cmd_add().
362
:param file_list: List of zero or more paths. *NB: these are
363
interpreted relative to the process cwd, not relative to the
364
tree.* (Add and most other tree methods use tree-relative
403
366
:param action: A reporter to be called with the inventory, parent_ie,
404
367
path and kind of the path being added. It may return a file_id if
405
368
a specific one should be used.
429
390
user_dirs = set()
430
conflicts_related = set()
431
# Not all mutable trees can have conflicts
432
if getattr(self, 'conflicts', None) is not None:
433
# Collect all related files without checking whether they exist or
434
# are versioned. It's cheaper to do that once for all conflicts
435
# than trying to find the relevant conflict for each added file.
436
for c in self.conflicts():
437
conflicts_related.update(c.associated_filenames())
392
# expand any symlinks in the directory part, while leaving the
394
file_list = map(osutils.normalizepath, file_list)
439
396
# validate user file paths and convert all paths to tree
440
397
# relative : it's cheaper to make a tree relative path an abspath
442
399
# perform the canonicalization in bulk.
443
400
for filepath in osutils.canonical_relpaths(self.basedir, file_list):
444
401
rf = _FastPath(filepath)
445
# validate user parameters. Our recursive code avoids adding new
446
# files that need such validation
402
# validate user parameters. Our recursive code avoids adding new files
403
# that need such validation
447
404
if self.is_control_filename(rf.raw_path):
448
405
raise errors.ForbiddenControlFileError(filename=rf.raw_path)
456
413
if not InventoryEntry.versionable_kind(kind):
457
414
raise errors.BadFileKindError(filename=abspath, kind=kind)
458
# ensure the named path is added, so that ignore rules in the later
459
# directory walk dont skip it.
460
# we dont have a parent ie known yet.: use the relatively slower
461
# inventory probing method
415
# ensure the named path is added, so that ignore rules in the later directory
417
# we dont have a parent ie known yet.: use the relatively slower inventory
462
419
versioned = inv.has_filename(rf.raw_path)
495
452
kind = osutils.file_kind(abspath)
497
454
if not InventoryEntry.versionable_kind(kind):
498
trace.warning("skipping %s (can't add file of kind '%s')",
455
warning("skipping %s (can't add file of kind '%s')", abspath, kind)
501
457
if illegalpath_re.search(directory.raw_path):
502
trace.warning("skipping %r (contains \\n or \\r)" % abspath)
504
if directory.raw_path in conflicts_related:
505
# If the file looks like one generated for a conflict, don't
508
'skipping %s (generated to help resolve conflicts)',
458
warning("skipping %r (contains \\n or \\r)" % abspath)
512
461
if parent_ie is not None:
536
485
# mutter("%r is already versioned", abspath)
538
# XXX: This is wrong; people *might* reasonably be trying to
539
# add subtrees as subtrees. This should probably only be done
540
# in formats which can represent subtrees, and even then
541
# perhaps only when the user asked to add subtrees. At the
542
# moment you can add them specially through 'join --reference',
543
# which is perhaps reasonable: adding a new reference is a
544
# special operation and can have a special behaviour. mbp
546
trace.mutter("%r is a nested bzr tree", abspath)
487
# XXX: This is wrong; people *might* reasonably be trying to add
488
# subtrees as subtrees. This should probably only be done in formats
489
# which can represent subtrees, and even then perhaps only when
490
# the user asked to add subtrees. At the moment you can add them
491
# specially through 'join --reference', which is perhaps
492
# reasonable: adding a new reference is a special operation and
493
# can have a special behaviour. mbp 20070306
494
mutter("%r is a nested bzr tree", abspath)
548
496
_add_one(self, inv, parent_ie, directory, kind, action)
549
497
added.append(directory.raw_path)
571
519
# faster - its impossible for a non root dir to have a
573
521
if self.is_control_filename(subp):
574
trace.mutter("skip control directory %r", subp)
522
mutter("skip control directory %r", subp)
575
523
elif subf in this_ie.children:
576
524
# recurse into this already versioned subdir.
577
525
dirs_to_add.append((_FastPath(subp, subf), this_ie))
633
581
inventory = basis.inventory._get_mutable_inventory()
635
583
inventory.apply_delta(delta)
636
rev_tree = revisiontree.RevisionTree(self.branch.repository,
637
inventory, new_revid)
584
rev_tree = RevisionTree(self.branch.repository, inventory, new_revid)
638
585
self.set_parent_trees([(new_revid, rev_tree)])
723
670
# there are a limited number of dirs we can be nested under, it should
724
671
# generally find it very fast and not recurse after that.
725
672
added = _add_one_and_parent(tree, inv, None,
726
_FastPath(osutils.dirname(path.raw_path)), 'directory', action)
727
parent_id = inv.path2id(osutils.dirname(path.raw_path))
673
_FastPath(dirname(path.raw_path)), 'directory', action)
674
parent_id = inv.path2id(dirname(path.raw_path))
728
675
parent_ie = inv[parent_id]
729
676
_add_one(tree, inv, parent_ie, path, kind, action)
730
677
return added + [path.raw_path]
740
687
file_id or None to generate a new file id
690
# if the parent exists, but isn't a directory, we have to do the
691
# kind change now -- really the inventory shouldn't pretend to know
692
# the kind of wt files, but it does.
693
if parent_ie.kind != 'directory':
694
# nb: this relies on someone else checking that the path we're using
695
# doesn't contain symlinks.
696
new_parent_ie = inventory.make_entry('directory', parent_ie.name,
697
parent_ie.parent_id, parent_ie.file_id)
698
del inv[parent_ie.file_id]
699
inv.add(new_parent_ie)
700
parent_ie = new_parent_ie
743
701
file_id = file_id_callback(inv, parent_ie, path, kind)
744
702
entry = inv.make_entry(kind, path.base_path, parent_ie.file_id,
added
removed
bzrlib/mutabletree.py
