1
# Copyright (C) 2006, 2007 Canonical Ltd
1
# Copyright (C) 2006-2010 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
23
23
from bzrlib.lazy_import import lazy_import
24
24
lazy_import(globals(), """
27
28
from bzrlib import (
33
from bzrlib.osutils import dirname
34
from bzrlib.revisiontree import RevisionTree
35
from bzrlib.trace import mutter, warning
43
41
from bzrlib.decorators import needs_read_lock, needs_write_lock
44
from bzrlib.osutils import splitpath
47
44
def needs_tree_write_lock(unbound):
129
126
# generic constraint checks:
130
127
if self.is_control_filename(f):
131
128
raise errors.ForbiddenControlFileError(filename=f)
129
fp = osutils.splitpath(f)
133
130
# fill out file kinds for all files [not needed when we stop
134
131
# caring about the instantaneous file kind within a uncommmitted tree
186
183
# avoid circular imports
187
184
from bzrlib import commit
190
185
possible_master_transports=[]
191
if not 'branch-nick' in revprops:
192
revprops['branch-nick'] = self.branch._get_nick(
186
revprops = commit.Commit.update_revprops(
189
kwargs.pop('authors', None),
190
kwargs.pop('author', None),
193
191
kwargs.get('local', False),
194
192
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
221
193
# args for wt.commit start at message from the Commit.commit method,
222
194
args = (message, ) + args
223
195
for hook in MutableTree.hooks['start_commit']:
236
208
raise NotImplementedError(self._gather_kinds)
239
def has_changes(self, from_tree):
240
"""Quickly check that the tree contains at least one change.
211
def has_changes(self, _from_tree=None):
212
"""Quickly check that the tree contains at least one commitable change.
214
:param _from_tree: tree to compare against to find changes (default to
215
the basis tree and is intended to be used by tests).
242
217
:return: True if a change is found. False otherwise
244
changes = self.iter_changes(from_tree)
219
# Check pending merges
220
if len(self.get_parent_ids()) > 1:
222
if _from_tree is None:
223
_from_tree = self.basis_tree()
224
changes = self.iter_changes(_from_tree)
246
226
change = changes.next()
247
227
# Exclude root (talk about black magic... --vila 20090629)
236
def check_changed_or_out_of_date(self, strict, opt_name,
237
more_error, more_warning):
238
"""Check the tree for uncommitted changes and branch synchronization.
240
If strict is None and not set in the config files, a warning is issued.
241
If strict is True, an error is raised.
242
If strict is False, no checks are done and no warning is issued.
244
:param strict: True, False or None, searched in branch config if None.
246
:param opt_name: strict option name to search in config file.
248
:param more_error: Details about how to avoid the check.
250
:param more_warning: Details about what is happening.
253
strict = self.branch.get_config().get_user_option_as_bool(opt_name)
254
if strict is not False:
256
if (self.has_changes()):
257
err_class = errors.UncommittedChanges
258
elif self.last_revision() != self.branch.last_revision():
259
# The tree has lost sync with its branch, there is little
260
# chance that the user is aware of it but he can still force
261
# the action with --no-strict
262
err_class = errors.OutOfDateTree
263
if err_class is not None:
265
err = err_class(self, more=more_warning)
266
# We don't want to interrupt the user if he expressed no
267
# preference about strict.
268
trace.warning('%s', err._format())
270
err = err_class(self, more=more_error)
256
274
def last_revision(self):
257
275
"""Return the revision id of the last commit performed in this tree.
384
404
user_dirs = set()
405
conflicts_related = set()
406
# Not all mutable trees can have conflicts
407
if getattr(self, 'conflicts', None) is not None:
408
# Collect all related files without checking whether they exist or
409
# are versioned. It's cheaper to do that once for all conflicts
410
# than trying to find the relevant conflict for each added file.
411
for c in self.conflicts():
412
conflicts_related.update(c.associated_filenames())
386
414
# validate user file paths and convert all paths to tree
387
415
# relative : it's cheaper to make a tree relative path an abspath
389
417
# perform the canonicalization in bulk.
390
418
for filepath in osutils.canonical_relpaths(self.basedir, file_list):
391
419
rf = _FastPath(filepath)
392
# validate user parameters. Our recursive code avoids adding new files
393
# that need such validation
420
# validate user parameters. Our recursive code avoids adding new
421
# files that need such validation
394
422
if self.is_control_filename(rf.raw_path):
395
423
raise errors.ForbiddenControlFileError(filename=rf.raw_path)
403
431
if not InventoryEntry.versionable_kind(kind):
404
432
raise errors.BadFileKindError(filename=abspath, kind=kind)
405
# ensure the named path is added, so that ignore rules in the later directory
407
# we dont have a parent ie known yet.: use the relatively slower inventory
433
# ensure the named path is added, so that ignore rules in the later
434
# directory walk dont skip it.
435
# we dont have a parent ie known yet.: use the relatively slower
436
# inventory probing method
409
437
versioned = inv.has_filename(rf.raw_path)
427
455
dirs_to_add.append((path, None))
428
456
prev_dir = path.raw_path
458
illegalpath_re = re.compile(r'[\r\n]')
430
459
# dirs_to_add is initialised to a list of directories, but as we scan
431
460
# directories we append files to it.
432
461
# XXX: We should determine kind of files when we scan them rather than
441
470
kind = osutils.file_kind(abspath)
443
472
if not InventoryEntry.versionable_kind(kind):
444
warning("skipping %s (can't add file of kind '%s')", abspath, kind)
473
trace.warning("skipping %s (can't add file of kind '%s')",
476
if illegalpath_re.search(directory.raw_path):
477
trace.warning("skipping %r (contains \\n or \\r)" % abspath)
479
if directory.raw_path in conflicts_related:
480
# If the file looks like one generated for a conflict, don't
483
'skipping %s (generated to help resolve conflicts)',
447
487
if parent_ie is not None:
471
511
# mutter("%r is already versioned", abspath)
473
# XXX: This is wrong; people *might* reasonably be trying to add
474
# subtrees as subtrees. This should probably only be done in formats
475
# which can represent subtrees, and even then perhaps only when
476
# the user asked to add subtrees. At the moment you can add them
477
# specially through 'join --reference', which is perhaps
478
# reasonable: adding a new reference is a special operation and
479
# can have a special behaviour. mbp 20070306
480
mutter("%r is a nested bzr tree", abspath)
513
# XXX: This is wrong; people *might* reasonably be trying to
514
# add subtrees as subtrees. This should probably only be done
515
# in formats which can represent subtrees, and even then
516
# perhaps only when the user asked to add subtrees. At the
517
# moment you can add them specially through 'join --reference',
518
# which is perhaps reasonable: adding a new reference is a
519
# special operation and can have a special behaviour. mbp
521
trace.mutter("%r is a nested bzr tree", abspath)
482
523
_add_one(self, inv, parent_ie, directory, kind, action)
483
524
added.append(directory.raw_path)
505
546
# faster - its impossible for a non root dir to have a
507
548
if self.is_control_filename(subp):
508
mutter("skip control directory %r", subp)
549
trace.mutter("skip control directory %r", subp)
509
550
elif subf in this_ie.children:
510
551
# recurse into this already versioned subdir.
511
552
dirs_to_add.append((_FastPath(subp, subf), this_ie))
567
608
inventory = basis.inventory._get_mutable_inventory()
569
610
inventory.apply_delta(delta)
570
rev_tree = RevisionTree(self.branch.repository, inventory, new_revid)
611
rev_tree = revisiontree.RevisionTree(self.branch.repository,
612
inventory, new_revid)
571
613
self.set_parent_trees([(new_revid, rev_tree)])
656
698
# there are a limited number of dirs we can be nested under, it should
657
699
# generally find it very fast and not recurse after that.
658
700
added = _add_one_and_parent(tree, inv, None,
659
_FastPath(dirname(path.raw_path)), 'directory', action)
660
parent_id = inv.path2id(dirname(path.raw_path))
701
_FastPath(osutils.dirname(path.raw_path)), 'directory', action)
702
parent_id = inv.path2id(osutils.dirname(path.raw_path))
661
703
parent_ie = inv[parent_id]
662
704
_add_one(tree, inv, parent_ie, path, kind, action)
663
705
return added + [path.raw_path]
added
removed
bzrlib/mutabletree.py
