29
29
WorkingTree.open(dir).
32
# TODO: Give the workingtree sole responsibility for the working inventory;
33
# remove the variable and references to it from the branch. This may require
34
# updating the commit code so as to update the inventory within the working
35
# copy, and making sure there's only one WorkingTree for any directory on disk.
36
# At the moment they may alias the inventory and have old copies of it in
37
# memory. (Now done? -- mbp 20060309)
33
39
from cStringIO import StringIO
37
42
from bzrlib.lazy_import import lazy_import
38
43
lazy_import(globals(), """
39
from bisect import bisect_left
45
from copy import deepcopy
48
52
from bzrlib import (
51
54
conflicts as _mod_conflicts,
60
revision as _mod_revision,
69
67
import bzrlib.branch
70
68
from bzrlib.transport import get_transport
71
from bzrlib.workingtree_4 import (
78
72
from bzrlib import symbol_versioning
79
73
from bzrlib.decorators import needs_read_lock, needs_write_lock
80
from bzrlib.lockable_files import LockableFiles
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
81
86
from bzrlib.lockdir import LockDir
82
87
import bzrlib.mutabletree
83
88
from bzrlib.mutabletree import needs_tree_write_lock
84
from bzrlib import osutils
85
89
from bzrlib.osutils import (
93
99
supports_executable,
95
from bzrlib.filters import filtered_input_file
96
101
from bzrlib.trace import mutter, note
97
102
from bzrlib.transport.local import LocalTransport
98
from bzrlib.revision import CURRENT_REVISION
104
from bzrlib.progress import DummyProgress, ProgressPhase
105
from bzrlib.revision import NULL_REVISION, CURRENT_REVISION
106
import bzrlib.revisiontree
99
107
from bzrlib.rio import RioReader, rio_file, Stanza
100
from bzrlib.symbol_versioning import (
102
DEPRECATED_PARAMETER,
108
from bzrlib.symbol_versioning import (deprecated_passed,
111
DEPRECATED_PARAMETER,
106
118
MERGE_MODIFIED_HEADER_1 = "BZR merge-modified list format 1"
107
# TODO: Modifying the conflict objects or their type is currently nearly
108
# impossible as there is no clear relationship between the working tree format
109
# and the conflict list file format.
110
119
CONFLICT_HEADER_1 = "BZR conflict list format 1"
112
ERROR_PATH_NOT_FOUND = 3 # WindowsError errno code, equivalent to ENOENT
122
@deprecated_function(zero_thirteen)
123
def gen_file_id(name):
124
"""Return new file id for the basename 'name'.
126
Use bzrlib.generate_ids.gen_file_id() instead
128
return generate_ids.gen_file_id(name)
131
@deprecated_function(zero_thirteen)
133
"""Return a new tree-root file id.
135
This has been deprecated in favor of bzrlib.generate_ids.gen_root_id()
137
return generate_ids.gen_root_id()
115
140
class TreeEntry(object):
116
141
"""An entry that implements the minimum interface used by commands.
118
This needs further inspection, it may be better to have
143
This needs further inspection, it may be better to have
119
144
InventoryEntries without ids - though that seems wrong. For now,
120
145
this is a parallel hierarchy to InventoryEntry, and needs to become
121
146
one of several things: decorates to that hierarchy, children of, or
411
386
# no parents, return an empty revision tree.
412
387
# in the future this should return the tree for
413
388
# 'empty:' - the implicit root empty tree.
414
return self.branch.repository.revision_tree(
415
_mod_revision.NULL_REVISION)
417
return self.revision_tree(revision_id)
418
except errors.NoSuchRevision:
389
return self.branch.repository.revision_tree(None)
392
xml = self.read_basis_inventory()
393
inv = xml6.serializer_v6.read_inventory_from_string(xml)
394
if inv is not None and inv.revision_id == revision_id:
395
return bzrlib.revisiontree.RevisionTree(
396
self.branch.repository, inv, revision_id)
397
except (NoSuchFile, errors.BadInventoryFormat):
420
399
# No cached copy available, retrieve from the repository.
421
400
# FIXME? RBC 20060403 should we cache the inventory locally
422
401
# at this point ?
424
403
return self.branch.repository.revision_tree(revision_id)
425
except (errors.RevisionNotPresent, errors.NoSuchRevision):
404
except errors.RevisionNotPresent:
426
405
# the basis tree *may* be a ghost or a low level error may have
427
# occurred. If the revision is present, its a problem, if its not
406
# occured. If the revision is present, its a problem, if its not
429
408
if self.branch.repository.has_revision(revision_id):
431
410
# the basis tree is a ghost so return an empty tree.
432
return self.branch.repository.revision_tree(
433
_mod_revision.NULL_REVISION)
436
self._flush_ignore_list_cache()
411
return self.branch.repository.revision_tree(None)
414
@deprecated_method(zero_eight)
415
def create(branch, directory):
416
"""Create a workingtree for branch at directory.
418
If existing_directory already exists it must have a .bzr directory.
419
If it does not exist, it will be created.
421
This returns a new WorkingTree object for the new checkout.
423
TODO FIXME RBC 20060124 when we have checkout formats in place this
424
should accept an optional revisionid to checkout [and reject this if
425
checking out into the same dir as a pre-checkout-aware branch format.]
427
XXX: When BzrDir is present, these should be created through that
430
warnings.warn('delete WorkingTree.create', stacklevel=3)
431
transport = get_transport(directory)
432
if branch.bzrdir.root_transport.base == transport.base:
434
return branch.bzrdir.create_workingtree()
435
# different directory,
436
# create a branch reference
437
# and now a working tree.
438
raise NotImplementedError
441
@deprecated_method(zero_eight)
442
def create_standalone(directory):
443
"""Create a checkout and a branch and a repo at directory.
445
Directory must exist and be empty.
447
please use BzrDir.create_standalone_workingtree
449
return bzrdir.BzrDir.create_standalone_workingtree(directory)
438
451
def relpath(self, path):
439
452
"""Return the local path portion from a given path.
441
The path may be absolute or relative. If its a relative path it is
454
The path may be absolute or relative. If its a relative path it is
442
455
interpreted relative to the python current working directory.
444
457
return osutils.relpath(self.basedir, path)
492
478
incorrectly attributed to CURRENT_REVISION (but after committing, the
493
479
attribution will be correct).
495
maybe_file_parent_keys = []
496
for parent_id in self.get_parent_ids():
498
parent_tree = self.revision_tree(parent_id)
499
except errors.NoSuchRevisionInTree:
500
parent_tree = self.branch.repository.revision_tree(parent_id)
501
parent_tree.lock_read()
503
if file_id not in parent_tree:
505
ie = parent_tree.inventory[file_id]
506
if ie.kind != 'file':
507
# Note: this is slightly unnecessary, because symlinks and
508
# directories have a "text" which is the empty text, and we
509
# know that won't mess up annotations. But it seems cleaner
511
parent_text_key = (file_id, ie.revision)
512
if parent_text_key not in maybe_file_parent_keys:
513
maybe_file_parent_keys.append(parent_text_key)
516
graph = _mod_graph.Graph(self.branch.repository.texts)
517
heads = graph.heads(maybe_file_parent_keys)
518
file_parent_keys = []
519
for key in maybe_file_parent_keys:
521
file_parent_keys.append(key)
523
# Now we have the parents of this content
524
annotator = self.branch.repository.texts.get_annotator()
525
text = self.get_file(file_id).read()
526
this_key =(file_id, default_revision)
527
annotator.add_special_text(this_key, file_parent_keys, text)
528
annotations = [(key[-1], line)
529
for key, line in annotator.annotate_flat(this_key)]
532
def _get_ancestors(self, default_revision):
533
ancestors = set([default_revision])
534
for parent_id in self.get_parent_ids():
535
ancestors.update(self.branch.repository.get_ancestry(
536
parent_id, topo_sorted=False))
481
basis = self.basis_tree()
482
changes = self._iter_changes(basis, True, [file_id]).next()
483
changed_content, kind = changes[2], changes[6]
484
if not changed_content:
485
return basis.annotate_iter(file_id)
489
if kind[0] != 'file':
492
old_lines = list(basis.annotate_iter(file_id))
493
return annotate.reannotate(old_lines,
494
self.get_file(file_id).readlines(),
539
497
def get_parent_ids(self):
540
498
"""See Tree.get_parent_ids.
542
500
This implementation reads the pending merges list and last_revision
543
501
value and uses that to decide what the parents list should be.
545
last_rev = _mod_revision.ensure_null(self._last_revision())
546
if _mod_revision.NULL_REVISION == last_rev:
503
last_rev = self._last_revision()
549
507
parents = [last_rev]
551
merges_bytes = self._transport.get_bytes('pending-merges')
552
except errors.NoSuchFile:
509
merges_file = self._control_files.get_utf8('pending-merges')
555
for l in osutils.split_lines(merges_bytes):
556
revision_id = l.rstrip('\n')
557
parents.append(revision_id)
513
for l in merges_file.readlines():
514
parents.append(l.rstrip('\n'))
561
518
def get_root_id(self):
562
519
"""Return the id of this trees root"""
563
520
return self._inventory.root.file_id
565
522
def _get_store_filename(self, file_id):
566
523
## XXX: badly named; this is not in the store at all
567
524
return self.abspath(self.id2path(file_id))
570
def clone(self, to_bzrdir, revision_id=None):
527
def clone(self, to_bzrdir, revision_id=None, basis=None):
571
528
"""Duplicate this working tree into to_bzr, including all state.
573
530
Specifically modified files are kept as modified, but
574
531
ignored and unknown files are discarded.
576
533
If you want to make a new line of development, see bzrdir.sprout()
579
If not None, the cloned tree will have its last revision set to
580
revision, and difference between the source trees last revision
536
If not None, the cloned tree will have its last revision set to
537
revision, and and difference between the source trees last revision
581
538
and this one merged in.
541
If not None, a closer copy of a tree which may have some files in
542
common, and which file content should be preferentially copied from.
583
544
# assumes the target bzr dir format is compatible.
584
result = to_bzrdir.create_workingtree()
545
result = self._format.initialize(to_bzrdir)
585
546
self.copy_content_into(result, revision_id)
883
769
def set_merge_modified(self, modified_hashes):
884
770
def iter_stanzas():
885
771
for file_id, hash in modified_hashes.iteritems():
886
yield Stanza(file_id=file_id.decode('utf8'), hash=hash)
772
yield Stanza(file_id=file_id, hash=hash)
887
773
self._put_rio('merge-hashes', iter_stanzas(), MERGE_MODIFIED_HEADER_1)
889
def _sha_from_stat(self, path, stat_result):
890
"""Get a sha digest from the tree's stat cache.
892
The default implementation assumes no stat cache is present.
894
:param path: The path.
895
:param stat_result: The stat result being looked up.
775
@needs_tree_write_lock
899
776
def _put_rio(self, filename, stanzas, header):
900
self._must_be_locked()
901
777
my_file = rio_file(stanzas, header)
902
self._transport.put_file(filename, my_file,
903
mode=self.bzrdir._get_file_mode())
778
self._control_files.put(filename, my_file)
905
780
@needs_write_lock # because merge pulls data into the branch.
906
def merge_from_branch(self, branch, to_revision=None, from_revision=None,
907
merge_type=None, force=False):
781
def merge_from_branch(self, branch, to_revision=None):
908
782
"""Merge from a branch into this working tree.
910
784
:param branch: The branch to merge from.
911
:param to_revision: If non-None, the merge will merge to to_revision,
912
but not beyond it. to_revision does not need to be in the history
913
of the branch when it is supplied. If None, to_revision defaults to
785
:param to_revision: If non-None, the merge will merge to to_revision, but
786
not beyond it. to_revision does not need to be in the history of
787
the branch when it is supplied. If None, to_revision defaults to
914
788
branch.last_revision().
916
790
from bzrlib.merge import Merger, Merge3Merger
917
merger = Merger(self.branch, this_tree=self)
918
# check that there are no local alterations
919
if not force and self.has_changes():
920
raise errors.UncommittedChanges(self)
921
if to_revision is None:
922
to_revision = _mod_revision.ensure_null(branch.last_revision())
923
merger.other_rev_id = to_revision
924
if _mod_revision.is_null(merger.other_rev_id):
925
raise errors.NoCommits(branch)
926
self.branch.fetch(branch, last_revision=merger.other_rev_id)
927
merger.other_basis = merger.other_rev_id
928
merger.other_tree = self.branch.repository.revision_tree(
930
merger.other_branch = branch
931
if from_revision is None:
791
pb = bzrlib.ui.ui_factory.nested_progress_bar()
793
merger = Merger(self.branch, this_tree=self, pb=pb)
794
merger.pp = ProgressPhase("Merge phase", 5, pb)
795
merger.pp.next_phase()
796
# check that there are no
798
merger.check_basis(check_clean=True, require_commits=False)
799
if to_revision is None:
800
to_revision = branch.last_revision()
801
merger.other_rev_id = to_revision
802
if merger.other_rev_id is None:
803
raise error.NoCommits(branch)
804
self.branch.fetch(branch, last_revision=merger.other_rev_id)
805
merger.other_basis = merger.other_rev_id
806
merger.other_tree = self.branch.repository.revision_tree(
808
merger.pp.next_phase()
932
809
merger.find_base()
934
merger.set_base_revision(from_revision, branch)
935
if merger.base_rev_id == merger.other_rev_id:
936
raise errors.PointlessMerge
937
merger.backup_files = False
938
if merge_type is None:
810
if merger.base_rev_id == merger.other_rev_id:
811
raise errors.PointlessMerge
812
merger.backup_files = False
939
813
merger.merge_type = Merge3Merger
941
merger.merge_type = merge_type
942
merger.set_interesting_files(None)
943
merger.show_base = False
944
merger.reprocess = False
945
conflicts = merger.do_merge()
814
merger.set_interesting_files(None)
815
merger.show_base = False
816
merger.reprocess = False
817
conflicts = merger.do_merge()
950
824
def merge_modified(self):
951
"""Return a dictionary of files modified by a merge.
953
The list is initialized by WorkingTree.set_merge_modified, which is
954
typically called after we make some automatic updates to the tree
957
This returns a map of file_id->sha1, containing only files which are
958
still in the working inventory and have that text hash.
961
hashfile = self._transport.get('merge-hashes')
962
except errors.NoSuchFile:
826
hashfile = self._control_files.get('merge-hashes')
967
if hashfile.next() != MERGE_MODIFIED_HEADER_1 + '\n':
968
raise errors.MergeModifiedFormatError()
969
except StopIteration:
970
raise errors.MergeModifiedFormatError()
971
for s in RioReader(hashfile):
972
# RioReader reads in Unicode, so convert file_ids back to utf8
973
file_id = osutils.safe_file_id(s.get("file_id"), warn=False)
974
if file_id not in self.inventory:
976
text_hash = s.get("hash")
977
if text_hash == self.get_file_sha1(file_id):
978
merge_hashes[file_id] = text_hash
831
if hashfile.next() != MERGE_MODIFIED_HEADER_1 + '\n':
832
raise MergeModifiedFormatError()
833
except StopIteration:
834
raise MergeModifiedFormatError()
835
for s in RioReader(hashfile):
836
file_id = s.get("file_id")
837
if file_id not in self.inventory:
840
if hash == self.get_file_sha1(file_id):
841
merge_hashes[file_id] = hash
983
844
@needs_write_lock
984
845
def mkdir(self, path, file_id=None):
992
853
def get_symlink_target(self, file_id):
993
abspath = self.id2abspath(file_id)
994
target = osutils.readlink(abspath)
998
def subsume(self, other_tree):
999
def add_children(inventory, entry):
1000
for child_entry in entry.children.values():
1001
inventory._byid[child_entry.file_id] = child_entry
1002
if child_entry.kind == 'directory':
1003
add_children(inventory, child_entry)
1004
if other_tree.get_root_id() == self.get_root_id():
1005
raise errors.BadSubsumeSource(self, other_tree,
1006
'Trees have the same root')
1008
other_tree_path = self.relpath(other_tree.basedir)
1009
except errors.PathNotChild:
1010
raise errors.BadSubsumeSource(self, other_tree,
1011
'Tree is not contained by the other')
1012
new_root_parent = self.path2id(osutils.dirname(other_tree_path))
1013
if new_root_parent is None:
1014
raise errors.BadSubsumeSource(self, other_tree,
1015
'Parent directory is not versioned.')
1016
# We need to ensure that the result of a fetch will have a
1017
# versionedfile for the other_tree root, and only fetching into
1018
# RepositoryKnit2 guarantees that.
1019
if not self.branch.repository.supports_rich_root():
1020
raise errors.SubsumeTargetNeedsUpgrade(other_tree)
1021
other_tree.lock_tree_write()
1023
new_parents = other_tree.get_parent_ids()
1024
other_root = other_tree.inventory.root
1025
other_root.parent_id = new_root_parent
1026
other_root.name = osutils.basename(other_tree_path)
1027
self.inventory.add(other_root)
1028
add_children(self.inventory, other_root)
1029
self._write_inventory(self.inventory)
1030
# normally we don't want to fetch whole repositories, but i think
1031
# here we really do want to consolidate the whole thing.
1032
for parent_id in other_tree.get_parent_ids():
1033
self.branch.fetch(other_tree.branch, parent_id)
1034
self.add_parent_tree_id(parent_id)
1037
other_tree.bzrdir.retire_bzrdir()
1039
def _setup_directory_is_tree_reference(self):
1040
if self._branch.repository._format.supports_tree_reference:
1041
self._directory_is_tree_reference = \
1042
self._directory_may_be_tree_reference
1044
self._directory_is_tree_reference = \
1045
self._directory_is_never_tree_reference
1047
def _directory_is_never_tree_reference(self, relpath):
1050
def _directory_may_be_tree_reference(self, relpath):
1051
# as a special case, if a directory contains control files then
1052
# it's a tree reference, except that the root of the tree is not
1053
return relpath and osutils.isdir(self.abspath(relpath) + u"/.bzr")
1054
# TODO: We could ask all the control formats whether they
1055
# recognize this directory, but at the moment there's no cheap api
1056
# to do that. Since we probably can only nest bzr checkouts and
1057
# they always use this name it's ok for now. -- mbp 20060306
1059
# FIXME: There is an unhandled case here of a subdirectory
1060
# containing .bzr but not a branch; that will probably blow up
1061
# when you try to commit it. It might happen if there is a
1062
# checkout in a subdirectory. This can be avoided by not adding
1065
@needs_tree_write_lock
1066
def extract(self, file_id, format=None):
1067
"""Extract a subtree from this tree.
1069
A new branch will be created, relative to the path for this tree.
1073
segments = osutils.splitpath(path)
1074
transport = self.branch.bzrdir.root_transport
1075
for name in segments:
1076
transport = transport.clone(name)
1077
transport.ensure_base()
1080
sub_path = self.id2path(file_id)
1081
branch_transport = mkdirs(sub_path)
1083
format = self.bzrdir.cloning_metadir()
1084
branch_transport.ensure_base()
1085
branch_bzrdir = format.initialize_on_transport(branch_transport)
1087
repo = branch_bzrdir.find_repository()
1088
except errors.NoRepositoryPresent:
1089
repo = branch_bzrdir.create_repository()
1090
if not repo.supports_rich_root():
1091
raise errors.RootNotRich()
1092
new_branch = branch_bzrdir.create_branch()
1093
new_branch.pull(self.branch)
1094
for parent_id in self.get_parent_ids():
1095
new_branch.fetch(self.branch, parent_id)
1096
tree_transport = self.bzrdir.root_transport.clone(sub_path)
1097
if tree_transport.base != branch_transport.base:
1098
tree_bzrdir = format.initialize_on_transport(tree_transport)
1099
branch.BranchReferenceFormat().initialize(tree_bzrdir,
1100
target_branch=new_branch)
1102
tree_bzrdir = branch_bzrdir
1103
wt = tree_bzrdir.create_workingtree(_mod_revision.NULL_REVISION)
1104
wt.set_parent_ids(self.get_parent_ids())
1105
my_inv = self.inventory
1106
child_inv = inventory.Inventory(root_id=None)
1107
new_root = my_inv[file_id]
1108
my_inv.remove_recursive_id(file_id)
1109
new_root.parent_id = None
1110
child_inv.add(new_root)
1111
self._write_inventory(my_inv)
1112
wt._write_inventory(child_inv)
1115
def _serialize(self, inventory, out_file):
1116
xml5.serializer_v5.write_inventory(self._inventory, out_file,
1119
def _deserialize(selt, in_file):
1120
return xml5.serializer_v5.read_inventory(in_file)
854
return os.readlink(self.id2abspath(file_id))
856
def file_class(self, filename):
857
if self.path2id(filename):
859
elif self.is_ignored(filename):
1122
864
def flush(self):
1123
865
"""Write the in memory inventory to disk."""
1239
968
except KeyError:
1240
969
yield fp[1:], c, fk, None, TreeEntry()
1243
972
if fk != 'directory':
1246
# But do this child first if recursing down
1248
new_children = os.listdir(fap)
1250
new_children = collections.deque(new_children)
1251
stack.append((f_ie.file_id, fp, fap, new_children))
1252
# Break out of inner loop,
1253
# so that we start outer loop with child
975
# But do this child first
976
new_children = os.listdir(fap)
978
new_children = collections.deque(new_children)
979
stack.append((f_ie.file_id, fp, fap, new_children))
980
# Break out of inner loop, so that we start outer loop with child
1256
983
# if we finished all children, pop it off the stack
1259
986
@needs_tree_write_lock
1260
def move(self, from_paths, to_dir=None, after=False, **kwargs):
987
def move(self, from_paths, to_name):
1261
988
"""Rename files.
1263
to_dir must exist in the inventory.
1265
If to_dir exists and is a directory, the files are moved into
1266
it, keeping their old names.
1268
Note that to_dir is only the last component of the new name;
990
to_name must exist in the inventory.
992
If to_name exists and is a directory, the files are moved into
993
it, keeping their old names.
995
Note that to_name is only the last component of the new name;
1269
996
this doesn't change the directory.
1271
For each entry in from_paths the move mode will be determined
1274
The first mode moves the file in the filesystem and updates the
1275
inventory. The second mode only updates the inventory without
1276
touching the file on the filesystem. This is the new mode introduced
1279
move uses the second mode if 'after == True' and the target is not
1280
versioned but present in the working tree.
1282
move uses the second mode if 'after == False' and the source is
1283
versioned but no longer in the working tree, and the target is not
1284
versioned but present in the working tree.
1286
move uses the first mode if 'after == False' and the source is
1287
versioned and present in the working tree, and the target is not
1288
versioned and not present in the working tree.
1290
Everything else results in an error.
1292
998
This returns a list of (from_path, to_path) pairs for each
1293
999
entry that is moved.
1298
# check for deprecated use of signature
1300
to_dir = kwargs.get('to_name', None)
1302
raise TypeError('You must supply a target directory')
1304
symbol_versioning.warn('The parameter to_name was deprecated'
1305
' in version 0.13. Use to_dir instead',
1308
# check destination directory
1309
if isinstance(from_paths, basestring):
1002
## TODO: Option to move IDs only
1003
assert not isinstance(from_paths, basestring)
1311
1004
inv = self.inventory
1312
to_abs = self.abspath(to_dir)
1005
to_abs = self.abspath(to_name)
1313
1006
if not isdir(to_abs):
1314
raise errors.BzrMoveFailedError('',to_dir,
1315
errors.NotADirectory(to_abs))
1316
if not self.has_filename(to_dir):
1317
raise errors.BzrMoveFailedError('',to_dir,
1318
errors.NotInWorkingDirectory(to_dir))
1319
to_dir_id = inv.path2id(to_dir)
1320
if to_dir_id is None:
1321
raise errors.BzrMoveFailedError('',to_dir,
1322
errors.NotVersionedError(path=str(to_dir)))
1007
raise BzrError("destination %r is not a directory" % to_abs)
1008
if not self.has_filename(to_name):
1009
raise BzrError("destination %r not in working directory" % to_abs)
1010
to_dir_id = inv.path2id(to_name)
1011
if to_dir_id is None and to_name != '':
1012
raise BzrError("destination %r is not a versioned directory" % to_name)
1324
1013
to_dir_ie = inv[to_dir_id]
1325
1014
if to_dir_ie.kind != 'directory':
1326
raise errors.BzrMoveFailedError('',to_dir,
1327
errors.NotADirectory(to_abs))
1329
# create rename entries and tuples
1330
for from_rel in from_paths:
1331
from_tail = splitpath(from_rel)[-1]
1332
from_id = inv.path2id(from_rel)
1334
raise errors.BzrMoveFailedError(from_rel,to_dir,
1335
errors.NotVersionedError(path=str(from_rel)))
1337
from_entry = inv[from_id]
1338
from_parent_id = from_entry.parent_id
1339
to_rel = pathjoin(to_dir, from_tail)
1340
rename_entry = WorkingTree._RenameEntry(from_rel=from_rel,
1342
from_tail=from_tail,
1343
from_parent_id=from_parent_id,
1344
to_rel=to_rel, to_tail=from_tail,
1345
to_parent_id=to_dir_id)
1346
rename_entries.append(rename_entry)
1347
rename_tuples.append((from_rel, to_rel))
1349
# determine which move mode to use. checks also for movability
1350
rename_entries = self._determine_mv_mode(rename_entries, after)
1015
raise BzrError("destination %r is not a directory" % to_abs)
1017
to_idpath = inv.get_idpath(to_dir_id)
1019
for f in from_paths:
1020
if not self.has_filename(f):
1021
raise BzrError("%r does not exist in working tree" % f)
1022
f_id = inv.path2id(f)
1024
raise BzrError("%r is not versioned" % f)
1025
name_tail = splitpath(f)[-1]
1026
dest_path = pathjoin(to_name, name_tail)
1027
if self.has_filename(dest_path):
1028
raise BzrError("destination %r already exists" % dest_path)
1029
if f_id in to_idpath:
1030
raise BzrError("can't move %r to a subdirectory of itself" % f)
1032
# OK, so there's a race here, it's possible that someone will
1033
# create a file in this interval and then the rename might be
1034
# left half-done. But we should have caught most problems.
1035
orig_inv = deepcopy(self.inventory)
1352
1036
original_modified = self._inventory_is_modified
1354
1038
if len(from_paths):
1355
1039
self._inventory_is_modified = True
1356
self._move(rename_entries)
1040
for f in from_paths:
1041
name_tail = splitpath(f)[-1]
1042
dest_path = pathjoin(to_name, name_tail)
1043
result.append((f, dest_path))
1044
inv.rename(inv.path2id(f), to_dir_id, name_tail)
1046
osutils.rename(self.abspath(f), self.abspath(dest_path))
1048
raise BzrError("failed to rename %r to %r: %s" %
1049
(f, dest_path, e[1]))
1358
1051
# restore the inventory on error
1359
self._inventory_is_modified = original_modified
1052
self._set_inventory(orig_inv, dirty=original_modified)
1361
1054
self._write_inventory(inv)
1362
return rename_tuples
1364
def _determine_mv_mode(self, rename_entries, after=False):
1365
"""Determines for each from-to pair if both inventory and working tree
1366
or only the inventory has to be changed.
1368
Also does basic plausability tests.
1370
inv = self.inventory
1372
for rename_entry in rename_entries:
1373
# store to local variables for easier reference
1374
from_rel = rename_entry.from_rel
1375
from_id = rename_entry.from_id
1376
to_rel = rename_entry.to_rel
1377
to_id = inv.path2id(to_rel)
1378
only_change_inv = False
1380
# check the inventory for source and destination
1382
raise errors.BzrMoveFailedError(from_rel,to_rel,
1383
errors.NotVersionedError(path=str(from_rel)))
1384
if to_id is not None:
1385
raise errors.BzrMoveFailedError(from_rel,to_rel,
1386
errors.AlreadyVersionedError(path=str(to_rel)))
1388
# try to determine the mode for rename (only change inv or change
1389
# inv and file system)
1391
if not self.has_filename(to_rel):
1392
raise errors.BzrMoveFailedError(from_id,to_rel,
1393
errors.NoSuchFile(path=str(to_rel),
1394
extra="New file has not been created yet"))
1395
only_change_inv = True
1396
elif not self.has_filename(from_rel) and self.has_filename(to_rel):
1397
only_change_inv = True
1398
elif self.has_filename(from_rel) and not self.has_filename(to_rel):
1399
only_change_inv = False
1400
elif (not self.case_sensitive
1401
and from_rel.lower() == to_rel.lower()
1402
and self.has_filename(from_rel)):
1403
only_change_inv = False
1405
# something is wrong, so lets determine what exactly
1406
if not self.has_filename(from_rel) and \
1407
not self.has_filename(to_rel):
1408
raise errors.BzrRenameFailedError(from_rel,to_rel,
1409
errors.PathsDoNotExist(paths=(str(from_rel),
1412
raise errors.RenameFailedFilesExist(from_rel, to_rel)
1413
rename_entry.only_change_inv = only_change_inv
1414
return rename_entries
1416
def _move(self, rename_entries):
1417
"""Moves a list of files.
1419
Depending on the value of the flag 'only_change_inv', the
1420
file will be moved on the file system or not.
1422
inv = self.inventory
1425
for entry in rename_entries:
1427
self._move_entry(entry)
1429
self._rollback_move(moved)
1433
def _rollback_move(self, moved):
1434
"""Try to rollback a previous move in case of an filesystem error."""
1435
inv = self.inventory
1438
self._move_entry(WorkingTree._RenameEntry(
1439
entry.to_rel, entry.from_id,
1440
entry.to_tail, entry.to_parent_id, entry.from_rel,
1441
entry.from_tail, entry.from_parent_id,
1442
entry.only_change_inv))
1443
except errors.BzrMoveFailedError, e:
1444
raise errors.BzrMoveFailedError( '', '', "Rollback failed."
1445
" The working tree is in an inconsistent state."
1446
" Please consider doing a 'bzr revert'."
1447
" Error message is: %s" % e)
1449
def _move_entry(self, entry):
1450
inv = self.inventory
1451
from_rel_abs = self.abspath(entry.from_rel)
1452
to_rel_abs = self.abspath(entry.to_rel)
1453
if from_rel_abs == to_rel_abs:
1454
raise errors.BzrMoveFailedError(entry.from_rel, entry.to_rel,
1455
"Source and target are identical.")
1457
if not entry.only_change_inv:
1459
osutils.rename(from_rel_abs, to_rel_abs)
1461
raise errors.BzrMoveFailedError(entry.from_rel,
1463
inv.rename(entry.from_id, entry.to_parent_id, entry.to_tail)
1465
1057
@needs_tree_write_lock
1466
def rename_one(self, from_rel, to_rel, after=False):
1058
def rename_one(self, from_rel, to_rel):
1467
1059
"""Rename one file.
1469
1061
This can change the directory or the filename or both.
1471
rename_one has several 'modes' to work. First, it can rename a physical
1472
file and change the file_id. That is the normal mode. Second, it can
1473
only change the file_id without touching any physical file. This is
1474
the new mode introduced in version 0.15.
1476
rename_one uses the second mode if 'after == True' and 'to_rel' is not
1477
versioned but present in the working tree.
1479
rename_one uses the second mode if 'after == False' and 'from_rel' is
1480
versioned but no longer in the working tree, and 'to_rel' is not
1481
versioned but present in the working tree.
1483
rename_one uses the first mode if 'after == False' and 'from_rel' is
1484
versioned and present in the working tree, and 'to_rel' is not
1485
versioned and not present in the working tree.
1487
Everything else results in an error.
1489
1063
inv = self.inventory
1492
# create rename entries and tuples
1493
from_tail = splitpath(from_rel)[-1]
1494
from_id = inv.path2id(from_rel)
1496
# if file is missing in the inventory maybe it's in the basis_tree
1497
basis_tree = self.branch.basis_tree()
1498
from_id = basis_tree.path2id(from_rel)
1500
raise errors.BzrRenameFailedError(from_rel,to_rel,
1501
errors.NotVersionedError(path=str(from_rel)))
1502
# put entry back in the inventory so we can rename it
1503
from_entry = basis_tree.inventory[from_id].copy()
1506
from_entry = inv[from_id]
1507
from_parent_id = from_entry.parent_id
1064
if not self.has_filename(from_rel):
1065
raise BzrError("can't rename: old working file %r does not exist" % from_rel)
1066
if self.has_filename(to_rel):
1067
raise BzrError("can't rename: new working file %r already exists" % to_rel)
1069
file_id = inv.path2id(from_rel)
1071
raise BzrError("can't rename: old name %r is not versioned" % from_rel)
1073
entry = inv[file_id]
1074
from_parent = entry.parent_id
1075
from_name = entry.name
1077
if inv.path2id(to_rel):
1078
raise BzrError("can't rename: new name %r is already versioned" % to_rel)
1508
1080
to_dir, to_tail = os.path.split(to_rel)
1509
1081
to_dir_id = inv.path2id(to_dir)
1510
rename_entry = WorkingTree._RenameEntry(from_rel=from_rel,
1512
from_tail=from_tail,
1513
from_parent_id=from_parent_id,
1514
to_rel=to_rel, to_tail=to_tail,
1515
to_parent_id=to_dir_id)
1516
rename_entries.append(rename_entry)
1518
# determine which move mode to use. checks also for movability
1519
rename_entries = self._determine_mv_mode(rename_entries, after)
1521
# check if the target changed directory and if the target directory is
1523
if to_dir_id is None:
1524
raise errors.BzrMoveFailedError(from_rel,to_rel,
1525
errors.NotVersionedError(path=str(to_dir)))
1527
# all checks done. now we can continue with our actual work
1528
mutter('rename_one:\n'
1533
' to_dir_id {%s}\n',
1534
from_id, from_rel, to_rel, to_dir, to_dir_id)
1536
self._move(rename_entries)
1082
if to_dir_id is None and to_dir != '':
1083
raise BzrError("can't determine destination directory id for %r" % to_dir)
1085
mutter("rename_one:")
1086
mutter(" file_id {%s}" % file_id)
1087
mutter(" from_rel %r" % from_rel)
1088
mutter(" to_rel %r" % to_rel)
1089
mutter(" to_dir %r" % to_dir)
1090
mutter(" to_dir_id {%s}" % to_dir_id)
1092
inv.rename(file_id, to_dir_id, to_tail)
1094
from_abs = self.abspath(from_rel)
1095
to_abs = self.abspath(to_rel)
1097
osutils.rename(from_abs, to_abs)
1099
inv.rename(file_id, from_parent, from_name)
1100
raise BzrError("failed to rename %r to %r: %s"
1101
% (from_abs, to_abs, e[1]))
1537
1102
self._write_inventory(inv)
1539
class _RenameEntry(object):
1540
def __init__(self, from_rel, from_id, from_tail, from_parent_id,
1541
to_rel, to_tail, to_parent_id, only_change_inv=False):
1542
self.from_rel = from_rel
1543
self.from_id = from_id
1544
self.from_tail = from_tail
1545
self.from_parent_id = from_parent_id
1546
self.to_rel = to_rel
1547
self.to_tail = to_tail
1548
self.to_parent_id = to_parent_id
1549
self.only_change_inv = only_change_inv
1551
1104
@needs_read_lock
1552
1105
def unknowns(self):
1553
1106
"""Return all unknown files.
1910
1436
def read_basis_inventory(self):
1911
1437
"""Read the cached basis inventory."""
1912
1438
path = self._basis_inventory_name()
1913
return self._transport.get_bytes(path)
1439
return self._control_files.get(path).read()
1915
1441
@needs_read_lock
1916
1442
def read_working_inventory(self):
1917
1443
"""Read the working inventory.
1919
1445
:raises errors.InventoryModified: read_working_inventory will fail
1920
1446
when the current in memory inventory has been modified.
1922
# conceptually this should be an implementation detail of the tree.
1448
# conceptually this should be an implementation detail of the tree.
1923
1449
# XXX: Deprecate this.
1924
1450
# ElementTree does its own conversion from UTF-8, so open in
1926
1452
if self._inventory_is_modified:
1927
1453
raise errors.InventoryModified(self)
1928
f = self._transport.get('inventory')
1930
result = self._deserialize(f)
1454
result = xml5.serializer_v5.read_inventory(
1455
self._control_files.get('inventory'))
1933
1456
self._set_inventory(result, dirty=False)
1936
1459
@needs_tree_write_lock
1937
def remove(self, files, verbose=False, to_file=None, keep_files=True,
1939
"""Remove nominated files from the working inventory.
1941
:files: File paths relative to the basedir.
1942
:keep_files: If true, the files will also be kept.
1943
:force: Delete files and directories, even if they are changed and
1944
even if the directories are not empty.
1460
def remove(self, files, verbose=False, to_file=None):
1461
"""Remove nominated files from the working inventory..
1463
This does not remove their text. This does not run on XXX on what? RBC
1465
TODO: Refuse to remove modified files unless --force is given?
1467
TODO: Do something useful with directories.
1469
TODO: Should this remove the text or not? Tough call; not
1470
removing may be useful and the user can just use use rm, and
1471
is the opposite of add. Removing it is consistent with most
1472
other tools. Maybe an option.
1474
## TODO: Normalize names
1475
## TODO: Remove nested loops; better scalability
1946
1476
if isinstance(files, basestring):
1947
1477
files = [files]
1952
unknown_nested_files=set()
1954
to_file = sys.stdout
1956
def recurse_directory_to_add_files(directory):
1957
# Recurse directory and add all files
1958
# so we can check if they have changed.
1959
for parent_info, file_infos in\
1960
self.walkdirs(directory):
1961
for relpath, basename, kind, lstat, fileid, kind in file_infos:
1962
# Is it versioned or ignored?
1963
if self.path2id(relpath) or self.is_ignored(relpath):
1964
# Add nested content for deletion.
1965
new_files.add(relpath)
1967
# Files which are not versioned and not ignored
1968
# should be treated as unknown.
1969
unknown_nested_files.add((relpath, None, kind))
1971
for filename in files:
1972
# Get file name into canonical form.
1973
abspath = self.abspath(filename)
1974
filename = self.relpath(abspath)
1975
if len(filename) > 0:
1976
new_files.add(filename)
1977
recurse_directory_to_add_files(filename)
1979
files = list(new_files)
1982
return # nothing to do
1984
# Sort needed to first handle directory content before the directory
1985
files.sort(reverse=True)
1987
# Bail out if we are going to delete files we shouldn't
1988
if not keep_files and not force:
1989
has_changed_files = len(unknown_nested_files) > 0
1990
if not has_changed_files:
1991
for (file_id, path, content_change, versioned, parent_id, name,
1992
kind, executable) in self.iter_changes(self.basis_tree(),
1993
include_unchanged=True, require_versioned=False,
1994
want_unversioned=True, specific_files=files):
1995
if versioned == (False, False):
1996
# The record is unknown ...
1997
if not self.is_ignored(path[1]):
1998
# ... but not ignored
1999
has_changed_files = True
2001
elif content_change and (kind[1] is not None):
2002
# Versioned and changed, but not deleted
2003
has_changed_files = True
2006
if has_changed_files:
2007
# Make delta show ALL applicable changes in error message.
2008
tree_delta = self.changes_from(self.basis_tree(),
2009
require_versioned=False, want_unversioned=True,
2010
specific_files=files)
2011
for unknown_file in unknown_nested_files:
2012
if unknown_file not in tree_delta.unversioned:
2013
tree_delta.unversioned.extend((unknown_file,))
2014
raise errors.BzrRemoveChangedFilesError(tree_delta)
2016
# Build inv_delta and delete files where applicable,
2017
# do this before any modifications to inventory.
1479
inv = self.inventory
1481
# do this before any modifications
2018
1482
for f in files:
2019
fid = self.path2id(f)
1483
fid = inv.path2id(f)
2022
message = "%s is not versioned." % (f,)
2025
# having removed it, it must be either ignored or unknown
2026
if self.is_ignored(f):
2030
# XXX: Really should be a more abstract reporter interface
2031
kind_ch = osutils.kind_marker(self.kind(fid))
2032
to_file.write(new_status + ' ' + f + kind_ch + '\n')
2034
inv_delta.append((f, None, fid, None))
2035
message = "removed %s" % (f,)
2038
abs_path = self.abspath(f)
2039
if osutils.lexists(abs_path):
2040
if (osutils.isdir(abs_path) and
2041
len(os.listdir(abs_path)) > 0):
2043
osutils.rmtree(abs_path)
2045
message = "%s is not an empty directory "\
2046
"and won't be deleted." % (f,)
2048
osutils.delete_any(abs_path)
2049
message = "deleted %s" % (f,)
2050
elif message is not None:
2051
# Only care if we haven't done anything yet.
2052
message = "%s does not exist." % (f,)
2054
# Print only one message (if any) per file.
2055
if message is not None:
2057
self.apply_inventory_delta(inv_delta)
1485
# TODO: Perhaps make this just a warning, and continue?
1486
# This tends to happen when
1487
raise NotVersionedError(path=f)
1489
# having remove it, it must be either ignored or unknown
1490
if self.is_ignored(f):
1494
textui.show_status(new_status, inv[fid].kind, f,
1498
self._write_inventory(inv)
2059
1500
@needs_tree_write_lock
2060
def revert(self, filenames=None, old_tree=None, backups=True,
2061
pb=None, report_changes=False):
1501
def revert(self, filenames, old_tree=None, backups=True,
1502
pb=DummyProgress()):
2062
1503
from bzrlib.conflicts import resolve
2065
symbol_versioning.warn('Using [] to revert all files is deprecated'
2066
' as of bzr 0.91. Please use None (the default) instead.',
2067
DeprecationWarning, stacklevel=2)
2068
1504
if old_tree is None:
2069
basis_tree = self.basis_tree()
2070
basis_tree.lock_read()
2071
old_tree = basis_tree
1505
old_tree = self.basis_tree()
1506
conflicts = transform.revert(self, old_tree, filenames, backups, pb)
1507
if not len(filenames):
1508
self.set_parent_ids(self.get_parent_ids()[:1])
2075
conflicts = transform.revert(self, old_tree, filenames, backups, pb,
2077
if filenames is None and len(self.get_parent_ids()) > 1:
2079
last_revision = self.last_revision()
2080
if last_revision != _mod_revision.NULL_REVISION:
2081
if basis_tree is None:
2082
basis_tree = self.basis_tree()
2083
basis_tree.lock_read()
2084
parent_trees.append((last_revision, basis_tree))
2085
self.set_parent_trees(parent_trees)
2088
resolve(self, filenames, ignore_misses=True, recursive=True)
2090
if basis_tree is not None:
1511
resolve(self, filenames, ignore_misses=True)
2092
1512
return conflicts
2094
def revision_tree(self, revision_id):
2095
"""See Tree.revision_tree.
2097
WorkingTree can supply revision_trees for the basis revision only
2098
because there is only one cached inventory in the bzr directory.
2100
if revision_id == self.last_revision():
2102
xml = self.read_basis_inventory()
2103
except errors.NoSuchFile:
2107
inv = xml7.serializer_v7.read_inventory_from_string(xml)
2108
# dont use the repository revision_tree api because we want
2109
# to supply the inventory.
2110
if inv.revision_id == revision_id:
2111
return revisiontree.RevisionTree(self.branch.repository,
2113
except errors.BadInventoryFormat:
2115
# raise if there was no inventory, or if we read the wrong inventory.
2116
raise errors.NoSuchRevisionInTree(self, revision_id)
2118
1514
# XXX: This method should be deprecated in favour of taking in a proper
2119
1515
# new Inventory object.
2120
1516
@needs_tree_write_lock
2121
1517
def set_inventory(self, new_inventory_list):
2122
1518
from bzrlib.inventory import (Inventory,
2123
1519
InventoryDirectory,
2126
1523
inv = Inventory(self.get_root_id())
2249
1629
# cant set that until we update the working trees last revision to be
2250
1630
# one from the new branch, because it will just get absorbed by the
2251
1631
# parent de-duplication logic.
2253
1633
# We MUST save it even if an error occurs, because otherwise the users
2254
1634
# local work is unreferenced and will appear to have been lost.
2258
1638
last_rev = self.get_parent_ids()[0]
2259
1639
except IndexError:
2260
last_rev = _mod_revision.NULL_REVISION
2261
if revision is None:
2262
revision = self.branch.last_revision()
2264
old_tip = old_tip or _mod_revision.NULL_REVISION
2266
if not _mod_revision.is_null(old_tip) and old_tip != last_rev:
2267
# the branch we are bound to was updated
2268
# merge those changes in first
2269
base_tree = self.basis_tree()
2270
other_tree = self.branch.repository.revision_tree(old_tip)
2271
nb_conflicts = merge.merge_inner(self.branch, other_tree,
2272
base_tree, this_tree=self,
2273
change_reporter=change_reporter)
2275
self.add_parent_tree((old_tip, other_tree))
2276
trace.note('Rerun update after fixing the conflicts.')
2279
if last_rev != _mod_revision.ensure_null(revision):
2280
# the working tree is up to date with the branch
2281
# we can merge the specified revision from master
2282
to_tree = self.branch.repository.revision_tree(revision)
2283
to_root_id = to_tree.get_root_id()
1641
if last_rev != self.branch.last_revision():
1642
# merge tree state up to new branch tip.
2285
1643
basis = self.basis_tree()
2288
if (basis.inventory.root is None
2289
or basis.inventory.root.file_id != to_root_id):
2290
self.set_root_id(to_root_id)
2295
# determine the branch point
2296
graph = self.branch.repository.get_graph()
2297
base_rev_id = graph.find_unique_lca(self.branch.last_revision(),
2299
base_tree = self.branch.repository.revision_tree(base_rev_id)
2301
nb_conflicts = merge.merge_inner(self.branch, to_tree, base_tree,
2303
change_reporter=change_reporter)
2304
self.set_last_revision(revision)
1644
to_tree = self.branch.basis_tree()
1645
if basis.inventory.root is None:
1646
self.set_root_id(to_tree.inventory.root.file_id)
1647
result += merge.merge_inner(
2305
1652
# TODO - dedup parents list with things merged by pull ?
2306
1653
# reuse the tree we've updated to to set the basis:
2307
parent_trees = [(revision, to_tree)]
1654
parent_trees = [(self.branch.last_revision(), to_tree)]
2308
1655
merges = self.get_parent_ids()[1:]
2309
1656
# Ideally we ask the tree for the trees here, that way the working
2310
# tree can decide whether to give us the entire tree or give us a
1657
# tree can decide whether to give us teh entire tree or give us a
2311
1658
# lazy initialised tree. dirstate for instance will have the trees
2312
1659
# in ram already, whereas a last-revision + basis-inventory tree
2313
1660
# will not, but also does not need them when setting parents.
2314
1661
for parent in merges:
2315
1662
parent_trees.append(
2316
1663
(parent, self.branch.repository.revision_tree(parent)))
2317
if not _mod_revision.is_null(old_tip):
1664
if old_tip is not None:
2318
1665
parent_trees.append(
2319
1666
(old_tip, self.branch.repository.revision_tree(old_tip)))
2320
1667
self.set_parent_trees(parent_trees)
2321
1668
last_rev = parent_trees[0][0]
2324
def _write_hashcache_if_dirty(self):
2325
"""Write out the hashcache if it is dirty."""
2326
if self._hashcache.needs_write:
1670
# the working tree had the same last-revision as the master
1671
# branch did. We may still have pivot local work from the local
1672
# branch into old_tip:
1673
if old_tip is not None:
1674
self.add_parent_tree_id(old_tip)
1675
if old_tip and old_tip != last_rev:
1676
# our last revision was not the prior branch last revision
1677
# and we have converted that last revision to a pending merge.
1678
# base is somewhere between the branch tip now
1679
# and the now pending merge
1680
from bzrlib.revision import common_ancestor
2328
self._hashcache.write()
2330
if e.errno not in (errno.EPERM, errno.EACCES):
2332
# TODO: jam 20061219 Should this be a warning? A single line
2333
# warning might be sufficient to let the user know what
2335
mutter('Could not write hashcache for %s\nError: %s',
2336
self._hashcache.cache_file_name(), e)
1682
base_rev_id = common_ancestor(self.branch.last_revision(),
1684
self.branch.repository)
1685
except errors.NoCommonAncestor:
1687
base_tree = self.branch.repository.revision_tree(base_rev_id)
1688
other_tree = self.branch.repository.revision_tree(old_tip)
1689
result += merge.merge_inner(
2338
1696
@needs_tree_write_lock
2339
1697
def _write_inventory(self, inv):
2373
1731
file_id=self.path2id(conflicted)))
2374
1732
return conflicts
2376
def walkdirs(self, prefix=""):
2377
"""Walk the directories of this tree.
2379
returns a generator which yields items in the form:
2380
((curren_directory_path, fileid),
2381
[(file1_path, file1_name, file1_kind, (lstat), file1_id,
2384
This API returns a generator, which is only valid during the current
2385
tree transaction - within a single lock_read or lock_write duration.
2387
If the tree is not locked, it may cause an error to be raised,
2388
depending on the tree implementation.
2390
disk_top = self.abspath(prefix)
2391
if disk_top.endswith('/'):
2392
disk_top = disk_top[:-1]
2393
top_strip_len = len(disk_top) + 1
2394
inventory_iterator = self._walkdirs(prefix)
2395
disk_iterator = osutils.walkdirs(disk_top, prefix)
2397
current_disk = disk_iterator.next()
2398
disk_finished = False
2400
if not (e.errno == errno.ENOENT or
2401
(sys.platform == 'win32' and e.errno == ERROR_PATH_NOT_FOUND)):
2404
disk_finished = True
2406
current_inv = inventory_iterator.next()
2407
inv_finished = False
2408
except StopIteration:
2411
while not inv_finished or not disk_finished:
2413
((cur_disk_dir_relpath, cur_disk_dir_path_from_top),
2414
cur_disk_dir_content) = current_disk
2416
((cur_disk_dir_relpath, cur_disk_dir_path_from_top),
2417
cur_disk_dir_content) = ((None, None), None)
2418
if not disk_finished:
2419
# strip out .bzr dirs
2420
if (cur_disk_dir_path_from_top[top_strip_len:] == '' and
2421
len(cur_disk_dir_content) > 0):
2422
# osutils.walkdirs can be made nicer -
2423
# yield the path-from-prefix rather than the pathjoined
2425
bzrdir_loc = bisect_left(cur_disk_dir_content,
2427
if (bzrdir_loc < len(cur_disk_dir_content)
2428
and self.bzrdir.is_control_filename(
2429
cur_disk_dir_content[bzrdir_loc][0])):
2430
# we dont yield the contents of, or, .bzr itself.
2431
del cur_disk_dir_content[bzrdir_loc]
2433
# everything is unknown
2436
# everything is missing
2439
direction = cmp(current_inv[0][0], cur_disk_dir_relpath)
2441
# disk is before inventory - unknown
2442
dirblock = [(relpath, basename, kind, stat, None, None) for
2443
relpath, basename, kind, stat, top_path in
2444
cur_disk_dir_content]
2445
yield (cur_disk_dir_relpath, None), dirblock
2447
current_disk = disk_iterator.next()
2448
except StopIteration:
2449
disk_finished = True
2451
# inventory is before disk - missing.
2452
dirblock = [(relpath, basename, 'unknown', None, fileid, kind)
2453
for relpath, basename, dkind, stat, fileid, kind in
2455
yield (current_inv[0][0], current_inv[0][1]), dirblock
2457
current_inv = inventory_iterator.next()
2458
except StopIteration:
2461
# versioned present directory
2462
# merge the inventory and disk data together
2464
for relpath, subiterator in itertools.groupby(sorted(
2465
current_inv[1] + cur_disk_dir_content,
2466
key=operator.itemgetter(0)), operator.itemgetter(1)):
2467
path_elements = list(subiterator)
2468
if len(path_elements) == 2:
2469
inv_row, disk_row = path_elements
2470
# versioned, present file
2471
dirblock.append((inv_row[0],
2472
inv_row[1], disk_row[2],
2473
disk_row[3], inv_row[4],
2475
elif len(path_elements[0]) == 5:
2477
dirblock.append((path_elements[0][0],
2478
path_elements[0][1], path_elements[0][2],
2479
path_elements[0][3], None, None))
2480
elif len(path_elements[0]) == 6:
2481
# versioned, absent file.
2482
dirblock.append((path_elements[0][0],
2483
path_elements[0][1], 'unknown', None,
2484
path_elements[0][4], path_elements[0][5]))
2486
raise NotImplementedError('unreachable code')
2487
yield current_inv[0], dirblock
2489
current_inv = inventory_iterator.next()
2490
except StopIteration:
2493
current_disk = disk_iterator.next()
2494
except StopIteration:
2495
disk_finished = True
2497
def _walkdirs(self, prefix=""):
2498
"""Walk the directories of this tree.
2500
:prefix: is used as the directrory to start with.
2501
returns a generator which yields items in the form:
2502
((curren_directory_path, fileid),
2503
[(file1_path, file1_name, file1_kind, None, file1_id,
2506
_directory = 'directory'
2507
# get the root in the inventory
2508
inv = self.inventory
2509
top_id = inv.path2id(prefix)
2513
pending = [(prefix, '', _directory, None, top_id, None)]
2516
currentdir = pending.pop()
2517
# 0 - relpath, 1- basename, 2- kind, 3- stat, 4-id, 5-kind
2518
top_id = currentdir[4]
2520
relroot = currentdir[0] + '/'
2523
# FIXME: stash the node in pending
2525
if entry.kind == 'directory':
2526
for name, child in entry.sorted_children():
2527
dirblock.append((relroot + name, name, child.kind, None,
2528
child.file_id, child.kind
2530
yield (currentdir[0], entry.file_id), dirblock
2531
# push the user specified dirs from dirblock
2532
for dir in reversed(dirblock):
2533
if dir[2] == _directory:
2536
@needs_tree_write_lock
2537
def auto_resolve(self):
2538
"""Automatically resolve text conflicts according to contents.
2540
Only text conflicts are auto_resolvable. Files with no conflict markers
2541
are considered 'resolved', because bzr always puts conflict markers
2542
into files that have text conflicts. The corresponding .THIS .BASE and
2543
.OTHER files are deleted, as per 'resolve'.
2544
:return: a tuple of ConflictLists: (un_resolved, resolved).
2546
un_resolved = _mod_conflicts.ConflictList()
2547
resolved = _mod_conflicts.ConflictList()
2548
conflict_re = re.compile('^(<{7}|={7}|>{7})')
2549
for conflict in self.conflicts():
2550
if (conflict.typestring != 'text conflict' or
2551
self.kind(conflict.file_id) != 'file'):
2552
un_resolved.append(conflict)
2554
my_file = open(self.id2abspath(conflict.file_id), 'rb')
2556
for line in my_file:
2557
if conflict_re.search(line):
2558
un_resolved.append(conflict)
2561
resolved.append(conflict)
2564
resolved.remove_files(self)
2565
self.set_conflicts(un_resolved)
2566
return un_resolved, resolved
2569
def _check(self, references):
2570
"""Check the tree for consistency.
2572
:param references: A dict with keys matching the items returned by
2573
self._get_check_refs(), and values from looking those keys up in
2576
tree_basis = self.basis_tree()
2577
tree_basis.lock_read()
2579
repo_basis = references[('trees', self.last_revision())]
2580
if len(list(repo_basis.iter_changes(tree_basis))) > 0:
2581
raise errors.BzrCheckError(
2582
"Mismatched basis inventory content.")
2587
def _validate(self):
2588
"""Validate internal structures.
2590
This is meant mostly for the test suite. To give it a chance to detect
2591
corruption after actions have occurred. The default implementation is a
2594
:return: None. An exception should be raised if there is an error.
2598
def _get_rules_searcher(self, default_searcher):
2599
"""See Tree._get_rules_searcher."""
2600
if self._rules_searcher is None:
2601
self._rules_searcher = super(WorkingTree,
2602
self)._get_rules_searcher(default_searcher)
2603
return self._rules_searcher
2605
def get_shelf_manager(self):
2606
"""Return the ShelfManager for this WorkingTree."""
2607
from bzrlib.shelf import ShelfManager
2608
return ShelfManager(self, self._transport)
2611
1735
class WorkingTree2(WorkingTree):
2612
1736
"""This is the Format 2 working tree.
2614
This was the first weave based working tree.
1738
This was the first weave based working tree.
2615
1739
- uses os locks for locking.
2616
1740
- uses the branch last-revision.
2619
def __init__(self, *args, **kwargs):
2620
super(WorkingTree2, self).__init__(*args, **kwargs)
2621
# WorkingTree2 has more of a constraint that self._inventory must
2622
# exist. Because this is an older format, we don't mind the overhead
2623
# caused by the extra computation here.
2625
# Newer WorkingTree's should only have self._inventory set when they
2627
if self._inventory is None:
2628
self.read_working_inventory()
2630
def _get_check_refs(self):
2631
"""Return the references needed to perform a check of this tree."""
2632
return [('trees', self.last_revision())]
2634
1743
def lock_tree_write(self):
2635
1744
"""See WorkingTree.lock_tree_write().
2835
1928
def unregister_format(klass, format):
1929
assert klass._formats[format.get_format_string()] is format
2836
1930
del klass._formats[format.get_format_string()]
2839
1934
class WorkingTreeFormat2(WorkingTreeFormat):
2840
"""The second working tree format.
1935
"""The second working tree format.
2842
1937
This format modified the hash cache from the format 1 hash cache.
2845
upgrade_recommended = True
2847
1940
def get_format_description(self):
2848
1941
"""See WorkingTreeFormat.get_format_description()."""
2849
1942
return "Working tree format 2"
2851
def _stub_initialize_on_transport(self, transport, file_mode):
2852
"""Workaround: create control files for a remote working tree.
1944
def stub_initialize_remote(self, control_files):
1945
"""As a special workaround create critical control files for a remote working tree
2854
1947
This ensures that it can later be updated and dealt with locally,
2855
since BzrDirFormat6 and BzrDirFormat5 cannot represent dirs with
1948
since BzrDirFormat6 and BzrDirFormat5 cannot represent dirs with
2856
1949
no working tree. (See bug #43064).
2858
1951
sio = StringIO()
2859
inv = inventory.Inventory()
2860
xml5.serializer_v5.write_inventory(inv, sio, working=True)
1953
xml5.serializer_v5.write_inventory(inv, sio)
2862
transport.put_file('inventory', sio, file_mode)
2863
transport.put_bytes('pending-merges', '', file_mode)
2865
def initialize(self, a_bzrdir, revision_id=None, from_branch=None,
2866
accelerator_tree=None, hardlink=False):
1955
control_files.put('inventory', sio)
1957
control_files.put_utf8('pending-merges', '')
1960
def initialize(self, a_bzrdir, revision_id=None):
2867
1961
"""See WorkingTreeFormat.initialize()."""
2868
1962
if not isinstance(a_bzrdir.transport, LocalTransport):
2869
1963
raise errors.NotLocalUrl(a_bzrdir.transport.base)
2870
if from_branch is not None:
2871
branch = from_branch
2873
branch = a_bzrdir.open_branch()
2874
if revision_id is None:
2875
revision_id = _mod_revision.ensure_null(branch.last_revision())
2878
branch.generate_revision_history(revision_id)
2881
inv = inventory.Inventory()
1964
branch = a_bzrdir.open_branch()
1965
if revision_id is not None:
1968
revision_history = branch.revision_history()
1970
position = revision_history.index(revision_id)
1972
raise errors.NoSuchRevision(branch, revision_id)
1973
branch.set_revision_history(revision_history[:position + 1])
1976
revision = branch.last_revision()
2882
1978
wt = WorkingTree2(a_bzrdir.root_transport.local_abspath('.'),
2885
1981
_internal=True,
2887
1983
_bzrdir=a_bzrdir)
2888
basis_tree = branch.repository.revision_tree(revision_id)
1984
basis_tree = branch.repository.revision_tree(revision)
2889
1985
if basis_tree.inventory.root is not None:
2890
wt.set_root_id(basis_tree.get_root_id())
1986
wt.set_root_id(basis_tree.inventory.root.file_id)
2891
1987
# set the parent list and cache the basis tree.
2892
if _mod_revision.is_null(revision_id):
2895
parent_trees = [(revision_id, basis_tree)]
2896
wt.set_parent_trees(parent_trees)
1988
wt.set_parent_trees([(revision, basis_tree)])
2897
1989
transform.build_tree(basis_tree, wt)
3030
2100
raise NotImplementedError
3031
2101
if not isinstance(a_bzrdir.transport, LocalTransport):
3032
2102
raise errors.NotLocalUrl(a_bzrdir.transport.base)
3033
wt = self._open(a_bzrdir, self._open_control_files(a_bzrdir))
2103
return self._open(a_bzrdir, self._open_control_files(a_bzrdir))
3036
2105
def _open(self, a_bzrdir, control_files):
3037
2106
"""Open the tree itself.
3039
2108
:param a_bzrdir: the dir for the tree.
3040
2109
:param control_files: the control files for the tree.
3042
return self._tree_class(a_bzrdir.root_transport.local_abspath('.'),
3046
_control_files=control_files)
2111
return WorkingTree3(a_bzrdir.root_transport.local_abspath('.'),
2115
_control_files=control_files)
3048
2117
def __str__(self):
3049
2118
return self.get_format_string()
3052
__default_format = WorkingTreeFormat6()
2121
# formats which have no format string are not discoverable
2122
# and not independently creatable, so are not registered.
2123
__default_format = WorkingTreeFormat3()
3053
2124
WorkingTreeFormat.register_format(__default_format)
3054
WorkingTreeFormat.register_format(WorkingTreeFormat5())
3055
WorkingTreeFormat.register_format(WorkingTreeFormat4())
3056
WorkingTreeFormat.register_format(WorkingTreeFormat3())
3057
2125
WorkingTreeFormat.set_default_format(__default_format)
3058
# formats which have no format string are not discoverable
3059
# and not independently creatable, so are not registered.
3060
2126
_legacy_formats = [WorkingTreeFormat2(),
2130
class WorkingTreeTestProviderAdapter(object):
2131
"""A tool to generate a suite testing multiple workingtree formats at once.
2133
This is done by copying the test once for each transport and injecting
2134
the transport_server, transport_readonly_server, and workingtree_format
2135
classes into each copy. Each copy is also given a new id() to make it
2139
def __init__(self, transport_server, transport_readonly_server, formats):
2140
self._transport_server = transport_server
2141
self._transport_readonly_server = transport_readonly_server
2142
self._formats = formats
2144
def _clone_test(self, test, bzrdir_format, workingtree_format, variation):
2145
"""Clone test for adaption."""
2146
new_test = deepcopy(test)
2147
new_test.transport_server = self._transport_server
2148
new_test.transport_readonly_server = self._transport_readonly_server
2149
new_test.bzrdir_format = bzrdir_format
2150
new_test.workingtree_format = workingtree_format
2151
def make_new_test_id():
2152
new_id = "%s(%s)" % (test.id(), variation)
2153
return lambda: new_id
2154
new_test.id = make_new_test_id()
2157
def adapt(self, test):
2158
from bzrlib.tests import TestSuite
2159
result = TestSuite()
2160
for workingtree_format, bzrdir_format in self._formats:
2161
new_test = self._clone_test(
2164
workingtree_format, workingtree_format.__class__.__name__)
2165
result.addTest(new_test)
added
removed
bzrlib/workingtree.py
