39
39
from cStringIO import StringIO
43
42
from bzrlib.lazy_import import lazy_import
44
43
lazy_import(globals(), """
45
from bisect import bisect_left
45
from copy import deepcopy
54
52
from bzrlib import (
57
54
conflicts as _mod_conflicts,
66
revision as _mod_revision,
76
68
import bzrlib.branch
77
69
from bzrlib.transport import get_transport
78
from bzrlib.workingtree_4 import (
85
73
from bzrlib import symbol_versioning
86
74
from bzrlib.decorators import needs_read_lock, needs_write_lock
87
from bzrlib.lockable_files import LockableFiles
75
from bzrlib.errors import (BzrCheckError,
78
WeaveRevisionNotPresent,
82
MergeModifiedFormatError,
85
from bzrlib.inventory import InventoryEntry, Inventory, ROOT_ID
86
from bzrlib.lockable_files import LockableFiles, TransportLock
88
87
from bzrlib.lockdir import LockDir
89
88
import bzrlib.mutabletree
90
89
from bzrlib.mutabletree import needs_tree_write_lock
91
from bzrlib import osutils
92
90
from bzrlib.osutils import (
100
100
supports_executable,
102
from bzrlib.filters import filtered_input_file
103
102
from bzrlib.trace import mutter, note
104
103
from bzrlib.transport.local import LocalTransport
105
105
from bzrlib.progress import DummyProgress, ProgressPhase
106
from bzrlib.revision import CURRENT_REVISION
106
from bzrlib.revision import NULL_REVISION, CURRENT_REVISION
107
import bzrlib.revisiontree
107
108
from bzrlib.rio import RioReader, rio_file, Stanza
108
from bzrlib.symbol_versioning import (
110
DEPRECATED_PARAMETER,
109
from bzrlib.symbol_versioning import (deprecated_passed,
112
DEPRECATED_PARAMETER,
114
119
MERGE_MODIFIED_HEADER_1 = "BZR merge-modified list format 1"
115
120
CONFLICT_HEADER_1 = "BZR conflict list format 1"
117
ERROR_PATH_NOT_FOUND = 3 # WindowsError errno code, equivalent to ENOENT
123
@deprecated_function(zero_thirteen)
124
def gen_file_id(name):
125
"""Return new file id for the basename 'name'.
127
Use bzrlib.generate_ids.gen_file_id() instead
129
return generate_ids.gen_file_id(name)
132
@deprecated_function(zero_thirteen)
134
"""Return a new tree-root file id.
136
This has been deprecated in favor of bzrlib.generate_ids.gen_root_id()
138
return generate_ids.gen_root_id()
120
141
class TreeEntry(object):
121
142
"""An entry that implements the minimum interface used by commands.
123
This needs further inspection, it may be better to have
144
This needs further inspection, it may be better to have
124
145
InventoryEntries without ids - though that seems wrong. For now,
125
146
this is a parallel hierarchy to InventoryEntry, and needs to become
126
147
one of several things: decorates to that hierarchy, children of, or
407
387
# no parents, return an empty revision tree.
408
388
# in the future this should return the tree for
409
389
# 'empty:' - the implicit root empty tree.
410
return self.branch.repository.revision_tree(
411
_mod_revision.NULL_REVISION)
413
return self.revision_tree(revision_id)
414
except errors.NoSuchRevision:
390
return self.branch.repository.revision_tree(None)
393
xml = self.read_basis_inventory()
394
inv = xml6.serializer_v6.read_inventory_from_string(xml)
395
if inv is not None and inv.revision_id == revision_id:
396
return bzrlib.revisiontree.RevisionTree(
397
self.branch.repository, inv, revision_id)
398
except (NoSuchFile, errors.BadInventoryFormat):
416
400
# No cached copy available, retrieve from the repository.
417
401
# FIXME? RBC 20060403 should we cache the inventory locally
418
402
# at this point ?
420
404
return self.branch.repository.revision_tree(revision_id)
421
except (errors.RevisionNotPresent, errors.NoSuchRevision):
405
except errors.RevisionNotPresent:
422
406
# the basis tree *may* be a ghost or a low level error may have
423
# occurred. If the revision is present, its a problem, if its not
407
# occured. If the revision is present, its a problem, if its not
425
409
if self.branch.repository.has_revision(revision_id):
427
411
# the basis tree is a ghost so return an empty tree.
428
return self.branch.repository.revision_tree(
429
_mod_revision.NULL_REVISION)
432
self._flush_ignore_list_cache()
412
return self.branch.repository.revision_tree(None)
415
@deprecated_method(zero_eight)
416
def create(branch, directory):
417
"""Create a workingtree for branch at directory.
419
If existing_directory already exists it must have a .bzr directory.
420
If it does not exist, it will be created.
422
This returns a new WorkingTree object for the new checkout.
424
TODO FIXME RBC 20060124 when we have checkout formats in place this
425
should accept an optional revisionid to checkout [and reject this if
426
checking out into the same dir as a pre-checkout-aware branch format.]
428
XXX: When BzrDir is present, these should be created through that
431
warnings.warn('delete WorkingTree.create', stacklevel=3)
432
transport = get_transport(directory)
433
if branch.bzrdir.root_transport.base == transport.base:
435
return branch.bzrdir.create_workingtree()
436
# different directory,
437
# create a branch reference
438
# and now a working tree.
439
raise NotImplementedError
442
@deprecated_method(zero_eight)
443
def create_standalone(directory):
444
"""Create a checkout and a branch and a repo at directory.
446
Directory must exist and be empty.
448
please use BzrDir.create_standalone_workingtree
450
return bzrdir.BzrDir.create_standalone_workingtree(directory)
434
452
def relpath(self, path):
435
453
"""Return the local path portion from a given path.
437
The path may be absolute or relative. If its a relative path it is
455
The path may be absolute or relative. If its a relative path it is
438
456
interpreted relative to the python current working directory.
440
458
return osutils.relpath(self.basedir, path)
488
479
incorrectly attributed to CURRENT_REVISION (but after committing, the
489
480
attribution will be correct).
491
maybe_file_parent_keys = []
492
for parent_id in self.get_parent_ids():
494
parent_tree = self.revision_tree(parent_id)
495
except errors.NoSuchRevisionInTree:
496
parent_tree = self.branch.repository.revision_tree(parent_id)
497
parent_tree.lock_read()
499
if file_id not in parent_tree:
501
ie = parent_tree.inventory[file_id]
502
if ie.kind != 'file':
503
# Note: this is slightly unnecessary, because symlinks and
504
# directories have a "text" which is the empty text, and we
505
# know that won't mess up annotations. But it seems cleaner
507
parent_text_key = (file_id, ie.revision)
508
if parent_text_key not in maybe_file_parent_keys:
509
maybe_file_parent_keys.append(parent_text_key)
512
graph = _mod_graph.Graph(self.branch.repository.texts)
513
heads = graph.heads(maybe_file_parent_keys)
514
file_parent_keys = []
515
for key in maybe_file_parent_keys:
517
file_parent_keys.append(key)
519
# Now we have the parents of this content
520
annotator = self.branch.repository.texts.get_annotator()
521
text = self.get_file(file_id).read()
522
this_key =(file_id, default_revision)
523
annotator.add_special_text(this_key, file_parent_keys, text)
524
annotations = [(key[-1], line)
525
for key, line in annotator.annotate_flat(this_key)]
528
def _get_ancestors(self, default_revision):
529
ancestors = set([default_revision])
530
for parent_id in self.get_parent_ids():
531
ancestors.update(self.branch.repository.get_ancestry(
532
parent_id, topo_sorted=False))
482
basis = self.basis_tree()
483
changes = self._iter_changes(basis, True, [file_id]).next()
484
changed_content, kind = changes[2], changes[6]
485
if not changed_content:
486
return basis.annotate_iter(file_id)
490
if kind[0] != 'file':
493
old_lines = list(basis.annotate_iter(file_id))
495
for tree in self.branch.repository.revision_trees(
496
self.get_parent_ids()[1:]):
497
if file_id not in tree:
499
old.append(list(tree.annotate_iter(file_id)))
500
return annotate.reannotate(old, self.get_file(file_id).readlines(),
535
503
def get_parent_ids(self):
536
504
"""See Tree.get_parent_ids.
538
506
This implementation reads the pending merges list and last_revision
539
507
value and uses that to decide what the parents list should be.
541
last_rev = _mod_revision.ensure_null(self._last_revision())
542
if _mod_revision.NULL_REVISION == last_rev:
509
last_rev = self._last_revision()
545
513
parents = [last_rev]
547
merges_file = self._transport.get('pending-merges')
548
except errors.NoSuchFile:
515
merges_file = self._control_files.get_utf8('pending-merges')
551
519
for l in merges_file.readlines():
552
revision_id = l.rstrip('\n')
553
parents.append(revision_id)
520
parents.append(l.rstrip('\n'))
557
524
def get_root_id(self):
558
525
"""Return the id of this trees root"""
559
526
return self._inventory.root.file_id
561
528
def _get_store_filename(self, file_id):
562
529
## XXX: badly named; this is not in the store at all
563
530
return self.abspath(self.id2path(file_id))
566
def clone(self, to_bzrdir, revision_id=None):
533
def clone(self, to_bzrdir, revision_id=None, basis=None):
567
534
"""Duplicate this working tree into to_bzr, including all state.
569
536
Specifically modified files are kept as modified, but
570
537
ignored and unknown files are discarded.
572
539
If you want to make a new line of development, see bzrdir.sprout()
575
If not None, the cloned tree will have its last revision set to
576
revision, and difference between the source trees last revision
542
If not None, the cloned tree will have its last revision set to
543
revision, and and difference between the source trees last revision
577
544
and this one merged in.
547
If not None, a closer copy of a tree which may have some files in
548
common, and which file content should be preferentially copied from.
579
550
# assumes the target bzr dir format is compatible.
580
result = to_bzrdir.create_workingtree()
551
result = self._format.initialize(to_bzrdir)
581
552
self.copy_content_into(result, revision_id)
986
859
def get_symlink_target(self, file_id):
987
abspath = self.id2abspath(file_id)
988
target = osutils.readlink(abspath)
992
def subsume(self, other_tree):
993
def add_children(inventory, entry):
994
for child_entry in entry.children.values():
995
inventory._byid[child_entry.file_id] = child_entry
996
if child_entry.kind == 'directory':
997
add_children(inventory, child_entry)
998
if other_tree.get_root_id() == self.get_root_id():
999
raise errors.BadSubsumeSource(self, other_tree,
1000
'Trees have the same root')
1002
other_tree_path = self.relpath(other_tree.basedir)
1003
except errors.PathNotChild:
1004
raise errors.BadSubsumeSource(self, other_tree,
1005
'Tree is not contained by the other')
1006
new_root_parent = self.path2id(osutils.dirname(other_tree_path))
1007
if new_root_parent is None:
1008
raise errors.BadSubsumeSource(self, other_tree,
1009
'Parent directory is not versioned.')
1010
# We need to ensure that the result of a fetch will have a
1011
# versionedfile for the other_tree root, and only fetching into
1012
# RepositoryKnit2 guarantees that.
1013
if not self.branch.repository.supports_rich_root():
1014
raise errors.SubsumeTargetNeedsUpgrade(other_tree)
1015
other_tree.lock_tree_write()
1017
new_parents = other_tree.get_parent_ids()
1018
other_root = other_tree.inventory.root
1019
other_root.parent_id = new_root_parent
1020
other_root.name = osutils.basename(other_tree_path)
1021
self.inventory.add(other_root)
1022
add_children(self.inventory, other_root)
1023
self._write_inventory(self.inventory)
1024
# normally we don't want to fetch whole repositories, but i think
1025
# here we really do want to consolidate the whole thing.
1026
for parent_id in other_tree.get_parent_ids():
1027
self.branch.fetch(other_tree.branch, parent_id)
1028
self.add_parent_tree_id(parent_id)
1031
other_tree.bzrdir.retire_bzrdir()
1033
def _setup_directory_is_tree_reference(self):
1034
if self._branch.repository._format.supports_tree_reference:
1035
self._directory_is_tree_reference = \
1036
self._directory_may_be_tree_reference
1038
self._directory_is_tree_reference = \
1039
self._directory_is_never_tree_reference
1041
def _directory_is_never_tree_reference(self, relpath):
1044
def _directory_may_be_tree_reference(self, relpath):
1045
# as a special case, if a directory contains control files then
1046
# it's a tree reference, except that the root of the tree is not
1047
return relpath and osutils.isdir(self.abspath(relpath) + u"/.bzr")
1048
# TODO: We could ask all the control formats whether they
1049
# recognize this directory, but at the moment there's no cheap api
1050
# to do that. Since we probably can only nest bzr checkouts and
1051
# they always use this name it's ok for now. -- mbp 20060306
1053
# FIXME: There is an unhandled case here of a subdirectory
1054
# containing .bzr but not a branch; that will probably blow up
1055
# when you try to commit it. It might happen if there is a
1056
# checkout in a subdirectory. This can be avoided by not adding
1059
@needs_tree_write_lock
1060
def extract(self, file_id, format=None):
1061
"""Extract a subtree from this tree.
1063
A new branch will be created, relative to the path for this tree.
1067
segments = osutils.splitpath(path)
1068
transport = self.branch.bzrdir.root_transport
1069
for name in segments:
1070
transport = transport.clone(name)
1071
transport.ensure_base()
1074
sub_path = self.id2path(file_id)
1075
branch_transport = mkdirs(sub_path)
1077
format = self.bzrdir.cloning_metadir()
1078
branch_transport.ensure_base()
1079
branch_bzrdir = format.initialize_on_transport(branch_transport)
1081
repo = branch_bzrdir.find_repository()
1082
except errors.NoRepositoryPresent:
1083
repo = branch_bzrdir.create_repository()
1084
if not repo.supports_rich_root():
1085
raise errors.RootNotRich()
1086
new_branch = branch_bzrdir.create_branch()
1087
new_branch.pull(self.branch)
1088
for parent_id in self.get_parent_ids():
1089
new_branch.fetch(self.branch, parent_id)
1090
tree_transport = self.bzrdir.root_transport.clone(sub_path)
1091
if tree_transport.base != branch_transport.base:
1092
tree_bzrdir = format.initialize_on_transport(tree_transport)
1093
branch.BranchReferenceFormat().initialize(tree_bzrdir, new_branch)
1095
tree_bzrdir = branch_bzrdir
1096
wt = tree_bzrdir.create_workingtree(_mod_revision.NULL_REVISION)
1097
wt.set_parent_ids(self.get_parent_ids())
1098
my_inv = self.inventory
1099
child_inv = inventory.Inventory(root_id=None)
1100
new_root = my_inv[file_id]
1101
my_inv.remove_recursive_id(file_id)
1102
new_root.parent_id = None
1103
child_inv.add(new_root)
1104
self._write_inventory(my_inv)
1105
wt._write_inventory(child_inv)
1108
def _serialize(self, inventory, out_file):
1109
xml5.serializer_v5.write_inventory(self._inventory, out_file,
1112
def _deserialize(selt, in_file):
1113
return xml5.serializer_v5.read_inventory(in_file)
860
return os.readlink(self.id2abspath(file_id))
862
def file_class(self, filename):
863
if self.path2id(filename):
865
elif self.is_ignored(filename):
1115
870
def flush(self):
1116
871
"""Write the in memory inventory to disk."""
1232
974
except KeyError:
1233
975
yield fp[1:], c, fk, None, TreeEntry()
1236
978
if fk != 'directory':
1239
# But do this child first if recursing down
1241
new_children = os.listdir(fap)
1243
new_children = collections.deque(new_children)
1244
stack.append((f_ie.file_id, fp, fap, new_children))
1245
# Break out of inner loop,
1246
# so that we start outer loop with child
981
# But do this child first
982
new_children = os.listdir(fap)
984
new_children = collections.deque(new_children)
985
stack.append((f_ie.file_id, fp, fap, new_children))
986
# Break out of inner loop, so that we start outer loop with child
1249
989
# if we finished all children, pop it off the stack
1252
992
@needs_tree_write_lock
1253
def move(self, from_paths, to_dir=None, after=False, **kwargs):
993
def move(self, from_paths, to_name):
1254
994
"""Rename files.
1256
to_dir must exist in the inventory.
1258
If to_dir exists and is a directory, the files are moved into
1259
it, keeping their old names.
1261
Note that to_dir is only the last component of the new name;
996
to_name must exist in the inventory.
998
If to_name exists and is a directory, the files are moved into
999
it, keeping their old names.
1001
Note that to_name is only the last component of the new name;
1262
1002
this doesn't change the directory.
1264
For each entry in from_paths the move mode will be determined
1267
The first mode moves the file in the filesystem and updates the
1268
inventory. The second mode only updates the inventory without
1269
touching the file on the filesystem. This is the new mode introduced
1272
move uses the second mode if 'after == True' and the target is not
1273
versioned but present in the working tree.
1275
move uses the second mode if 'after == False' and the source is
1276
versioned but no longer in the working tree, and the target is not
1277
versioned but present in the working tree.
1279
move uses the first mode if 'after == False' and the source is
1280
versioned and present in the working tree, and the target is not
1281
versioned and not present in the working tree.
1283
Everything else results in an error.
1285
1004
This returns a list of (from_path, to_path) pairs for each
1286
1005
entry that is moved.
1291
# check for deprecated use of signature
1293
to_dir = kwargs.get('to_name', None)
1295
raise TypeError('You must supply a target directory')
1297
symbol_versioning.warn('The parameter to_name was deprecated'
1298
' in version 0.13. Use to_dir instead',
1301
# check destination directory
1302
if isinstance(from_paths, basestring):
1008
## TODO: Option to move IDs only
1009
assert not isinstance(from_paths, basestring)
1304
1010
inv = self.inventory
1305
to_abs = self.abspath(to_dir)
1011
to_abs = self.abspath(to_name)
1306
1012
if not isdir(to_abs):
1307
raise errors.BzrMoveFailedError('',to_dir,
1308
errors.NotADirectory(to_abs))
1309
if not self.has_filename(to_dir):
1310
raise errors.BzrMoveFailedError('',to_dir,
1311
errors.NotInWorkingDirectory(to_dir))
1312
to_dir_id = inv.path2id(to_dir)
1313
if to_dir_id is None:
1314
raise errors.BzrMoveFailedError('',to_dir,
1315
errors.NotVersionedError(path=str(to_dir)))
1013
raise BzrError("destination %r is not a directory" % to_abs)
1014
if not self.has_filename(to_name):
1015
raise BzrError("destination %r not in working directory" % to_abs)
1016
to_dir_id = inv.path2id(to_name)
1017
if to_dir_id is None and to_name != '':
1018
raise BzrError("destination %r is not a versioned directory" % to_name)
1317
1019
to_dir_ie = inv[to_dir_id]
1318
1020
if to_dir_ie.kind != 'directory':
1319
raise errors.BzrMoveFailedError('',to_dir,
1320
errors.NotADirectory(to_abs))
1322
# create rename entries and tuples
1323
for from_rel in from_paths:
1324
from_tail = splitpath(from_rel)[-1]
1325
from_id = inv.path2id(from_rel)
1327
raise errors.BzrMoveFailedError(from_rel,to_dir,
1328
errors.NotVersionedError(path=str(from_rel)))
1330
from_entry = inv[from_id]
1331
from_parent_id = from_entry.parent_id
1332
to_rel = pathjoin(to_dir, from_tail)
1333
rename_entry = WorkingTree._RenameEntry(from_rel=from_rel,
1335
from_tail=from_tail,
1336
from_parent_id=from_parent_id,
1337
to_rel=to_rel, to_tail=from_tail,
1338
to_parent_id=to_dir_id)
1339
rename_entries.append(rename_entry)
1340
rename_tuples.append((from_rel, to_rel))
1342
# determine which move mode to use. checks also for movability
1343
rename_entries = self._determine_mv_mode(rename_entries, after)
1021
raise BzrError("destination %r is not a directory" % to_abs)
1023
to_idpath = inv.get_idpath(to_dir_id)
1025
for f in from_paths:
1026
if not self.has_filename(f):
1027
raise BzrError("%r does not exist in working tree" % f)
1028
f_id = inv.path2id(f)
1030
raise BzrError("%r is not versioned" % f)
1031
name_tail = splitpath(f)[-1]
1032
dest_path = pathjoin(to_name, name_tail)
1033
if self.has_filename(dest_path):
1034
raise BzrError("destination %r already exists" % dest_path)
1035
if f_id in to_idpath:
1036
raise BzrError("can't move %r to a subdirectory of itself" % f)
1038
# OK, so there's a race here, it's possible that someone will
1039
# create a file in this interval and then the rename might be
1040
# left half-done. But we should have caught most problems.
1041
orig_inv = deepcopy(self.inventory)
1345
1042
original_modified = self._inventory_is_modified
1347
1044
if len(from_paths):
1348
1045
self._inventory_is_modified = True
1349
self._move(rename_entries)
1046
for f in from_paths:
1047
name_tail = splitpath(f)[-1]
1048
dest_path = pathjoin(to_name, name_tail)
1049
result.append((f, dest_path))
1050
inv.rename(inv.path2id(f), to_dir_id, name_tail)
1052
osutils.rename(self.abspath(f), self.abspath(dest_path))
1054
raise BzrError("failed to rename %r to %r: %s" %
1055
(f, dest_path, e[1]))
1351
1057
# restore the inventory on error
1352
self._inventory_is_modified = original_modified
1058
self._set_inventory(orig_inv, dirty=original_modified)
1354
1060
self._write_inventory(inv)
1355
return rename_tuples
1357
def _determine_mv_mode(self, rename_entries, after=False):
1358
"""Determines for each from-to pair if both inventory and working tree
1359
or only the inventory has to be changed.
1361
Also does basic plausability tests.
1363
inv = self.inventory
1365
for rename_entry in rename_entries:
1366
# store to local variables for easier reference
1367
from_rel = rename_entry.from_rel
1368
from_id = rename_entry.from_id
1369
to_rel = rename_entry.to_rel
1370
to_id = inv.path2id(to_rel)
1371
only_change_inv = False
1373
# check the inventory for source and destination
1375
raise errors.BzrMoveFailedError(from_rel,to_rel,
1376
errors.NotVersionedError(path=str(from_rel)))
1377
if to_id is not None:
1378
raise errors.BzrMoveFailedError(from_rel,to_rel,
1379
errors.AlreadyVersionedError(path=str(to_rel)))
1381
# try to determine the mode for rename (only change inv or change
1382
# inv and file system)
1384
if not self.has_filename(to_rel):
1385
raise errors.BzrMoveFailedError(from_id,to_rel,
1386
errors.NoSuchFile(path=str(to_rel),
1387
extra="New file has not been created yet"))
1388
only_change_inv = True
1389
elif not self.has_filename(from_rel) and self.has_filename(to_rel):
1390
only_change_inv = True
1391
elif self.has_filename(from_rel) and not self.has_filename(to_rel):
1392
only_change_inv = False
1393
elif (not self.case_sensitive
1394
and from_rel.lower() == to_rel.lower()
1395
and self.has_filename(from_rel)):
1396
only_change_inv = False
1398
# something is wrong, so lets determine what exactly
1399
if not self.has_filename(from_rel) and \
1400
not self.has_filename(to_rel):
1401
raise errors.BzrRenameFailedError(from_rel,to_rel,
1402
errors.PathsDoNotExist(paths=(str(from_rel),
1405
raise errors.RenameFailedFilesExist(from_rel, to_rel)
1406
rename_entry.only_change_inv = only_change_inv
1407
return rename_entries
1409
def _move(self, rename_entries):
1410
"""Moves a list of files.
1412
Depending on the value of the flag 'only_change_inv', the
1413
file will be moved on the file system or not.
1415
inv = self.inventory
1418
for entry in rename_entries:
1420
self._move_entry(entry)
1422
self._rollback_move(moved)
1426
def _rollback_move(self, moved):
1427
"""Try to rollback a previous move in case of an filesystem error."""
1428
inv = self.inventory
1431
self._move_entry(WorkingTree._RenameEntry(
1432
entry.to_rel, entry.from_id,
1433
entry.to_tail, entry.to_parent_id, entry.from_rel,
1434
entry.from_tail, entry.from_parent_id,
1435
entry.only_change_inv))
1436
except errors.BzrMoveFailedError, e:
1437
raise errors.BzrMoveFailedError( '', '', "Rollback failed."
1438
" The working tree is in an inconsistent state."
1439
" Please consider doing a 'bzr revert'."
1440
" Error message is: %s" % e)
1442
def _move_entry(self, entry):
1443
inv = self.inventory
1444
from_rel_abs = self.abspath(entry.from_rel)
1445
to_rel_abs = self.abspath(entry.to_rel)
1446
if from_rel_abs == to_rel_abs:
1447
raise errors.BzrMoveFailedError(entry.from_rel, entry.to_rel,
1448
"Source and target are identical.")
1450
if not entry.only_change_inv:
1452
osutils.rename(from_rel_abs, to_rel_abs)
1454
raise errors.BzrMoveFailedError(entry.from_rel,
1456
inv.rename(entry.from_id, entry.to_parent_id, entry.to_tail)
1458
1063
@needs_tree_write_lock
1459
def rename_one(self, from_rel, to_rel, after=False):
1064
def rename_one(self, from_rel, to_rel):
1460
1065
"""Rename one file.
1462
1067
This can change the directory or the filename or both.
1464
rename_one has several 'modes' to work. First, it can rename a physical
1465
file and change the file_id. That is the normal mode. Second, it can
1466
only change the file_id without touching any physical file. This is
1467
the new mode introduced in version 0.15.
1469
rename_one uses the second mode if 'after == True' and 'to_rel' is not
1470
versioned but present in the working tree.
1472
rename_one uses the second mode if 'after == False' and 'from_rel' is
1473
versioned but no longer in the working tree, and 'to_rel' is not
1474
versioned but present in the working tree.
1476
rename_one uses the first mode if 'after == False' and 'from_rel' is
1477
versioned and present in the working tree, and 'to_rel' is not
1478
versioned and not present in the working tree.
1480
Everything else results in an error.
1482
1069
inv = self.inventory
1485
# create rename entries and tuples
1486
from_tail = splitpath(from_rel)[-1]
1487
from_id = inv.path2id(from_rel)
1489
# if file is missing in the inventory maybe it's in the basis_tree
1490
basis_tree = self.branch.basis_tree()
1491
from_id = basis_tree.path2id(from_rel)
1493
raise errors.BzrRenameFailedError(from_rel,to_rel,
1494
errors.NotVersionedError(path=str(from_rel)))
1495
# put entry back in the inventory so we can rename it
1496
from_entry = basis_tree.inventory[from_id].copy()
1499
from_entry = inv[from_id]
1500
from_parent_id = from_entry.parent_id
1070
if not self.has_filename(from_rel):
1071
raise BzrError("can't rename: old working file %r does not exist" % from_rel)
1072
if self.has_filename(to_rel):
1073
raise BzrError("can't rename: new working file %r already exists" % to_rel)
1075
file_id = inv.path2id(from_rel)
1077
raise BzrError("can't rename: old name %r is not versioned" % from_rel)
1079
entry = inv[file_id]
1080
from_parent = entry.parent_id
1081
from_name = entry.name
1083
if inv.path2id(to_rel):
1084
raise BzrError("can't rename: new name %r is already versioned" % to_rel)
1501
1086
to_dir, to_tail = os.path.split(to_rel)
1502
1087
to_dir_id = inv.path2id(to_dir)
1503
rename_entry = WorkingTree._RenameEntry(from_rel=from_rel,
1505
from_tail=from_tail,
1506
from_parent_id=from_parent_id,
1507
to_rel=to_rel, to_tail=to_tail,
1508
to_parent_id=to_dir_id)
1509
rename_entries.append(rename_entry)
1511
# determine which move mode to use. checks also for movability
1512
rename_entries = self._determine_mv_mode(rename_entries, after)
1514
# check if the target changed directory and if the target directory is
1516
if to_dir_id is None:
1517
raise errors.BzrMoveFailedError(from_rel,to_rel,
1518
errors.NotVersionedError(path=str(to_dir)))
1520
# all checks done. now we can continue with our actual work
1521
mutter('rename_one:\n'
1526
' to_dir_id {%s}\n',
1527
from_id, from_rel, to_rel, to_dir, to_dir_id)
1529
self._move(rename_entries)
1088
if to_dir_id is None and to_dir != '':
1089
raise BzrError("can't determine destination directory id for %r" % to_dir)
1091
mutter("rename_one:")
1092
mutter(" file_id {%s}" % file_id)
1093
mutter(" from_rel %r" % from_rel)
1094
mutter(" to_rel %r" % to_rel)
1095
mutter(" to_dir %r" % to_dir)
1096
mutter(" to_dir_id {%s}" % to_dir_id)
1098
inv.rename(file_id, to_dir_id, to_tail)
1100
from_abs = self.abspath(from_rel)
1101
to_abs = self.abspath(to_rel)
1103
osutils.rename(from_abs, to_abs)
1105
inv.rename(file_id, from_parent, from_name)
1106
raise BzrError("failed to rename %r to %r: %s"
1107
% (from_abs, to_abs, e[1]))
1530
1108
self._write_inventory(inv)
1532
class _RenameEntry(object):
1533
def __init__(self, from_rel, from_id, from_tail, from_parent_id,
1534
to_rel, to_tail, to_parent_id, only_change_inv=False):
1535
self.from_rel = from_rel
1536
self.from_id = from_id
1537
self.from_tail = from_tail
1538
self.from_parent_id = from_parent_id
1539
self.to_rel = to_rel
1540
self.to_tail = to_tail
1541
self.to_parent_id = to_parent_id
1542
self.only_change_inv = only_change_inv
1544
1110
@needs_read_lock
1545
1111
def unknowns(self):
1546
1112
"""Return all unknown files.
1903
1442
def read_basis_inventory(self):
1904
1443
"""Read the cached basis inventory."""
1905
1444
path = self._basis_inventory_name()
1906
return self._transport.get_bytes(path)
1445
return self._control_files.get(path).read()
1908
1447
@needs_read_lock
1909
1448
def read_working_inventory(self):
1910
1449
"""Read the working inventory.
1912
1451
:raises errors.InventoryModified: read_working_inventory will fail
1913
1452
when the current in memory inventory has been modified.
1915
# conceptually this should be an implementation detail of the tree.
1454
# conceptually this should be an implementation detail of the tree.
1916
1455
# XXX: Deprecate this.
1917
1456
# ElementTree does its own conversion from UTF-8, so open in
1919
1458
if self._inventory_is_modified:
1920
1459
raise errors.InventoryModified(self)
1921
result = self._deserialize(self._transport.get('inventory'))
1460
result = xml5.serializer_v5.read_inventory(
1461
self._control_files.get('inventory'))
1922
1462
self._set_inventory(result, dirty=False)
1925
1465
@needs_tree_write_lock
1926
def remove(self, files, verbose=False, to_file=None, keep_files=True,
1928
"""Remove nominated files from the working inventory.
1930
:files: File paths relative to the basedir.
1931
:keep_files: If true, the files will also be kept.
1932
:force: Delete files and directories, even if they are changed and
1933
even if the directories are not empty.
1466
def remove(self, files, verbose=False, to_file=None):
1467
"""Remove nominated files from the working inventory..
1469
This does not remove their text. This does not run on XXX on what? RBC
1471
TODO: Refuse to remove modified files unless --force is given?
1473
TODO: Do something useful with directories.
1475
TODO: Should this remove the text or not? Tough call; not
1476
removing may be useful and the user can just use use rm, and
1477
is the opposite of add. Removing it is consistent with most
1478
other tools. Maybe an option.
1480
## TODO: Normalize names
1481
## TODO: Remove nested loops; better scalability
1935
1482
if isinstance(files, basestring):
1936
1483
files = [files]
1941
unknown_nested_files=set()
1943
def recurse_directory_to_add_files(directory):
1944
# Recurse directory and add all files
1945
# so we can check if they have changed.
1946
for parent_info, file_infos in\
1947
self.walkdirs(directory):
1948
for relpath, basename, kind, lstat, fileid, kind in file_infos:
1949
# Is it versioned or ignored?
1950
if self.path2id(relpath) or self.is_ignored(relpath):
1951
# Add nested content for deletion.
1952
new_files.add(relpath)
1954
# Files which are not versioned and not ignored
1955
# should be treated as unknown.
1956
unknown_nested_files.add((relpath, None, kind))
1958
for filename in files:
1959
# Get file name into canonical form.
1960
abspath = self.abspath(filename)
1961
filename = self.relpath(abspath)
1962
if len(filename) > 0:
1963
new_files.add(filename)
1964
recurse_directory_to_add_files(filename)
1966
files = list(new_files)
1969
return # nothing to do
1971
# Sort needed to first handle directory content before the directory
1972
files.sort(reverse=True)
1974
# Bail out if we are going to delete files we shouldn't
1975
if not keep_files and not force:
1976
has_changed_files = len(unknown_nested_files) > 0
1977
if not has_changed_files:
1978
for (file_id, path, content_change, versioned, parent_id, name,
1979
kind, executable) in self.iter_changes(self.basis_tree(),
1980
include_unchanged=True, require_versioned=False,
1981
want_unversioned=True, specific_files=files):
1982
if versioned == (False, False):
1983
# The record is unknown ...
1984
if not self.is_ignored(path[1]):
1985
# ... but not ignored
1986
has_changed_files = True
1988
elif content_change and (kind[1] is not None):
1989
# Versioned and changed, but not deleted
1990
has_changed_files = True
1993
if has_changed_files:
1994
# Make delta show ALL applicable changes in error message.
1995
tree_delta = self.changes_from(self.basis_tree(),
1996
require_versioned=False, want_unversioned=True,
1997
specific_files=files)
1998
for unknown_file in unknown_nested_files:
1999
if unknown_file not in tree_delta.unversioned:
2000
tree_delta.unversioned.extend((unknown_file,))
2001
raise errors.BzrRemoveChangedFilesError(tree_delta)
2003
# Build inv_delta and delete files where applicable,
2004
# do this before any modifications to inventory.
1485
inv = self.inventory
1487
# do this before any modifications
2005
1488
for f in files:
2006
fid = self.path2id(f)
1489
fid = inv.path2id(f)
2009
message = "%s is not versioned." % (f,)
2012
# having removed it, it must be either ignored or unknown
2013
if self.is_ignored(f):
2017
textui.show_status(new_status, self.kind(fid), f,
2020
inv_delta.append((f, None, fid, None))
2021
message = "removed %s" % (f,)
2024
abs_path = self.abspath(f)
2025
if osutils.lexists(abs_path):
2026
if (osutils.isdir(abs_path) and
2027
len(os.listdir(abs_path)) > 0):
2029
osutils.rmtree(abs_path)
2031
message = "%s is not an empty directory "\
2032
"and won't be deleted." % (f,)
2034
osutils.delete_any(abs_path)
2035
message = "deleted %s" % (f,)
2036
elif message is not None:
2037
# Only care if we haven't done anything yet.
2038
message = "%s does not exist." % (f,)
2040
# Print only one message (if any) per file.
2041
if message is not None:
2043
self.apply_inventory_delta(inv_delta)
1491
# TODO: Perhaps make this just a warning, and continue?
1492
# This tends to happen when
1493
raise NotVersionedError(path=f)
1495
# having remove it, it must be either ignored or unknown
1496
if self.is_ignored(f):
1500
textui.show_status(new_status, inv[fid].kind, f,
1504
self._write_inventory(inv)
2045
1506
@needs_tree_write_lock
2046
def revert(self, filenames=None, old_tree=None, backups=True,
2047
pb=DummyProgress(), report_changes=False):
1507
def revert(self, filenames, old_tree=None, backups=True,
1508
pb=DummyProgress()):
2048
1509
from bzrlib.conflicts import resolve
2051
symbol_versioning.warn('Using [] to revert all files is deprecated'
2052
' as of bzr 0.91. Please use None (the default) instead.',
2053
DeprecationWarning, stacklevel=2)
2054
1510
if old_tree is None:
2055
basis_tree = self.basis_tree()
2056
basis_tree.lock_read()
2057
old_tree = basis_tree
1511
old_tree = self.basis_tree()
1512
conflicts = transform.revert(self, old_tree, filenames, backups, pb)
1513
if not len(filenames):
1514
self.set_parent_ids(self.get_parent_ids()[:1])
2061
conflicts = transform.revert(self, old_tree, filenames, backups, pb,
2063
if filenames is None and len(self.get_parent_ids()) > 1:
2065
last_revision = self.last_revision()
2066
if last_revision != _mod_revision.NULL_REVISION:
2067
if basis_tree is None:
2068
basis_tree = self.basis_tree()
2069
basis_tree.lock_read()
2070
parent_trees.append((last_revision, basis_tree))
2071
self.set_parent_trees(parent_trees)
2074
resolve(self, filenames, ignore_misses=True, recursive=True)
2076
if basis_tree is not None:
1517
resolve(self, filenames, ignore_misses=True)
2078
1518
return conflicts
2080
def revision_tree(self, revision_id):
2081
"""See Tree.revision_tree.
2083
WorkingTree can supply revision_trees for the basis revision only
2084
because there is only one cached inventory in the bzr directory.
2086
if revision_id == self.last_revision():
2088
xml = self.read_basis_inventory()
2089
except errors.NoSuchFile:
2093
inv = xml7.serializer_v7.read_inventory_from_string(xml)
2094
# dont use the repository revision_tree api because we want
2095
# to supply the inventory.
2096
if inv.revision_id == revision_id:
2097
return revisiontree.RevisionTree(self.branch.repository,
2099
except errors.BadInventoryFormat:
2101
# raise if there was no inventory, or if we read the wrong inventory.
2102
raise errors.NoSuchRevisionInTree(self, revision_id)
2104
1520
# XXX: This method should be deprecated in favour of taking in a proper
2105
1521
# new Inventory object.
2106
1522
@needs_tree_write_lock
2107
1523
def set_inventory(self, new_inventory_list):
2108
1524
from bzrlib.inventory import (Inventory,
2109
1525
InventoryDirectory,
2112
1529
inv = Inventory(self.get_root_id())
2353
1751
file_id=self.path2id(conflicted)))
2354
1752
return conflicts
2356
def walkdirs(self, prefix=""):
2357
"""Walk the directories of this tree.
2359
returns a generator which yields items in the form:
2360
((curren_directory_path, fileid),
2361
[(file1_path, file1_name, file1_kind, (lstat), file1_id,
2364
This API returns a generator, which is only valid during the current
2365
tree transaction - within a single lock_read or lock_write duration.
2367
If the tree is not locked, it may cause an error to be raised,
2368
depending on the tree implementation.
2370
disk_top = self.abspath(prefix)
2371
if disk_top.endswith('/'):
2372
disk_top = disk_top[:-1]
2373
top_strip_len = len(disk_top) + 1
2374
inventory_iterator = self._walkdirs(prefix)
2375
disk_iterator = osutils.walkdirs(disk_top, prefix)
2377
current_disk = disk_iterator.next()
2378
disk_finished = False
2380
if not (e.errno == errno.ENOENT or
2381
(sys.platform == 'win32' and e.errno == ERROR_PATH_NOT_FOUND)):
2384
disk_finished = True
2386
current_inv = inventory_iterator.next()
2387
inv_finished = False
2388
except StopIteration:
2391
while not inv_finished or not disk_finished:
2393
((cur_disk_dir_relpath, cur_disk_dir_path_from_top),
2394
cur_disk_dir_content) = current_disk
2396
((cur_disk_dir_relpath, cur_disk_dir_path_from_top),
2397
cur_disk_dir_content) = ((None, None), None)
2398
if not disk_finished:
2399
# strip out .bzr dirs
2400
if (cur_disk_dir_path_from_top[top_strip_len:] == '' and
2401
len(cur_disk_dir_content) > 0):
2402
# osutils.walkdirs can be made nicer -
2403
# yield the path-from-prefix rather than the pathjoined
2405
bzrdir_loc = bisect_left(cur_disk_dir_content,
2407
if (bzrdir_loc < len(cur_disk_dir_content)
2408
and self.bzrdir.is_control_filename(
2409
cur_disk_dir_content[bzrdir_loc][0])):
2410
# we dont yield the contents of, or, .bzr itself.
2411
del cur_disk_dir_content[bzrdir_loc]
2413
# everything is unknown
2416
# everything is missing
2419
direction = cmp(current_inv[0][0], cur_disk_dir_relpath)
2421
# disk is before inventory - unknown
2422
dirblock = [(relpath, basename, kind, stat, None, None) for
2423
relpath, basename, kind, stat, top_path in
2424
cur_disk_dir_content]
2425
yield (cur_disk_dir_relpath, None), dirblock
2427
current_disk = disk_iterator.next()
2428
except StopIteration:
2429
disk_finished = True
2431
# inventory is before disk - missing.
2432
dirblock = [(relpath, basename, 'unknown', None, fileid, kind)
2433
for relpath, basename, dkind, stat, fileid, kind in
2435
yield (current_inv[0][0], current_inv[0][1]), dirblock
2437
current_inv = inventory_iterator.next()
2438
except StopIteration:
2441
# versioned present directory
2442
# merge the inventory and disk data together
2444
for relpath, subiterator in itertools.groupby(sorted(
2445
current_inv[1] + cur_disk_dir_content,
2446
key=operator.itemgetter(0)), operator.itemgetter(1)):
2447
path_elements = list(subiterator)
2448
if len(path_elements) == 2:
2449
inv_row, disk_row = path_elements
2450
# versioned, present file
2451
dirblock.append((inv_row[0],
2452
inv_row[1], disk_row[2],
2453
disk_row[3], inv_row[4],
2455
elif len(path_elements[0]) == 5:
2457
dirblock.append((path_elements[0][0],
2458
path_elements[0][1], path_elements[0][2],
2459
path_elements[0][3], None, None))
2460
elif len(path_elements[0]) == 6:
2461
# versioned, absent file.
2462
dirblock.append((path_elements[0][0],
2463
path_elements[0][1], 'unknown', None,
2464
path_elements[0][4], path_elements[0][5]))
2466
raise NotImplementedError('unreachable code')
2467
yield current_inv[0], dirblock
2469
current_inv = inventory_iterator.next()
2470
except StopIteration:
2473
current_disk = disk_iterator.next()
2474
except StopIteration:
2475
disk_finished = True
2477
def _walkdirs(self, prefix=""):
2478
"""Walk the directories of this tree.
2480
:prefix: is used as the directrory to start with.
2481
returns a generator which yields items in the form:
2482
((curren_directory_path, fileid),
2483
[(file1_path, file1_name, file1_kind, None, file1_id,
2486
_directory = 'directory'
2487
# get the root in the inventory
2488
inv = self.inventory
2489
top_id = inv.path2id(prefix)
2493
pending = [(prefix, '', _directory, None, top_id, None)]
2496
currentdir = pending.pop()
2497
# 0 - relpath, 1- basename, 2- kind, 3- stat, 4-id, 5-kind
2498
top_id = currentdir[4]
2500
relroot = currentdir[0] + '/'
2503
# FIXME: stash the node in pending
2505
if entry.kind == 'directory':
2506
for name, child in entry.sorted_children():
2507
dirblock.append((relroot + name, name, child.kind, None,
2508
child.file_id, child.kind
2510
yield (currentdir[0], entry.file_id), dirblock
2511
# push the user specified dirs from dirblock
2512
for dir in reversed(dirblock):
2513
if dir[2] == _directory:
2516
@needs_tree_write_lock
2517
def auto_resolve(self):
2518
"""Automatically resolve text conflicts according to contents.
2520
Only text conflicts are auto_resolvable. Files with no conflict markers
2521
are considered 'resolved', because bzr always puts conflict markers
2522
into files that have text conflicts. The corresponding .THIS .BASE and
2523
.OTHER files are deleted, as per 'resolve'.
2524
:return: a tuple of ConflictLists: (un_resolved, resolved).
2526
un_resolved = _mod_conflicts.ConflictList()
2527
resolved = _mod_conflicts.ConflictList()
2528
conflict_re = re.compile('^(<{7}|={7}|>{7})')
2529
for conflict in self.conflicts():
2530
if (conflict.typestring != 'text conflict' or
2531
self.kind(conflict.file_id) != 'file'):
2532
un_resolved.append(conflict)
2534
my_file = open(self.id2abspath(conflict.file_id), 'rb')
2536
for line in my_file:
2537
if conflict_re.search(line):
2538
un_resolved.append(conflict)
2541
resolved.append(conflict)
2544
resolved.remove_files(self)
2545
self.set_conflicts(un_resolved)
2546
return un_resolved, resolved
2549
def _check(self, references):
2550
"""Check the tree for consistency.
2552
:param references: A dict with keys matching the items returned by
2553
self._get_check_refs(), and values from looking those keys up in
2556
tree_basis = self.basis_tree()
2557
tree_basis.lock_read()
2559
repo_basis = references[('trees', self.last_revision())]
2560
if len(list(repo_basis.iter_changes(tree_basis))) > 0:
2561
raise errors.BzrCheckError(
2562
"Mismatched basis inventory content.")
2567
def _validate(self):
2568
"""Validate internal structures.
2570
This is meant mostly for the test suite. To give it a chance to detect
2571
corruption after actions have occurred. The default implementation is a
2574
:return: None. An exception should be raised if there is an error.
2579
def _get_rules_searcher(self, default_searcher):
2580
"""See Tree._get_rules_searcher."""
2581
if self._rules_searcher is None:
2582
self._rules_searcher = super(WorkingTree,
2583
self)._get_rules_searcher(default_searcher)
2584
return self._rules_searcher
2586
def get_shelf_manager(self):
2587
"""Return the ShelfManager for this WorkingTree."""
2588
from bzrlib.shelf import ShelfManager
2589
return ShelfManager(self, self._transport)
2592
1755
class WorkingTree2(WorkingTree):
2593
1756
"""This is the Format 2 working tree.
2595
This was the first weave based working tree.
1758
This was the first weave based working tree.
2596
1759
- uses os locks for locking.
2597
1760
- uses the branch last-revision.
2600
def __init__(self, *args, **kwargs):
2601
super(WorkingTree2, self).__init__(*args, **kwargs)
2602
# WorkingTree2 has more of a constraint that self._inventory must
2603
# exist. Because this is an older format, we don't mind the overhead
2604
# caused by the extra computation here.
2606
# Newer WorkingTree's should only have self._inventory set when they
2608
if self._inventory is None:
2609
self.read_working_inventory()
2611
def _get_check_refs(self):
2612
"""Return the references needed to perform a check of this tree."""
2613
return [('trees', self.last_revision())]
2615
1763
def lock_tree_write(self):
2616
1764
"""See WorkingTree.lock_tree_write().
2816
1947
def unregister_format(klass, format):
1948
assert klass._formats[format.get_format_string()] is format
2817
1949
del klass._formats[format.get_format_string()]
2820
1953
class WorkingTreeFormat2(WorkingTreeFormat):
2821
"""The second working tree format.
1954
"""The second working tree format.
2823
1956
This format modified the hash cache from the format 1 hash cache.
2826
upgrade_recommended = True
2828
1959
def get_format_description(self):
2829
1960
"""See WorkingTreeFormat.get_format_description()."""
2830
1961
return "Working tree format 2"
2832
def _stub_initialize_on_transport(self, transport, file_mode):
2833
"""Workaround: create control files for a remote working tree.
1963
def stub_initialize_remote(self, control_files):
1964
"""As a special workaround create critical control files for a remote working tree
2835
1966
This ensures that it can later be updated and dealt with locally,
2836
since BzrDirFormat6 and BzrDirFormat5 cannot represent dirs with
1967
since BzrDirFormat6 and BzrDirFormat5 cannot represent dirs with
2837
1968
no working tree. (See bug #43064).
2839
1970
sio = StringIO()
2840
inv = inventory.Inventory()
2841
xml5.serializer_v5.write_inventory(inv, sio, working=True)
1972
xml5.serializer_v5.write_inventory(inv, sio)
2843
transport.put_file('inventory', sio, file_mode)
2844
transport.put_bytes('pending-merges', '', file_mode)
2846
def initialize(self, a_bzrdir, revision_id=None, from_branch=None,
2847
accelerator_tree=None, hardlink=False):
1974
control_files.put('inventory', sio)
1976
control_files.put_utf8('pending-merges', '')
1979
def initialize(self, a_bzrdir, revision_id=None):
2848
1980
"""See WorkingTreeFormat.initialize()."""
2849
1981
if not isinstance(a_bzrdir.transport, LocalTransport):
2850
1982
raise errors.NotLocalUrl(a_bzrdir.transport.base)
2851
if from_branch is not None:
2852
branch = from_branch
2854
branch = a_bzrdir.open_branch()
2855
if revision_id is None:
2856
revision_id = _mod_revision.ensure_null(branch.last_revision())
2859
branch.generate_revision_history(revision_id)
2862
inv = inventory.Inventory()
1983
branch = a_bzrdir.open_branch()
1984
if revision_id is not None:
1987
revision_history = branch.revision_history()
1989
position = revision_history.index(revision_id)
1991
raise errors.NoSuchRevision(branch, revision_id)
1992
branch.set_revision_history(revision_history[:position + 1])
1995
revision = branch.last_revision()
2863
1997
wt = WorkingTree2(a_bzrdir.root_transport.local_abspath('.'),
2866
2000
_internal=True,
2868
2002
_bzrdir=a_bzrdir)
2869
basis_tree = branch.repository.revision_tree(revision_id)
2003
basis_tree = branch.repository.revision_tree(revision)
2870
2004
if basis_tree.inventory.root is not None:
2871
wt.set_root_id(basis_tree.get_root_id())
2005
wt.set_root_id(basis_tree.inventory.root.file_id)
2872
2006
# set the parent list and cache the basis tree.
2873
if _mod_revision.is_null(revision_id):
2876
parent_trees = [(revision_id, basis_tree)]
2877
wt.set_parent_trees(parent_trees)
2007
wt.set_parent_trees([(revision, basis_tree)])
2878
2008
transform.build_tree(basis_tree, wt)
3011
2119
raise NotImplementedError
3012
2120
if not isinstance(a_bzrdir.transport, LocalTransport):
3013
2121
raise errors.NotLocalUrl(a_bzrdir.transport.base)
3014
wt = self._open(a_bzrdir, self._open_control_files(a_bzrdir))
2122
return self._open(a_bzrdir, self._open_control_files(a_bzrdir))
3017
2124
def _open(self, a_bzrdir, control_files):
3018
2125
"""Open the tree itself.
3020
2127
:param a_bzrdir: the dir for the tree.
3021
2128
:param control_files: the control files for the tree.
3023
return self._tree_class(a_bzrdir.root_transport.local_abspath('.'),
3027
_control_files=control_files)
2130
return WorkingTree3(a_bzrdir.root_transport.local_abspath('.'),
2134
_control_files=control_files)
3029
2136
def __str__(self):
3030
2137
return self.get_format_string()
3033
__default_format = WorkingTreeFormat6()
2140
# formats which have no format string are not discoverable
2141
# and not independently creatable, so are not registered.
2142
__default_format = WorkingTreeFormat3()
3034
2143
WorkingTreeFormat.register_format(__default_format)
3035
WorkingTreeFormat.register_format(WorkingTreeFormat5())
3036
WorkingTreeFormat.register_format(WorkingTreeFormat4())
3037
WorkingTreeFormat.register_format(WorkingTreeFormat3())
3038
2144
WorkingTreeFormat.set_default_format(__default_format)
3039
# formats which have no format string are not discoverable
3040
# and not independently creatable, so are not registered.
3041
2145
_legacy_formats = [WorkingTreeFormat2(),
2149
class WorkingTreeTestProviderAdapter(object):
2150
"""A tool to generate a suite testing multiple workingtree formats at once.
2152
This is done by copying the test once for each transport and injecting
2153
the transport_server, transport_readonly_server, and workingtree_format
2154
classes into each copy. Each copy is also given a new id() to make it
2158
def __init__(self, transport_server, transport_readonly_server, formats):
2159
self._transport_server = transport_server
2160
self._transport_readonly_server = transport_readonly_server
2161
self._formats = formats
2163
def _clone_test(self, test, bzrdir_format, workingtree_format, variation):
2164
"""Clone test for adaption."""
2165
new_test = deepcopy(test)
2166
new_test.transport_server = self._transport_server
2167
new_test.transport_readonly_server = self._transport_readonly_server
2168
new_test.bzrdir_format = bzrdir_format
2169
new_test.workingtree_format = workingtree_format
2170
def make_new_test_id():
2171
new_id = "%s(%s)" % (test.id(), variation)
2172
return lambda: new_id
2173
new_test.id = make_new_test_id()
2176
def adapt(self, test):
2177
from bzrlib.tests import TestSuite
2178
result = TestSuite()
2179
for workingtree_format, bzrdir_format in self._formats:
2180
new_test = self._clone_test(
2183
workingtree_format, workingtree_format.__class__.__name__)
2184
result.addTest(new_test)
added
removed
bzrlib/workingtree.py
