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
68
import bzrlib.branch
70
69
from bzrlib.transport import get_transport
71
from bzrlib.workingtree_4 import (
78
73
from bzrlib import symbol_versioning
79
74
from bzrlib.decorators import needs_read_lock, needs_write_lock
80
from bzrlib.lock import LogicalLockResult
81
from bzrlib.lockable_files import LockableFiles
75
from bzrlib.inventory import InventoryEntry, Inventory, ROOT_ID
76
from bzrlib.lockable_files import LockableFiles, TransportLock
82
77
from bzrlib.lockdir import LockDir
83
78
import bzrlib.mutabletree
84
79
from bzrlib.mutabletree import needs_tree_write_lock
85
from bzrlib import osutils
86
80
from bzrlib.osutils import (
94
90
supports_executable,
96
from bzrlib.filters import filtered_input_file
97
92
from bzrlib.trace import mutter, note
98
93
from bzrlib.transport.local import LocalTransport
99
from bzrlib.revision import CURRENT_REVISION
95
from bzrlib.progress import DummyProgress, ProgressPhase
96
from bzrlib.revision import NULL_REVISION, CURRENT_REVISION
97
import bzrlib.revisiontree
100
98
from bzrlib.rio import RioReader, rio_file, Stanza
101
from bzrlib.symbol_versioning import (
103
DEPRECATED_PARAMETER,
99
from bzrlib.symbol_versioning import (deprecated_passed,
102
DEPRECATED_PARAMETER,
107
109
MERGE_MODIFIED_HEADER_1 = "BZR merge-modified list format 1"
108
# TODO: Modifying the conflict objects or their type is currently nearly
109
# impossible as there is no clear relationship between the working tree format
110
# and the conflict list file format.
111
110
CONFLICT_HEADER_1 = "BZR conflict list format 1"
113
ERROR_PATH_NOT_FOUND = 3 # WindowsError errno code, equivalent to ENOENT
113
@deprecated_function(zero_thirteen)
114
def gen_file_id(name):
115
"""Return new file id for the basename 'name'.
117
Use bzrlib.generate_ids.gen_file_id() instead
119
return generate_ids.gen_file_id(name)
122
@deprecated_function(zero_thirteen)
124
"""Return a new tree-root file id.
126
This has been deprecated in favor of bzrlib.generate_ids.gen_root_id()
128
return generate_ids.gen_root_id()
116
131
class TreeEntry(object):
117
132
"""An entry that implements the minimum interface used by commands.
119
This needs further inspection, it may be better to have
134
This needs further inspection, it may be better to have
120
135
InventoryEntries without ids - though that seems wrong. For now,
121
136
this is a parallel hierarchy to InventoryEntry, and needs to become
122
137
one of several things: decorates to that hierarchy, children of, or
412
378
# no parents, return an empty revision tree.
413
379
# in the future this should return the tree for
414
380
# 'empty:' - the implicit root empty tree.
415
return self.branch.repository.revision_tree(
416
_mod_revision.NULL_REVISION)
418
return self.revision_tree(revision_id)
419
except errors.NoSuchRevision:
381
return self.branch.repository.revision_tree(None)
384
xml = self.read_basis_inventory()
385
inv = xml6.serializer_v6.read_inventory_from_string(xml)
386
if inv is not None and inv.revision_id == revision_id:
387
return bzrlib.revisiontree.RevisionTree(
388
self.branch.repository, inv, revision_id)
389
except (errors.NoSuchFile, errors.BadInventoryFormat):
421
391
# No cached copy available, retrieve from the repository.
422
392
# FIXME? RBC 20060403 should we cache the inventory locally
423
393
# at this point ?
425
395
return self.branch.repository.revision_tree(revision_id)
426
except (errors.RevisionNotPresent, errors.NoSuchRevision):
396
except errors.RevisionNotPresent:
427
397
# the basis tree *may* be a ghost or a low level error may have
428
# occurred. If the revision is present, its a problem, if its not
398
# occured. If the revision is present, its a problem, if its not
430
400
if self.branch.repository.has_revision(revision_id):
432
402
# the basis tree is a ghost so return an empty tree.
433
return self.branch.repository.revision_tree(
434
_mod_revision.NULL_REVISION)
437
self._flush_ignore_list_cache()
403
return self.branch.repository.revision_tree(None)
406
@deprecated_method(zero_eight)
407
def create(branch, directory):
408
"""Create a workingtree for branch at directory.
410
If existing_directory already exists it must have a .bzr directory.
411
If it does not exist, it will be created.
413
This returns a new WorkingTree object for the new checkout.
415
TODO FIXME RBC 20060124 when we have checkout formats in place this
416
should accept an optional revisionid to checkout [and reject this if
417
checking out into the same dir as a pre-checkout-aware branch format.]
419
XXX: When BzrDir is present, these should be created through that
422
warnings.warn('delete WorkingTree.create', stacklevel=3)
423
transport = get_transport(directory)
424
if branch.bzrdir.root_transport.base == transport.base:
426
return branch.bzrdir.create_workingtree()
427
# different directory,
428
# create a branch reference
429
# and now a working tree.
430
raise NotImplementedError
433
@deprecated_method(zero_eight)
434
def create_standalone(directory):
435
"""Create a checkout and a branch and a repo at directory.
437
Directory must exist and be empty.
439
please use BzrDir.create_standalone_workingtree
441
return bzrdir.BzrDir.create_standalone_workingtree(directory)
439
443
def relpath(self, path):
440
444
"""Return the local path portion from a given path.
442
The path may be absolute or relative. If its a relative path it is
446
The path may be absolute or relative. If its a relative path it is
443
447
interpreted relative to the python current working directory.
445
449
return osutils.relpath(self.basedir, path)
447
451
def has_filename(self, filename):
448
452
return osutils.lexists(self.abspath(filename))
450
def get_file(self, file_id, path=None, filtered=True):
451
return self.get_file_with_stat(file_id, path, filtered=filtered)[0]
453
def get_file_with_stat(self, file_id, path=None, filtered=True,
455
"""See Tree.get_file_with_stat."""
457
path = self.id2path(file_id)
458
file_obj = self.get_file_byname(path, filtered=False)
459
stat_value = _fstat(file_obj.fileno())
460
if filtered and self.supports_content_filtering():
461
filters = self._content_filter_stack(path)
462
file_obj = filtered_input_file(file_obj, filters)
463
return (file_obj, stat_value)
465
def get_file_text(self, file_id, path=None, filtered=True):
466
my_file = self.get_file(file_id, path=path, filtered=filtered)
468
return my_file.read()
472
def get_file_byname(self, filename, filtered=True):
473
path = self.abspath(filename)
475
if filtered and self.supports_content_filtering():
476
filters = self._content_filter_stack(filename)
477
return filtered_input_file(f, filters)
481
def get_file_lines(self, file_id, path=None, filtered=True):
482
"""See Tree.get_file_lines()"""
483
file = self.get_file(file_id, path, filtered=filtered)
485
return file.readlines()
490
def annotate_iter(self, file_id, default_revision=CURRENT_REVISION):
454
def get_file(self, file_id):
455
file_id = osutils.safe_file_id(file_id)
456
return self.get_file_byname(self.id2path(file_id))
458
def get_file_text(self, file_id):
459
file_id = osutils.safe_file_id(file_id)
460
return self.get_file(file_id).read()
462
def get_file_byname(self, filename):
463
return file(self.abspath(filename), 'rb')
465
def annotate_iter(self, file_id):
491
466
"""See Tree.annotate_iter
493
468
This implementation will use the basis tree implementation if possible.
497
472
incorrectly attributed to CURRENT_REVISION (but after committing, the
498
473
attribution will be correct).
500
maybe_file_parent_keys = []
501
for parent_id in self.get_parent_ids():
503
parent_tree = self.revision_tree(parent_id)
504
except errors.NoSuchRevisionInTree:
505
parent_tree = self.branch.repository.revision_tree(parent_id)
506
parent_tree.lock_read()
508
if file_id not in parent_tree:
510
ie = parent_tree.inventory[file_id]
511
if ie.kind != 'file':
512
# Note: this is slightly unnecessary, because symlinks and
513
# directories have a "text" which is the empty text, and we
514
# know that won't mess up annotations. But it seems cleaner
516
parent_text_key = (file_id, ie.revision)
517
if parent_text_key not in maybe_file_parent_keys:
518
maybe_file_parent_keys.append(parent_text_key)
521
graph = _mod_graph.Graph(self.branch.repository.texts)
522
heads = graph.heads(maybe_file_parent_keys)
523
file_parent_keys = []
524
for key in maybe_file_parent_keys:
526
file_parent_keys.append(key)
528
# Now we have the parents of this content
529
annotator = self.branch.repository.texts.get_annotator()
530
text = self.get_file_text(file_id)
531
this_key =(file_id, default_revision)
532
annotator.add_special_text(this_key, file_parent_keys, text)
533
annotations = [(key[-1], line)
534
for key, line in annotator.annotate_flat(this_key)]
537
def _get_ancestors(self, default_revision):
538
ancestors = set([default_revision])
539
for parent_id in self.get_parent_ids():
540
ancestors.update(self.branch.repository.get_ancestry(
541
parent_id, topo_sorted=False))
475
file_id = osutils.safe_file_id(file_id)
476
basis = self.basis_tree()
477
changes = self._iter_changes(basis, True, [file_id]).next()
478
changed_content, kind = changes[2], changes[6]
479
if not changed_content:
480
return basis.annotate_iter(file_id)
484
if kind[0] != 'file':
487
old_lines = list(basis.annotate_iter(file_id))
489
for tree in self.branch.repository.revision_trees(
490
self.get_parent_ids()[1:]):
491
if file_id not in tree:
493
old.append(list(tree.annotate_iter(file_id)))
494
return annotate.reannotate(old, self.get_file(file_id).readlines(),
544
497
def get_parent_ids(self):
545
498
"""See Tree.get_parent_ids.
547
500
This implementation reads the pending merges list and last_revision
548
501
value and uses that to decide what the parents list should be.
550
last_rev = _mod_revision.ensure_null(self._last_revision())
551
if _mod_revision.NULL_REVISION == last_rev:
503
last_rev = self._last_revision()
554
507
parents = [last_rev]
556
merges_bytes = self._transport.get_bytes('pending-merges')
509
merges_file = self._control_files.get('pending-merges')
557
510
except errors.NoSuchFile:
560
for l in osutils.split_lines(merges_bytes):
561
revision_id = l.rstrip('\n')
513
for l in merges_file.readlines():
514
revision_id = osutils.safe_revision_id(l.rstrip('\n'))
562
515
parents.append(revision_id)
621
582
__contains__ = has_id
623
584
def get_file_size(self, file_id):
624
"""See Tree.get_file_size"""
625
# XXX: this returns the on-disk size; it should probably return the
628
return os.path.getsize(self.id2abspath(file_id))
630
if e.errno != errno.ENOENT:
585
file_id = osutils.safe_file_id(file_id)
586
return os.path.getsize(self.id2abspath(file_id))
636
589
def get_file_sha1(self, file_id, path=None, stat_value=None):
590
file_id = osutils.safe_file_id(file_id)
638
592
path = self._inventory.id2path(file_id)
639
593
return self._hashcache.get_sha1(path, stat_value)
641
595
def get_file_mtime(self, file_id, path=None):
596
file_id = osutils.safe_file_id(file_id)
643
path = self.inventory.id2path(file_id)
598
path = self._inventory.id2path(file_id)
644
599
return os.lstat(self.abspath(path)).st_mtime
646
def _is_executable_from_path_and_stat_from_basis(self, path, stat_result):
647
file_id = self.path2id(path)
649
# For unversioned files on win32, we just assume they are not
652
return self._inventory[file_id].executable
654
def _is_executable_from_path_and_stat_from_stat(self, path, stat_result):
655
mode = stat_result.st_mode
656
return bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode)
658
601
if not supports_executable():
659
602
def is_executable(self, file_id, path=None):
603
file_id = osutils.safe_file_id(file_id)
660
604
return self._inventory[file_id].executable
662
_is_executable_from_path_and_stat = \
663
_is_executable_from_path_and_stat_from_basis
665
606
def is_executable(self, file_id, path=None):
667
path = self.id2path(file_id)
608
file_id = osutils.safe_file_id(file_id)
609
path = self._inventory.id2path(file_id)
668
610
mode = os.lstat(self.abspath(path)).st_mode
669
611
return bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode)
671
_is_executable_from_path_and_stat = \
672
_is_executable_from_path_and_stat_from_stat
674
@needs_tree_write_lock
675
614
def _add(self, files, ids, kinds):
676
615
"""See MutableTree._add."""
677
616
# TODO: Re-adding a file that is removed in the working copy
678
617
# should probably put it back with the previous ID.
679
# the read and write working inventory should not occur in this
618
# the read and write working inventory should not occur in this
680
619
# function - they should be part of lock_write and unlock.
620
inv = self.read_working_inventory()
682
621
for f, file_id, kind in zip(files, ids, kinds):
622
assert kind is not None
683
623
if file_id is None:
684
624
inv.add_path(f, kind=kind)
626
file_id = osutils.safe_file_id(file_id)
686
627
inv.add_path(f, kind=kind, file_id=file_id)
687
self._inventory_is_modified = True
628
self._write_inventory(inv)
689
630
@needs_tree_write_lock
690
631
def _gather_kinds(self, files, kinds):
751
692
self.set_parent_ids(parents, allow_leftmost_as_ghost=True)
753
def path_content_summary(self, path, _lstat=os.lstat,
754
_mapper=osutils.file_kind_from_stat_mode):
755
"""See Tree.path_content_summary."""
756
abspath = self.abspath(path)
758
stat_result = _lstat(abspath)
760
if getattr(e, 'errno', None) == errno.ENOENT:
762
return ('missing', None, None, None)
763
# propagate other errors
765
kind = _mapper(stat_result.st_mode)
767
return self._file_content_summary(path, stat_result)
768
elif kind == 'directory':
769
# perhaps it looks like a plain directory, but it's really a
771
if self._directory_is_tree_reference(path):
772
kind = 'tree-reference'
773
return kind, None, None, None
774
elif kind == 'symlink':
775
target = osutils.readlink(abspath)
776
return ('symlink', None, None, target)
778
return (kind, None, None, None)
780
def _file_content_summary(self, path, stat_result):
781
size = stat_result.st_size
782
executable = self._is_executable_from_path_and_stat(path, stat_result)
783
# try for a stat cache lookup
784
return ('file', size, executable, self._sha_from_stat(
694
@deprecated_method(zero_eleven)
696
def pending_merges(self):
697
"""Return a list of pending merges.
699
These are revisions that have been merged into the working
700
directory but not yet committed.
702
As of 0.11 this is deprecated. Please see WorkingTree.get_parent_ids()
703
instead - which is available on all tree objects.
705
return self.get_parent_ids()[1:]
787
707
def _check_parents_for_ghosts(self, revision_ids, allow_leftmost_as_ghost):
788
708
"""Common ghost checking functionality from set_parent_*.
919
800
branch.last_revision().
921
802
from bzrlib.merge import Merger, Merge3Merger
922
merger = Merger(self.branch, this_tree=self)
923
# check that there are no local alterations
924
if not force and self.has_changes():
925
raise errors.UncommittedChanges(self)
926
if to_revision is None:
927
to_revision = _mod_revision.ensure_null(branch.last_revision())
928
merger.other_rev_id = to_revision
929
if _mod_revision.is_null(merger.other_rev_id):
930
raise errors.NoCommits(branch)
931
self.branch.fetch(branch, last_revision=merger.other_rev_id)
932
merger.other_basis = merger.other_rev_id
933
merger.other_tree = self.branch.repository.revision_tree(
935
merger.other_branch = branch
936
if from_revision is None:
803
pb = bzrlib.ui.ui_factory.nested_progress_bar()
805
merger = Merger(self.branch, this_tree=self, pb=pb)
806
merger.pp = ProgressPhase("Merge phase", 5, pb)
807
merger.pp.next_phase()
808
# check that there are no
810
merger.check_basis(check_clean=True, require_commits=False)
811
if to_revision is None:
812
to_revision = branch.last_revision()
814
to_revision = osutils.safe_revision_id(to_revision)
815
merger.other_rev_id = to_revision
816
if merger.other_rev_id is None:
817
raise error.NoCommits(branch)
818
self.branch.fetch(branch, last_revision=merger.other_rev_id)
819
merger.other_basis = merger.other_rev_id
820
merger.other_tree = self.branch.repository.revision_tree(
822
merger.pp.next_phase()
937
823
merger.find_base()
939
merger.set_base_revision(from_revision, branch)
940
if merger.base_rev_id == merger.other_rev_id:
941
raise errors.PointlessMerge
942
merger.backup_files = False
943
if merge_type is None:
824
if merger.base_rev_id == merger.other_rev_id:
825
raise errors.PointlessMerge
826
merger.backup_files = False
944
827
merger.merge_type = Merge3Merger
946
merger.merge_type = merge_type
947
merger.set_interesting_files(None)
948
merger.show_base = False
949
merger.reprocess = False
950
conflicts = merger.do_merge()
828
merger.set_interesting_files(None)
829
merger.show_base = False
830
merger.reprocess = False
831
conflicts = merger.do_merge()
955
838
def merge_modified(self):
956
"""Return a dictionary of files modified by a merge.
958
The list is initialized by WorkingTree.set_merge_modified, which is
959
typically called after we make some automatic updates to the tree
962
This returns a map of file_id->sha1, containing only files which are
963
still in the working inventory and have that text hash.
966
hashfile = self._transport.get('merge-hashes')
840
hashfile = self._control_files.get('merge-hashes')
967
841
except errors.NoSuchFile:
972
if hashfile.next() != MERGE_MODIFIED_HEADER_1 + '\n':
973
raise errors.MergeModifiedFormatError()
974
except StopIteration:
845
if hashfile.next() != MERGE_MODIFIED_HEADER_1 + '\n':
975
846
raise errors.MergeModifiedFormatError()
976
for s in RioReader(hashfile):
977
# RioReader reads in Unicode, so convert file_ids back to utf8
978
file_id = osutils.safe_file_id(s.get("file_id"), warn=False)
979
if file_id not in self.inventory:
981
text_hash = s.get("hash")
982
if text_hash == self.get_file_sha1(file_id):
983
merge_hashes[file_id] = text_hash
847
except StopIteration:
848
raise errors.MergeModifiedFormatError()
849
for s in RioReader(hashfile):
850
file_id = s.get("file_id")
851
if file_id not in self.inventory:
854
if hash == self.get_file_sha1(file_id):
855
merge_hashes[file_id] = hash
988
858
@needs_write_lock
989
859
def mkdir(self, path, file_id=None):
997
867
def get_symlink_target(self, file_id):
998
abspath = self.id2abspath(file_id)
999
target = osutils.readlink(abspath)
1003
def subsume(self, other_tree):
1004
def add_children(inventory, entry):
1005
for child_entry in entry.children.values():
1006
inventory._byid[child_entry.file_id] = child_entry
1007
if child_entry.kind == 'directory':
1008
add_children(inventory, child_entry)
1009
if other_tree.get_root_id() == self.get_root_id():
1010
raise errors.BadSubsumeSource(self, other_tree,
1011
'Trees have the same root')
1013
other_tree_path = self.relpath(other_tree.basedir)
1014
except errors.PathNotChild:
1015
raise errors.BadSubsumeSource(self, other_tree,
1016
'Tree is not contained by the other')
1017
new_root_parent = self.path2id(osutils.dirname(other_tree_path))
1018
if new_root_parent is None:
1019
raise errors.BadSubsumeSource(self, other_tree,
1020
'Parent directory is not versioned.')
1021
# We need to ensure that the result of a fetch will have a
1022
# versionedfile for the other_tree root, and only fetching into
1023
# RepositoryKnit2 guarantees that.
1024
if not self.branch.repository.supports_rich_root():
1025
raise errors.SubsumeTargetNeedsUpgrade(other_tree)
1026
other_tree.lock_tree_write()
1028
new_parents = other_tree.get_parent_ids()
1029
other_root = other_tree.inventory.root
1030
other_root.parent_id = new_root_parent
1031
other_root.name = osutils.basename(other_tree_path)
1032
self.inventory.add(other_root)
1033
add_children(self.inventory, other_root)
1034
self._write_inventory(self.inventory)
1035
# normally we don't want to fetch whole repositories, but i think
1036
# here we really do want to consolidate the whole thing.
1037
for parent_id in other_tree.get_parent_ids():
1038
self.branch.fetch(other_tree.branch, parent_id)
1039
self.add_parent_tree_id(parent_id)
1042
other_tree.bzrdir.retire_bzrdir()
1044
def _setup_directory_is_tree_reference(self):
1045
if self._branch.repository._format.supports_tree_reference:
1046
self._directory_is_tree_reference = \
1047
self._directory_may_be_tree_reference
1049
self._directory_is_tree_reference = \
1050
self._directory_is_never_tree_reference
1052
def _directory_is_never_tree_reference(self, relpath):
1055
def _directory_may_be_tree_reference(self, relpath):
1056
# as a special case, if a directory contains control files then
1057
# it's a tree reference, except that the root of the tree is not
1058
return relpath and osutils.isdir(self.abspath(relpath) + u"/.bzr")
1059
# TODO: We could ask all the control formats whether they
1060
# recognize this directory, but at the moment there's no cheap api
1061
# to do that. Since we probably can only nest bzr checkouts and
1062
# they always use this name it's ok for now. -- mbp 20060306
1064
# FIXME: There is an unhandled case here of a subdirectory
1065
# containing .bzr but not a branch; that will probably blow up
1066
# when you try to commit it. It might happen if there is a
1067
# checkout in a subdirectory. This can be avoided by not adding
1070
@needs_tree_write_lock
1071
def extract(self, file_id, format=None):
1072
"""Extract a subtree from this tree.
1074
A new branch will be created, relative to the path for this tree.
1078
segments = osutils.splitpath(path)
1079
transport = self.branch.bzrdir.root_transport
1080
for name in segments:
1081
transport = transport.clone(name)
1082
transport.ensure_base()
1085
sub_path = self.id2path(file_id)
1086
branch_transport = mkdirs(sub_path)
1088
format = self.bzrdir.cloning_metadir()
1089
branch_transport.ensure_base()
1090
branch_bzrdir = format.initialize_on_transport(branch_transport)
1092
repo = branch_bzrdir.find_repository()
1093
except errors.NoRepositoryPresent:
1094
repo = branch_bzrdir.create_repository()
1095
if not repo.supports_rich_root():
1096
raise errors.RootNotRich()
1097
new_branch = branch_bzrdir.create_branch()
1098
new_branch.pull(self.branch)
1099
for parent_id in self.get_parent_ids():
1100
new_branch.fetch(self.branch, parent_id)
1101
tree_transport = self.bzrdir.root_transport.clone(sub_path)
1102
if tree_transport.base != branch_transport.base:
1103
tree_bzrdir = format.initialize_on_transport(tree_transport)
1104
branch.BranchReferenceFormat().initialize(tree_bzrdir,
1105
target_branch=new_branch)
1107
tree_bzrdir = branch_bzrdir
1108
wt = tree_bzrdir.create_workingtree(_mod_revision.NULL_REVISION)
1109
wt.set_parent_ids(self.get_parent_ids())
1110
my_inv = self.inventory
1111
child_inv = inventory.Inventory(root_id=None)
1112
new_root = my_inv[file_id]
1113
my_inv.remove_recursive_id(file_id)
1114
new_root.parent_id = None
1115
child_inv.add(new_root)
1116
self._write_inventory(my_inv)
1117
wt._write_inventory(child_inv)
1120
def _serialize(self, inventory, out_file):
1121
xml5.serializer_v5.write_inventory(self._inventory, out_file,
1124
def _deserialize(selt, in_file):
1125
return xml5.serializer_v5.read_inventory(in_file)
868
return os.readlink(self.id2abspath(file_id))
870
def file_class(self, filename):
871
if self.path2id(filename):
873
elif self.is_ignored(filename):
1127
878
def flush(self):
1128
879
"""Write the in memory inventory to disk."""
1130
881
if self._control_files._lock_mode != 'w':
1131
882
raise errors.NotWriteLocked(self)
1132
883
sio = StringIO()
1133
self._serialize(self._inventory, sio)
884
xml5.serializer_v5.write_inventory(self._inventory, sio)
1135
self._transport.put_file('inventory', sio,
1136
mode=self.bzrdir._get_file_mode())
886
self._control_files.put('inventory', sio)
1137
887
self._inventory_is_modified = False
1139
def _kind(self, relpath):
1140
return osutils.file_kind(self.abspath(relpath))
1142
def list_files(self, include_root=False, from_dir=None, recursive=True):
1143
"""List all files as (path, class, kind, id, entry).
889
def list_files(self, include_root=False):
890
"""Recursively list all files as (path, class, kind, id, entry).
1145
892
Lists, but does not descend into unversioned directories.
1146
894
This does not include files that have been deleted in this
1147
tree. Skips the control directory.
1149
:param include_root: if True, return an entry for the root
1150
:param from_dir: start from this directory or None for the root
1151
:param recursive: whether to recurse into subdirectories or not
897
Skips the control directory.
1153
# list_files is an iterator, so @needs_read_lock doesn't work properly
1154
# with it. So callers should be careful to always read_lock the tree.
1155
if not self.is_locked():
1156
raise errors.ObjectNotLocked(self)
1158
inv = self.inventory
1159
if from_dir is None and include_root is True:
899
inv = self._inventory
900
if include_root is True:
1160
901
yield ('', 'V', 'directory', inv.root.file_id, inv.root)
1161
902
# Convert these into local objects to save lookup times
1162
903
pathjoin = osutils.pathjoin
1163
file_kind = self._kind
904
file_kind = osutils.file_kind
1165
906
# transport.base ends in a slash, we want the piece
1166
907
# between the last two slashes
1929
1616
def read_basis_inventory(self):
1930
1617
"""Read the cached basis inventory."""
1931
1618
path = self._basis_inventory_name()
1932
return self._transport.get_bytes(path)
1619
return self._control_files.get(path).read()
1934
1621
@needs_read_lock
1935
1622
def read_working_inventory(self):
1936
1623
"""Read the working inventory.
1938
1625
:raises errors.InventoryModified: read_working_inventory will fail
1939
1626
when the current in memory inventory has been modified.
1941
# conceptually this should be an implementation detail of the tree.
1628
# conceptually this should be an implementation detail of the tree.
1942
1629
# XXX: Deprecate this.
1943
1630
# ElementTree does its own conversion from UTF-8, so open in
1945
1632
if self._inventory_is_modified:
1946
1633
raise errors.InventoryModified(self)
1947
f = self._transport.get('inventory')
1949
result = self._deserialize(f)
1634
result = xml5.serializer_v5.read_inventory(
1635
self._control_files.get('inventory'))
1952
1636
self._set_inventory(result, dirty=False)
1955
1639
@needs_tree_write_lock
1956
def remove(self, files, verbose=False, to_file=None, keep_files=True,
1958
"""Remove nominated files from the working inventory.
1960
:files: File paths relative to the basedir.
1961
:keep_files: If true, the files will also be kept.
1962
:force: Delete files and directories, even if they are changed and
1963
even if the directories are not empty.
1640
def remove(self, files, verbose=False, to_file=None):
1641
"""Remove nominated files from the working inventory..
1643
This does not remove their text. This does not run on XXX on what? RBC
1645
TODO: Refuse to remove modified files unless --force is given?
1647
TODO: Do something useful with directories.
1649
TODO: Should this remove the text or not? Tough call; not
1650
removing may be useful and the user can just use use rm, and
1651
is the opposite of add. Removing it is consistent with most
1652
other tools. Maybe an option.
1654
## TODO: Normalize names
1655
## TODO: Remove nested loops; better scalability
1965
1656
if isinstance(files, basestring):
1966
1657
files = [files]
1971
unknown_nested_files=set()
1973
to_file = sys.stdout
1975
def recurse_directory_to_add_files(directory):
1976
# Recurse directory and add all files
1977
# so we can check if they have changed.
1978
for parent_info, file_infos in self.walkdirs(directory):
1979
for relpath, basename, kind, lstat, fileid, kind in file_infos:
1980
# Is it versioned or ignored?
1981
if self.path2id(relpath) or self.is_ignored(relpath):
1982
# Add nested content for deletion.
1983
new_files.add(relpath)
1985
# Files which are not versioned and not ignored
1986
# should be treated as unknown.
1987
unknown_nested_files.add((relpath, None, kind))
1989
for filename in files:
1990
# Get file name into canonical form.
1991
abspath = self.abspath(filename)
1992
filename = self.relpath(abspath)
1993
if len(filename) > 0:
1994
new_files.add(filename)
1995
recurse_directory_to_add_files(filename)
1997
files = list(new_files)
2000
return # nothing to do
2002
# Sort needed to first handle directory content before the directory
2003
files.sort(reverse=True)
2005
# Bail out if we are going to delete files we shouldn't
2006
if not keep_files and not force:
2007
has_changed_files = len(unknown_nested_files) > 0
2008
if not has_changed_files:
2009
for (file_id, path, content_change, versioned, parent_id, name,
2010
kind, executable) in self.iter_changes(self.basis_tree(),
2011
include_unchanged=True, require_versioned=False,
2012
want_unversioned=True, specific_files=files):
2013
if versioned == (False, False):
2014
# The record is unknown ...
2015
if not self.is_ignored(path[1]):
2016
# ... but not ignored
2017
has_changed_files = True
2019
elif (content_change and (kind[1] is not None) and
2020
osutils.is_inside_any(files, path[1])):
2021
# Versioned and changed, but not deleted, and still
2022
# in one of the dirs to be deleted.
2023
has_changed_files = True
2026
if has_changed_files:
2027
# Make delta show ALL applicable changes in error message.
2028
tree_delta = self.changes_from(self.basis_tree(),
2029
require_versioned=False, want_unversioned=True,
2030
specific_files=files)
2031
for unknown_file in unknown_nested_files:
2032
if unknown_file not in tree_delta.unversioned:
2033
tree_delta.unversioned.extend((unknown_file,))
2034
raise errors.BzrRemoveChangedFilesError(tree_delta)
2036
# Build inv_delta and delete files where applicable,
2037
# do this before any modifications to inventory.
1659
inv = self.inventory
1661
# do this before any modifications
2038
1662
for f in files:
2039
fid = self.path2id(f)
1663
fid = inv.path2id(f)
2042
message = "%s is not versioned." % (f,)
1665
note("%s is not versioned."%f)
2045
# having removed it, it must be either ignored or unknown
1668
# having remove it, it must be either ignored or unknown
2046
1669
if self.is_ignored(f):
2047
1670
new_status = 'I'
2049
1672
new_status = '?'
2050
# XXX: Really should be a more abstract reporter interface
2051
kind_ch = osutils.kind_marker(self.kind(fid))
2052
to_file.write(new_status + ' ' + f + kind_ch + '\n')
2054
inv_delta.append((f, None, fid, None))
2055
message = "removed %s" % (f,)
2058
abs_path = self.abspath(f)
2059
if osutils.lexists(abs_path):
2060
if (osutils.isdir(abs_path) and
2061
len(os.listdir(abs_path)) > 0):
2063
osutils.rmtree(abs_path)
2065
message = "%s is not an empty directory "\
2066
"and won't be deleted." % (f,)
2068
osutils.delete_any(abs_path)
2069
message = "deleted %s" % (f,)
2070
elif message is not None:
2071
# Only care if we haven't done anything yet.
2072
message = "%s does not exist." % (f,)
2074
# Print only one message (if any) per file.
2075
if message is not None:
2077
self.apply_inventory_delta(inv_delta)
1673
textui.show_status(new_status, inv[fid].kind, f,
1677
self._write_inventory(inv)
2079
1679
@needs_tree_write_lock
2080
def revert(self, filenames=None, old_tree=None, backups=True,
2081
pb=None, report_changes=False):
1680
def revert(self, filenames, old_tree=None, backups=True,
1681
pb=DummyProgress(), report_changes=False):
2082
1682
from bzrlib.conflicts import resolve
2085
symbol_versioning.warn('Using [] to revert all files is deprecated'
2086
' as of bzr 0.91. Please use None (the default) instead.',
2087
DeprecationWarning, stacklevel=2)
2088
1683
if old_tree is None:
2089
basis_tree = self.basis_tree()
2090
basis_tree.lock_read()
2091
old_tree = basis_tree
1684
old_tree = self.basis_tree()
1685
conflicts = transform.revert(self, old_tree, filenames, backups, pb,
1687
if not len(filenames):
1688
self.set_parent_ids(self.get_parent_ids()[:1])
2095
conflicts = transform.revert(self, old_tree, filenames, backups, pb,
2097
if filenames is None and len(self.get_parent_ids()) > 1:
2099
last_revision = self.last_revision()
2100
if last_revision != _mod_revision.NULL_REVISION:
2101
if basis_tree is None:
2102
basis_tree = self.basis_tree()
2103
basis_tree.lock_read()
2104
parent_trees.append((last_revision, basis_tree))
2105
self.set_parent_trees(parent_trees)
2108
resolve(self, filenames, ignore_misses=True, recursive=True)
2110
if basis_tree is not None:
1691
resolve(self, filenames, ignore_misses=True)
2112
1692
return conflicts
2114
def revision_tree(self, revision_id):
2115
"""See Tree.revision_tree.
2117
WorkingTree can supply revision_trees for the basis revision only
2118
because there is only one cached inventory in the bzr directory.
2120
if revision_id == self.last_revision():
2122
xml = self.read_basis_inventory()
2123
except errors.NoSuchFile:
2127
inv = xml7.serializer_v7.read_inventory_from_string(xml)
2128
# dont use the repository revision_tree api because we want
2129
# to supply the inventory.
2130
if inv.revision_id == revision_id:
2131
return revisiontree.RevisionTree(self.branch.repository,
2133
except errors.BadInventoryFormat:
2135
# raise if there was no inventory, or if we read the wrong inventory.
2136
raise errors.NoSuchRevisionInTree(self, revision_id)
2138
1694
# XXX: This method should be deprecated in favour of taking in a proper
2139
1695
# new Inventory object.
2140
1696
@needs_tree_write_lock
2141
1697
def set_inventory(self, new_inventory_list):
2142
1698
from bzrlib.inventory import (Inventory,
2143
1699
InventoryDirectory,
2146
1703
inv = Inventory(self.get_root_id())
2269
1811
# cant set that until we update the working trees last revision to be
2270
1812
# one from the new branch, because it will just get absorbed by the
2271
1813
# parent de-duplication logic.
2273
1815
# We MUST save it even if an error occurs, because otherwise the users
2274
1816
# local work is unreferenced and will appear to have been lost.
2278
1820
last_rev = self.get_parent_ids()[0]
2279
1821
except IndexError:
2280
last_rev = _mod_revision.NULL_REVISION
2281
if revision is None:
2282
revision = self.branch.last_revision()
2284
old_tip = old_tip or _mod_revision.NULL_REVISION
2286
if not _mod_revision.is_null(old_tip) and old_tip != last_rev:
2287
# the branch we are bound to was updated
2288
# merge those changes in first
2289
base_tree = self.basis_tree()
2290
other_tree = self.branch.repository.revision_tree(old_tip)
2291
nb_conflicts = merge.merge_inner(self.branch, other_tree,
2292
base_tree, this_tree=self,
2293
change_reporter=change_reporter)
2295
self.add_parent_tree((old_tip, other_tree))
2296
trace.note('Rerun update after fixing the conflicts.')
2299
if last_rev != _mod_revision.ensure_null(revision):
2300
# the working tree is up to date with the branch
2301
# we can merge the specified revision from master
2302
to_tree = self.branch.repository.revision_tree(revision)
2303
to_root_id = to_tree.get_root_id()
1823
if last_rev != self.branch.last_revision():
1824
# merge tree state up to new branch tip.
2305
1825
basis = self.basis_tree()
2308
if (basis.inventory.root is None
2309
or basis.inventory.root.file_id != to_root_id):
2310
self.set_root_id(to_root_id)
2315
# determine the branch point
2316
graph = self.branch.repository.get_graph()
2317
base_rev_id = graph.find_unique_lca(self.branch.last_revision(),
2319
base_tree = self.branch.repository.revision_tree(base_rev_id)
2321
nb_conflicts = merge.merge_inner(self.branch, to_tree, base_tree,
2323
change_reporter=change_reporter)
2324
self.set_last_revision(revision)
1826
to_tree = self.branch.basis_tree()
1827
if basis.inventory.root is None:
1828
self.set_root_id(to_tree.inventory.root.file_id)
1829
result += merge.merge_inner(
2325
1834
# TODO - dedup parents list with things merged by pull ?
2326
1835
# reuse the tree we've updated to to set the basis:
2327
parent_trees = [(revision, to_tree)]
1836
parent_trees = [(self.branch.last_revision(), to_tree)]
2328
1837
merges = self.get_parent_ids()[1:]
2329
1838
# Ideally we ask the tree for the trees here, that way the working
2330
# tree can decide whether to give us the entire tree or give us a
1839
# tree can decide whether to give us teh entire tree or give us a
2331
1840
# lazy initialised tree. dirstate for instance will have the trees
2332
1841
# in ram already, whereas a last-revision + basis-inventory tree
2333
1842
# will not, but also does not need them when setting parents.
2334
1843
for parent in merges:
2335
1844
parent_trees.append(
2336
1845
(parent, self.branch.repository.revision_tree(parent)))
2337
if not _mod_revision.is_null(old_tip):
1846
if old_tip is not None:
2338
1847
parent_trees.append(
2339
1848
(old_tip, self.branch.repository.revision_tree(old_tip)))
2340
1849
self.set_parent_trees(parent_trees)
2341
1850
last_rev = parent_trees[0][0]
1852
# the working tree had the same last-revision as the master
1853
# branch did. We may still have pivot local work from the local
1854
# branch into old_tip:
1855
if old_tip is not None:
1856
self.add_parent_tree_id(old_tip)
1857
if old_tip and old_tip != last_rev:
1858
# our last revision was not the prior branch last revision
1859
# and we have converted that last revision to a pending merge.
1860
# base is somewhere between the branch tip now
1861
# and the now pending merge
1862
from bzrlib.revision import common_ancestor
1864
base_rev_id = common_ancestor(self.branch.last_revision(),
1866
self.branch.repository)
1867
except errors.NoCommonAncestor:
1869
base_tree = self.branch.repository.revision_tree(base_rev_id)
1870
other_tree = self.branch.repository.revision_tree(old_tip)
1871
result += merge.merge_inner(
2344
1878
def _write_hashcache_if_dirty(self):
2345
1879
"""Write out the hashcache if it is dirty."""
2393
1927
file_id=self.path2id(conflicted)))
2394
1928
return conflicts
2396
def walkdirs(self, prefix=""):
2397
"""Walk the directories of this tree.
2399
returns a generator which yields items in the form:
2400
((curren_directory_path, fileid),
2401
[(file1_path, file1_name, file1_kind, (lstat), file1_id,
2404
This API returns a generator, which is only valid during the current
2405
tree transaction - within a single lock_read or lock_write duration.
2407
If the tree is not locked, it may cause an error to be raised,
2408
depending on the tree implementation.
2410
disk_top = self.abspath(prefix)
2411
if disk_top.endswith('/'):
2412
disk_top = disk_top[:-1]
2413
top_strip_len = len(disk_top) + 1
2414
inventory_iterator = self._walkdirs(prefix)
2415
disk_iterator = osutils.walkdirs(disk_top, prefix)
2417
current_disk = disk_iterator.next()
2418
disk_finished = False
2420
if not (e.errno == errno.ENOENT or
2421
(sys.platform == 'win32' and e.errno == ERROR_PATH_NOT_FOUND)):
2424
disk_finished = True
2426
current_inv = inventory_iterator.next()
2427
inv_finished = False
2428
except StopIteration:
2431
while not inv_finished or not disk_finished:
2433
((cur_disk_dir_relpath, cur_disk_dir_path_from_top),
2434
cur_disk_dir_content) = current_disk
2436
((cur_disk_dir_relpath, cur_disk_dir_path_from_top),
2437
cur_disk_dir_content) = ((None, None), None)
2438
if not disk_finished:
2439
# strip out .bzr dirs
2440
if (cur_disk_dir_path_from_top[top_strip_len:] == '' and
2441
len(cur_disk_dir_content) > 0):
2442
# osutils.walkdirs can be made nicer -
2443
# yield the path-from-prefix rather than the pathjoined
2445
bzrdir_loc = bisect_left(cur_disk_dir_content,
2447
if (bzrdir_loc < len(cur_disk_dir_content)
2448
and self.bzrdir.is_control_filename(
2449
cur_disk_dir_content[bzrdir_loc][0])):
2450
# we dont yield the contents of, or, .bzr itself.
2451
del cur_disk_dir_content[bzrdir_loc]
2453
# everything is unknown
2456
# everything is missing
2459
direction = cmp(current_inv[0][0], cur_disk_dir_relpath)
2461
# disk is before inventory - unknown
2462
dirblock = [(relpath, basename, kind, stat, None, None) for
2463
relpath, basename, kind, stat, top_path in
2464
cur_disk_dir_content]
2465
yield (cur_disk_dir_relpath, None), dirblock
2467
current_disk = disk_iterator.next()
2468
except StopIteration:
2469
disk_finished = True
2471
# inventory is before disk - missing.
2472
dirblock = [(relpath, basename, 'unknown', None, fileid, kind)
2473
for relpath, basename, dkind, stat, fileid, kind in
2475
yield (current_inv[0][0], current_inv[0][1]), dirblock
2477
current_inv = inventory_iterator.next()
2478
except StopIteration:
2481
# versioned present directory
2482
# merge the inventory and disk data together
2484
for relpath, subiterator in itertools.groupby(sorted(
2485
current_inv[1] + cur_disk_dir_content,
2486
key=operator.itemgetter(0)), operator.itemgetter(1)):
2487
path_elements = list(subiterator)
2488
if len(path_elements) == 2:
2489
inv_row, disk_row = path_elements
2490
# versioned, present file
2491
dirblock.append((inv_row[0],
2492
inv_row[1], disk_row[2],
2493
disk_row[3], inv_row[4],
2495
elif len(path_elements[0]) == 5:
2497
dirblock.append((path_elements[0][0],
2498
path_elements[0][1], path_elements[0][2],
2499
path_elements[0][3], None, None))
2500
elif len(path_elements[0]) == 6:
2501
# versioned, absent file.
2502
dirblock.append((path_elements[0][0],
2503
path_elements[0][1], 'unknown', None,
2504
path_elements[0][4], path_elements[0][5]))
2506
raise NotImplementedError('unreachable code')
2507
yield current_inv[0], dirblock
2509
current_inv = inventory_iterator.next()
2510
except StopIteration:
2513
current_disk = disk_iterator.next()
2514
except StopIteration:
2515
disk_finished = True
2517
def _walkdirs(self, prefix=""):
2518
"""Walk the directories of this tree.
2520
:prefix: is used as the directrory to start with.
2521
returns a generator which yields items in the form:
2522
((curren_directory_path, fileid),
2523
[(file1_path, file1_name, file1_kind, None, file1_id,
2526
_directory = 'directory'
2527
# get the root in the inventory
2528
inv = self.inventory
2529
top_id = inv.path2id(prefix)
2533
pending = [(prefix, '', _directory, None, top_id, None)]
2536
currentdir = pending.pop()
2537
# 0 - relpath, 1- basename, 2- kind, 3- stat, 4-id, 5-kind
2538
top_id = currentdir[4]
2540
relroot = currentdir[0] + '/'
2543
# FIXME: stash the node in pending
2545
if entry.kind == 'directory':
2546
for name, child in entry.sorted_children():
2547
dirblock.append((relroot + name, name, child.kind, None,
2548
child.file_id, child.kind
2550
yield (currentdir[0], entry.file_id), dirblock
2551
# push the user specified dirs from dirblock
2552
for dir in reversed(dirblock):
2553
if dir[2] == _directory:
2556
@needs_tree_write_lock
2557
def auto_resolve(self):
2558
"""Automatically resolve text conflicts according to contents.
2560
Only text conflicts are auto_resolvable. Files with no conflict markers
2561
are considered 'resolved', because bzr always puts conflict markers
2562
into files that have text conflicts. The corresponding .THIS .BASE and
2563
.OTHER files are deleted, as per 'resolve'.
2564
:return: a tuple of ConflictLists: (un_resolved, resolved).
2566
un_resolved = _mod_conflicts.ConflictList()
2567
resolved = _mod_conflicts.ConflictList()
2568
conflict_re = re.compile('^(<{7}|={7}|>{7})')
2569
for conflict in self.conflicts():
2570
if (conflict.typestring != 'text conflict' or
2571
self.kind(conflict.file_id) != 'file'):
2572
un_resolved.append(conflict)
2574
my_file = open(self.id2abspath(conflict.file_id), 'rb')
2576
for line in my_file:
2577
if conflict_re.search(line):
2578
un_resolved.append(conflict)
2581
resolved.append(conflict)
2584
resolved.remove_files(self)
2585
self.set_conflicts(un_resolved)
2586
return un_resolved, resolved
2589
def _check(self, references):
2590
"""Check the tree for consistency.
2592
:param references: A dict with keys matching the items returned by
2593
self._get_check_refs(), and values from looking those keys up in
2596
tree_basis = self.basis_tree()
2597
tree_basis.lock_read()
2599
repo_basis = references[('trees', self.last_revision())]
2600
if len(list(repo_basis.iter_changes(tree_basis))) > 0:
2601
raise errors.BzrCheckError(
2602
"Mismatched basis inventory content.")
2607
def _validate(self):
2608
"""Validate internal structures.
2610
This is meant mostly for the test suite. To give it a chance to detect
2611
corruption after actions have occurred. The default implementation is a
2614
:return: None. An exception should be raised if there is an error.
2618
def _get_rules_searcher(self, default_searcher):
2619
"""See Tree._get_rules_searcher."""
2620
if self._rules_searcher is None:
2621
self._rules_searcher = super(WorkingTree,
2622
self)._get_rules_searcher(default_searcher)
2623
return self._rules_searcher
2625
def get_shelf_manager(self):
2626
"""Return the ShelfManager for this WorkingTree."""
2627
from bzrlib.shelf import ShelfManager
2628
return ShelfManager(self, self._transport)
2631
1931
class WorkingTree2(WorkingTree):
2632
1932
"""This is the Format 2 working tree.
2634
This was the first weave based working tree.
1934
This was the first weave based working tree.
2635
1935
- uses os locks for locking.
2636
1936
- uses the branch last-revision.
2639
def __init__(self, *args, **kwargs):
2640
super(WorkingTree2, self).__init__(*args, **kwargs)
2641
# WorkingTree2 has more of a constraint that self._inventory must
2642
# exist. Because this is an older format, we don't mind the overhead
2643
# caused by the extra computation here.
2645
# Newer WorkingTree's should only have self._inventory set when they
2647
if self._inventory is None:
2648
self.read_working_inventory()
2650
def _get_check_refs(self):
2651
"""Return the references needed to perform a check of this tree."""
2652
return [('trees', self.last_revision())]
2654
1939
def lock_tree_write(self):
2655
1940
"""See WorkingTree.lock_tree_write().
2657
1942
In Format2 WorkingTrees we have a single lock for the branch and tree
2658
1943
so lock_tree_write() degrades to lock_write().
2660
:return: An object with an unlock method which will release the lock
2663
1945
self.branch.lock_write()
2665
self._control_files.lock_write()
1947
return self._control_files.lock_write()
2668
1949
self.branch.unlock()
2671
1952
def unlock(self):
2672
# do non-implementation specific cleanup
2675
1953
# we share control files:
2676
1954
if self._control_files._lock_count == 3:
2677
1955
# _inventory_is_modified is always False during a read lock.
2678
1956
if self._inventory_is_modified:
2680
1958
self._write_hashcache_if_dirty()
2682
1960
# reverse order of locking.
2684
1962
return self._control_files.unlock()
2859
2124
def unregister_format(klass, format):
2125
assert klass._formats[format.get_format_string()] is format
2860
2126
del klass._formats[format.get_format_string()]
2863
2130
class WorkingTreeFormat2(WorkingTreeFormat):
2864
"""The second working tree format.
2131
"""The second working tree format.
2866
2133
This format modified the hash cache from the format 1 hash cache.
2869
upgrade_recommended = True
2871
2136
def get_format_description(self):
2872
2137
"""See WorkingTreeFormat.get_format_description()."""
2873
2138
return "Working tree format 2"
2875
def _stub_initialize_on_transport(self, transport, file_mode):
2876
"""Workaround: create control files for a remote working tree.
2140
def stub_initialize_remote(self, control_files):
2141
"""As a special workaround create critical control files for a remote working tree
2878
2143
This ensures that it can later be updated and dealt with locally,
2879
since BzrDirFormat6 and BzrDirFormat5 cannot represent dirs with
2144
since BzrDirFormat6 and BzrDirFormat5 cannot represent dirs with
2880
2145
no working tree. (See bug #43064).
2882
2147
sio = StringIO()
2883
inv = inventory.Inventory()
2884
xml5.serializer_v5.write_inventory(inv, sio, working=True)
2149
xml5.serializer_v5.write_inventory(inv, sio)
2886
transport.put_file('inventory', sio, file_mode)
2887
transport.put_bytes('pending-merges', '', file_mode)
2889
def initialize(self, a_bzrdir, revision_id=None, from_branch=None,
2890
accelerator_tree=None, hardlink=False):
2151
control_files.put('inventory', sio)
2153
control_files.put_bytes('pending-merges', '')
2156
def initialize(self, a_bzrdir, revision_id=None):
2891
2157
"""See WorkingTreeFormat.initialize()."""
2892
2158
if not isinstance(a_bzrdir.transport, LocalTransport):
2893
2159
raise errors.NotLocalUrl(a_bzrdir.transport.base)
2894
if from_branch is not None:
2895
branch = from_branch
2897
branch = a_bzrdir.open_branch()
2898
if revision_id is None:
2899
revision_id = _mod_revision.ensure_null(branch.last_revision())
2902
branch.generate_revision_history(revision_id)
2905
inv = inventory.Inventory()
2160
branch = a_bzrdir.open_branch()
2161
if revision_id is not None:
2162
revision_id = osutils.safe_revision_id(revision_id)
2165
revision_history = branch.revision_history()
2167
position = revision_history.index(revision_id)
2169
raise errors.NoSuchRevision(branch, revision_id)
2170
branch.set_revision_history(revision_history[:position + 1])
2173
revision = branch.last_revision()
2906
2175
wt = WorkingTree2(a_bzrdir.root_transport.local_abspath('.'),
2909
2178
_internal=True,
2911
2180
_bzrdir=a_bzrdir)
2912
basis_tree = branch.repository.revision_tree(revision_id)
2181
basis_tree = branch.repository.revision_tree(revision)
2913
2182
if basis_tree.inventory.root is not None:
2914
wt.set_root_id(basis_tree.get_root_id())
2183
wt.set_root_id(basis_tree.inventory.root.file_id)
2915
2184
# set the parent list and cache the basis tree.
2916
if _mod_revision.is_null(revision_id):
2919
parent_trees = [(revision_id, basis_tree)]
2920
wt.set_parent_trees(parent_trees)
2185
wt.set_parent_trees([(revision, basis_tree)])
2921
2186
transform.build_tree(basis_tree, wt)
3054
2299
raise NotImplementedError
3055
2300
if not isinstance(a_bzrdir.transport, LocalTransport):
3056
2301
raise errors.NotLocalUrl(a_bzrdir.transport.base)
3057
wt = self._open(a_bzrdir, self._open_control_files(a_bzrdir))
2302
return self._open(a_bzrdir, self._open_control_files(a_bzrdir))
3060
2304
def _open(self, a_bzrdir, control_files):
3061
2305
"""Open the tree itself.
3063
2307
:param a_bzrdir: the dir for the tree.
3064
2308
:param control_files: the control files for the tree.
3066
return self._tree_class(a_bzrdir.root_transport.local_abspath('.'),
3070
_control_files=control_files)
2310
return WorkingTree3(a_bzrdir.root_transport.local_abspath('.'),
2314
_control_files=control_files)
3072
2316
def __str__(self):
3073
2317
return self.get_format_string()
3076
__default_format = WorkingTreeFormat6()
2320
# formats which have no format string are not discoverable
2321
# and not independently creatable, so are not registered.
2322
__default_format = WorkingTreeFormat3()
3077
2323
WorkingTreeFormat.register_format(__default_format)
3078
WorkingTreeFormat.register_format(WorkingTreeFormat5())
3079
WorkingTreeFormat.register_format(WorkingTreeFormat4())
3080
WorkingTreeFormat.register_format(WorkingTreeFormat3())
3081
2324
WorkingTreeFormat.set_default_format(__default_format)
3082
# formats which have no format string are not discoverable
3083
# and not independently creatable, so are not registered.
3084
2325
_legacy_formats = [WorkingTreeFormat2(),
2329
class WorkingTreeTestProviderAdapter(object):
2330
"""A tool to generate a suite testing multiple workingtree formats at once.
2332
This is done by copying the test once for each transport and injecting
2333
the transport_server, transport_readonly_server, and workingtree_format
2334
classes into each copy. Each copy is also given a new id() to make it
2338
def __init__(self, transport_server, transport_readonly_server, formats):
2339
self._transport_server = transport_server
2340
self._transport_readonly_server = transport_readonly_server
2341
self._formats = formats
2343
def _clone_test(self, test, bzrdir_format, workingtree_format, variation):
2344
"""Clone test for adaption."""
2345
new_test = deepcopy(test)
2346
new_test.transport_server = self._transport_server
2347
new_test.transport_readonly_server = self._transport_readonly_server
2348
new_test.bzrdir_format = bzrdir_format
2349
new_test.workingtree_format = workingtree_format
2350
def make_new_test_id():
2351
new_id = "%s(%s)" % (test.id(), variation)
2352
return lambda: new_id
2353
new_test.id = make_new_test_id()
2356
def adapt(self, test):
2357
from bzrlib.tests import TestSuite
2358
result = TestSuite()
2359
for workingtree_format, bzrdir_format in self._formats:
2360
new_test = self._clone_test(
2363
workingtree_format, workingtree_format.__class__.__name__)
2364
result.addTest(new_test)
added
removed
bzrlib/workingtree.py
