39
39
from cStringIO import StringIO
43
43
from bzrlib.lazy_import import lazy_import
44
44
lazy_import(globals(), """
45
from bisect import bisect_left
46
from copy import deepcopy
54
54
from bzrlib import (
56
57
conflicts as _mod_conflicts,
66
revision as _mod_revision,
67
76
import bzrlib.branch
68
77
from bzrlib.transport import get_transport
78
from bzrlib.workingtree_4 import (
72
85
from bzrlib import symbol_versioning
73
86
from bzrlib.decorators import needs_read_lock, needs_write_lock
74
from bzrlib.errors import (BzrCheckError,
77
WeaveRevisionNotPresent,
81
MergeModifiedFormatError,
84
from bzrlib.inventory import InventoryEntry, Inventory, ROOT_ID
85
from bzrlib.lockable_files import LockableFiles, TransportLock
87
from bzrlib.lockable_files import LockableFiles
86
88
from bzrlib.lockdir import LockDir
87
89
import bzrlib.mutabletree
88
90
from bzrlib.mutabletree import needs_tree_write_lock
91
from bzrlib import osutils
89
92
from bzrlib.osutils import (
99
100
supports_executable,
102
from bzrlib.filters import filtered_input_file
101
103
from bzrlib.trace import mutter, note
102
104
from bzrlib.transport.local import LocalTransport
104
105
from bzrlib.progress import DummyProgress, ProgressPhase
105
from bzrlib.revision import NULL_REVISION
106
import bzrlib.revisiontree
106
from bzrlib.revision import CURRENT_REVISION
107
107
from bzrlib.rio import RioReader, rio_file, Stanza
108
from bzrlib.symbol_versioning import (deprecated_passed,
111
DEPRECATED_PARAMETER,
108
from bzrlib.symbol_versioning import (
110
DEPRECATED_PARAMETER,
117
114
MERGE_MODIFIED_HEADER_1 = "BZR merge-modified list format 1"
118
115
CONFLICT_HEADER_1 = "BZR conflict list format 1"
120
# the regex removes any weird characters; we don't escape them
121
# but rather just pull them out
122
_gen_file_id_re = re.compile(r'[^\w.]')
123
_gen_id_suffix = None
127
def _next_id_suffix():
128
"""Create a new file id suffix that is reasonably unique.
130
On the first call we combine the current time with 64 bits of randomness
131
to give a highly probably globally unique number. Then each call in the same
132
process adds 1 to a serial number we append to that unique value.
134
# XXX TODO: change bzrlib.add.smart_add to call workingtree.add() rather
135
# than having to move the id randomness out of the inner loop like this.
136
# XXX TODO: for the global randomness this uses we should add the thread-id
137
# before the serial #.
138
global _gen_id_suffix, _gen_id_serial
139
if _gen_id_suffix is None:
140
_gen_id_suffix = "-%s-%s-" % (compact_date(time()), rand_chars(16))
142
return _gen_id_suffix + str(_gen_id_serial)
145
def gen_file_id(name):
146
"""Return new file id for the basename 'name'.
148
The uniqueness is supplied from _next_id_suffix.
150
# The real randomness is in the _next_id_suffix, the
151
# rest of the identifier is just to be nice.
153
# 1) Remove non-ascii word characters to keep the ids portable
154
# 2) squash to lowercase, so the file id doesn't have to
155
# be escaped (case insensitive filesystems would bork for ids
156
# that only differred in case without escaping).
157
# 3) truncate the filename to 20 chars. Long filenames also bork on some
159
# 4) Removing starting '.' characters to prevent the file ids from
160
# being considered hidden.
161
ascii_word_only = _gen_file_id_re.sub('', name.lower())
162
short_no_dots = ascii_word_only.lstrip('.')[:20]
163
return short_no_dots + _next_id_suffix()
167
"""Return a new tree-root file id."""
168
return gen_file_id('tree_root')
117
ERROR_PATH_NOT_FOUND = 3 # WindowsError errno code, equivalent to ENOENT
171
120
class TreeEntry(object):
172
121
"""An entry that implements the minimum interface used by commands.
174
This needs further inspection, it may be better to have
123
This needs further inspection, it may be better to have
175
124
InventoryEntries without ids - though that seems wrong. For now,
176
125
this is a parallel hierarchy to InventoryEntry, and needs to become
177
126
one of several things: decorates to that hierarchy, children of, or
417
407
# no parents, return an empty revision tree.
418
408
# in the future this should return the tree for
419
409
# 'empty:' - the implicit root empty tree.
420
return self.branch.repository.revision_tree(None)
423
xml = self.read_basis_inventory()
424
inv = xml6.serializer_v6.read_inventory_from_string(xml)
425
if inv is not None and inv.revision_id == revision_id:
426
return bzrlib.revisiontree.RevisionTree(
427
self.branch.repository, inv, revision_id)
428
except (NoSuchFile, errors.BadInventoryFormat):
410
return self.branch.repository.revision_tree(
411
_mod_revision.NULL_REVISION)
413
return self.revision_tree(revision_id)
414
except errors.NoSuchRevision:
430
416
# No cached copy available, retrieve from the repository.
431
417
# FIXME? RBC 20060403 should we cache the inventory locally
432
418
# at this point ?
434
420
return self.branch.repository.revision_tree(revision_id)
435
except errors.RevisionNotPresent:
421
except (errors.RevisionNotPresent, errors.NoSuchRevision):
436
422
# the basis tree *may* be a ghost or a low level error may have
437
# occured. If the revision is present, its a problem, if its not
423
# occurred. If the revision is present, its a problem, if its not
439
425
if self.branch.repository.has_revision(revision_id):
441
427
# the basis tree is a ghost so return an empty tree.
442
return self.branch.repository.revision_tree(None)
445
@deprecated_method(zero_eight)
446
def create(branch, directory):
447
"""Create a workingtree for branch at directory.
449
If existing_directory already exists it must have a .bzr directory.
450
If it does not exist, it will be created.
452
This returns a new WorkingTree object for the new checkout.
454
TODO FIXME RBC 20060124 when we have checkout formats in place this
455
should accept an optional revisionid to checkout [and reject this if
456
checking out into the same dir as a pre-checkout-aware branch format.]
458
XXX: When BzrDir is present, these should be created through that
461
warnings.warn('delete WorkingTree.create', stacklevel=3)
462
transport = get_transport(directory)
463
if branch.bzrdir.root_transport.base == transport.base:
465
return branch.bzrdir.create_workingtree()
466
# different directory,
467
# create a branch reference
468
# and now a working tree.
469
raise NotImplementedError
472
@deprecated_method(zero_eight)
473
def create_standalone(directory):
474
"""Create a checkout and a branch and a repo at directory.
476
Directory must exist and be empty.
478
please use BzrDir.create_standalone_workingtree
480
return bzrdir.BzrDir.create_standalone_workingtree(directory)
428
return self.branch.repository.revision_tree(
429
_mod_revision.NULL_REVISION)
432
self._flush_ignore_list_cache()
482
434
def relpath(self, path):
483
435
"""Return the local path portion from a given path.
485
The path may be absolute or relative. If its a relative path it is
437
The path may be absolute or relative. If its a relative path it is
486
438
interpreted relative to the python current working directory.
488
440
return osutils.relpath(self.basedir, path)
490
442
def has_filename(self, filename):
491
443
return osutils.lexists(self.abspath(filename))
493
def get_file(self, file_id):
494
return self.get_file_byname(self.id2path(file_id))
496
def get_file_text(self, file_id):
497
return self.get_file(file_id).read()
499
def get_file_byname(self, filename):
500
return file(self.abspath(filename), 'rb')
445
def get_file(self, file_id, path=None, filtered=True):
446
return self.get_file_with_stat(file_id, path, filtered=filtered)[0]
448
def get_file_with_stat(self, file_id, path=None, filtered=True,
450
"""See Tree.get_file_with_stat."""
452
path = self.id2path(file_id)
453
file_obj = self.get_file_byname(path, filtered=False)
454
stat_value = _fstat(file_obj.fileno())
455
if filtered and self.supports_content_filtering():
456
filters = self._content_filter_stack(path)
457
file_obj = filtered_input_file(file_obj, filters)
458
return (file_obj, stat_value)
460
def get_file_text(self, file_id, path=None, filtered=True):
461
return self.get_file(file_id, path=path, filtered=filtered).read()
463
def get_file_byname(self, filename, filtered=True):
464
path = self.abspath(filename)
466
if filtered and self.supports_content_filtering():
467
filters = self._content_filter_stack(filename)
468
return filtered_input_file(f, filters)
472
def get_file_lines(self, file_id, path=None, filtered=True):
473
"""See Tree.get_file_lines()"""
474
file = self.get_file(file_id, path, filtered=filtered)
476
return file.readlines()
481
def annotate_iter(self, file_id, default_revision=CURRENT_REVISION):
482
"""See Tree.annotate_iter
484
This implementation will use the basis tree implementation if possible.
485
Lines not in the basis are attributed to CURRENT_REVISION
487
If there are pending merges, lines added by those merges will be
488
incorrectly attributed to CURRENT_REVISION (but after committing, the
489
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))
502
535
def get_parent_ids(self):
503
536
"""See Tree.get_parent_ids.
505
538
This implementation reads the pending merges list and last_revision
506
539
value and uses that to decide what the parents list should be.
508
last_rev = self._last_revision()
541
last_rev = _mod_revision.ensure_null(self._last_revision())
542
if _mod_revision.NULL_REVISION == last_rev:
512
545
parents = [last_rev]
514
merges_file = self._control_files.get_utf8('pending-merges')
547
merges_file = self._transport.get('pending-merges')
548
except errors.NoSuchFile:
518
551
for l in merges_file.readlines():
519
parents.append(l.rstrip('\n'))
552
revision_id = l.rstrip('\n')
553
parents.append(revision_id)
523
557
def get_root_id(self):
524
558
"""Return the id of this trees root"""
525
559
return self._inventory.root.file_id
527
561
def _get_store_filename(self, file_id):
528
562
## XXX: badly named; this is not in the store at all
529
563
return self.abspath(self.id2path(file_id))
532
def clone(self, to_bzrdir, revision_id=None, basis=None):
566
def clone(self, to_bzrdir, revision_id=None):
533
567
"""Duplicate this working tree into to_bzr, including all state.
535
569
Specifically modified files are kept as modified, but
536
570
ignored and unknown files are discarded.
538
572
If you want to make a new line of development, see bzrdir.sprout()
541
If not None, the cloned tree will have its last revision set to
542
revision, and and difference between the source trees last revision
575
If not None, the cloned tree will have its last revision set to
576
revision, and difference between the source trees last revision
543
577
and this one merged in.
546
If not None, a closer copy of a tree which may have some files in
547
common, and which file content should be preferentially copied from.
549
579
# assumes the target bzr dir format is compatible.
550
result = self._format.initialize(to_bzrdir)
580
result = to_bzrdir.create_workingtree()
551
581
self.copy_content_into(result, revision_id)
582
612
__contains__ = has_id
584
614
def get_file_size(self, file_id):
585
return os.path.getsize(self.id2abspath(file_id))
615
"""See Tree.get_file_size"""
616
# XXX: this returns the on-disk size; it should probably return the
619
return os.path.getsize(self.id2abspath(file_id))
621
if e.errno != errno.ENOENT:
588
def get_file_sha1(self, file_id, path=None):
627
def get_file_sha1(self, file_id, path=None, stat_value=None):
590
629
path = self._inventory.id2path(file_id)
591
return self._hashcache.get_sha1(path)
630
return self._hashcache.get_sha1(path, stat_value)
593
632
def get_file_mtime(self, file_id, path=None):
595
path = self._inventory.id2path(file_id)
634
path = self.inventory.id2path(file_id)
596
635
return os.lstat(self.abspath(path)).st_mtime
637
def _is_executable_from_path_and_stat_from_basis(self, path, stat_result):
638
file_id = self.path2id(path)
639
return self._inventory[file_id].executable
641
def _is_executable_from_path_and_stat_from_stat(self, path, stat_result):
642
mode = stat_result.st_mode
643
return bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode)
598
645
if not supports_executable():
599
646
def is_executable(self, file_id, path=None):
600
647
return self._inventory[file_id].executable
649
_is_executable_from_path_and_stat = \
650
_is_executable_from_path_and_stat_from_basis
602
652
def is_executable(self, file_id, path=None):
604
path = self._inventory.id2path(file_id)
654
path = self.id2path(file_id)
605
655
mode = os.lstat(self.abspath(path)).st_mode
606
656
return bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode)
658
_is_executable_from_path_and_stat = \
659
_is_executable_from_path_and_stat_from_stat
661
@needs_tree_write_lock
609
662
def _add(self, files, ids, kinds):
610
663
"""See MutableTree._add."""
611
664
# TODO: Re-adding a file that is removed in the working copy
612
665
# should probably put it back with the previous ID.
613
# the read and write working inventory should not occur in this
666
# the read and write working inventory should not occur in this
614
667
# function - they should be part of lock_write and unlock.
615
inv = self.read_working_inventory()
616
669
for f, file_id, kind in zip(files, ids, kinds):
617
assert kind is not None
618
670
if file_id is None:
619
671
inv.add_path(f, kind=kind)
621
673
inv.add_path(f, kind=kind, file_id=file_id)
622
self._write_inventory(inv)
674
self._inventory_is_modified = True
624
676
@needs_tree_write_lock
625
677
def _gather_kinds(self, files, kinds):
829
949
def merge_modified(self):
950
"""Return a dictionary of files modified by a merge.
952
The list is initialized by WorkingTree.set_merge_modified, which is
953
typically called after we make some automatic updates to the tree
956
This returns a map of file_id->sha1, containing only files which are
957
still in the working inventory and have that text hash.
831
hashfile = self._control_files.get('merge-hashes')
960
hashfile = self._transport.get('merge-hashes')
961
except errors.NoSuchFile:
836
if hashfile.next() != MERGE_MODIFIED_HEADER_1 + '\n':
837
raise MergeModifiedFormatError()
838
except StopIteration:
839
raise MergeModifiedFormatError()
840
for s in RioReader(hashfile):
841
file_id = s.get("file_id")
842
if file_id not in self.inventory:
845
if hash == self.get_file_sha1(file_id):
846
merge_hashes[file_id] = hash
966
if hashfile.next() != MERGE_MODIFIED_HEADER_1 + '\n':
967
raise errors.MergeModifiedFormatError()
968
except StopIteration:
969
raise errors.MergeModifiedFormatError()
970
for s in RioReader(hashfile):
971
# RioReader reads in Unicode, so convert file_ids back to utf8
972
file_id = osutils.safe_file_id(s.get("file_id"), warn=False)
973
if file_id not in self.inventory:
975
text_hash = s.get("hash")
976
if text_hash == self.get_file_sha1(file_id):
977
merge_hashes[file_id] = text_hash
849
982
@needs_write_lock
850
983
def mkdir(self, path, file_id=None):
851
984
"""See MutableTree.mkdir()."""
852
985
if file_id is None:
853
file_id = gen_file_id(os.path.basename(path))
986
file_id = generate_ids.gen_file_id(os.path.basename(path))
854
987
os.mkdir(self.abspath(path))
855
988
self.add(path, file_id, 'directory')
858
991
def get_symlink_target(self, file_id):
859
return os.readlink(self.id2abspath(file_id))
861
def file_class(self, filename):
862
if self.path2id(filename):
864
elif self.is_ignored(filename):
992
abspath = self.id2abspath(file_id)
993
target = osutils.readlink(abspath)
997
def subsume(self, other_tree):
998
def add_children(inventory, entry):
999
for child_entry in entry.children.values():
1000
inventory._byid[child_entry.file_id] = child_entry
1001
if child_entry.kind == 'directory':
1002
add_children(inventory, child_entry)
1003
if other_tree.get_root_id() == self.get_root_id():
1004
raise errors.BadSubsumeSource(self, other_tree,
1005
'Trees have the same root')
1007
other_tree_path = self.relpath(other_tree.basedir)
1008
except errors.PathNotChild:
1009
raise errors.BadSubsumeSource(self, other_tree,
1010
'Tree is not contained by the other')
1011
new_root_parent = self.path2id(osutils.dirname(other_tree_path))
1012
if new_root_parent is None:
1013
raise errors.BadSubsumeSource(self, other_tree,
1014
'Parent directory is not versioned.')
1015
# We need to ensure that the result of a fetch will have a
1016
# versionedfile for the other_tree root, and only fetching into
1017
# RepositoryKnit2 guarantees that.
1018
if not self.branch.repository.supports_rich_root():
1019
raise errors.SubsumeTargetNeedsUpgrade(other_tree)
1020
other_tree.lock_tree_write()
1022
new_parents = other_tree.get_parent_ids()
1023
other_root = other_tree.inventory.root
1024
other_root.parent_id = new_root_parent
1025
other_root.name = osutils.basename(other_tree_path)
1026
self.inventory.add(other_root)
1027
add_children(self.inventory, other_root)
1028
self._write_inventory(self.inventory)
1029
# normally we don't want to fetch whole repositories, but i think
1030
# here we really do want to consolidate the whole thing.
1031
for parent_id in other_tree.get_parent_ids():
1032
self.branch.fetch(other_tree.branch, parent_id)
1033
self.add_parent_tree_id(parent_id)
1036
other_tree.bzrdir.retire_bzrdir()
1038
def _setup_directory_is_tree_reference(self):
1039
if self._branch.repository._format.supports_tree_reference:
1040
self._directory_is_tree_reference = \
1041
self._directory_may_be_tree_reference
1043
self._directory_is_tree_reference = \
1044
self._directory_is_never_tree_reference
1046
def _directory_is_never_tree_reference(self, relpath):
1049
def _directory_may_be_tree_reference(self, relpath):
1050
# as a special case, if a directory contains control files then
1051
# it's a tree reference, except that the root of the tree is not
1052
return relpath and osutils.isdir(self.abspath(relpath) + u"/.bzr")
1053
# TODO: We could ask all the control formats whether they
1054
# recognize this directory, but at the moment there's no cheap api
1055
# to do that. Since we probably can only nest bzr checkouts and
1056
# they always use this name it's ok for now. -- mbp 20060306
1058
# FIXME: There is an unhandled case here of a subdirectory
1059
# containing .bzr but not a branch; that will probably blow up
1060
# when you try to commit it. It might happen if there is a
1061
# checkout in a subdirectory. This can be avoided by not adding
1064
@needs_tree_write_lock
1065
def extract(self, file_id, format=None):
1066
"""Extract a subtree from this tree.
1068
A new branch will be created, relative to the path for this tree.
1072
segments = osutils.splitpath(path)
1073
transport = self.branch.bzrdir.root_transport
1074
for name in segments:
1075
transport = transport.clone(name)
1076
transport.ensure_base()
1079
sub_path = self.id2path(file_id)
1080
branch_transport = mkdirs(sub_path)
1082
format = self.bzrdir.cloning_metadir()
1083
branch_transport.ensure_base()
1084
branch_bzrdir = format.initialize_on_transport(branch_transport)
1086
repo = branch_bzrdir.find_repository()
1087
except errors.NoRepositoryPresent:
1088
repo = branch_bzrdir.create_repository()
1089
if not repo.supports_rich_root():
1090
raise errors.RootNotRich()
1091
new_branch = branch_bzrdir.create_branch()
1092
new_branch.pull(self.branch)
1093
for parent_id in self.get_parent_ids():
1094
new_branch.fetch(self.branch, parent_id)
1095
tree_transport = self.bzrdir.root_transport.clone(sub_path)
1096
if tree_transport.base != branch_transport.base:
1097
tree_bzrdir = format.initialize_on_transport(tree_transport)
1098
branch.BranchReferenceFormat().initialize(tree_bzrdir, new_branch)
1100
tree_bzrdir = branch_bzrdir
1101
wt = tree_bzrdir.create_workingtree(_mod_revision.NULL_REVISION)
1102
wt.set_parent_ids(self.get_parent_ids())
1103
my_inv = self.inventory
1104
child_inv = inventory.Inventory(root_id=None)
1105
new_root = my_inv[file_id]
1106
my_inv.remove_recursive_id(file_id)
1107
new_root.parent_id = None
1108
child_inv.add(new_root)
1109
self._write_inventory(my_inv)
1110
wt._write_inventory(child_inv)
1113
def _serialize(self, inventory, out_file):
1114
xml5.serializer_v5.write_inventory(self._inventory, out_file,
1117
def _deserialize(selt, in_file):
1118
return xml5.serializer_v5.read_inventory(in_file)
869
1120
def flush(self):
870
1121
"""Write the in memory inventory to disk."""
973
1237
except KeyError:
974
1238
yield fp[1:], c, fk, None, TreeEntry()
977
1241
if fk != 'directory':
980
# But do this child first
981
new_children = os.listdir(fap)
983
new_children = collections.deque(new_children)
984
stack.append((f_ie.file_id, fp, fap, new_children))
985
# Break out of inner loop, so that we start outer loop with child
1244
# But do this child first if recursing down
1246
new_children = os.listdir(fap)
1248
new_children = collections.deque(new_children)
1249
stack.append((f_ie.file_id, fp, fap, new_children))
1250
# Break out of inner loop,
1251
# so that we start outer loop with child
988
1254
# if we finished all children, pop it off the stack
991
1257
@needs_tree_write_lock
992
def move(self, from_paths, to_name):
1258
def move(self, from_paths, to_dir=None, after=False, **kwargs):
993
1259
"""Rename files.
995
to_name must exist in the inventory.
997
If to_name exists and is a directory, the files are moved into
998
it, keeping their old names.
1000
Note that to_name is only the last component of the new name;
1261
to_dir must exist in the inventory.
1263
If to_dir exists and is a directory, the files are moved into
1264
it, keeping their old names.
1266
Note that to_dir is only the last component of the new name;
1001
1267
this doesn't change the directory.
1269
For each entry in from_paths the move mode will be determined
1272
The first mode moves the file in the filesystem and updates the
1273
inventory. The second mode only updates the inventory without
1274
touching the file on the filesystem. This is the new mode introduced
1277
move uses the second mode if 'after == True' and the target is not
1278
versioned but present in the working tree.
1280
move uses the second mode if 'after == False' and the source is
1281
versioned but no longer in the working tree, and the target is not
1282
versioned but present in the working tree.
1284
move uses the first mode if 'after == False' and the source is
1285
versioned and present in the working tree, and the target is not
1286
versioned and not present in the working tree.
1288
Everything else results in an error.
1003
1290
This returns a list of (from_path, to_path) pairs for each
1004
1291
entry that is moved.
1007
## TODO: Option to move IDs only
1008
assert not isinstance(from_paths, basestring)
1296
# check for deprecated use of signature
1298
to_dir = kwargs.get('to_name', None)
1300
raise TypeError('You must supply a target directory')
1302
symbol_versioning.warn('The parameter to_name was deprecated'
1303
' in version 0.13. Use to_dir instead',
1306
# check destination directory
1307
if isinstance(from_paths, basestring):
1009
1309
inv = self.inventory
1010
to_abs = self.abspath(to_name)
1310
to_abs = self.abspath(to_dir)
1011
1311
if not isdir(to_abs):
1012
raise BzrError("destination %r is not a directory" % to_abs)
1013
if not self.has_filename(to_name):
1014
raise BzrError("destination %r not in working directory" % to_abs)
1015
to_dir_id = inv.path2id(to_name)
1016
if to_dir_id is None and to_name != '':
1017
raise BzrError("destination %r is not a versioned directory" % to_name)
1312
raise errors.BzrMoveFailedError('',to_dir,
1313
errors.NotADirectory(to_abs))
1314
if not self.has_filename(to_dir):
1315
raise errors.BzrMoveFailedError('',to_dir,
1316
errors.NotInWorkingDirectory(to_dir))
1317
to_dir_id = inv.path2id(to_dir)
1318
if to_dir_id is None:
1319
raise errors.BzrMoveFailedError('',to_dir,
1320
errors.NotVersionedError(path=str(to_dir)))
1018
1322
to_dir_ie = inv[to_dir_id]
1019
1323
if to_dir_ie.kind != 'directory':
1020
raise BzrError("destination %r is not a directory" % to_abs)
1022
to_idpath = inv.get_idpath(to_dir_id)
1024
for f in from_paths:
1025
if not self.has_filename(f):
1026
raise BzrError("%r does not exist in working tree" % f)
1027
f_id = inv.path2id(f)
1029
raise BzrError("%r is not versioned" % f)
1030
name_tail = splitpath(f)[-1]
1031
dest_path = pathjoin(to_name, name_tail)
1032
if self.has_filename(dest_path):
1033
raise BzrError("destination %r already exists" % dest_path)
1034
if f_id in to_idpath:
1035
raise BzrError("can't move %r to a subdirectory of itself" % f)
1037
# OK, so there's a race here, it's possible that someone will
1038
# create a file in this interval and then the rename might be
1039
# left half-done. But we should have caught most problems.
1040
orig_inv = deepcopy(self.inventory)
1324
raise errors.BzrMoveFailedError('',to_dir,
1325
errors.NotADirectory(to_abs))
1327
# create rename entries and tuples
1328
for from_rel in from_paths:
1329
from_tail = splitpath(from_rel)[-1]
1330
from_id = inv.path2id(from_rel)
1332
raise errors.BzrMoveFailedError(from_rel,to_dir,
1333
errors.NotVersionedError(path=str(from_rel)))
1335
from_entry = inv[from_id]
1336
from_parent_id = from_entry.parent_id
1337
to_rel = pathjoin(to_dir, from_tail)
1338
rename_entry = WorkingTree._RenameEntry(from_rel=from_rel,
1340
from_tail=from_tail,
1341
from_parent_id=from_parent_id,
1342
to_rel=to_rel, to_tail=from_tail,
1343
to_parent_id=to_dir_id)
1344
rename_entries.append(rename_entry)
1345
rename_tuples.append((from_rel, to_rel))
1347
# determine which move mode to use. checks also for movability
1348
rename_entries = self._determine_mv_mode(rename_entries, after)
1041
1350
original_modified = self._inventory_is_modified
1043
1352
if len(from_paths):
1044
1353
self._inventory_is_modified = True
1045
for f in from_paths:
1046
name_tail = splitpath(f)[-1]
1047
dest_path = pathjoin(to_name, name_tail)
1048
result.append((f, dest_path))
1049
inv.rename(inv.path2id(f), to_dir_id, name_tail)
1051
osutils.rename(self.abspath(f), self.abspath(dest_path))
1053
raise BzrError("failed to rename %r to %r: %s" %
1054
(f, dest_path, e[1]))
1354
self._move(rename_entries)
1056
1356
# restore the inventory on error
1057
self._set_inventory(orig_inv, dirty=original_modified)
1357
self._inventory_is_modified = original_modified
1059
1359
self._write_inventory(inv)
1360
return rename_tuples
1362
def _determine_mv_mode(self, rename_entries, after=False):
1363
"""Determines for each from-to pair if both inventory and working tree
1364
or only the inventory has to be changed.
1366
Also does basic plausability tests.
1368
inv = self.inventory
1370
for rename_entry in rename_entries:
1371
# store to local variables for easier reference
1372
from_rel = rename_entry.from_rel
1373
from_id = rename_entry.from_id
1374
to_rel = rename_entry.to_rel
1375
to_id = inv.path2id(to_rel)
1376
only_change_inv = False
1378
# check the inventory for source and destination
1380
raise errors.BzrMoveFailedError(from_rel,to_rel,
1381
errors.NotVersionedError(path=str(from_rel)))
1382
if to_id is not None:
1383
raise errors.BzrMoveFailedError(from_rel,to_rel,
1384
errors.AlreadyVersionedError(path=str(to_rel)))
1386
# try to determine the mode for rename (only change inv or change
1387
# inv and file system)
1389
if not self.has_filename(to_rel):
1390
raise errors.BzrMoveFailedError(from_id,to_rel,
1391
errors.NoSuchFile(path=str(to_rel),
1392
extra="New file has not been created yet"))
1393
only_change_inv = True
1394
elif not self.has_filename(from_rel) and self.has_filename(to_rel):
1395
only_change_inv = True
1396
elif self.has_filename(from_rel) and not self.has_filename(to_rel):
1397
only_change_inv = False
1398
elif (not self.case_sensitive
1399
and from_rel.lower() == to_rel.lower()
1400
and self.has_filename(from_rel)):
1401
only_change_inv = False
1403
# something is wrong, so lets determine what exactly
1404
if not self.has_filename(from_rel) and \
1405
not self.has_filename(to_rel):
1406
raise errors.BzrRenameFailedError(from_rel,to_rel,
1407
errors.PathsDoNotExist(paths=(str(from_rel),
1410
raise errors.RenameFailedFilesExist(from_rel, to_rel)
1411
rename_entry.only_change_inv = only_change_inv
1412
return rename_entries
1414
def _move(self, rename_entries):
1415
"""Moves a list of files.
1417
Depending on the value of the flag 'only_change_inv', the
1418
file will be moved on the file system or not.
1420
inv = self.inventory
1423
for entry in rename_entries:
1425
self._move_entry(entry)
1427
self._rollback_move(moved)
1431
def _rollback_move(self, moved):
1432
"""Try to rollback a previous move in case of an filesystem error."""
1433
inv = self.inventory
1436
self._move_entry(WorkingTree._RenameEntry(
1437
entry.to_rel, entry.from_id,
1438
entry.to_tail, entry.to_parent_id, entry.from_rel,
1439
entry.from_tail, entry.from_parent_id,
1440
entry.only_change_inv))
1441
except errors.BzrMoveFailedError, e:
1442
raise errors.BzrMoveFailedError( '', '', "Rollback failed."
1443
" The working tree is in an inconsistent state."
1444
" Please consider doing a 'bzr revert'."
1445
" Error message is: %s" % e)
1447
def _move_entry(self, entry):
1448
inv = self.inventory
1449
from_rel_abs = self.abspath(entry.from_rel)
1450
to_rel_abs = self.abspath(entry.to_rel)
1451
if from_rel_abs == to_rel_abs:
1452
raise errors.BzrMoveFailedError(entry.from_rel, entry.to_rel,
1453
"Source and target are identical.")
1455
if not entry.only_change_inv:
1457
osutils.rename(from_rel_abs, to_rel_abs)
1459
raise errors.BzrMoveFailedError(entry.from_rel,
1461
inv.rename(entry.from_id, entry.to_parent_id, entry.to_tail)
1062
1463
@needs_tree_write_lock
1063
def rename_one(self, from_rel, to_rel):
1464
def rename_one(self, from_rel, to_rel, after=False):
1064
1465
"""Rename one file.
1066
1467
This can change the directory or the filename or both.
1469
rename_one has several 'modes' to work. First, it can rename a physical
1470
file and change the file_id. That is the normal mode. Second, it can
1471
only change the file_id without touching any physical file. This is
1472
the new mode introduced in version 0.15.
1474
rename_one uses the second mode if 'after == True' and 'to_rel' is not
1475
versioned but present in the working tree.
1477
rename_one uses the second mode if 'after == False' and 'from_rel' is
1478
versioned but no longer in the working tree, and 'to_rel' is not
1479
versioned but present in the working tree.
1481
rename_one uses the first mode if 'after == False' and 'from_rel' is
1482
versioned and present in the working tree, and 'to_rel' is not
1483
versioned and not present in the working tree.
1485
Everything else results in an error.
1068
1487
inv = self.inventory
1069
if not self.has_filename(from_rel):
1070
raise BzrError("can't rename: old working file %r does not exist" % from_rel)
1071
if self.has_filename(to_rel):
1072
raise BzrError("can't rename: new working file %r already exists" % to_rel)
1074
file_id = inv.path2id(from_rel)
1076
raise BzrError("can't rename: old name %r is not versioned" % from_rel)
1078
entry = inv[file_id]
1079
from_parent = entry.parent_id
1080
from_name = entry.name
1082
if inv.path2id(to_rel):
1083
raise BzrError("can't rename: new name %r is already versioned" % to_rel)
1490
# create rename entries and tuples
1491
from_tail = splitpath(from_rel)[-1]
1492
from_id = inv.path2id(from_rel)
1494
# if file is missing in the inventory maybe it's in the basis_tree
1495
basis_tree = self.branch.basis_tree()
1496
from_id = basis_tree.path2id(from_rel)
1498
raise errors.BzrRenameFailedError(from_rel,to_rel,
1499
errors.NotVersionedError(path=str(from_rel)))
1500
# put entry back in the inventory so we can rename it
1501
from_entry = basis_tree.inventory[from_id].copy()
1504
from_entry = inv[from_id]
1505
from_parent_id = from_entry.parent_id
1085
1506
to_dir, to_tail = os.path.split(to_rel)
1086
1507
to_dir_id = inv.path2id(to_dir)
1087
if to_dir_id is None and to_dir != '':
1088
raise BzrError("can't determine destination directory id for %r" % to_dir)
1090
mutter("rename_one:")
1091
mutter(" file_id {%s}" % file_id)
1092
mutter(" from_rel %r" % from_rel)
1093
mutter(" to_rel %r" % to_rel)
1094
mutter(" to_dir %r" % to_dir)
1095
mutter(" to_dir_id {%s}" % to_dir_id)
1097
inv.rename(file_id, to_dir_id, to_tail)
1099
from_abs = self.abspath(from_rel)
1100
to_abs = self.abspath(to_rel)
1102
osutils.rename(from_abs, to_abs)
1104
inv.rename(file_id, from_parent, from_name)
1105
raise BzrError("failed to rename %r to %r: %s"
1106
% (from_abs, to_abs, e[1]))
1508
rename_entry = WorkingTree._RenameEntry(from_rel=from_rel,
1510
from_tail=from_tail,
1511
from_parent_id=from_parent_id,
1512
to_rel=to_rel, to_tail=to_tail,
1513
to_parent_id=to_dir_id)
1514
rename_entries.append(rename_entry)
1516
# determine which move mode to use. checks also for movability
1517
rename_entries = self._determine_mv_mode(rename_entries, after)
1519
# check if the target changed directory and if the target directory is
1521
if to_dir_id is None:
1522
raise errors.BzrMoveFailedError(from_rel,to_rel,
1523
errors.NotVersionedError(path=str(to_dir)))
1525
# all checks done. now we can continue with our actual work
1526
mutter('rename_one:\n'
1531
' to_dir_id {%s}\n',
1532
from_id, from_rel, to_rel, to_dir, to_dir_id)
1534
self._move(rename_entries)
1107
1535
self._write_inventory(inv)
1537
class _RenameEntry(object):
1538
def __init__(self, from_rel, from_id, from_tail, from_parent_id,
1539
to_rel, to_tail, to_parent_id, only_change_inv=False):
1540
self.from_rel = from_rel
1541
self.from_id = from_id
1542
self.from_tail = from_tail
1543
self.from_parent_id = from_parent_id
1544
self.to_rel = to_rel
1545
self.to_tail = to_tail
1546
self.to_parent_id = to_parent_id
1547
self.only_change_inv = only_change_inv
1109
1549
@needs_read_lock
1110
1550
def unknowns(self):
1111
1551
"""Return all unknown files.
1499
1908
def read_basis_inventory(self):
1500
1909
"""Read the cached basis inventory."""
1501
1910
path = self._basis_inventory_name()
1502
return self._control_files.get(path).read()
1911
return self._transport.get_bytes(path)
1504
1913
@needs_read_lock
1505
1914
def read_working_inventory(self):
1506
1915
"""Read the working inventory.
1508
1917
:raises errors.InventoryModified: read_working_inventory will fail
1509
1918
when the current in memory inventory has been modified.
1511
# conceptually this should be an implementation detail of the tree.
1920
# conceptually this should be an implementation detail of the tree.
1512
1921
# XXX: Deprecate this.
1513
1922
# ElementTree does its own conversion from UTF-8, so open in
1515
1924
if self._inventory_is_modified:
1516
1925
raise errors.InventoryModified(self)
1517
result = xml5.serializer_v5.read_inventory(
1518
self._control_files.get('inventory'))
1926
result = self._deserialize(self._transport.get('inventory'))
1519
1927
self._set_inventory(result, dirty=False)
1522
1930
@needs_tree_write_lock
1523
def remove(self, files, verbose=False, to_file=None):
1524
"""Remove nominated files from the working inventory..
1526
This does not remove their text. This does not run on XXX on what? RBC
1528
TODO: Refuse to remove modified files unless --force is given?
1530
TODO: Do something useful with directories.
1532
TODO: Should this remove the text or not? Tough call; not
1533
removing may be useful and the user can just use use rm, and
1534
is the opposite of add. Removing it is consistent with most
1535
other tools. Maybe an option.
1931
def remove(self, files, verbose=False, to_file=None, keep_files=True,
1933
"""Remove nominated files from the working inventory.
1935
:files: File paths relative to the basedir.
1936
:keep_files: If true, the files will also be kept.
1937
:force: Delete files and directories, even if they are changed and
1938
even if the directories are not empty.
1537
## TODO: Normalize names
1538
## TODO: Remove nested loops; better scalability
1539
1940
if isinstance(files, basestring):
1540
1941
files = [files]
1542
inv = self.inventory
1544
# do this before any modifications
1946
unknown_nested_files=set()
1948
def recurse_directory_to_add_files(directory):
1949
# Recurse directory and add all files
1950
# so we can check if they have changed.
1951
for parent_info, file_infos in\
1952
self.walkdirs(directory):
1953
for relpath, basename, kind, lstat, fileid, kind in file_infos:
1954
# Is it versioned or ignored?
1955
if self.path2id(relpath) or self.is_ignored(relpath):
1956
# Add nested content for deletion.
1957
new_files.add(relpath)
1959
# Files which are not versioned and not ignored
1960
# should be treated as unknown.
1961
unknown_nested_files.add((relpath, None, kind))
1963
for filename in files:
1964
# Get file name into canonical form.
1965
abspath = self.abspath(filename)
1966
filename = self.relpath(abspath)
1967
if len(filename) > 0:
1968
new_files.add(filename)
1969
recurse_directory_to_add_files(filename)
1971
files = list(new_files)
1974
return # nothing to do
1976
# Sort needed to first handle directory content before the directory
1977
files.sort(reverse=True)
1979
# Bail out if we are going to delete files we shouldn't
1980
if not keep_files and not force:
1981
has_changed_files = len(unknown_nested_files) > 0
1982
if not has_changed_files:
1983
for (file_id, path, content_change, versioned, parent_id, name,
1984
kind, executable) in self.iter_changes(self.basis_tree(),
1985
include_unchanged=True, require_versioned=False,
1986
want_unversioned=True, specific_files=files):
1987
if versioned == (False, False):
1988
# The record is unknown ...
1989
if not self.is_ignored(path[1]):
1990
# ... but not ignored
1991
has_changed_files = True
1993
elif content_change and (kind[1] is not None):
1994
# Versioned and changed, but not deleted
1995
has_changed_files = True
1998
if has_changed_files:
1999
# Make delta show ALL applicable changes in error message.
2000
tree_delta = self.changes_from(self.basis_tree(),
2001
require_versioned=False, want_unversioned=True,
2002
specific_files=files)
2003
for unknown_file in unknown_nested_files:
2004
if unknown_file not in tree_delta.unversioned:
2005
tree_delta.unversioned.extend((unknown_file,))
2006
raise errors.BzrRemoveChangedFilesError(tree_delta)
2008
# Build inv_delta and delete files where applicable,
2009
# do this before any modifications to inventory.
1545
2010
for f in files:
1546
fid = inv.path2id(f)
2011
fid = self.path2id(f)
1548
# TODO: Perhaps make this just a warning, and continue?
1549
# This tends to happen when
1550
raise NotVersionedError(path=f)
1552
# having remove it, it must be either ignored or unknown
1553
if self.is_ignored(f):
1557
textui.show_status(new_status, inv[fid].kind, f,
1561
self._write_inventory(inv)
2014
message = "%s is not versioned." % (f,)
2017
# having removed it, it must be either ignored or unknown
2018
if self.is_ignored(f):
2022
textui.show_status(new_status, self.kind(fid), f,
2025
inv_delta.append((f, None, fid, None))
2026
message = "removed %s" % (f,)
2029
abs_path = self.abspath(f)
2030
if osutils.lexists(abs_path):
2031
if (osutils.isdir(abs_path) and
2032
len(os.listdir(abs_path)) > 0):
2034
osutils.rmtree(abs_path)
2036
message = "%s is not an empty directory "\
2037
"and won't be deleted." % (f,)
2039
osutils.delete_any(abs_path)
2040
message = "deleted %s" % (f,)
2041
elif message is not None:
2042
# Only care if we haven't done anything yet.
2043
message = "%s does not exist." % (f,)
2045
# Print only one message (if any) per file.
2046
if message is not None:
2048
self.apply_inventory_delta(inv_delta)
1563
2050
@needs_tree_write_lock
1564
def revert(self, filenames, old_tree=None, backups=True,
1565
pb=DummyProgress()):
2051
def revert(self, filenames=None, old_tree=None, backups=True,
2052
pb=DummyProgress(), report_changes=False):
1566
2053
from bzrlib.conflicts import resolve
2056
symbol_versioning.warn('Using [] to revert all files is deprecated'
2057
' as of bzr 0.91. Please use None (the default) instead.',
2058
DeprecationWarning, stacklevel=2)
1567
2059
if old_tree is None:
1568
old_tree = self.basis_tree()
1569
conflicts = transform.revert(self, old_tree, filenames, backups, pb)
1570
if not len(filenames):
1571
self.set_parent_ids(self.get_parent_ids()[:1])
2060
basis_tree = self.basis_tree()
2061
basis_tree.lock_read()
2062
old_tree = basis_tree
1574
resolve(self, filenames, ignore_misses=True)
2066
conflicts = transform.revert(self, old_tree, filenames, backups, pb,
2068
if filenames is None and len(self.get_parent_ids()) > 1:
2070
last_revision = self.last_revision()
2071
if last_revision != _mod_revision.NULL_REVISION:
2072
if basis_tree is None:
2073
basis_tree = self.basis_tree()
2074
basis_tree.lock_read()
2075
parent_trees.append((last_revision, basis_tree))
2076
self.set_parent_trees(parent_trees)
2079
resolve(self, filenames, ignore_misses=True, recursive=True)
2081
if basis_tree is not None:
1575
2083
return conflicts
2085
def revision_tree(self, revision_id):
2086
"""See Tree.revision_tree.
2088
WorkingTree can supply revision_trees for the basis revision only
2089
because there is only one cached inventory in the bzr directory.
2091
if revision_id == self.last_revision():
2093
xml = self.read_basis_inventory()
2094
except errors.NoSuchFile:
2098
inv = xml7.serializer_v7.read_inventory_from_string(xml)
2099
# dont use the repository revision_tree api because we want
2100
# to supply the inventory.
2101
if inv.revision_id == revision_id:
2102
return revisiontree.RevisionTree(self.branch.repository,
2104
except errors.BadInventoryFormat:
2106
# raise if there was no inventory, or if we read the wrong inventory.
2107
raise errors.NoSuchRevisionInTree(self, revision_id)
1577
2109
# XXX: This method should be deprecated in favour of taking in a proper
1578
2110
# new Inventory object.
1579
2111
@needs_tree_write_lock
1580
2112
def set_inventory(self, new_inventory_list):
1581
2113
from bzrlib.inventory import (Inventory,
1582
2114
InventoryDirectory,
1586
2117
inv = Inventory(self.get_root_id())
1794
2358
file_id=self.path2id(conflicted)))
1795
2359
return conflicts
2361
def walkdirs(self, prefix=""):
2362
"""Walk the directories of this tree.
2364
returns a generator which yields items in the form:
2365
((curren_directory_path, fileid),
2366
[(file1_path, file1_name, file1_kind, (lstat), file1_id,
2369
This API returns a generator, which is only valid during the current
2370
tree transaction - within a single lock_read or lock_write duration.
2372
If the tree is not locked, it may cause an error to be raised,
2373
depending on the tree implementation.
2375
disk_top = self.abspath(prefix)
2376
if disk_top.endswith('/'):
2377
disk_top = disk_top[:-1]
2378
top_strip_len = len(disk_top) + 1
2379
inventory_iterator = self._walkdirs(prefix)
2380
disk_iterator = osutils.walkdirs(disk_top, prefix)
2382
current_disk = disk_iterator.next()
2383
disk_finished = False
2385
if not (e.errno == errno.ENOENT or
2386
(sys.platform == 'win32' and e.errno == ERROR_PATH_NOT_FOUND)):
2389
disk_finished = True
2391
current_inv = inventory_iterator.next()
2392
inv_finished = False
2393
except StopIteration:
2396
while not inv_finished or not disk_finished:
2398
((cur_disk_dir_relpath, cur_disk_dir_path_from_top),
2399
cur_disk_dir_content) = current_disk
2401
((cur_disk_dir_relpath, cur_disk_dir_path_from_top),
2402
cur_disk_dir_content) = ((None, None), None)
2403
if not disk_finished:
2404
# strip out .bzr dirs
2405
if (cur_disk_dir_path_from_top[top_strip_len:] == '' and
2406
len(cur_disk_dir_content) > 0):
2407
# osutils.walkdirs can be made nicer -
2408
# yield the path-from-prefix rather than the pathjoined
2410
bzrdir_loc = bisect_left(cur_disk_dir_content,
2412
if (bzrdir_loc < len(cur_disk_dir_content)
2413
and self.bzrdir.is_control_filename(
2414
cur_disk_dir_content[bzrdir_loc][0])):
2415
# we dont yield the contents of, or, .bzr itself.
2416
del cur_disk_dir_content[bzrdir_loc]
2418
# everything is unknown
2421
# everything is missing
2424
direction = cmp(current_inv[0][0], cur_disk_dir_relpath)
2426
# disk is before inventory - unknown
2427
dirblock = [(relpath, basename, kind, stat, None, None) for
2428
relpath, basename, kind, stat, top_path in
2429
cur_disk_dir_content]
2430
yield (cur_disk_dir_relpath, None), dirblock
2432
current_disk = disk_iterator.next()
2433
except StopIteration:
2434
disk_finished = True
2436
# inventory is before disk - missing.
2437
dirblock = [(relpath, basename, 'unknown', None, fileid, kind)
2438
for relpath, basename, dkind, stat, fileid, kind in
2440
yield (current_inv[0][0], current_inv[0][1]), dirblock
2442
current_inv = inventory_iterator.next()
2443
except StopIteration:
2446
# versioned present directory
2447
# merge the inventory and disk data together
2449
for relpath, subiterator in itertools.groupby(sorted(
2450
current_inv[1] + cur_disk_dir_content,
2451
key=operator.itemgetter(0)), operator.itemgetter(1)):
2452
path_elements = list(subiterator)
2453
if len(path_elements) == 2:
2454
inv_row, disk_row = path_elements
2455
# versioned, present file
2456
dirblock.append((inv_row[0],
2457
inv_row[1], disk_row[2],
2458
disk_row[3], inv_row[4],
2460
elif len(path_elements[0]) == 5:
2462
dirblock.append((path_elements[0][0],
2463
path_elements[0][1], path_elements[0][2],
2464
path_elements[0][3], None, None))
2465
elif len(path_elements[0]) == 6:
2466
# versioned, absent file.
2467
dirblock.append((path_elements[0][0],
2468
path_elements[0][1], 'unknown', None,
2469
path_elements[0][4], path_elements[0][5]))
2471
raise NotImplementedError('unreachable code')
2472
yield current_inv[0], dirblock
2474
current_inv = inventory_iterator.next()
2475
except StopIteration:
2478
current_disk = disk_iterator.next()
2479
except StopIteration:
2480
disk_finished = True
2482
def _walkdirs(self, prefix=""):
2483
"""Walk the directories of this tree.
2485
:prefix: is used as the directrory to start with.
2486
returns a generator which yields items in the form:
2487
((curren_directory_path, fileid),
2488
[(file1_path, file1_name, file1_kind, None, file1_id,
2491
_directory = 'directory'
2492
# get the root in the inventory
2493
inv = self.inventory
2494
top_id = inv.path2id(prefix)
2498
pending = [(prefix, '', _directory, None, top_id, None)]
2501
currentdir = pending.pop()
2502
# 0 - relpath, 1- basename, 2- kind, 3- stat, 4-id, 5-kind
2503
top_id = currentdir[4]
2505
relroot = currentdir[0] + '/'
2508
# FIXME: stash the node in pending
2510
if entry.kind == 'directory':
2511
for name, child in entry.sorted_children():
2512
dirblock.append((relroot + name, name, child.kind, None,
2513
child.file_id, child.kind
2515
yield (currentdir[0], entry.file_id), dirblock
2516
# push the user specified dirs from dirblock
2517
for dir in reversed(dirblock):
2518
if dir[2] == _directory:
2521
@needs_tree_write_lock
2522
def auto_resolve(self):
2523
"""Automatically resolve text conflicts according to contents.
2525
Only text conflicts are auto_resolvable. Files with no conflict markers
2526
are considered 'resolved', because bzr always puts conflict markers
2527
into files that have text conflicts. The corresponding .THIS .BASE and
2528
.OTHER files are deleted, as per 'resolve'.
2529
:return: a tuple of ConflictLists: (un_resolved, resolved).
2531
un_resolved = _mod_conflicts.ConflictList()
2532
resolved = _mod_conflicts.ConflictList()
2533
conflict_re = re.compile('^(<{7}|={7}|>{7})')
2534
for conflict in self.conflicts():
2535
if (conflict.typestring != 'text conflict' or
2536
self.kind(conflict.file_id) != 'file'):
2537
un_resolved.append(conflict)
2539
my_file = open(self.id2abspath(conflict.file_id), 'rb')
2541
for line in my_file:
2542
if conflict_re.search(line):
2543
un_resolved.append(conflict)
2546
resolved.append(conflict)
2549
resolved.remove_files(self)
2550
self.set_conflicts(un_resolved)
2551
return un_resolved, resolved
2554
def _check(self, references):
2555
"""Check the tree for consistency.
2557
:param references: A dict with keys matching the items returned by
2558
self._get_check_refs(), and values from looking those keys up in
2561
tree_basis = self.basis_tree()
2562
tree_basis.lock_read()
2564
repo_basis = references[('trees', self.last_revision())]
2565
if len(list(repo_basis.iter_changes(tree_basis))) > 0:
2566
raise errors.BzrCheckError(
2567
"Mismatched basis inventory content.")
2572
def _validate(self):
2573
"""Validate internal structures.
2575
This is meant mostly for the test suite. To give it a chance to detect
2576
corruption after actions have occurred. The default implementation is a
2579
:return: None. An exception should be raised if there is an error.
2584
def _get_rules_searcher(self, default_searcher):
2585
"""See Tree._get_rules_searcher."""
2586
if self._rules_searcher is None:
2587
self._rules_searcher = super(WorkingTree,
2588
self)._get_rules_searcher(default_searcher)
2589
return self._rules_searcher
2591
def get_shelf_manager(self):
2592
"""Return the ShelfManager for this WorkingTree."""
2593
from bzrlib.shelf import ShelfManager
2594
return ShelfManager(self, self._transport)
1798
2597
class WorkingTree2(WorkingTree):
1799
2598
"""This is the Format 2 working tree.
1801
This was the first weave based working tree.
2600
This was the first weave based working tree.
1802
2601
- uses os locks for locking.
1803
2602
- uses the branch last-revision.
2605
def __init__(self, *args, **kwargs):
2606
super(WorkingTree2, self).__init__(*args, **kwargs)
2607
# WorkingTree2 has more of a constraint that self._inventory must
2608
# exist. Because this is an older format, we don't mind the overhead
2609
# caused by the extra computation here.
2611
# Newer WorkingTree's should only have self._inventory set when they
2613
if self._inventory is None:
2614
self.read_working_inventory()
2616
def _get_check_refs(self):
2617
"""Return the references needed to perform a check of this tree."""
2618
return [('trees', self.last_revision())]
1806
2620
def lock_tree_write(self):
1807
2621
"""See WorkingTree.lock_tree_write().
1991
2821
def unregister_format(klass, format):
1992
assert klass._formats[format.get_format_string()] is format
1993
2822
del klass._formats[format.get_format_string()]
1997
2825
class WorkingTreeFormat2(WorkingTreeFormat):
1998
"""The second working tree format.
2826
"""The second working tree format.
2000
2828
This format modified the hash cache from the format 1 hash cache.
2831
upgrade_recommended = True
2003
2833
def get_format_description(self):
2004
2834
"""See WorkingTreeFormat.get_format_description()."""
2005
2835
return "Working tree format 2"
2007
def stub_initialize_remote(self, control_files):
2008
"""As a special workaround create critical control files for a remote working tree
2837
def _stub_initialize_on_transport(self, transport, file_mode):
2838
"""Workaround: create control files for a remote working tree.
2010
2840
This ensures that it can later be updated and dealt with locally,
2011
since BzrDirFormat6 and BzrDirFormat5 cannot represent dirs with
2841
since BzrDirFormat6 and BzrDirFormat5 cannot represent dirs with
2012
2842
no working tree. (See bug #43064).
2014
2844
sio = StringIO()
2016
xml5.serializer_v5.write_inventory(inv, sio)
2845
inv = inventory.Inventory()
2846
xml5.serializer_v5.write_inventory(inv, sio, working=True)
2018
control_files.put('inventory', sio)
2020
control_files.put_utf8('pending-merges', '')
2023
def initialize(self, a_bzrdir, revision_id=None):
2848
transport.put_file('inventory', sio, file_mode)
2849
transport.put_bytes('pending-merges', '', file_mode)
2851
def initialize(self, a_bzrdir, revision_id=None, from_branch=None,
2852
accelerator_tree=None, hardlink=False):
2024
2853
"""See WorkingTreeFormat.initialize()."""
2025
2854
if not isinstance(a_bzrdir.transport, LocalTransport):
2026
2855
raise errors.NotLocalUrl(a_bzrdir.transport.base)
2027
branch = a_bzrdir.open_branch()
2028
if revision_id is not None:
2031
revision_history = branch.revision_history()
2033
position = revision_history.index(revision_id)
2035
raise errors.NoSuchRevision(branch, revision_id)
2036
branch.set_revision_history(revision_history[:position + 1])
2039
revision = branch.last_revision()
2856
if from_branch is not None:
2857
branch = from_branch
2859
branch = a_bzrdir.open_branch()
2860
if revision_id is None:
2861
revision_id = _mod_revision.ensure_null(branch.last_revision())
2864
branch.generate_revision_history(revision_id)
2867
inv = inventory.Inventory()
2041
2868
wt = WorkingTree2(a_bzrdir.root_transport.local_abspath('.'),
2044
2871
_internal=True,
2046
2873
_bzrdir=a_bzrdir)
2047
basis_tree = branch.repository.revision_tree(revision)
2874
basis_tree = branch.repository.revision_tree(revision_id)
2048
2875
if basis_tree.inventory.root is not None:
2049
wt.set_root_id(basis_tree.inventory.root.file_id)
2876
wt.set_root_id(basis_tree.get_root_id())
2050
2877
# set the parent list and cache the basis tree.
2051
wt.set_parent_trees([(revision, basis_tree)])
2878
if _mod_revision.is_null(revision_id):
2881
parent_trees = [(revision_id, basis_tree)]
2882
wt.set_parent_trees(parent_trees)
2052
2883
transform.build_tree(basis_tree, wt)
2163
3016
raise NotImplementedError
2164
3017
if not isinstance(a_bzrdir.transport, LocalTransport):
2165
3018
raise errors.NotLocalUrl(a_bzrdir.transport.base)
2166
return self._open(a_bzrdir, self._open_control_files(a_bzrdir))
3019
wt = self._open(a_bzrdir, self._open_control_files(a_bzrdir))
2168
3022
def _open(self, a_bzrdir, control_files):
2169
3023
"""Open the tree itself.
2171
3025
:param a_bzrdir: the dir for the tree.
2172
3026
:param control_files: the control files for the tree.
2174
return WorkingTree3(a_bzrdir.root_transport.local_abspath('.'),
2178
_control_files=control_files)
3028
return self._tree_class(a_bzrdir.root_transport.local_abspath('.'),
3032
_control_files=control_files)
2180
3034
def __str__(self):
2181
3035
return self.get_format_string()
3038
__default_format = WorkingTreeFormat6()
3039
WorkingTreeFormat.register_format(__default_format)
3040
WorkingTreeFormat.register_format(WorkingTreeFormat5())
3041
WorkingTreeFormat.register_format(WorkingTreeFormat4())
3042
WorkingTreeFormat.register_format(WorkingTreeFormat3())
3043
WorkingTreeFormat.set_default_format(__default_format)
2184
3044
# formats which have no format string are not discoverable
2185
3045
# and not independently creatable, so are not registered.
2186
__default_format = WorkingTreeFormat3()
2187
WorkingTreeFormat.register_format(__default_format)
2188
WorkingTreeFormat.set_default_format(__default_format)
2189
3046
_legacy_formats = [WorkingTreeFormat2(),
2193
class WorkingTreeTestProviderAdapter(object):
2194
"""A tool to generate a suite testing multiple workingtree formats at once.
2196
This is done by copying the test once for each transport and injecting
2197
the transport_server, transport_readonly_server, and workingtree_format
2198
classes into each copy. Each copy is also given a new id() to make it
2202
def __init__(self, transport_server, transport_readonly_server, formats):
2203
self._transport_server = transport_server
2204
self._transport_readonly_server = transport_readonly_server
2205
self._formats = formats
2207
def _clone_test(self, test, bzrdir_format, workingtree_format, variation):
2208
"""Clone test for adaption."""
2209
new_test = deepcopy(test)
2210
new_test.transport_server = self._transport_server
2211
new_test.transport_readonly_server = self._transport_readonly_server
2212
new_test.bzrdir_format = bzrdir_format
2213
new_test.workingtree_format = workingtree_format
2214
def make_new_test_id():
2215
new_id = "%s(%s)" % (test.id(), variation)
2216
return lambda: new_id
2217
new_test.id = make_new_test_id()
2220
def adapt(self, test):
2221
from bzrlib.tests import TestSuite
2222
result = TestSuite()
2223
for workingtree_format, bzrdir_format in self._formats:
2224
new_test = self._clone_test(
2227
workingtree_format, workingtree_format.__class__.__name__)
2228
result.addTest(new_test)
added
removed
bzrlib/workingtree.py
