60
revision as _mod_revision,
69
71
import bzrlib.branch
70
72
from bzrlib.transport import get_transport
71
from bzrlib.workingtree_4 import (
78
76
from bzrlib import symbol_versioning
79
77
from bzrlib.decorators import needs_read_lock, needs_write_lock
80
from bzrlib.lockable_files import LockableFiles
78
from bzrlib.inventory import InventoryEntry, Inventory, ROOT_ID, TreeReference
79
from bzrlib.lockable_files import LockableFiles, TransportLock
81
80
from bzrlib.lockdir import LockDir
82
81
import bzrlib.mutabletree
83
82
from bzrlib.mutabletree import needs_tree_write_lock
84
from bzrlib import osutils
85
83
from bzrlib.osutils import (
93
93
supports_executable,
95
from bzrlib.filters import filtered_input_file
96
95
from bzrlib.trace import mutter, note
97
96
from bzrlib.transport.local import LocalTransport
98
from bzrlib.revision import CURRENT_REVISION
98
from bzrlib.progress import DummyProgress, ProgressPhase
99
from bzrlib.revision import NULL_REVISION, CURRENT_REVISION
100
import bzrlib.revisiontree
99
101
from bzrlib.rio import RioReader, rio_file, Stanza
100
from bzrlib.symbol_versioning import (
102
DEPRECATED_PARAMETER,
102
from bzrlib.symbol_versioning import (deprecated_passed,
105
DEPRECATED_PARAMETER,
106
112
MERGE_MODIFIED_HEADER_1 = "BZR merge-modified list format 1"
107
# TODO: Modifying the conflict objects or their type is currently nearly
108
# impossible as there is no clear relationship between the working tree format
109
# and the conflict list file format.
110
113
CONFLICT_HEADER_1 = "BZR conflict list format 1"
112
ERROR_PATH_NOT_FOUND = 3 # WindowsError errno code, equivalent to ENOENT
116
@deprecated_function(zero_thirteen)
117
def gen_file_id(name):
118
"""Return new file id for the basename 'name'.
120
Use bzrlib.generate_ids.gen_file_id() instead
122
return generate_ids.gen_file_id(name)
125
@deprecated_function(zero_thirteen)
127
"""Return a new tree-root file id.
129
This has been deprecated in favor of bzrlib.generate_ids.gen_root_id()
131
return generate_ids.gen_root_id()
115
134
class TreeEntry(object):
116
135
"""An entry that implements the minimum interface used by commands.
118
This needs further inspection, it may be better to have
137
This needs further inspection, it may be better to have
119
138
InventoryEntries without ids - though that seems wrong. For now,
120
139
this is a parallel hierarchy to InventoryEntry, and needs to become
121
140
one of several things: decorates to that hierarchy, children of, or
411
387
# no parents, return an empty revision tree.
412
388
# in the future this should return the tree for
413
389
# 'empty:' - the implicit root empty tree.
414
return self.branch.repository.revision_tree(
415
_mod_revision.NULL_REVISION)
417
return self.revision_tree(revision_id)
418
except errors.NoSuchRevision:
390
return self.branch.repository.revision_tree(None)
393
xml = self.read_basis_inventory()
394
inv = xml6.serializer_v6.read_inventory_from_string(xml)
395
if inv is not None and inv.revision_id == revision_id:
396
return bzrlib.revisiontree.RevisionTree(
397
self.branch.repository, inv, revision_id)
398
except (errors.NoSuchFile, errors.BadInventoryFormat):
420
400
# No cached copy available, retrieve from the repository.
421
401
# FIXME? RBC 20060403 should we cache the inventory locally
422
402
# at this point ?
424
404
return self.branch.repository.revision_tree(revision_id)
425
except (errors.RevisionNotPresent, errors.NoSuchRevision):
405
except errors.RevisionNotPresent:
426
406
# the basis tree *may* be a ghost or a low level error may have
427
# occurred. If the revision is present, its a problem, if its not
407
# occured. If the revision is present, its a problem, if its not
429
409
if self.branch.repository.has_revision(revision_id):
431
411
# the basis tree is a ghost so return an empty tree.
432
return self.branch.repository.revision_tree(
433
_mod_revision.NULL_REVISION)
436
self._flush_ignore_list_cache()
412
return self.branch.repository.revision_tree(None)
415
@deprecated_method(zero_eight)
416
def create(branch, directory):
417
"""Create a workingtree for branch at directory.
419
If existing_directory already exists it must have a .bzr directory.
420
If it does not exist, it will be created.
422
This returns a new WorkingTree object for the new checkout.
424
TODO FIXME RBC 20060124 when we have checkout formats in place this
425
should accept an optional revisionid to checkout [and reject this if
426
checking out into the same dir as a pre-checkout-aware branch format.]
428
XXX: When BzrDir is present, these should be created through that
431
warnings.warn('delete WorkingTree.create', stacklevel=3)
432
transport = get_transport(directory)
433
if branch.bzrdir.root_transport.base == transport.base:
435
return branch.bzrdir.create_workingtree()
436
# different directory,
437
# create a branch reference
438
# and now a working tree.
439
raise NotImplementedError
442
@deprecated_method(zero_eight)
443
def create_standalone(directory):
444
"""Create a checkout and a branch and a repo at directory.
446
Directory must exist and be empty.
448
please use BzrDir.create_standalone_workingtree
450
return bzrdir.BzrDir.create_standalone_workingtree(directory)
438
452
def relpath(self, path):
439
453
"""Return the local path portion from a given path.
441
The path may be absolute or relative. If its a relative path it is
455
The path may be absolute or relative. If its a relative path it is
442
456
interpreted relative to the python current working directory.
444
458
return osutils.relpath(self.basedir, path)
446
460
def has_filename(self, filename):
447
461
return osutils.lexists(self.abspath(filename))
449
def get_file(self, file_id, path=None, filtered=True):
450
return self.get_file_with_stat(file_id, path, filtered=filtered)[0]
452
def get_file_with_stat(self, file_id, path=None, filtered=True,
454
"""See Tree.get_file_with_stat."""
456
path = self.id2path(file_id)
457
file_obj = self.get_file_byname(path, filtered=False)
458
stat_value = _fstat(file_obj.fileno())
459
if filtered and self.supports_content_filtering():
460
filters = self._content_filter_stack(path)
461
file_obj = filtered_input_file(file_obj, filters)
462
return (file_obj, stat_value)
464
def get_file_text(self, file_id, path=None, filtered=True):
465
return self.get_file(file_id, path=path, filtered=filtered).read()
467
def get_file_byname(self, filename, filtered=True):
468
path = self.abspath(filename)
470
if filtered and self.supports_content_filtering():
471
filters = self._content_filter_stack(filename)
472
return filtered_input_file(f, filters)
476
def get_file_lines(self, file_id, path=None, filtered=True):
477
"""See Tree.get_file_lines()"""
478
file = self.get_file(file_id, path, filtered=filtered)
480
return file.readlines()
485
def annotate_iter(self, file_id, default_revision=CURRENT_REVISION):
463
def get_file(self, file_id):
464
return self.get_file_byname(self.id2path(file_id))
466
def get_file_text(self, file_id):
467
return self.get_file(file_id).read()
469
def get_file_byname(self, filename):
470
return file(self.abspath(filename), 'rb')
472
def annotate_iter(self, file_id):
486
473
"""See Tree.annotate_iter
488
475
This implementation will use the basis tree implementation if possible.
492
479
incorrectly attributed to CURRENT_REVISION (but after committing, the
493
480
attribution will be correct).
495
maybe_file_parent_keys = []
496
for parent_id in self.get_parent_ids():
498
parent_tree = self.revision_tree(parent_id)
499
except errors.NoSuchRevisionInTree:
500
parent_tree = self.branch.repository.revision_tree(parent_id)
501
parent_tree.lock_read()
503
if file_id not in parent_tree:
505
ie = parent_tree.inventory[file_id]
506
if ie.kind != 'file':
507
# Note: this is slightly unnecessary, because symlinks and
508
# directories have a "text" which is the empty text, and we
509
# know that won't mess up annotations. But it seems cleaner
511
parent_text_key = (file_id, ie.revision)
512
if parent_text_key not in maybe_file_parent_keys:
513
maybe_file_parent_keys.append(parent_text_key)
516
graph = _mod_graph.Graph(self.branch.repository.texts)
517
heads = graph.heads(maybe_file_parent_keys)
518
file_parent_keys = []
519
for key in maybe_file_parent_keys:
521
file_parent_keys.append(key)
523
# Now we have the parents of this content
524
annotator = self.branch.repository.texts.get_annotator()
525
text = self.get_file(file_id).read()
526
this_key =(file_id, default_revision)
527
annotator.add_special_text(this_key, file_parent_keys, text)
528
annotations = [(key[-1], line)
529
for key, line in annotator.annotate_flat(this_key)]
532
def _get_ancestors(self, default_revision):
533
ancestors = set([default_revision])
534
for parent_id in self.get_parent_ids():
535
ancestors.update(self.branch.repository.get_ancestry(
536
parent_id, topo_sorted=False))
482
basis = self.basis_tree()
483
changes = self._iter_changes(basis, True, [file_id]).next()
484
changed_content, kind = changes[2], changes[6]
485
if not changed_content:
486
return basis.annotate_iter(file_id)
490
if kind[0] != 'file':
493
old_lines = list(basis.annotate_iter(file_id))
495
for tree in self.branch.repository.revision_trees(
496
self.get_parent_ids()[1:]):
497
if file_id not in tree:
499
old.append(list(tree.annotate_iter(file_id)))
500
return annotate.reannotate(old, self.get_file(file_id).readlines(),
539
503
def get_parent_ids(self):
540
504
"""See Tree.get_parent_ids.
542
506
This implementation reads the pending merges list and last_revision
543
507
value and uses that to decide what the parents list should be.
545
last_rev = _mod_revision.ensure_null(self._last_revision())
546
if _mod_revision.NULL_REVISION == last_rev:
509
last_rev = self._last_revision()
549
513
parents = [last_rev]
551
merges_bytes = self._transport.get_bytes('pending-merges')
515
merges_file = self._control_files.get_utf8('pending-merges')
552
516
except errors.NoSuchFile:
555
for l in osutils.split_lines(merges_bytes):
556
revision_id = l.rstrip('\n')
557
parents.append(revision_id)
519
for l in merges_file.readlines():
520
parents.append(l.rstrip('\n'))
561
524
def get_root_id(self):
562
525
"""Return the id of this trees root"""
563
526
return self._inventory.root.file_id
565
528
def _get_store_filename(self, file_id):
566
529
## XXX: badly named; this is not in the store at all
567
530
return self.abspath(self.id2path(file_id))
570
def clone(self, to_bzrdir, revision_id=None):
533
def clone(self, to_bzrdir, revision_id=None, basis=None):
571
534
"""Duplicate this working tree into to_bzr, including all state.
573
536
Specifically modified files are kept as modified, but
574
537
ignored and unknown files are discarded.
576
539
If you want to make a new line of development, see bzrdir.sprout()
579
If not None, the cloned tree will have its last revision set to
580
revision, and difference between the source trees last revision
542
If not None, the cloned tree will have its last revision set to
543
revision, and and difference between the source trees last revision
581
544
and this one merged in.
547
If not None, a closer copy of a tree which may have some files in
548
common, and which file content should be preferentially copied from.
583
550
# assumes the target bzr dir format is compatible.
584
result = to_bzrdir.create_workingtree()
551
result = self._format.initialize(to_bzrdir)
585
552
self.copy_content_into(result, revision_id)
636
594
def get_file_mtime(self, file_id, path=None):
638
path = self.inventory.id2path(file_id)
596
path = self._inventory.id2path(file_id)
639
597
return os.lstat(self.abspath(path)).st_mtime
641
def _is_executable_from_path_and_stat_from_basis(self, path, stat_result):
642
file_id = self.path2id(path)
644
# For unversioned files on win32, we just assume they are not
647
return self._inventory[file_id].executable
649
def _is_executable_from_path_and_stat_from_stat(self, path, stat_result):
650
mode = stat_result.st_mode
651
return bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode)
653
599
if not supports_executable():
654
600
def is_executable(self, file_id, path=None):
655
601
return self._inventory[file_id].executable
657
_is_executable_from_path_and_stat = \
658
_is_executable_from_path_and_stat_from_basis
660
603
def is_executable(self, file_id, path=None):
662
path = self.id2path(file_id)
605
path = self._inventory.id2path(file_id)
663
606
mode = os.lstat(self.abspath(path)).st_mode
664
607
return bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode)
666
_is_executable_from_path_and_stat = \
667
_is_executable_from_path_and_stat_from_stat
669
@needs_tree_write_lock
670
610
def _add(self, files, ids, kinds):
671
611
"""See MutableTree._add."""
672
612
# TODO: Re-adding a file that is removed in the working copy
673
613
# should probably put it back with the previous ID.
674
# the read and write working inventory should not occur in this
614
# the read and write working inventory should not occur in this
675
615
# function - they should be part of lock_write and unlock.
616
inv = self.read_working_inventory()
677
617
for f, file_id, kind in zip(files, ids, kinds):
618
assert kind is not None
678
619
if file_id is None:
679
620
inv.add_path(f, kind=kind)
681
622
inv.add_path(f, kind=kind, file_id=file_id)
682
self._inventory_is_modified = True
623
self._write_inventory(inv)
625
def add_reference(self, sub_tree):
626
"""Add a TreeReference to the tree, pointing at sub_tree"""
627
raise errors.UnsupportedOperation(self.add_reference, self)
684
629
@needs_tree_write_lock
685
630
def _gather_kinds(self, files, kinds):
746
691
self.set_parent_ids(parents, allow_leftmost_as_ghost=True)
748
def path_content_summary(self, path, _lstat=os.lstat,
749
_mapper=osutils.file_kind_from_stat_mode):
750
"""See Tree.path_content_summary."""
751
abspath = self.abspath(path)
753
stat_result = _lstat(abspath)
755
if getattr(e, 'errno', None) == errno.ENOENT:
757
return ('missing', None, None, None)
758
# propagate other errors
760
kind = _mapper(stat_result.st_mode)
762
return self._file_content_summary(path, stat_result)
763
elif kind == 'directory':
764
# perhaps it looks like a plain directory, but it's really a
766
if self._directory_is_tree_reference(path):
767
kind = 'tree-reference'
768
return kind, None, None, None
769
elif kind == 'symlink':
770
target = osutils.readlink(abspath)
771
return ('symlink', None, None, target)
773
return (kind, None, None, None)
775
def _file_content_summary(self, path, stat_result):
776
size = stat_result.st_size
777
executable = self._is_executable_from_path_and_stat(path, stat_result)
778
# try for a stat cache lookup
779
return ('file', size, executable, self._sha_from_stat(
693
@deprecated_method(zero_eleven)
695
def pending_merges(self):
696
"""Return a list of pending merges.
698
These are revisions that have been merged into the working
699
directory but not yet committed.
701
As of 0.11 this is deprecated. Please see WorkingTree.get_parent_ids()
702
instead - which is available on all tree objects.
704
return self.get_parent_ids()[1:]
782
706
def _check_parents_for_ghosts(self, revision_ids, allow_leftmost_as_ghost):
783
707
"""Common ghost checking functionality from set_parent_*.
914
798
branch.last_revision().
916
800
from bzrlib.merge import Merger, Merge3Merger
917
merger = Merger(self.branch, this_tree=self)
918
# check that there are no local alterations
919
if not force and self.has_changes():
920
raise errors.UncommittedChanges(self)
921
if to_revision is None:
922
to_revision = _mod_revision.ensure_null(branch.last_revision())
923
merger.other_rev_id = to_revision
924
if _mod_revision.is_null(merger.other_rev_id):
925
raise errors.NoCommits(branch)
926
self.branch.fetch(branch, last_revision=merger.other_rev_id)
927
merger.other_basis = merger.other_rev_id
928
merger.other_tree = self.branch.repository.revision_tree(
930
merger.other_branch = branch
931
if from_revision is None:
801
pb = bzrlib.ui.ui_factory.nested_progress_bar()
803
merger = Merger(self.branch, this_tree=self, pb=pb)
804
merger.pp = ProgressPhase("Merge phase", 5, pb)
805
merger.pp.next_phase()
806
# check that there are no
808
merger.check_basis(check_clean=True, require_commits=False)
809
if to_revision is None:
810
to_revision = branch.last_revision()
811
merger.other_rev_id = to_revision
812
if merger.other_rev_id is None:
813
raise error.NoCommits(branch)
814
self.branch.fetch(branch, last_revision=merger.other_rev_id)
815
merger.other_basis = merger.other_rev_id
816
merger.other_tree = self.branch.repository.revision_tree(
818
merger.other_branch = branch
819
merger.pp.next_phase()
932
820
merger.find_base()
934
merger.set_base_revision(from_revision, branch)
935
if merger.base_rev_id == merger.other_rev_id:
936
raise errors.PointlessMerge
937
merger.backup_files = False
938
if merge_type is None:
821
if merger.base_rev_id == merger.other_rev_id:
822
raise errors.PointlessMerge
823
merger.backup_files = False
939
824
merger.merge_type = Merge3Merger
941
merger.merge_type = merge_type
942
merger.set_interesting_files(None)
943
merger.show_base = False
944
merger.reprocess = False
945
conflicts = merger.do_merge()
825
merger.set_interesting_files(None)
826
merger.show_base = False
827
merger.reprocess = False
828
conflicts = merger.do_merge()
950
def merge_modified(self):
951
"""Return a dictionary of files modified by a merge.
953
The list is initialized by WorkingTree.set_merge_modified, which is
954
typically called after we make some automatic updates to the tree
957
This returns a map of file_id->sha1, containing only files which are
958
still in the working inventory and have that text hash.
961
hashfile = self._transport.get('merge-hashes')
962
except errors.NoSuchFile:
967
if hashfile.next() != MERGE_MODIFIED_HEADER_1 + '\n':
968
raise errors.MergeModifiedFormatError()
969
except StopIteration:
970
raise errors.MergeModifiedFormatError()
971
for s in RioReader(hashfile):
972
# RioReader reads in Unicode, so convert file_ids back to utf8
973
file_id = osutils.safe_file_id(s.get("file_id"), warn=False)
974
if file_id not in self.inventory:
976
text_hash = s.get("hash")
977
if text_hash == self.get_file_sha1(file_id):
978
merge_hashes[file_id] = text_hash
984
def mkdir(self, path, file_id=None):
985
"""See MutableTree.mkdir()."""
987
file_id = generate_ids.gen_file_id(os.path.basename(path))
988
os.mkdir(self.abspath(path))
989
self.add(path, file_id, 'directory')
992
def get_symlink_target(self, file_id):
993
abspath = self.id2abspath(file_id)
994
target = osutils.readlink(abspath)
997
834
@needs_write_lock
998
835
def subsume(self, other_tree):
999
836
def add_children(inventory, entry):
1020
857
raise errors.SubsumeTargetNeedsUpgrade(other_tree)
1021
858
other_tree.lock_tree_write()
1023
new_parents = other_tree.get_parent_ids()
860
for parent_id in other_tree.get_parent_ids():
861
self.branch.fetch(other_tree.branch, parent_id)
862
self.add_parent_tree_id(parent_id)
1024
863
other_root = other_tree.inventory.root
1025
864
other_root.parent_id = new_root_parent
1026
865
other_root.name = osutils.basename(other_tree_path)
1027
866
self.inventory.add(other_root)
1028
867
add_children(self.inventory, other_root)
1029
868
self._write_inventory(self.inventory)
1030
# normally we don't want to fetch whole repositories, but i think
1031
# here we really do want to consolidate the whole thing.
1032
for parent_id in other_tree.get_parent_ids():
1033
self.branch.fetch(other_tree.branch, parent_id)
1034
self.add_parent_tree_id(parent_id)
1036
870
other_tree.unlock()
1037
other_tree.bzrdir.retire_bzrdir()
1039
def _setup_directory_is_tree_reference(self):
1040
if self._branch.repository._format.supports_tree_reference:
1041
self._directory_is_tree_reference = \
1042
self._directory_may_be_tree_reference
1044
self._directory_is_tree_reference = \
1045
self._directory_is_never_tree_reference
1047
def _directory_is_never_tree_reference(self, relpath):
1050
def _directory_may_be_tree_reference(self, relpath):
1051
# as a special case, if a directory contains control files then
1052
# it's a tree reference, except that the root of the tree is not
1053
return relpath and osutils.isdir(self.abspath(relpath) + u"/.bzr")
1054
# TODO: We could ask all the control formats whether they
1055
# recognize this directory, but at the moment there's no cheap api
1056
# to do that. Since we probably can only nest bzr checkouts and
1057
# they always use this name it's ok for now. -- mbp 20060306
1059
# FIXME: There is an unhandled case here of a subdirectory
1060
# containing .bzr but not a branch; that will probably blow up
1061
# when you try to commit it. It might happen if there is a
1062
# checkout in a subdirectory. This can be avoided by not adding
871
other_tree.bzrdir.destroy_workingtree_metadata()
1065
873
@needs_tree_write_lock
1066
874
def extract(self, file_id, format=None):
1067
875
"""Extract a subtree from this tree.
1069
877
A new branch will be created, relative to the path for this tree.
1072
879
def mkdirs(path):
1073
880
segments = osutils.splitpath(path)
1074
881
transport = self.branch.bzrdir.root_transport
1075
882
for name in segments:
1076
883
transport = transport.clone(name)
1077
transport.ensure_base()
886
except errors.FileExists:
1078
888
return transport
1080
890
sub_path = self.id2path(file_id)
1081
891
branch_transport = mkdirs(sub_path)
1082
892
if format is None:
1083
format = self.bzrdir.cloning_metadir()
1084
branch_transport.ensure_base()
893
format = bzrdir.format_registry.make_bzrdir('experimental-knit2')
895
branch_transport.mkdir('.')
896
except errors.FileExists:
1085
898
branch_bzrdir = format.initialize_on_transport(branch_transport)
1087
900
repo = branch_bzrdir.find_repository()
1088
901
except errors.NoRepositoryPresent:
1089
902
repo = branch_bzrdir.create_repository()
1090
if not repo.supports_rich_root():
1091
raise errors.RootNotRich()
903
assert repo.supports_rich_root()
905
if not repo.supports_rich_root():
906
raise errors.RootNotRich()
1092
907
new_branch = branch_bzrdir.create_branch()
1093
908
new_branch.pull(self.branch)
1094
909
for parent_id in self.get_parent_ids():
1127
975
sio = StringIO()
1128
976
self._serialize(self._inventory, sio)
1130
self._transport.put_file('inventory', sio,
1131
mode=self.bzrdir._get_file_mode())
978
self._control_files.put('inventory', sio)
1132
979
self._inventory_is_modified = False
1134
def _kind(self, relpath):
1135
return osutils.file_kind(self.abspath(relpath))
1137
def list_files(self, include_root=False, from_dir=None, recursive=True):
1138
"""List all files as (path, class, kind, id, entry).
981
def _serialize(self, inventory, out_file):
982
xml5.serializer_v5.write_inventory(self._inventory, out_file)
984
def _deserialize(selt, in_file):
985
return xml5.serializer_v5.read_inventory(in_file)
987
def list_files(self, include_root=False):
988
"""Recursively list all files as (path, class, kind, id, entry).
1140
990
Lists, but does not descend into unversioned directories.
1141
992
This does not include files that have been deleted in this
1142
tree. Skips the control directory.
1144
:param include_root: if True, return an entry for the root
1145
:param from_dir: start from this directory or None for the root
1146
:param recursive: whether to recurse into subdirectories or not
995
Skips the control directory.
1148
# list_files is an iterator, so @needs_read_lock doesn't work properly
1149
# with it. So callers should be careful to always read_lock the tree.
1150
if not self.is_locked():
1151
raise errors.ObjectNotLocked(self)
1153
inv = self.inventory
1154
if from_dir is None and include_root is True:
997
inv = self._inventory
998
if include_root is True:
1155
999
yield ('', 'V', 'directory', inv.root.file_id, inv.root)
1156
1000
# Convert these into local objects to save lookup times
1157
1001
pathjoin = osutils.pathjoin
1158
file_kind = self._kind
1002
file_kind = osutils.file_kind
1160
1004
# transport.base ends in a slash, we want the piece
1161
1005
# between the last two slashes
1910
1706
def read_basis_inventory(self):
1911
1707
"""Read the cached basis inventory."""
1912
1708
path = self._basis_inventory_name()
1913
return self._transport.get_bytes(path)
1709
return self._control_files.get(path).read()
1915
1711
@needs_read_lock
1916
1712
def read_working_inventory(self):
1917
1713
"""Read the working inventory.
1919
1715
:raises errors.InventoryModified: read_working_inventory will fail
1920
1716
when the current in memory inventory has been modified.
1922
# conceptually this should be an implementation detail of the tree.
1718
# conceptually this should be an implementation detail of the tree.
1923
1719
# XXX: Deprecate this.
1924
1720
# ElementTree does its own conversion from UTF-8, so open in
1926
1722
if self._inventory_is_modified:
1927
1723
raise errors.InventoryModified(self)
1928
f = self._transport.get('inventory')
1930
result = self._deserialize(f)
1724
result = self._deserialize(self._control_files.get('inventory'))
1933
1725
self._set_inventory(result, dirty=False)
1936
1728
@needs_tree_write_lock
1937
def remove(self, files, verbose=False, to_file=None, keep_files=True,
1939
"""Remove nominated files from the working inventory.
1941
:files: File paths relative to the basedir.
1942
:keep_files: If true, the files will also be kept.
1943
:force: Delete files and directories, even if they are changed and
1944
even if the directories are not empty.
1729
def remove(self, files, verbose=False, to_file=None):
1730
"""Remove nominated files from the working inventory..
1732
This does not remove their text. This does not run on XXX on what? RBC
1734
TODO: Refuse to remove modified files unless --force is given?
1736
TODO: Do something useful with directories.
1738
TODO: Should this remove the text or not? Tough call; not
1739
removing may be useful and the user can just use use rm, and
1740
is the opposite of add. Removing it is consistent with most
1741
other tools. Maybe an option.
1743
## TODO: Normalize names
1744
## TODO: Remove nested loops; better scalability
1946
1745
if isinstance(files, basestring):
1947
1746
files = [files]
1952
unknown_nested_files=set()
1954
to_file = sys.stdout
1956
def recurse_directory_to_add_files(directory):
1957
# Recurse directory and add all files
1958
# so we can check if they have changed.
1959
for parent_info, file_infos in\
1960
self.walkdirs(directory):
1961
for relpath, basename, kind, lstat, fileid, kind in file_infos:
1962
# Is it versioned or ignored?
1963
if self.path2id(relpath) or self.is_ignored(relpath):
1964
# Add nested content for deletion.
1965
new_files.add(relpath)
1967
# Files which are not versioned and not ignored
1968
# should be treated as unknown.
1969
unknown_nested_files.add((relpath, None, kind))
1971
for filename in files:
1972
# Get file name into canonical form.
1973
abspath = self.abspath(filename)
1974
filename = self.relpath(abspath)
1975
if len(filename) > 0:
1976
new_files.add(filename)
1977
recurse_directory_to_add_files(filename)
1979
files = list(new_files)
1982
return # nothing to do
1984
# Sort needed to first handle directory content before the directory
1985
files.sort(reverse=True)
1987
# Bail out if we are going to delete files we shouldn't
1988
if not keep_files and not force:
1989
has_changed_files = len(unknown_nested_files) > 0
1990
if not has_changed_files:
1991
for (file_id, path, content_change, versioned, parent_id, name,
1992
kind, executable) in self.iter_changes(self.basis_tree(),
1993
include_unchanged=True, require_versioned=False,
1994
want_unversioned=True, specific_files=files):
1995
if versioned == (False, False):
1996
# The record is unknown ...
1997
if not self.is_ignored(path[1]):
1998
# ... but not ignored
1999
has_changed_files = True
2001
elif content_change and (kind[1] is not None):
2002
# Versioned and changed, but not deleted
2003
has_changed_files = True
2006
if has_changed_files:
2007
# Make delta show ALL applicable changes in error message.
2008
tree_delta = self.changes_from(self.basis_tree(),
2009
require_versioned=False, want_unversioned=True,
2010
specific_files=files)
2011
for unknown_file in unknown_nested_files:
2012
if unknown_file not in tree_delta.unversioned:
2013
tree_delta.unversioned.extend((unknown_file,))
2014
raise errors.BzrRemoveChangedFilesError(tree_delta)
2016
# Build inv_delta and delete files where applicable,
2017
# do this before any modifications to inventory.
1748
inv = self.inventory
1750
# do this before any modifications
2018
1751
for f in files:
2019
fid = self.path2id(f)
1752
fid = inv.path2id(f)
2022
message = "%s is not versioned." % (f,)
1754
note("%s is not versioned."%f)
2025
# having removed it, it must be either ignored or unknown
1757
# having remove it, it must be either ignored or unknown
2026
1758
if self.is_ignored(f):
2027
1759
new_status = 'I'
2029
1761
new_status = '?'
2030
# XXX: Really should be a more abstract reporter interface
2031
kind_ch = osutils.kind_marker(self.kind(fid))
2032
to_file.write(new_status + ' ' + f + kind_ch + '\n')
2034
inv_delta.append((f, None, fid, None))
2035
message = "removed %s" % (f,)
2038
abs_path = self.abspath(f)
2039
if osutils.lexists(abs_path):
2040
if (osutils.isdir(abs_path) and
2041
len(os.listdir(abs_path)) > 0):
2043
osutils.rmtree(abs_path)
2045
message = "%s is not an empty directory "\
2046
"and won't be deleted." % (f,)
2048
osutils.delete_any(abs_path)
2049
message = "deleted %s" % (f,)
2050
elif message is not None:
2051
# Only care if we haven't done anything yet.
2052
message = "%s does not exist." % (f,)
2054
# Print only one message (if any) per file.
2055
if message is not None:
2057
self.apply_inventory_delta(inv_delta)
1762
textui.show_status(new_status, inv[fid].kind, f,
1766
self._write_inventory(inv)
2059
1768
@needs_tree_write_lock
2060
def revert(self, filenames=None, old_tree=None, backups=True,
2061
pb=None, report_changes=False):
1769
def revert(self, filenames, old_tree=None, backups=True,
1770
pb=DummyProgress(), report_changes=False):
2062
1771
from bzrlib.conflicts import resolve
2065
symbol_versioning.warn('Using [] to revert all files is deprecated'
2066
' as of bzr 0.91. Please use None (the default) instead.',
2067
DeprecationWarning, stacklevel=2)
2068
1772
if old_tree is None:
2069
basis_tree = self.basis_tree()
2070
basis_tree.lock_read()
2071
old_tree = basis_tree
1773
old_tree = self.basis_tree()
1774
conflicts = transform.revert(self, old_tree, filenames, backups, pb,
1776
if not len(filenames):
1777
self.set_parent_ids(self.get_parent_ids()[:1])
2075
conflicts = transform.revert(self, old_tree, filenames, backups, pb,
2077
if filenames is None and len(self.get_parent_ids()) > 1:
2079
last_revision = self.last_revision()
2080
if last_revision != _mod_revision.NULL_REVISION:
2081
if basis_tree is None:
2082
basis_tree = self.basis_tree()
2083
basis_tree.lock_read()
2084
parent_trees.append((last_revision, basis_tree))
2085
self.set_parent_trees(parent_trees)
2088
resolve(self, filenames, ignore_misses=True, recursive=True)
2090
if basis_tree is not None:
1780
resolve(self, filenames, ignore_misses=True)
2092
1781
return conflicts
2094
def revision_tree(self, revision_id):
2095
"""See Tree.revision_tree.
2097
WorkingTree can supply revision_trees for the basis revision only
2098
because there is only one cached inventory in the bzr directory.
2100
if revision_id == self.last_revision():
2102
xml = self.read_basis_inventory()
2103
except errors.NoSuchFile:
2107
inv = xml7.serializer_v7.read_inventory_from_string(xml)
2108
# dont use the repository revision_tree api because we want
2109
# to supply the inventory.
2110
if inv.revision_id == revision_id:
2111
return revisiontree.RevisionTree(self.branch.repository,
2113
except errors.BadInventoryFormat:
2115
# raise if there was no inventory, or if we read the wrong inventory.
2116
raise errors.NoSuchRevisionInTree(self, revision_id)
2118
1783
# XXX: This method should be deprecated in favour of taking in a proper
2119
1784
# new Inventory object.
2120
1785
@needs_tree_write_lock
2121
1786
def set_inventory(self, new_inventory_list):
2122
1787
from bzrlib.inventory import (Inventory,
2123
1788
InventoryDirectory,
2126
1792
inv = Inventory(self.get_root_id())
2249
1898
# cant set that until we update the working trees last revision to be
2250
1899
# one from the new branch, because it will just get absorbed by the
2251
1900
# parent de-duplication logic.
2253
1902
# We MUST save it even if an error occurs, because otherwise the users
2254
1903
# local work is unreferenced and will appear to have been lost.
2258
1907
last_rev = self.get_parent_ids()[0]
2259
1908
except IndexError:
2260
last_rev = _mod_revision.NULL_REVISION
2261
if revision is None:
2262
revision = self.branch.last_revision()
2264
old_tip = old_tip or _mod_revision.NULL_REVISION
2266
if not _mod_revision.is_null(old_tip) and old_tip != last_rev:
2267
# the branch we are bound to was updated
2268
# merge those changes in first
2269
base_tree = self.basis_tree()
2270
other_tree = self.branch.repository.revision_tree(old_tip)
2271
nb_conflicts = merge.merge_inner(self.branch, other_tree,
2272
base_tree, this_tree=self,
2273
change_reporter=change_reporter)
2275
self.add_parent_tree((old_tip, other_tree))
2276
trace.note('Rerun update after fixing the conflicts.')
2279
if last_rev != _mod_revision.ensure_null(revision):
2280
# the working tree is up to date with the branch
2281
# we can merge the specified revision from master
2282
to_tree = self.branch.repository.revision_tree(revision)
2283
to_root_id = to_tree.get_root_id()
1910
if last_rev != self.branch.last_revision():
1911
# merge tree state up to new branch tip.
2285
1912
basis = self.basis_tree()
2288
if (basis.inventory.root is None
2289
or basis.inventory.root.file_id != to_root_id):
2290
self.set_root_id(to_root_id)
2295
# determine the branch point
2296
graph = self.branch.repository.get_graph()
2297
base_rev_id = graph.find_unique_lca(self.branch.last_revision(),
2299
base_tree = self.branch.repository.revision_tree(base_rev_id)
2301
nb_conflicts = merge.merge_inner(self.branch, to_tree, base_tree,
2303
change_reporter=change_reporter)
2304
self.set_last_revision(revision)
1913
to_tree = self.branch.basis_tree()
1914
if basis.inventory.root is None:
1915
self.set_root_id(to_tree.inventory.root.file_id)
1916
result += merge.merge_inner(
2305
1921
# TODO - dedup parents list with things merged by pull ?
2306
1922
# reuse the tree we've updated to to set the basis:
2307
parent_trees = [(revision, to_tree)]
1923
parent_trees = [(self.branch.last_revision(), to_tree)]
2308
1924
merges = self.get_parent_ids()[1:]
2309
1925
# Ideally we ask the tree for the trees here, that way the working
2310
# tree can decide whether to give us the entire tree or give us a
1926
# tree can decide whether to give us teh entire tree or give us a
2311
1927
# lazy initialised tree. dirstate for instance will have the trees
2312
1928
# in ram already, whereas a last-revision + basis-inventory tree
2313
1929
# will not, but also does not need them when setting parents.
2314
1930
for parent in merges:
2315
1931
parent_trees.append(
2316
1932
(parent, self.branch.repository.revision_tree(parent)))
2317
if not _mod_revision.is_null(old_tip):
1933
if old_tip is not None:
2318
1934
parent_trees.append(
2319
1935
(old_tip, self.branch.repository.revision_tree(old_tip)))
2320
1936
self.set_parent_trees(parent_trees)
2321
1937
last_rev = parent_trees[0][0]
1939
# the working tree had the same last-revision as the master
1940
# branch did. We may still have pivot local work from the local
1941
# branch into old_tip:
1942
if old_tip is not None:
1943
self.add_parent_tree_id(old_tip)
1944
if old_tip and old_tip != last_rev:
1945
# our last revision was not the prior branch last revision
1946
# and we have converted that last revision to a pending merge.
1947
# base is somewhere between the branch tip now
1948
# and the now pending merge
1949
from bzrlib.revision import common_ancestor
1951
base_rev_id = common_ancestor(self.branch.last_revision(),
1953
self.branch.repository)
1954
except errors.NoCommonAncestor:
1956
base_tree = self.branch.repository.revision_tree(base_rev_id)
1957
other_tree = self.branch.repository.revision_tree(old_tip)
1958
result += merge.merge_inner(
2324
1965
def _write_hashcache_if_dirty(self):
2325
1966
"""Write out the hashcache if it is dirty."""
2373
2014
file_id=self.path2id(conflicted)))
2374
2015
return conflicts
2376
def walkdirs(self, prefix=""):
2377
"""Walk the directories of this tree.
2379
returns a generator which yields items in the form:
2380
((curren_directory_path, fileid),
2381
[(file1_path, file1_name, file1_kind, (lstat), file1_id,
2384
This API returns a generator, which is only valid during the current
2385
tree transaction - within a single lock_read or lock_write duration.
2387
If the tree is not locked, it may cause an error to be raised,
2388
depending on the tree implementation.
2390
disk_top = self.abspath(prefix)
2391
if disk_top.endswith('/'):
2392
disk_top = disk_top[:-1]
2393
top_strip_len = len(disk_top) + 1
2394
inventory_iterator = self._walkdirs(prefix)
2395
disk_iterator = osutils.walkdirs(disk_top, prefix)
2397
current_disk = disk_iterator.next()
2398
disk_finished = False
2400
if not (e.errno == errno.ENOENT or
2401
(sys.platform == 'win32' and e.errno == ERROR_PATH_NOT_FOUND)):
2404
disk_finished = True
2406
current_inv = inventory_iterator.next()
2407
inv_finished = False
2408
except StopIteration:
2411
while not inv_finished or not disk_finished:
2413
((cur_disk_dir_relpath, cur_disk_dir_path_from_top),
2414
cur_disk_dir_content) = current_disk
2416
((cur_disk_dir_relpath, cur_disk_dir_path_from_top),
2417
cur_disk_dir_content) = ((None, None), None)
2418
if not disk_finished:
2419
# strip out .bzr dirs
2420
if (cur_disk_dir_path_from_top[top_strip_len:] == '' and
2421
len(cur_disk_dir_content) > 0):
2422
# osutils.walkdirs can be made nicer -
2423
# yield the path-from-prefix rather than the pathjoined
2425
bzrdir_loc = bisect_left(cur_disk_dir_content,
2427
if (bzrdir_loc < len(cur_disk_dir_content)
2428
and self.bzrdir.is_control_filename(
2429
cur_disk_dir_content[bzrdir_loc][0])):
2430
# we dont yield the contents of, or, .bzr itself.
2431
del cur_disk_dir_content[bzrdir_loc]
2433
# everything is unknown
2436
# everything is missing
2439
direction = cmp(current_inv[0][0], cur_disk_dir_relpath)
2441
# disk is before inventory - unknown
2442
dirblock = [(relpath, basename, kind, stat, None, None) for
2443
relpath, basename, kind, stat, top_path in
2444
cur_disk_dir_content]
2445
yield (cur_disk_dir_relpath, None), dirblock
2447
current_disk = disk_iterator.next()
2448
except StopIteration:
2449
disk_finished = True
2451
# inventory is before disk - missing.
2452
dirblock = [(relpath, basename, 'unknown', None, fileid, kind)
2453
for relpath, basename, dkind, stat, fileid, kind in
2455
yield (current_inv[0][0], current_inv[0][1]), dirblock
2457
current_inv = inventory_iterator.next()
2458
except StopIteration:
2461
# versioned present directory
2462
# merge the inventory and disk data together
2464
for relpath, subiterator in itertools.groupby(sorted(
2465
current_inv[1] + cur_disk_dir_content,
2466
key=operator.itemgetter(0)), operator.itemgetter(1)):
2467
path_elements = list(subiterator)
2468
if len(path_elements) == 2:
2469
inv_row, disk_row = path_elements
2470
# versioned, present file
2471
dirblock.append((inv_row[0],
2472
inv_row[1], disk_row[2],
2473
disk_row[3], inv_row[4],
2475
elif len(path_elements[0]) == 5:
2477
dirblock.append((path_elements[0][0],
2478
path_elements[0][1], path_elements[0][2],
2479
path_elements[0][3], None, None))
2480
elif len(path_elements[0]) == 6:
2481
# versioned, absent file.
2482
dirblock.append((path_elements[0][0],
2483
path_elements[0][1], 'unknown', None,
2484
path_elements[0][4], path_elements[0][5]))
2486
raise NotImplementedError('unreachable code')
2487
yield current_inv[0], dirblock
2489
current_inv = inventory_iterator.next()
2490
except StopIteration:
2493
current_disk = disk_iterator.next()
2494
except StopIteration:
2495
disk_finished = True
2497
def _walkdirs(self, prefix=""):
2498
"""Walk the directories of this tree.
2500
:prefix: is used as the directrory to start with.
2501
returns a generator which yields items in the form:
2502
((curren_directory_path, fileid),
2503
[(file1_path, file1_name, file1_kind, None, file1_id,
2506
_directory = 'directory'
2507
# get the root in the inventory
2508
inv = self.inventory
2509
top_id = inv.path2id(prefix)
2513
pending = [(prefix, '', _directory, None, top_id, None)]
2516
currentdir = pending.pop()
2517
# 0 - relpath, 1- basename, 2- kind, 3- stat, 4-id, 5-kind
2518
top_id = currentdir[4]
2520
relroot = currentdir[0] + '/'
2523
# FIXME: stash the node in pending
2525
if entry.kind == 'directory':
2526
for name, child in entry.sorted_children():
2527
dirblock.append((relroot + name, name, child.kind, None,
2528
child.file_id, child.kind
2530
yield (currentdir[0], entry.file_id), dirblock
2531
# push the user specified dirs from dirblock
2532
for dir in reversed(dirblock):
2533
if dir[2] == _directory:
2536
@needs_tree_write_lock
2537
def auto_resolve(self):
2538
"""Automatically resolve text conflicts according to contents.
2540
Only text conflicts are auto_resolvable. Files with no conflict markers
2541
are considered 'resolved', because bzr always puts conflict markers
2542
into files that have text conflicts. The corresponding .THIS .BASE and
2543
.OTHER files are deleted, as per 'resolve'.
2544
:return: a tuple of ConflictLists: (un_resolved, resolved).
2546
un_resolved = _mod_conflicts.ConflictList()
2547
resolved = _mod_conflicts.ConflictList()
2548
conflict_re = re.compile('^(<{7}|={7}|>{7})')
2549
for conflict in self.conflicts():
2550
if (conflict.typestring != 'text conflict' or
2551
self.kind(conflict.file_id) != 'file'):
2552
un_resolved.append(conflict)
2554
my_file = open(self.id2abspath(conflict.file_id), 'rb')
2556
for line in my_file:
2557
if conflict_re.search(line):
2558
un_resolved.append(conflict)
2561
resolved.append(conflict)
2564
resolved.remove_files(self)
2565
self.set_conflicts(un_resolved)
2566
return un_resolved, resolved
2569
def _check(self, references):
2570
"""Check the tree for consistency.
2572
:param references: A dict with keys matching the items returned by
2573
self._get_check_refs(), and values from looking those keys up in
2576
tree_basis = self.basis_tree()
2577
tree_basis.lock_read()
2579
repo_basis = references[('trees', self.last_revision())]
2580
if len(list(repo_basis.iter_changes(tree_basis))) > 0:
2581
raise errors.BzrCheckError(
2582
"Mismatched basis inventory content.")
2587
def _validate(self):
2588
"""Validate internal structures.
2590
This is meant mostly for the test suite. To give it a chance to detect
2591
corruption after actions have occurred. The default implementation is a
2594
:return: None. An exception should be raised if there is an error.
2598
def _get_rules_searcher(self, default_searcher):
2599
"""See Tree._get_rules_searcher."""
2600
if self._rules_searcher is None:
2601
self._rules_searcher = super(WorkingTree,
2602
self)._get_rules_searcher(default_searcher)
2603
return self._rules_searcher
2605
def get_shelf_manager(self):
2606
"""Return the ShelfManager for this WorkingTree."""
2607
from bzrlib.shelf import ShelfManager
2608
return ShelfManager(self, self._transport)
2611
2018
class WorkingTree2(WorkingTree):
2612
2019
"""This is the Format 2 working tree.
2614
This was the first weave based working tree.
2021
This was the first weave based working tree.
2615
2022
- uses os locks for locking.
2616
2023
- uses the branch last-revision.
2619
def __init__(self, *args, **kwargs):
2620
super(WorkingTree2, self).__init__(*args, **kwargs)
2621
# WorkingTree2 has more of a constraint that self._inventory must
2622
# exist. Because this is an older format, we don't mind the overhead
2623
# caused by the extra computation here.
2625
# Newer WorkingTree's should only have self._inventory set when they
2627
if self._inventory is None:
2628
self.read_working_inventory()
2630
def _get_check_refs(self):
2631
"""Return the references needed to perform a check of this tree."""
2632
return [('trees', self.last_revision())]
2634
2026
def lock_tree_write(self):
2635
2027
"""See WorkingTree.lock_tree_write().
2740
2119
self.branch.unlock()
2122
class WorkingTree4(WorkingTree3):
2124
def _serialize(self, inventory, out_file):
2125
xml7.serializer_v7.write_inventory(self._inventory, out_file)
2127
def _deserialize(selt, in_file):
2128
return xml7.serializer_v7.read_inventory(in_file)
2130
def _comparison_data(self, entry, path):
2131
kind, executable, stat_value = \
2132
WorkingTree3._comparison_data(self, entry, path)
2133
if kind == 'directory' and entry.kind == 'tree-reference':
2134
kind = 'tree-reference'
2135
return kind, executable, stat_value
2137
def add_reference(self, sub_tree):
2139
sub_tree_path = self.relpath(sub_tree.basedir)
2140
except errors.PathNotChild:
2141
raise errors.BadReferenceTarget(self, sub_tree,
2142
'Target not inside tree.')
2143
parent_id = self.path2id(osutils.dirname(sub_tree_path))
2144
name = osutils.basename(sub_tree_path)
2145
sub_tree_id = sub_tree.get_root_id()
2146
if sub_tree_id == self.get_root_id():
2147
raise errors.BadReferenceTarget(self, sub_tree,
2148
'Trees have the same root id.')
2149
if sub_tree_id in self.inventory:
2150
raise errors.BadReferenceTarget(self, sub_tree,
2151
'Root id already present in tree')
2152
entry = TreeReference(sub_tree_id, name, parent_id, None,
2154
self.inventory.add(entry)
2155
self._write_inventory(self.inventory)
2157
def get_nested_tree(self, entry, path=None):
2159
path = self.id2path(entry.file_id)
2160
return WorkingTree.open(self.abspath(path))
2162
def get_reference_revision(self, entry, path=None):
2163
return self.get_nested_tree(entry, path).last_revision()
2743
2166
def get_conflicted_stem(path):
2744
2167
for suffix in _mod_conflicts.CONFLICT_SUFFIXES:
2745
2168
if path.endswith(suffix):
2746
2169
return path[:-len(suffix)]
2171
@deprecated_function(zero_eight)
2172
def is_control_file(filename):
2173
"""See WorkingTree.is_control_filename(filename)."""
2174
## FIXME: better check
2175
filename = normpath(filename)
2176
while filename != '':
2177
head, tail = os.path.split(filename)
2178
## mutter('check %r for control file' % ((head, tail),))
2181
if filename == head:
2749
2187
class WorkingTreeFormat(object):
2750
2188
"""An encapsulation of the initialization and open routines for a format.
2835
2256
def unregister_format(klass, format):
2257
assert klass._formats[format.get_format_string()] is format
2836
2258
del klass._formats[format.get_format_string()]
2839
2262
class WorkingTreeFormat2(WorkingTreeFormat):
2840
"""The second working tree format.
2263
"""The second working tree format.
2842
2265
This format modified the hash cache from the format 1 hash cache.
2845
upgrade_recommended = True
2847
2268
def get_format_description(self):
2848
2269
"""See WorkingTreeFormat.get_format_description()."""
2849
2270
return "Working tree format 2"
2851
def _stub_initialize_on_transport(self, transport, file_mode):
2852
"""Workaround: create control files for a remote working tree.
2272
def stub_initialize_remote(self, control_files):
2273
"""As a special workaround create critical control files for a remote working tree
2854
2275
This ensures that it can later be updated and dealt with locally,
2855
since BzrDirFormat6 and BzrDirFormat5 cannot represent dirs with
2276
since BzrDirFormat6 and BzrDirFormat5 cannot represent dirs with
2856
2277
no working tree. (See bug #43064).
2858
2279
sio = StringIO()
2859
inv = inventory.Inventory()
2860
xml5.serializer_v5.write_inventory(inv, sio, working=True)
2281
xml5.serializer_v5.write_inventory(inv, sio)
2862
transport.put_file('inventory', sio, file_mode)
2863
transport.put_bytes('pending-merges', '', file_mode)
2865
def initialize(self, a_bzrdir, revision_id=None, from_branch=None,
2866
accelerator_tree=None, hardlink=False):
2283
control_files.put('inventory', sio)
2285
control_files.put_utf8('pending-merges', '')
2288
def initialize(self, a_bzrdir, revision_id=None):
2867
2289
"""See WorkingTreeFormat.initialize()."""
2868
2290
if not isinstance(a_bzrdir.transport, LocalTransport):
2869
2291
raise errors.NotLocalUrl(a_bzrdir.transport.base)
2870
if from_branch is not None:
2871
branch = from_branch
2873
branch = a_bzrdir.open_branch()
2874
if revision_id is None:
2875
revision_id = _mod_revision.ensure_null(branch.last_revision())
2878
branch.generate_revision_history(revision_id)
2881
inv = inventory.Inventory()
2292
branch = a_bzrdir.open_branch()
2293
if revision_id is not None:
2296
revision_history = branch.revision_history()
2298
position = revision_history.index(revision_id)
2300
raise errors.NoSuchRevision(branch, revision_id)
2301
branch.set_revision_history(revision_history[:position + 1])
2304
revision = branch.last_revision()
2882
2306
wt = WorkingTree2(a_bzrdir.root_transport.local_abspath('.'),
2885
2309
_internal=True,
2887
2311
_bzrdir=a_bzrdir)
2888
basis_tree = branch.repository.revision_tree(revision_id)
2312
basis_tree = branch.repository.revision_tree(revision)
2889
2313
if basis_tree.inventory.root is not None:
2890
wt.set_root_id(basis_tree.get_root_id())
2314
wt.set_root_id(basis_tree.inventory.root.file_id)
2891
2315
# set the parent list and cache the basis tree.
2892
if _mod_revision.is_null(revision_id):
2895
parent_trees = [(revision_id, basis_tree)]
2896
wt.set_parent_trees(parent_trees)
2316
wt.set_parent_trees([(revision, basis_tree)])
2897
2317
transform.build_tree(basis_tree, wt)
3049
2449
return self.get_format_string()
3052
__default_format = WorkingTreeFormat6()
2452
class WorkingTreeFormat4(WorkingTreeFormat3):
2454
"""Working tree format that supports unique roots and nested trees"""
2456
_tree_class = WorkingTree4
2458
requires_rich_root = True
2460
supports_tree_reference = True
2463
WorkingTreeFormat3.__init__(self)
2465
def __get_matchingbzrdir(self):
2466
return bzrdir.format_registry.make_bzrdir('experimental-knit3')
2468
_matchingbzrdir = property(__get_matchingbzrdir)
2470
def get_format_string(self):
2471
"""See WorkingTreeFormat.get_format_string()."""
2472
return "Bazaar-NG Working Tree format 4"
2474
def get_format_description(self):
2475
"""See WorkingTreeFormat.get_format_description()."""
2476
return "Working tree format 4"
2478
def _initial_inventory(self):
2479
return Inventory(root_id=generate_ids.gen_root_id())
2481
# formats which have no format string are not discoverable
2482
# and not independently creatable, so are not registered.
2483
__default_format = WorkingTreeFormat3()
3053
2484
WorkingTreeFormat.register_format(__default_format)
3054
WorkingTreeFormat.register_format(WorkingTreeFormat5())
3055
2485
WorkingTreeFormat.register_format(WorkingTreeFormat4())
3056
WorkingTreeFormat.register_format(WorkingTreeFormat3())
3057
2486
WorkingTreeFormat.set_default_format(__default_format)
3058
# formats which have no format string are not discoverable
3059
# and not independently creatable, so are not registered.
3060
2487
_legacy_formats = [WorkingTreeFormat2(),
2491
class WorkingTreeTestProviderAdapter(object):
2492
"""A tool to generate a suite testing multiple workingtree formats at once.
2494
This is done by copying the test once for each transport and injecting
2495
the transport_server, transport_readonly_server, and workingtree_format
2496
classes into each copy. Each copy is also given a new id() to make it
2500
def __init__(self, transport_server, transport_readonly_server, formats):
2501
self._transport_server = transport_server
2502
self._transport_readonly_server = transport_readonly_server
2503
self._formats = formats
2505
def _clone_test(self, test, bzrdir_format, workingtree_format, variation):
2506
"""Clone test for adaption."""
2507
new_test = deepcopy(test)
2508
new_test.transport_server = self._transport_server
2509
new_test.transport_readonly_server = self._transport_readonly_server
2510
new_test.bzrdir_format = bzrdir_format
2511
new_test.workingtree_format = workingtree_format
2512
def make_new_test_id():
2513
new_id = "%s(%s)" % (test.id(), variation)
2514
return lambda: new_id
2515
new_test.id = make_new_test_id()
2518
def adapt(self, test):
2519
from bzrlib.tests import TestSuite
2520
result = TestSuite()
2521
for workingtree_format, bzrdir_format in self._formats:
2522
new_test = self._clone_test(
2525
workingtree_format, workingtree_format.__class__.__name__)
2526
result.addTest(new_test)
added
removed
bzrlib/workingtree.py
