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
return self.get_file(file_id, path=path, filtered=filtered).read()
468
def get_file_byname(self, filename, filtered=True):
469
path = self.abspath(filename)
471
if filtered and self.supports_content_filtering():
472
filters = self._content_filter_stack(filename)
473
return filtered_input_file(f, filters)
477
def get_file_lines(self, file_id, path=None, filtered=True):
478
"""See Tree.get_file_lines()"""
479
file = self.get_file(file_id, path, filtered=filtered)
481
return file.readlines()
486
def annotate_iter(self, file_id, default_revision=CURRENT_REVISION):
454
def get_file(self, file_id):
455
return self.get_file_byname(self.id2path(file_id))
457
def get_file_text(self, file_id):
458
return self.get_file(file_id).read()
460
def get_file_byname(self, filename):
461
return file(self.abspath(filename), 'rb')
463
def annotate_iter(self, file_id):
487
464
"""See Tree.annotate_iter
489
466
This implementation will use the basis tree implementation if possible.
493
470
incorrectly attributed to CURRENT_REVISION (but after committing, the
494
471
attribution will be correct).
496
maybe_file_parent_keys = []
497
for parent_id in self.get_parent_ids():
499
parent_tree = self.revision_tree(parent_id)
500
except errors.NoSuchRevisionInTree:
501
parent_tree = self.branch.repository.revision_tree(parent_id)
502
parent_tree.lock_read()
504
if file_id not in parent_tree:
506
ie = parent_tree.inventory[file_id]
507
if ie.kind != 'file':
508
# Note: this is slightly unnecessary, because symlinks and
509
# directories have a "text" which is the empty text, and we
510
# know that won't mess up annotations. But it seems cleaner
512
parent_text_key = (file_id, ie.revision)
513
if parent_text_key not in maybe_file_parent_keys:
514
maybe_file_parent_keys.append(parent_text_key)
517
graph = _mod_graph.Graph(self.branch.repository.texts)
518
heads = graph.heads(maybe_file_parent_keys)
519
file_parent_keys = []
520
for key in maybe_file_parent_keys:
522
file_parent_keys.append(key)
524
# Now we have the parents of this content
525
annotator = self.branch.repository.texts.get_annotator()
526
text = self.get_file(file_id).read()
527
this_key =(file_id, default_revision)
528
annotator.add_special_text(this_key, file_parent_keys, text)
529
annotations = [(key[-1], line)
530
for key, line in annotator.annotate_flat(this_key)]
533
def _get_ancestors(self, default_revision):
534
ancestors = set([default_revision])
535
for parent_id in self.get_parent_ids():
536
ancestors.update(self.branch.repository.get_ancestry(
537
parent_id, topo_sorted=False))
473
basis = self.basis_tree()
474
changes = self._iter_changes(basis, True, [file_id]).next()
475
changed_content, kind = changes[2], changes[6]
476
if not changed_content:
477
return basis.annotate_iter(file_id)
481
if kind[0] != 'file':
484
old_lines = list(basis.annotate_iter(file_id))
486
for tree in self.branch.repository.revision_trees(
487
self.get_parent_ids()[1:]):
488
if file_id not in tree:
490
old.append(list(tree.annotate_iter(file_id)))
491
return annotate.reannotate(old, self.get_file(file_id).readlines(),
540
494
def get_parent_ids(self):
541
495
"""See Tree.get_parent_ids.
543
497
This implementation reads the pending merges list and last_revision
544
498
value and uses that to decide what the parents list should be.
546
last_rev = _mod_revision.ensure_null(self._last_revision())
547
if _mod_revision.NULL_REVISION == last_rev:
500
last_rev = self._last_revision()
550
504
parents = [last_rev]
552
merges_bytes = self._transport.get_bytes('pending-merges')
506
merges_file = self._control_files.get_utf8('pending-merges')
553
507
except errors.NoSuchFile:
556
for l in osutils.split_lines(merges_bytes):
557
revision_id = l.rstrip('\n')
558
parents.append(revision_id)
510
for l in merges_file.readlines():
511
parents.append(l.rstrip('\n'))
562
515
def get_root_id(self):
563
516
"""Return the id of this trees root"""
564
517
return self._inventory.root.file_id
566
519
def _get_store_filename(self, file_id):
567
520
## XXX: badly named; this is not in the store at all
568
521
return self.abspath(self.id2path(file_id))
571
def clone(self, to_bzrdir, revision_id=None):
524
def clone(self, to_bzrdir, revision_id=None, basis=None):
572
525
"""Duplicate this working tree into to_bzr, including all state.
574
527
Specifically modified files are kept as modified, but
575
528
ignored and unknown files are discarded.
577
530
If you want to make a new line of development, see bzrdir.sprout()
580
If not None, the cloned tree will have its last revision set to
581
revision, and difference between the source trees last revision
533
If not None, the cloned tree will have its last revision set to
534
revision, and and difference between the source trees last revision
582
535
and this one merged in.
538
If not None, a closer copy of a tree which may have some files in
539
common, and which file content should be preferentially copied from.
584
541
# assumes the target bzr dir format is compatible.
585
result = to_bzrdir.create_workingtree()
542
result = self._format.initialize(to_bzrdir)
586
543
self.copy_content_into(result, revision_id)
637
585
def get_file_mtime(self, file_id, path=None):
639
path = self.inventory.id2path(file_id)
587
path = self._inventory.id2path(file_id)
640
588
return os.lstat(self.abspath(path)).st_mtime
642
def _is_executable_from_path_and_stat_from_basis(self, path, stat_result):
643
file_id = self.path2id(path)
645
# For unversioned files on win32, we just assume they are not
648
return self._inventory[file_id].executable
650
def _is_executable_from_path_and_stat_from_stat(self, path, stat_result):
651
mode = stat_result.st_mode
652
return bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode)
654
590
if not supports_executable():
655
591
def is_executable(self, file_id, path=None):
656
592
return self._inventory[file_id].executable
658
_is_executable_from_path_and_stat = \
659
_is_executable_from_path_and_stat_from_basis
661
594
def is_executable(self, file_id, path=None):
663
path = self.id2path(file_id)
596
path = self._inventory.id2path(file_id)
664
597
mode = os.lstat(self.abspath(path)).st_mode
665
598
return bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode)
667
_is_executable_from_path_and_stat = \
668
_is_executable_from_path_and_stat_from_stat
670
@needs_tree_write_lock
671
601
def _add(self, files, ids, kinds):
672
602
"""See MutableTree._add."""
673
603
# TODO: Re-adding a file that is removed in the working copy
674
604
# should probably put it back with the previous ID.
675
# the read and write working inventory should not occur in this
605
# the read and write working inventory should not occur in this
676
606
# function - they should be part of lock_write and unlock.
607
inv = self.read_working_inventory()
678
608
for f, file_id, kind in zip(files, ids, kinds):
609
assert kind is not None
679
610
if file_id is None:
680
611
inv.add_path(f, kind=kind)
682
613
inv.add_path(f, kind=kind, file_id=file_id)
683
self._inventory_is_modified = True
614
self._write_inventory(inv)
685
616
@needs_tree_write_lock
686
617
def _gather_kinds(self, files, kinds):
747
678
self.set_parent_ids(parents, allow_leftmost_as_ghost=True)
749
def path_content_summary(self, path, _lstat=os.lstat,
750
_mapper=osutils.file_kind_from_stat_mode):
751
"""See Tree.path_content_summary."""
752
abspath = self.abspath(path)
754
stat_result = _lstat(abspath)
756
if getattr(e, 'errno', None) == errno.ENOENT:
758
return ('missing', None, None, None)
759
# propagate other errors
761
kind = _mapper(stat_result.st_mode)
763
return self._file_content_summary(path, stat_result)
764
elif kind == 'directory':
765
# perhaps it looks like a plain directory, but it's really a
767
if self._directory_is_tree_reference(path):
768
kind = 'tree-reference'
769
return kind, None, None, None
770
elif kind == 'symlink':
771
target = osutils.readlink(abspath)
772
return ('symlink', None, None, target)
774
return (kind, None, None, None)
776
def _file_content_summary(self, path, stat_result):
777
size = stat_result.st_size
778
executable = self._is_executable_from_path_and_stat(path, stat_result)
779
# try for a stat cache lookup
780
return ('file', size, executable, self._sha_from_stat(
680
@deprecated_method(zero_eleven)
682
def pending_merges(self):
683
"""Return a list of pending merges.
685
These are revisions that have been merged into the working
686
directory but not yet committed.
688
As of 0.11 this is deprecated. Please see WorkingTree.get_parent_ids()
689
instead - which is available on all tree objects.
691
return self.get_parent_ids()[1:]
783
693
def _check_parents_for_ghosts(self, revision_ids, allow_leftmost_as_ghost):
784
694
"""Common ghost checking functionality from set_parent_*.
915
785
branch.last_revision().
917
787
from bzrlib.merge import Merger, Merge3Merger
918
merger = Merger(self.branch, this_tree=self)
919
# check that there are no local alterations
920
if not force and self.has_changes():
921
raise errors.UncommittedChanges(self)
922
if to_revision is None:
923
to_revision = _mod_revision.ensure_null(branch.last_revision())
924
merger.other_rev_id = to_revision
925
if _mod_revision.is_null(merger.other_rev_id):
926
raise errors.NoCommits(branch)
927
self.branch.fetch(branch, last_revision=merger.other_rev_id)
928
merger.other_basis = merger.other_rev_id
929
merger.other_tree = self.branch.repository.revision_tree(
931
merger.other_branch = branch
932
if from_revision is None:
788
pb = bzrlib.ui.ui_factory.nested_progress_bar()
790
merger = Merger(self.branch, this_tree=self, pb=pb)
791
merger.pp = ProgressPhase("Merge phase", 5, pb)
792
merger.pp.next_phase()
793
# check that there are no
795
merger.check_basis(check_clean=True, require_commits=False)
796
if to_revision is None:
797
to_revision = branch.last_revision()
798
merger.other_rev_id = to_revision
799
if merger.other_rev_id is None:
800
raise error.NoCommits(branch)
801
self.branch.fetch(branch, last_revision=merger.other_rev_id)
802
merger.other_basis = merger.other_rev_id
803
merger.other_tree = self.branch.repository.revision_tree(
805
merger.pp.next_phase()
933
806
merger.find_base()
935
merger.set_base_revision(from_revision, branch)
936
if merger.base_rev_id == merger.other_rev_id:
937
raise errors.PointlessMerge
938
merger.backup_files = False
939
if merge_type is None:
807
if merger.base_rev_id == merger.other_rev_id:
808
raise errors.PointlessMerge
809
merger.backup_files = False
940
810
merger.merge_type = Merge3Merger
942
merger.merge_type = merge_type
943
merger.set_interesting_files(None)
944
merger.show_base = False
945
merger.reprocess = False
946
conflicts = merger.do_merge()
811
merger.set_interesting_files(None)
812
merger.show_base = False
813
merger.reprocess = False
814
conflicts = merger.do_merge()
951
821
def merge_modified(self):
952
"""Return a dictionary of files modified by a merge.
954
The list is initialized by WorkingTree.set_merge_modified, which is
955
typically called after we make some automatic updates to the tree
958
This returns a map of file_id->sha1, containing only files which are
959
still in the working inventory and have that text hash.
962
hashfile = self._transport.get('merge-hashes')
823
hashfile = self._control_files.get('merge-hashes')
963
824
except errors.NoSuchFile:
968
if hashfile.next() != MERGE_MODIFIED_HEADER_1 + '\n':
969
raise errors.MergeModifiedFormatError()
970
except StopIteration:
828
if hashfile.next() != MERGE_MODIFIED_HEADER_1 + '\n':
971
829
raise errors.MergeModifiedFormatError()
972
for s in RioReader(hashfile):
973
# RioReader reads in Unicode, so convert file_ids back to utf8
974
file_id = osutils.safe_file_id(s.get("file_id"), warn=False)
975
if file_id not in self.inventory:
977
text_hash = s.get("hash")
978
if text_hash == self.get_file_sha1(file_id):
979
merge_hashes[file_id] = text_hash
830
except StopIteration:
831
raise errors.MergeModifiedFormatError()
832
for s in RioReader(hashfile):
833
file_id = s.get("file_id")
834
if file_id not in self.inventory:
837
if hash == self.get_file_sha1(file_id):
838
merge_hashes[file_id] = hash
984
841
@needs_write_lock
985
842
def mkdir(self, path, file_id=None):
993
850
def get_symlink_target(self, file_id):
994
abspath = self.id2abspath(file_id)
995
target = osutils.readlink(abspath)
999
def subsume(self, other_tree):
1000
def add_children(inventory, entry):
1001
for child_entry in entry.children.values():
1002
inventory._byid[child_entry.file_id] = child_entry
1003
if child_entry.kind == 'directory':
1004
add_children(inventory, child_entry)
1005
if other_tree.get_root_id() == self.get_root_id():
1006
raise errors.BadSubsumeSource(self, other_tree,
1007
'Trees have the same root')
1009
other_tree_path = self.relpath(other_tree.basedir)
1010
except errors.PathNotChild:
1011
raise errors.BadSubsumeSource(self, other_tree,
1012
'Tree is not contained by the other')
1013
new_root_parent = self.path2id(osutils.dirname(other_tree_path))
1014
if new_root_parent is None:
1015
raise errors.BadSubsumeSource(self, other_tree,
1016
'Parent directory is not versioned.')
1017
# We need to ensure that the result of a fetch will have a
1018
# versionedfile for the other_tree root, and only fetching into
1019
# RepositoryKnit2 guarantees that.
1020
if not self.branch.repository.supports_rich_root():
1021
raise errors.SubsumeTargetNeedsUpgrade(other_tree)
1022
other_tree.lock_tree_write()
1024
new_parents = other_tree.get_parent_ids()
1025
other_root = other_tree.inventory.root
1026
other_root.parent_id = new_root_parent
1027
other_root.name = osutils.basename(other_tree_path)
1028
self.inventory.add(other_root)
1029
add_children(self.inventory, other_root)
1030
self._write_inventory(self.inventory)
1031
# normally we don't want to fetch whole repositories, but i think
1032
# here we really do want to consolidate the whole thing.
1033
for parent_id in other_tree.get_parent_ids():
1034
self.branch.fetch(other_tree.branch, parent_id)
1035
self.add_parent_tree_id(parent_id)
1038
other_tree.bzrdir.retire_bzrdir()
1040
def _setup_directory_is_tree_reference(self):
1041
if self._branch.repository._format.supports_tree_reference:
1042
self._directory_is_tree_reference = \
1043
self._directory_may_be_tree_reference
1045
self._directory_is_tree_reference = \
1046
self._directory_is_never_tree_reference
1048
def _directory_is_never_tree_reference(self, relpath):
1051
def _directory_may_be_tree_reference(self, relpath):
1052
# as a special case, if a directory contains control files then
1053
# it's a tree reference, except that the root of the tree is not
1054
return relpath and osutils.isdir(self.abspath(relpath) + u"/.bzr")
1055
# TODO: We could ask all the control formats whether they
1056
# recognize this directory, but at the moment there's no cheap api
1057
# to do that. Since we probably can only nest bzr checkouts and
1058
# they always use this name it's ok for now. -- mbp 20060306
1060
# FIXME: There is an unhandled case here of a subdirectory
1061
# containing .bzr but not a branch; that will probably blow up
1062
# when you try to commit it. It might happen if there is a
1063
# checkout in a subdirectory. This can be avoided by not adding
1066
@needs_tree_write_lock
1067
def extract(self, file_id, format=None):
1068
"""Extract a subtree from this tree.
1070
A new branch will be created, relative to the path for this tree.
1074
segments = osutils.splitpath(path)
1075
transport = self.branch.bzrdir.root_transport
1076
for name in segments:
1077
transport = transport.clone(name)
1078
transport.ensure_base()
1081
sub_path = self.id2path(file_id)
1082
branch_transport = mkdirs(sub_path)
1084
format = self.bzrdir.cloning_metadir()
1085
branch_transport.ensure_base()
1086
branch_bzrdir = format.initialize_on_transport(branch_transport)
1088
repo = branch_bzrdir.find_repository()
1089
except errors.NoRepositoryPresent:
1090
repo = branch_bzrdir.create_repository()
1091
if not repo.supports_rich_root():
1092
raise errors.RootNotRich()
1093
new_branch = branch_bzrdir.create_branch()
1094
new_branch.pull(self.branch)
1095
for parent_id in self.get_parent_ids():
1096
new_branch.fetch(self.branch, parent_id)
1097
tree_transport = self.bzrdir.root_transport.clone(sub_path)
1098
if tree_transport.base != branch_transport.base:
1099
tree_bzrdir = format.initialize_on_transport(tree_transport)
1100
branch.BranchReferenceFormat().initialize(tree_bzrdir,
1101
target_branch=new_branch)
1103
tree_bzrdir = branch_bzrdir
1104
wt = tree_bzrdir.create_workingtree(_mod_revision.NULL_REVISION)
1105
wt.set_parent_ids(self.get_parent_ids())
1106
my_inv = self.inventory
1107
child_inv = inventory.Inventory(root_id=None)
1108
new_root = my_inv[file_id]
1109
my_inv.remove_recursive_id(file_id)
1110
new_root.parent_id = None
1111
child_inv.add(new_root)
1112
self._write_inventory(my_inv)
1113
wt._write_inventory(child_inv)
1116
def _serialize(self, inventory, out_file):
1117
xml5.serializer_v5.write_inventory(self._inventory, out_file,
1120
def _deserialize(selt, in_file):
1121
return xml5.serializer_v5.read_inventory(in_file)
851
return os.readlink(self.id2abspath(file_id))
853
def file_class(self, filename):
854
if self.path2id(filename):
856
elif self.is_ignored(filename):
1123
861
def flush(self):
1124
862
"""Write the in memory inventory to disk."""
1126
864
if self._control_files._lock_mode != 'w':
1127
865
raise errors.NotWriteLocked(self)
1128
866
sio = StringIO()
1129
self._serialize(self._inventory, sio)
867
xml5.serializer_v5.write_inventory(self._inventory, sio)
1131
self._transport.put_file('inventory', sio,
1132
mode=self.bzrdir._get_file_mode())
869
self._control_files.put('inventory', sio)
1133
870
self._inventory_is_modified = False
1135
def _kind(self, relpath):
1136
return osutils.file_kind(self.abspath(relpath))
1138
def list_files(self, include_root=False, from_dir=None, recursive=True):
1139
"""List all files as (path, class, kind, id, entry).
872
def list_files(self, include_root=False):
873
"""Recursively list all files as (path, class, kind, id, entry).
1141
875
Lists, but does not descend into unversioned directories.
1142
877
This does not include files that have been deleted in this
1143
tree. Skips the control directory.
1145
:param include_root: if True, return an entry for the root
1146
:param from_dir: start from this directory or None for the root
1147
:param recursive: whether to recurse into subdirectories or not
880
Skips the control directory.
1149
# list_files is an iterator, so @needs_read_lock doesn't work properly
1150
# with it. So callers should be careful to always read_lock the tree.
1151
if not self.is_locked():
1152
raise errors.ObjectNotLocked(self)
1154
inv = self.inventory
1155
if from_dir is None and include_root is True:
882
inv = self._inventory
883
if include_root is True:
1156
884
yield ('', 'V', 'directory', inv.root.file_id, inv.root)
1157
885
# Convert these into local objects to save lookup times
1158
886
pathjoin = osutils.pathjoin
1159
file_kind = self._kind
887
file_kind = osutils.file_kind
1161
889
# transport.base ends in a slash, we want the piece
1162
890
# between the last two slashes
1925
1595
def read_basis_inventory(self):
1926
1596
"""Read the cached basis inventory."""
1927
1597
path = self._basis_inventory_name()
1928
return self._transport.get_bytes(path)
1598
return self._control_files.get(path).read()
1930
1600
@needs_read_lock
1931
1601
def read_working_inventory(self):
1932
1602
"""Read the working inventory.
1934
1604
:raises errors.InventoryModified: read_working_inventory will fail
1935
1605
when the current in memory inventory has been modified.
1937
# conceptually this should be an implementation detail of the tree.
1607
# conceptually this should be an implementation detail of the tree.
1938
1608
# XXX: Deprecate this.
1939
1609
# ElementTree does its own conversion from UTF-8, so open in
1941
1611
if self._inventory_is_modified:
1942
1612
raise errors.InventoryModified(self)
1943
f = self._transport.get('inventory')
1945
result = self._deserialize(f)
1613
result = xml5.serializer_v5.read_inventory(
1614
self._control_files.get('inventory'))
1948
1615
self._set_inventory(result, dirty=False)
1951
1618
@needs_tree_write_lock
1952
def remove(self, files, verbose=False, to_file=None, keep_files=True,
1954
"""Remove nominated files from the working inventory.
1956
:files: File paths relative to the basedir.
1957
:keep_files: If true, the files will also be kept.
1958
:force: Delete files and directories, even if they are changed and
1959
even if the directories are not empty.
1619
def remove(self, files, verbose=False, to_file=None):
1620
"""Remove nominated files from the working inventory..
1622
This does not remove their text. This does not run on XXX on what? RBC
1624
TODO: Refuse to remove modified files unless --force is given?
1626
TODO: Do something useful with directories.
1628
TODO: Should this remove the text or not? Tough call; not
1629
removing may be useful and the user can just use use rm, and
1630
is the opposite of add. Removing it is consistent with most
1631
other tools. Maybe an option.
1633
## TODO: Normalize names
1634
## TODO: Remove nested loops; better scalability
1961
1635
if isinstance(files, basestring):
1962
1636
files = [files]
1967
unknown_nested_files=set()
1969
to_file = sys.stdout
1971
def recurse_directory_to_add_files(directory):
1972
# Recurse directory and add all files
1973
# so we can check if they have changed.
1974
for parent_info, file_infos in self.walkdirs(directory):
1975
for relpath, basename, kind, lstat, fileid, kind in file_infos:
1976
# Is it versioned or ignored?
1977
if self.path2id(relpath) or self.is_ignored(relpath):
1978
# Add nested content for deletion.
1979
new_files.add(relpath)
1981
# Files which are not versioned and not ignored
1982
# should be treated as unknown.
1983
unknown_nested_files.add((relpath, None, kind))
1985
for filename in files:
1986
# Get file name into canonical form.
1987
abspath = self.abspath(filename)
1988
filename = self.relpath(abspath)
1989
if len(filename) > 0:
1990
new_files.add(filename)
1991
recurse_directory_to_add_files(filename)
1993
files = list(new_files)
1996
return # nothing to do
1998
# Sort needed to first handle directory content before the directory
1999
files.sort(reverse=True)
2001
# Bail out if we are going to delete files we shouldn't
2002
if not keep_files and not force:
2003
has_changed_files = len(unknown_nested_files) > 0
2004
if not has_changed_files:
2005
for (file_id, path, content_change, versioned, parent_id, name,
2006
kind, executable) in self.iter_changes(self.basis_tree(),
2007
include_unchanged=True, require_versioned=False,
2008
want_unversioned=True, specific_files=files):
2009
if versioned == (False, False):
2010
# The record is unknown ...
2011
if not self.is_ignored(path[1]):
2012
# ... but not ignored
2013
has_changed_files = True
2015
elif (content_change and (kind[1] is not None) and
2016
osutils.is_inside_any(files, path[1])):
2017
# Versioned and changed, but not deleted, and still
2018
# in one of the dirs to be deleted.
2019
has_changed_files = True
2022
if has_changed_files:
2023
# Make delta show ALL applicable changes in error message.
2024
tree_delta = self.changes_from(self.basis_tree(),
2025
require_versioned=False, want_unversioned=True,
2026
specific_files=files)
2027
for unknown_file in unknown_nested_files:
2028
if unknown_file not in tree_delta.unversioned:
2029
tree_delta.unversioned.extend((unknown_file,))
2030
raise errors.BzrRemoveChangedFilesError(tree_delta)
2032
# Build inv_delta and delete files where applicable,
2033
# do this before any modifications to inventory.
1638
inv = self.inventory
1640
# do this before any modifications
2034
1641
for f in files:
2035
fid = self.path2id(f)
1642
fid = inv.path2id(f)
2038
message = "%s is not versioned." % (f,)
2041
# having removed it, it must be either ignored or unknown
2042
if self.is_ignored(f):
2046
# XXX: Really should be a more abstract reporter interface
2047
kind_ch = osutils.kind_marker(self.kind(fid))
2048
to_file.write(new_status + ' ' + f + kind_ch + '\n')
2050
inv_delta.append((f, None, fid, None))
2051
message = "removed %s" % (f,)
2054
abs_path = self.abspath(f)
2055
if osutils.lexists(abs_path):
2056
if (osutils.isdir(abs_path) and
2057
len(os.listdir(abs_path)) > 0):
2059
osutils.rmtree(abs_path)
2061
message = "%s is not an empty directory "\
2062
"and won't be deleted." % (f,)
2064
osutils.delete_any(abs_path)
2065
message = "deleted %s" % (f,)
2066
elif message is not None:
2067
# Only care if we haven't done anything yet.
2068
message = "%s does not exist." % (f,)
2070
# Print only one message (if any) per file.
2071
if message is not None:
2073
self.apply_inventory_delta(inv_delta)
1644
# TODO: Perhaps make this just a warning, and continue?
1645
# This tends to happen when
1646
raise errors.NotVersionedError(path=f)
1648
# having remove it, it must be either ignored or unknown
1649
if self.is_ignored(f):
1653
textui.show_status(new_status, inv[fid].kind, f,
1657
self._write_inventory(inv)
2075
1659
@needs_tree_write_lock
2076
def revert(self, filenames=None, old_tree=None, backups=True,
2077
pb=None, report_changes=False):
1660
def revert(self, filenames, old_tree=None, backups=True,
1661
pb=DummyProgress()):
2078
1662
from bzrlib.conflicts import resolve
2081
symbol_versioning.warn('Using [] to revert all files is deprecated'
2082
' as of bzr 0.91. Please use None (the default) instead.',
2083
DeprecationWarning, stacklevel=2)
2084
1663
if old_tree is None:
2085
basis_tree = self.basis_tree()
2086
basis_tree.lock_read()
2087
old_tree = basis_tree
1664
old_tree = self.basis_tree()
1665
conflicts = transform.revert(self, old_tree, filenames, backups, pb)
1666
if not len(filenames):
1667
self.set_parent_ids(self.get_parent_ids()[:1])
2091
conflicts = transform.revert(self, old_tree, filenames, backups, pb,
2093
if filenames is None and len(self.get_parent_ids()) > 1:
2095
last_revision = self.last_revision()
2096
if last_revision != _mod_revision.NULL_REVISION:
2097
if basis_tree is None:
2098
basis_tree = self.basis_tree()
2099
basis_tree.lock_read()
2100
parent_trees.append((last_revision, basis_tree))
2101
self.set_parent_trees(parent_trees)
2104
resolve(self, filenames, ignore_misses=True, recursive=True)
2106
if basis_tree is not None:
1670
resolve(self, filenames, ignore_misses=True)
2108
1671
return conflicts
2110
def revision_tree(self, revision_id):
2111
"""See Tree.revision_tree.
2113
WorkingTree can supply revision_trees for the basis revision only
2114
because there is only one cached inventory in the bzr directory.
2116
if revision_id == self.last_revision():
2118
xml = self.read_basis_inventory()
2119
except errors.NoSuchFile:
2123
inv = xml7.serializer_v7.read_inventory_from_string(xml)
2124
# dont use the repository revision_tree api because we want
2125
# to supply the inventory.
2126
if inv.revision_id == revision_id:
2127
return revisiontree.RevisionTree(self.branch.repository,
2129
except errors.BadInventoryFormat:
2131
# raise if there was no inventory, or if we read the wrong inventory.
2132
raise errors.NoSuchRevisionInTree(self, revision_id)
2134
1673
# XXX: This method should be deprecated in favour of taking in a proper
2135
1674
# new Inventory object.
2136
1675
@needs_tree_write_lock
2137
1676
def set_inventory(self, new_inventory_list):
2138
1677
from bzrlib.inventory import (Inventory,
2139
1678
InventoryDirectory,
2142
1682
inv = Inventory(self.get_root_id())
2265
1788
# cant set that until we update the working trees last revision to be
2266
1789
# one from the new branch, because it will just get absorbed by the
2267
1790
# parent de-duplication logic.
2269
1792
# We MUST save it even if an error occurs, because otherwise the users
2270
1793
# local work is unreferenced and will appear to have been lost.
2274
1797
last_rev = self.get_parent_ids()[0]
2275
1798
except IndexError:
2276
last_rev = _mod_revision.NULL_REVISION
2277
if revision is None:
2278
revision = self.branch.last_revision()
2280
old_tip = old_tip or _mod_revision.NULL_REVISION
2282
if not _mod_revision.is_null(old_tip) and old_tip != last_rev:
2283
# the branch we are bound to was updated
2284
# merge those changes in first
2285
base_tree = self.basis_tree()
2286
other_tree = self.branch.repository.revision_tree(old_tip)
2287
nb_conflicts = merge.merge_inner(self.branch, other_tree,
2288
base_tree, this_tree=self,
2289
change_reporter=change_reporter)
2291
self.add_parent_tree((old_tip, other_tree))
2292
trace.note('Rerun update after fixing the conflicts.')
2295
if last_rev != _mod_revision.ensure_null(revision):
2296
# the working tree is up to date with the branch
2297
# we can merge the specified revision from master
2298
to_tree = self.branch.repository.revision_tree(revision)
2299
to_root_id = to_tree.get_root_id()
1800
if last_rev != self.branch.last_revision():
1801
# merge tree state up to new branch tip.
2301
1802
basis = self.basis_tree()
2304
if (basis.inventory.root is None
2305
or basis.inventory.root.file_id != to_root_id):
2306
self.set_root_id(to_root_id)
2311
# determine the branch point
2312
graph = self.branch.repository.get_graph()
2313
base_rev_id = graph.find_unique_lca(self.branch.last_revision(),
2315
base_tree = self.branch.repository.revision_tree(base_rev_id)
2317
nb_conflicts = merge.merge_inner(self.branch, to_tree, base_tree,
2319
change_reporter=change_reporter)
2320
self.set_last_revision(revision)
1803
to_tree = self.branch.basis_tree()
1804
if basis.inventory.root is None:
1805
self.set_root_id(to_tree.inventory.root.file_id)
1806
result += merge.merge_inner(
2321
1811
# TODO - dedup parents list with things merged by pull ?
2322
1812
# reuse the tree we've updated to to set the basis:
2323
parent_trees = [(revision, to_tree)]
1813
parent_trees = [(self.branch.last_revision(), to_tree)]
2324
1814
merges = self.get_parent_ids()[1:]
2325
1815
# Ideally we ask the tree for the trees here, that way the working
2326
# tree can decide whether to give us the entire tree or give us a
1816
# tree can decide whether to give us teh entire tree or give us a
2327
1817
# lazy initialised tree. dirstate for instance will have the trees
2328
1818
# in ram already, whereas a last-revision + basis-inventory tree
2329
1819
# will not, but also does not need them when setting parents.
2330
1820
for parent in merges:
2331
1821
parent_trees.append(
2332
1822
(parent, self.branch.repository.revision_tree(parent)))
2333
if not _mod_revision.is_null(old_tip):
1823
if old_tip is not None:
2334
1824
parent_trees.append(
2335
1825
(old_tip, self.branch.repository.revision_tree(old_tip)))
2336
1826
self.set_parent_trees(parent_trees)
2337
1827
last_rev = parent_trees[0][0]
1829
# the working tree had the same last-revision as the master
1830
# branch did. We may still have pivot local work from the local
1831
# branch into old_tip:
1832
if old_tip is not None:
1833
self.add_parent_tree_id(old_tip)
1834
if old_tip and old_tip != last_rev:
1835
# our last revision was not the prior branch last revision
1836
# and we have converted that last revision to a pending merge.
1837
# base is somewhere between the branch tip now
1838
# and the now pending merge
1839
from bzrlib.revision import common_ancestor
1841
base_rev_id = common_ancestor(self.branch.last_revision(),
1843
self.branch.repository)
1844
except errors.NoCommonAncestor:
1846
base_tree = self.branch.repository.revision_tree(base_rev_id)
1847
other_tree = self.branch.repository.revision_tree(old_tip)
1848
result += merge.merge_inner(
2340
1855
def _write_hashcache_if_dirty(self):
2341
1856
"""Write out the hashcache if it is dirty."""
2389
1904
file_id=self.path2id(conflicted)))
2390
1905
return conflicts
2392
def walkdirs(self, prefix=""):
2393
"""Walk the directories of this tree.
2395
returns a generator which yields items in the form:
2396
((curren_directory_path, fileid),
2397
[(file1_path, file1_name, file1_kind, (lstat), file1_id,
2400
This API returns a generator, which is only valid during the current
2401
tree transaction - within a single lock_read or lock_write duration.
2403
If the tree is not locked, it may cause an error to be raised,
2404
depending on the tree implementation.
2406
disk_top = self.abspath(prefix)
2407
if disk_top.endswith('/'):
2408
disk_top = disk_top[:-1]
2409
top_strip_len = len(disk_top) + 1
2410
inventory_iterator = self._walkdirs(prefix)
2411
disk_iterator = osutils.walkdirs(disk_top, prefix)
2413
current_disk = disk_iterator.next()
2414
disk_finished = False
2416
if not (e.errno == errno.ENOENT or
2417
(sys.platform == 'win32' and e.errno == ERROR_PATH_NOT_FOUND)):
2420
disk_finished = True
2422
current_inv = inventory_iterator.next()
2423
inv_finished = False
2424
except StopIteration:
2427
while not inv_finished or not disk_finished:
2429
((cur_disk_dir_relpath, cur_disk_dir_path_from_top),
2430
cur_disk_dir_content) = current_disk
2432
((cur_disk_dir_relpath, cur_disk_dir_path_from_top),
2433
cur_disk_dir_content) = ((None, None), None)
2434
if not disk_finished:
2435
# strip out .bzr dirs
2436
if (cur_disk_dir_path_from_top[top_strip_len:] == '' and
2437
len(cur_disk_dir_content) > 0):
2438
# osutils.walkdirs can be made nicer -
2439
# yield the path-from-prefix rather than the pathjoined
2441
bzrdir_loc = bisect_left(cur_disk_dir_content,
2443
if (bzrdir_loc < len(cur_disk_dir_content)
2444
and self.bzrdir.is_control_filename(
2445
cur_disk_dir_content[bzrdir_loc][0])):
2446
# we dont yield the contents of, or, .bzr itself.
2447
del cur_disk_dir_content[bzrdir_loc]
2449
# everything is unknown
2452
# everything is missing
2455
direction = cmp(current_inv[0][0], cur_disk_dir_relpath)
2457
# disk is before inventory - unknown
2458
dirblock = [(relpath, basename, kind, stat, None, None) for
2459
relpath, basename, kind, stat, top_path in
2460
cur_disk_dir_content]
2461
yield (cur_disk_dir_relpath, None), dirblock
2463
current_disk = disk_iterator.next()
2464
except StopIteration:
2465
disk_finished = True
2467
# inventory is before disk - missing.
2468
dirblock = [(relpath, basename, 'unknown', None, fileid, kind)
2469
for relpath, basename, dkind, stat, fileid, kind in
2471
yield (current_inv[0][0], current_inv[0][1]), dirblock
2473
current_inv = inventory_iterator.next()
2474
except StopIteration:
2477
# versioned present directory
2478
# merge the inventory and disk data together
2480
for relpath, subiterator in itertools.groupby(sorted(
2481
current_inv[1] + cur_disk_dir_content,
2482
key=operator.itemgetter(0)), operator.itemgetter(1)):
2483
path_elements = list(subiterator)
2484
if len(path_elements) == 2:
2485
inv_row, disk_row = path_elements
2486
# versioned, present file
2487
dirblock.append((inv_row[0],
2488
inv_row[1], disk_row[2],
2489
disk_row[3], inv_row[4],
2491
elif len(path_elements[0]) == 5:
2493
dirblock.append((path_elements[0][0],
2494
path_elements[0][1], path_elements[0][2],
2495
path_elements[0][3], None, None))
2496
elif len(path_elements[0]) == 6:
2497
# versioned, absent file.
2498
dirblock.append((path_elements[0][0],
2499
path_elements[0][1], 'unknown', None,
2500
path_elements[0][4], path_elements[0][5]))
2502
raise NotImplementedError('unreachable code')
2503
yield current_inv[0], dirblock
2505
current_inv = inventory_iterator.next()
2506
except StopIteration:
2509
current_disk = disk_iterator.next()
2510
except StopIteration:
2511
disk_finished = True
2513
def _walkdirs(self, prefix=""):
2514
"""Walk the directories of this tree.
2516
:prefix: is used as the directrory to start with.
2517
returns a generator which yields items in the form:
2518
((curren_directory_path, fileid),
2519
[(file1_path, file1_name, file1_kind, None, file1_id,
2522
_directory = 'directory'
2523
# get the root in the inventory
2524
inv = self.inventory
2525
top_id = inv.path2id(prefix)
2529
pending = [(prefix, '', _directory, None, top_id, None)]
2532
currentdir = pending.pop()
2533
# 0 - relpath, 1- basename, 2- kind, 3- stat, 4-id, 5-kind
2534
top_id = currentdir[4]
2536
relroot = currentdir[0] + '/'
2539
# FIXME: stash the node in pending
2541
if entry.kind == 'directory':
2542
for name, child in entry.sorted_children():
2543
dirblock.append((relroot + name, name, child.kind, None,
2544
child.file_id, child.kind
2546
yield (currentdir[0], entry.file_id), dirblock
2547
# push the user specified dirs from dirblock
2548
for dir in reversed(dirblock):
2549
if dir[2] == _directory:
2552
@needs_tree_write_lock
2553
def auto_resolve(self):
2554
"""Automatically resolve text conflicts according to contents.
2556
Only text conflicts are auto_resolvable. Files with no conflict markers
2557
are considered 'resolved', because bzr always puts conflict markers
2558
into files that have text conflicts. The corresponding .THIS .BASE and
2559
.OTHER files are deleted, as per 'resolve'.
2560
:return: a tuple of ConflictLists: (un_resolved, resolved).
2562
un_resolved = _mod_conflicts.ConflictList()
2563
resolved = _mod_conflicts.ConflictList()
2564
conflict_re = re.compile('^(<{7}|={7}|>{7})')
2565
for conflict in self.conflicts():
2566
if (conflict.typestring != 'text conflict' or
2567
self.kind(conflict.file_id) != 'file'):
2568
un_resolved.append(conflict)
2570
my_file = open(self.id2abspath(conflict.file_id), 'rb')
2572
for line in my_file:
2573
if conflict_re.search(line):
2574
un_resolved.append(conflict)
2577
resolved.append(conflict)
2580
resolved.remove_files(self)
2581
self.set_conflicts(un_resolved)
2582
return un_resolved, resolved
2585
def _check(self, references):
2586
"""Check the tree for consistency.
2588
:param references: A dict with keys matching the items returned by
2589
self._get_check_refs(), and values from looking those keys up in
2592
tree_basis = self.basis_tree()
2593
tree_basis.lock_read()
2595
repo_basis = references[('trees', self.last_revision())]
2596
if len(list(repo_basis.iter_changes(tree_basis))) > 0:
2597
raise errors.BzrCheckError(
2598
"Mismatched basis inventory content.")
2603
def _validate(self):
2604
"""Validate internal structures.
2606
This is meant mostly for the test suite. To give it a chance to detect
2607
corruption after actions have occurred. The default implementation is a
2610
:return: None. An exception should be raised if there is an error.
2614
def _get_rules_searcher(self, default_searcher):
2615
"""See Tree._get_rules_searcher."""
2616
if self._rules_searcher is None:
2617
self._rules_searcher = super(WorkingTree,
2618
self)._get_rules_searcher(default_searcher)
2619
return self._rules_searcher
2621
def get_shelf_manager(self):
2622
"""Return the ShelfManager for this WorkingTree."""
2623
from bzrlib.shelf import ShelfManager
2624
return ShelfManager(self, self._transport)
2627
1908
class WorkingTree2(WorkingTree):
2628
1909
"""This is the Format 2 working tree.
2630
This was the first weave based working tree.
1911
This was the first weave based working tree.
2631
1912
- uses os locks for locking.
2632
1913
- uses the branch last-revision.
2635
def __init__(self, *args, **kwargs):
2636
super(WorkingTree2, self).__init__(*args, **kwargs)
2637
# WorkingTree2 has more of a constraint that self._inventory must
2638
# exist. Because this is an older format, we don't mind the overhead
2639
# caused by the extra computation here.
2641
# Newer WorkingTree's should only have self._inventory set when they
2643
if self._inventory is None:
2644
self.read_working_inventory()
2646
def _get_check_refs(self):
2647
"""Return the references needed to perform a check of this tree."""
2648
return [('trees', self.last_revision())]
2650
1916
def lock_tree_write(self):
2651
1917
"""See WorkingTree.lock_tree_write().
2653
1919
In Format2 WorkingTrees we have a single lock for the branch and tree
2654
1920
so lock_tree_write() degrades to lock_write().
2656
:return: An object with an unlock method which will release the lock
2659
1922
self.branch.lock_write()
2661
self._control_files.lock_write()
1924
return self._control_files.lock_write()
2664
1926
self.branch.unlock()
2667
1929
def unlock(self):
2668
# do non-implementation specific cleanup
2671
1930
# we share control files:
2672
1931
if self._control_files._lock_count == 3:
2673
1932
# _inventory_is_modified is always False during a read lock.
2674
1933
if self._inventory_is_modified:
2676
1935
self._write_hashcache_if_dirty()
2678
1937
# reverse order of locking.
2680
1939
return self._control_files.unlock()
2855
2100
def unregister_format(klass, format):
2101
assert klass._formats[format.get_format_string()] is format
2856
2102
del klass._formats[format.get_format_string()]
2859
2106
class WorkingTreeFormat2(WorkingTreeFormat):
2860
"""The second working tree format.
2107
"""The second working tree format.
2862
2109
This format modified the hash cache from the format 1 hash cache.
2865
upgrade_recommended = True
2867
2112
def get_format_description(self):
2868
2113
"""See WorkingTreeFormat.get_format_description()."""
2869
2114
return "Working tree format 2"
2871
def _stub_initialize_on_transport(self, transport, file_mode):
2872
"""Workaround: create control files for a remote working tree.
2116
def stub_initialize_remote(self, control_files):
2117
"""As a special workaround create critical control files for a remote working tree
2874
2119
This ensures that it can later be updated and dealt with locally,
2875
since BzrDirFormat6 and BzrDirFormat5 cannot represent dirs with
2120
since BzrDirFormat6 and BzrDirFormat5 cannot represent dirs with
2876
2121
no working tree. (See bug #43064).
2878
2123
sio = StringIO()
2879
inv = inventory.Inventory()
2880
xml5.serializer_v5.write_inventory(inv, sio, working=True)
2125
xml5.serializer_v5.write_inventory(inv, sio)
2882
transport.put_file('inventory', sio, file_mode)
2883
transport.put_bytes('pending-merges', '', file_mode)
2885
def initialize(self, a_bzrdir, revision_id=None, from_branch=None,
2886
accelerator_tree=None, hardlink=False):
2127
control_files.put('inventory', sio)
2129
control_files.put_utf8('pending-merges', '')
2132
def initialize(self, a_bzrdir, revision_id=None):
2887
2133
"""See WorkingTreeFormat.initialize()."""
2888
2134
if not isinstance(a_bzrdir.transport, LocalTransport):
2889
2135
raise errors.NotLocalUrl(a_bzrdir.transport.base)
2890
if from_branch is not None:
2891
branch = from_branch
2893
branch = a_bzrdir.open_branch()
2894
if revision_id is None:
2895
revision_id = _mod_revision.ensure_null(branch.last_revision())
2898
branch.generate_revision_history(revision_id)
2901
inv = inventory.Inventory()
2136
branch = a_bzrdir.open_branch()
2137
if revision_id is not None:
2140
revision_history = branch.revision_history()
2142
position = revision_history.index(revision_id)
2144
raise errors.NoSuchRevision(branch, revision_id)
2145
branch.set_revision_history(revision_history[:position + 1])
2148
revision = branch.last_revision()
2902
2150
wt = WorkingTree2(a_bzrdir.root_transport.local_abspath('.'),
2905
2153
_internal=True,
2907
2155
_bzrdir=a_bzrdir)
2908
basis_tree = branch.repository.revision_tree(revision_id)
2156
basis_tree = branch.repository.revision_tree(revision)
2909
2157
if basis_tree.inventory.root is not None:
2910
wt.set_root_id(basis_tree.get_root_id())
2158
wt.set_root_id(basis_tree.inventory.root.file_id)
2911
2159
# set the parent list and cache the basis tree.
2912
if _mod_revision.is_null(revision_id):
2915
parent_trees = [(revision_id, basis_tree)]
2916
wt.set_parent_trees(parent_trees)
2160
wt.set_parent_trees([(revision, basis_tree)])
2917
2161
transform.build_tree(basis_tree, wt)
3050
2272
raise NotImplementedError
3051
2273
if not isinstance(a_bzrdir.transport, LocalTransport):
3052
2274
raise errors.NotLocalUrl(a_bzrdir.transport.base)
3053
wt = self._open(a_bzrdir, self._open_control_files(a_bzrdir))
2275
return self._open(a_bzrdir, self._open_control_files(a_bzrdir))
3056
2277
def _open(self, a_bzrdir, control_files):
3057
2278
"""Open the tree itself.
3059
2280
:param a_bzrdir: the dir for the tree.
3060
2281
:param control_files: the control files for the tree.
3062
return self._tree_class(a_bzrdir.root_transport.local_abspath('.'),
3066
_control_files=control_files)
2283
return WorkingTree3(a_bzrdir.root_transport.local_abspath('.'),
2287
_control_files=control_files)
3068
2289
def __str__(self):
3069
2290
return self.get_format_string()
3072
__default_format = WorkingTreeFormat6()
2293
# formats which have no format string are not discoverable
2294
# and not independently creatable, so are not registered.
2295
__default_format = WorkingTreeFormat3()
3073
2296
WorkingTreeFormat.register_format(__default_format)
3074
WorkingTreeFormat.register_format(WorkingTreeFormat5())
3075
WorkingTreeFormat.register_format(WorkingTreeFormat4())
3076
WorkingTreeFormat.register_format(WorkingTreeFormat3())
3077
2297
WorkingTreeFormat.set_default_format(__default_format)
3078
# formats which have no format string are not discoverable
3079
# and not independently creatable, so are not registered.
3080
2298
_legacy_formats = [WorkingTreeFormat2(),
2302
class WorkingTreeTestProviderAdapter(object):
2303
"""A tool to generate a suite testing multiple workingtree formats at once.
2305
This is done by copying the test once for each transport and injecting
2306
the transport_server, transport_readonly_server, and workingtree_format
2307
classes into each copy. Each copy is also given a new id() to make it
2311
def __init__(self, transport_server, transport_readonly_server, formats):
2312
self._transport_server = transport_server
2313
self._transport_readonly_server = transport_readonly_server
2314
self._formats = formats
2316
def _clone_test(self, test, bzrdir_format, workingtree_format, variation):
2317
"""Clone test for adaption."""
2318
new_test = deepcopy(test)
2319
new_test.transport_server = self._transport_server
2320
new_test.transport_readonly_server = self._transport_readonly_server
2321
new_test.bzrdir_format = bzrdir_format
2322
new_test.workingtree_format = workingtree_format
2323
def make_new_test_id():
2324
new_id = "%s(%s)" % (test.id(), variation)
2325
return lambda: new_id
2326
new_test.id = make_new_test_id()
2329
def adapt(self, test):
2330
from bzrlib.tests import TestSuite
2331
result = TestSuite()
2332
for workingtree_format, bzrdir_format in self._formats:
2333
new_test = self._clone_test(
2336
workingtree_format, workingtree_format.__class__.__name__)
2337
result.addTest(new_test)
added
removed
bzrlib/workingtree.py
