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.lockable_files import LockableFiles
75
from bzrlib.inventory import InventoryEntry, Inventory, ROOT_ID
76
from bzrlib.lockable_files import LockableFiles, TransportLock
81
77
from bzrlib.lockdir import LockDir
82
78
import bzrlib.mutabletree
83
79
from bzrlib.mutabletree import needs_tree_write_lock
84
from bzrlib import osutils
85
80
from bzrlib.osutils import (
93
90
supports_executable,
95
from bzrlib.filters import filtered_input_file
96
92
from bzrlib.trace import mutter, note
97
93
from bzrlib.transport.local import LocalTransport
98
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
99
98
from bzrlib.rio import RioReader, rio_file, Stanza
100
from bzrlib.symbol_versioning import (
102
DEPRECATED_PARAMETER,
99
from bzrlib.symbol_versioning import (deprecated_passed,
102
DEPRECATED_PARAMETER,
106
109
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
110
CONFLICT_HEADER_1 = "BZR conflict list format 1"
112
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()
115
131
class TreeEntry(object):
116
132
"""An entry that implements the minimum interface used by commands.
118
This needs further inspection, it may be better to have
134
This needs further inspection, it may be better to have
119
135
InventoryEntries without ids - though that seems wrong. For now,
120
136
this is a parallel hierarchy to InventoryEntry, and needs to become
121
137
one of several things: decorates to that hierarchy, children of, or
411
378
# no parents, return an empty revision tree.
412
379
# in the future this should return the tree for
413
380
# '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:
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):
420
391
# No cached copy available, retrieve from the repository.
421
392
# FIXME? RBC 20060403 should we cache the inventory locally
422
393
# at this point ?
424
395
return self.branch.repository.revision_tree(revision_id)
425
except (errors.RevisionNotPresent, errors.NoSuchRevision):
396
except errors.RevisionNotPresent:
426
397
# 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
398
# occured. If the revision is present, its a problem, if its not
429
400
if self.branch.repository.has_revision(revision_id):
431
402
# 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()
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)
438
443
def relpath(self, path):
439
444
"""Return the local path portion from a given path.
441
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
442
447
interpreted relative to the python current working directory.
444
449
return osutils.relpath(self.basedir, path)
446
451
def has_filename(self, filename):
447
452
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):
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):
486
464
"""See Tree.annotate_iter
488
466
This implementation will use the basis tree implementation if possible.
492
470
incorrectly attributed to CURRENT_REVISION (but after committing, the
493
471
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))
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(),
539
494
def get_parent_ids(self):
540
495
"""See Tree.get_parent_ids.
542
497
This implementation reads the pending merges list and last_revision
543
498
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:
500
last_rev = self._last_revision()
549
504
parents = [last_rev]
551
merges_bytes = self._transport.get_bytes('pending-merges')
506
merges_file = self._control_files.get_utf8('pending-merges')
552
507
except errors.NoSuchFile:
555
for l in osutils.split_lines(merges_bytes):
556
revision_id = l.rstrip('\n')
557
parents.append(revision_id)
510
for l in merges_file.readlines():
511
parents.append(l.rstrip('\n'))
561
515
def get_root_id(self):
562
516
"""Return the id of this trees root"""
563
517
return self._inventory.root.file_id
565
519
def _get_store_filename(self, file_id):
566
520
## XXX: badly named; this is not in the store at all
567
521
return self.abspath(self.id2path(file_id))
570
def clone(self, to_bzrdir, revision_id=None):
524
def clone(self, to_bzrdir, revision_id=None, basis=None):
571
525
"""Duplicate this working tree into to_bzr, including all state.
573
527
Specifically modified files are kept as modified, but
574
528
ignored and unknown files are discarded.
576
530
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
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
581
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.
583
541
# assumes the target bzr dir format is compatible.
584
result = to_bzrdir.create_workingtree()
542
result = self._format.initialize(to_bzrdir)
585
543
self.copy_content_into(result, revision_id)
636
585
def get_file_mtime(self, file_id, path=None):
638
path = self.inventory.id2path(file_id)
587
path = self._inventory.id2path(file_id)
639
588
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
590
if not supports_executable():
654
591
def is_executable(self, file_id, path=None):
655
592
return self._inventory[file_id].executable
657
_is_executable_from_path_and_stat = \
658
_is_executable_from_path_and_stat_from_basis
660
594
def is_executable(self, file_id, path=None):
662
path = self.id2path(file_id)
596
path = self._inventory.id2path(file_id)
663
597
mode = os.lstat(self.abspath(path)).st_mode
664
598
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
601
def _add(self, files, ids, kinds):
671
602
"""See MutableTree._add."""
672
603
# TODO: Re-adding a file that is removed in the working copy
673
604
# should probably put it back with the previous ID.
674
# the read and write working inventory should not occur in this
605
# the read and write working inventory should not occur in this
675
606
# function - they should be part of lock_write and unlock.
607
inv = self.read_working_inventory()
677
608
for f, file_id, kind in zip(files, ids, kinds):
609
assert kind is not None
678
610
if file_id is None:
679
611
inv.add_path(f, kind=kind)
681
613
inv.add_path(f, kind=kind, file_id=file_id)
682
self._inventory_is_modified = True
614
self._write_inventory(inv)
684
616
@needs_tree_write_lock
685
617
def _gather_kinds(self, files, kinds):
746
678
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(
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:]
782
693
def _check_parents_for_ghosts(self, revision_ids, allow_leftmost_as_ghost):
783
694
"""Common ghost checking functionality from set_parent_*.
914
785
branch.last_revision().
916
787
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:
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()
932
806
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:
807
if merger.base_rev_id == merger.other_rev_id:
808
raise errors.PointlessMerge
809
merger.backup_files = False
939
810
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()
811
merger.set_interesting_files(None)
812
merger.show_base = False
813
merger.reprocess = False
814
conflicts = merger.do_merge()
950
821
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')
823
hashfile = self._control_files.get('merge-hashes')
962
824
except errors.NoSuchFile:
967
if hashfile.next() != MERGE_MODIFIED_HEADER_1 + '\n':
968
raise errors.MergeModifiedFormatError()
969
except StopIteration:
828
if hashfile.next() != MERGE_MODIFIED_HEADER_1 + '\n':
970
829
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
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
983
841
@needs_write_lock
984
842
def mkdir(self, path, file_id=None):
992
850
def get_symlink_target(self, file_id):
993
abspath = self.id2abspath(file_id)
994
target = osutils.readlink(abspath)
998
def subsume(self, other_tree):
999
def add_children(inventory, entry):
1000
for child_entry in entry.children.values():
1001
inventory._byid[child_entry.file_id] = child_entry
1002
if child_entry.kind == 'directory':
1003
add_children(inventory, child_entry)
1004
if other_tree.get_root_id() == self.get_root_id():
1005
raise errors.BadSubsumeSource(self, other_tree,
1006
'Trees have the same root')
1008
other_tree_path = self.relpath(other_tree.basedir)
1009
except errors.PathNotChild:
1010
raise errors.BadSubsumeSource(self, other_tree,
1011
'Tree is not contained by the other')
1012
new_root_parent = self.path2id(osutils.dirname(other_tree_path))
1013
if new_root_parent is None:
1014
raise errors.BadSubsumeSource(self, other_tree,
1015
'Parent directory is not versioned.')
1016
# We need to ensure that the result of a fetch will have a
1017
# versionedfile for the other_tree root, and only fetching into
1018
# RepositoryKnit2 guarantees that.
1019
if not self.branch.repository.supports_rich_root():
1020
raise errors.SubsumeTargetNeedsUpgrade(other_tree)
1021
other_tree.lock_tree_write()
1023
new_parents = other_tree.get_parent_ids()
1024
other_root = other_tree.inventory.root
1025
other_root.parent_id = new_root_parent
1026
other_root.name = osutils.basename(other_tree_path)
1027
self.inventory.add(other_root)
1028
add_children(self.inventory, other_root)
1029
self._write_inventory(self.inventory)
1030
# normally we don't want to fetch whole repositories, but i think
1031
# here we really do want to consolidate the whole thing.
1032
for parent_id in other_tree.get_parent_ids():
1033
self.branch.fetch(other_tree.branch, parent_id)
1034
self.add_parent_tree_id(parent_id)
1037
other_tree.bzrdir.retire_bzrdir()
1039
def _setup_directory_is_tree_reference(self):
1040
if self._branch.repository._format.supports_tree_reference:
1041
self._directory_is_tree_reference = \
1042
self._directory_may_be_tree_reference
1044
self._directory_is_tree_reference = \
1045
self._directory_is_never_tree_reference
1047
def _directory_is_never_tree_reference(self, relpath):
1050
def _directory_may_be_tree_reference(self, relpath):
1051
# as a special case, if a directory contains control files then
1052
# it's a tree reference, except that the root of the tree is not
1053
return relpath and osutils.isdir(self.abspath(relpath) + u"/.bzr")
1054
# TODO: We could ask all the control formats whether they
1055
# recognize this directory, but at the moment there's no cheap api
1056
# to do that. Since we probably can only nest bzr checkouts and
1057
# they always use this name it's ok for now. -- mbp 20060306
1059
# FIXME: There is an unhandled case here of a subdirectory
1060
# containing .bzr but not a branch; that will probably blow up
1061
# when you try to commit it. It might happen if there is a
1062
# checkout in a subdirectory. This can be avoided by not adding
1065
@needs_tree_write_lock
1066
def extract(self, file_id, format=None):
1067
"""Extract a subtree from this tree.
1069
A new branch will be created, relative to the path for this tree.
1073
segments = osutils.splitpath(path)
1074
transport = self.branch.bzrdir.root_transport
1075
for name in segments:
1076
transport = transport.clone(name)
1077
transport.ensure_base()
1080
sub_path = self.id2path(file_id)
1081
branch_transport = mkdirs(sub_path)
1083
format = self.bzrdir.cloning_metadir()
1084
branch_transport.ensure_base()
1085
branch_bzrdir = format.initialize_on_transport(branch_transport)
1087
repo = branch_bzrdir.find_repository()
1088
except errors.NoRepositoryPresent:
1089
repo = branch_bzrdir.create_repository()
1090
if not repo.supports_rich_root():
1091
raise errors.RootNotRich()
1092
new_branch = branch_bzrdir.create_branch()
1093
new_branch.pull(self.branch)
1094
for parent_id in self.get_parent_ids():
1095
new_branch.fetch(self.branch, parent_id)
1096
tree_transport = self.bzrdir.root_transport.clone(sub_path)
1097
if tree_transport.base != branch_transport.base:
1098
tree_bzrdir = format.initialize_on_transport(tree_transport)
1099
branch.BranchReferenceFormat().initialize(tree_bzrdir,
1100
target_branch=new_branch)
1102
tree_bzrdir = branch_bzrdir
1103
wt = tree_bzrdir.create_workingtree(_mod_revision.NULL_REVISION)
1104
wt.set_parent_ids(self.get_parent_ids())
1105
my_inv = self.inventory
1106
child_inv = inventory.Inventory(root_id=None)
1107
new_root = my_inv[file_id]
1108
my_inv.remove_recursive_id(file_id)
1109
new_root.parent_id = None
1110
child_inv.add(new_root)
1111
self._write_inventory(my_inv)
1112
wt._write_inventory(child_inv)
1115
def _serialize(self, inventory, out_file):
1116
xml5.serializer_v5.write_inventory(self._inventory, out_file,
1119
def _deserialize(selt, in_file):
1120
return xml5.serializer_v5.read_inventory(in_file)
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):
1122
861
def flush(self):
1123
862
"""Write the in memory inventory to disk."""
1125
864
if self._control_files._lock_mode != 'w':
1126
865
raise errors.NotWriteLocked(self)
1127
866
sio = StringIO()
1128
self._serialize(self._inventory, sio)
867
xml5.serializer_v5.write_inventory(self._inventory, sio)
1130
self._transport.put_file('inventory', sio,
1131
mode=self.bzrdir._get_file_mode())
869
self._control_files.put('inventory', sio)
1132
870
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).
872
def list_files(self, include_root=False):
873
"""Recursively list all files as (path, class, kind, id, entry).
1140
875
Lists, but does not descend into unversioned directories.
1141
877
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
880
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:
882
inv = self._inventory
883
if include_root is True:
1155
884
yield ('', 'V', 'directory', inv.root.file_id, inv.root)
1156
885
# Convert these into local objects to save lookup times
1157
886
pathjoin = osutils.pathjoin
1158
file_kind = self._kind
887
file_kind = osutils.file_kind
1160
889
# transport.base ends in a slash, we want the piece
1161
890
# between the last two slashes
1927
1591
def read_basis_inventory(self):
1928
1592
"""Read the cached basis inventory."""
1929
1593
path = self._basis_inventory_name()
1930
return self._transport.get_bytes(path)
1594
return self._control_files.get(path).read()
1932
1596
@needs_read_lock
1933
1597
def read_working_inventory(self):
1934
1598
"""Read the working inventory.
1936
1600
:raises errors.InventoryModified: read_working_inventory will fail
1937
1601
when the current in memory inventory has been modified.
1939
# conceptually this should be an implementation detail of the tree.
1603
# conceptually this should be an implementation detail of the tree.
1940
1604
# XXX: Deprecate this.
1941
1605
# ElementTree does its own conversion from UTF-8, so open in
1943
1607
if self._inventory_is_modified:
1944
1608
raise errors.InventoryModified(self)
1945
f = self._transport.get('inventory')
1947
result = self._deserialize(f)
1609
result = xml5.serializer_v5.read_inventory(
1610
self._control_files.get('inventory'))
1950
1611
self._set_inventory(result, dirty=False)
1953
1614
@needs_tree_write_lock
1954
def remove(self, files, verbose=False, to_file=None, keep_files=True,
1956
"""Remove nominated files from the working inventory.
1958
:files: File paths relative to the basedir.
1959
:keep_files: If true, the files will also be kept.
1960
:force: Delete files and directories, even if they are changed and
1961
even if the directories are not empty.
1615
def remove(self, files, verbose=False, to_file=None):
1616
"""Remove nominated files from the working inventory..
1618
This does not remove their text. This does not run on XXX on what? RBC
1620
TODO: Refuse to remove modified files unless --force is given?
1622
TODO: Do something useful with directories.
1624
TODO: Should this remove the text or not? Tough call; not
1625
removing may be useful and the user can just use use rm, and
1626
is the opposite of add. Removing it is consistent with most
1627
other tools. Maybe an option.
1629
## TODO: Normalize names
1630
## TODO: Remove nested loops; better scalability
1963
1631
if isinstance(files, basestring):
1964
1632
files = [files]
1969
unknown_nested_files=set()
1971
to_file = sys.stdout
1973
def recurse_directory_to_add_files(directory):
1974
# Recurse directory and add all files
1975
# so we can check if they have changed.
1976
for parent_info, file_infos in\
1977
self.walkdirs(directory):
1978
for relpath, basename, kind, lstat, fileid, kind in file_infos:
1979
# Is it versioned or ignored?
1980
if self.path2id(relpath) or self.is_ignored(relpath):
1981
# Add nested content for deletion.
1982
new_files.add(relpath)
1984
# Files which are not versioned and not ignored
1985
# should be treated as unknown.
1986
unknown_nested_files.add((relpath, None, kind))
1988
for filename in files:
1989
# Get file name into canonical form.
1990
abspath = self.abspath(filename)
1991
filename = self.relpath(abspath)
1992
if len(filename) > 0:
1993
new_files.add(filename)
1994
recurse_directory_to_add_files(filename)
1996
files = list(new_files)
1999
return # nothing to do
2001
# Sort needed to first handle directory content before the directory
2002
files.sort(reverse=True)
2004
# Bail out if we are going to delete files we shouldn't
2005
if not keep_files and not force:
2006
has_changed_files = len(unknown_nested_files) > 0
2007
if not has_changed_files:
2008
for (file_id, path, content_change, versioned, parent_id, name,
2009
kind, executable) in self.iter_changes(self.basis_tree(),
2010
include_unchanged=True, require_versioned=False,
2011
want_unversioned=True, specific_files=files):
2012
if versioned == (False, False):
2013
# The record is unknown ...
2014
if not self.is_ignored(path[1]):
2015
# ... but not ignored
2016
has_changed_files = True
2018
elif content_change and (kind[1] is not None):
2019
# Versioned and changed, but not deleted
2020
has_changed_files = True
2023
if has_changed_files:
2024
# Make delta show ALL applicable changes in error message.
2025
tree_delta = self.changes_from(self.basis_tree(),
2026
require_versioned=False, want_unversioned=True,
2027
specific_files=files)
2028
for unknown_file in unknown_nested_files:
2029
if unknown_file not in tree_delta.unversioned:
2030
tree_delta.unversioned.extend((unknown_file,))
2031
raise errors.BzrRemoveChangedFilesError(tree_delta)
2033
# Build inv_delta and delete files where applicable,
2034
# do this before any modifications to inventory.
1634
inv = self.inventory
1636
# do this before any modifications
2035
1637
for f in files:
2036
fid = self.path2id(f)
1638
fid = inv.path2id(f)
2039
message = "%s is not versioned." % (f,)
1640
note("%s is not versioned."%f)
2042
# having removed it, it must be either ignored or unknown
1643
# having remove it, it must be either ignored or unknown
2043
1644
if self.is_ignored(f):
2044
1645
new_status = 'I'
2046
1647
new_status = '?'
2047
# XXX: Really should be a more abstract reporter interface
2048
kind_ch = osutils.kind_marker(self.kind(fid))
2049
to_file.write(new_status + ' ' + f + kind_ch + '\n')
2051
inv_delta.append((f, None, fid, None))
2052
message = "removed %s" % (f,)
2055
abs_path = self.abspath(f)
2056
if osutils.lexists(abs_path):
2057
if (osutils.isdir(abs_path) and
2058
len(os.listdir(abs_path)) > 0):
2060
osutils.rmtree(abs_path)
2062
message = "%s is not an empty directory "\
2063
"and won't be deleted." % (f,)
2065
osutils.delete_any(abs_path)
2066
message = "deleted %s" % (f,)
2067
elif message is not None:
2068
# Only care if we haven't done anything yet.
2069
message = "%s does not exist." % (f,)
2071
# Print only one message (if any) per file.
2072
if message is not None:
2074
self.apply_inventory_delta(inv_delta)
1648
textui.show_status(new_status, inv[fid].kind, f,
1652
self._write_inventory(inv)
2076
1654
@needs_tree_write_lock
2077
def revert(self, filenames=None, old_tree=None, backups=True,
2078
pb=None, report_changes=False):
1655
def revert(self, filenames, old_tree=None, backups=True,
1656
pb=DummyProgress(), report_changes=False):
2079
1657
from bzrlib.conflicts import resolve
2082
symbol_versioning.warn('Using [] to revert all files is deprecated'
2083
' as of bzr 0.91. Please use None (the default) instead.',
2084
DeprecationWarning, stacklevel=2)
2085
1658
if old_tree is None:
2086
basis_tree = self.basis_tree()
2087
basis_tree.lock_read()
2088
old_tree = basis_tree
1659
old_tree = self.basis_tree()
1660
conflicts = transform.revert(self, old_tree, filenames, backups, pb,
1662
if not len(filenames):
1663
self.set_parent_ids(self.get_parent_ids()[:1])
2092
conflicts = transform.revert(self, old_tree, filenames, backups, pb,
2094
if filenames is None and len(self.get_parent_ids()) > 1:
2096
last_revision = self.last_revision()
2097
if last_revision != _mod_revision.NULL_REVISION:
2098
if basis_tree is None:
2099
basis_tree = self.basis_tree()
2100
basis_tree.lock_read()
2101
parent_trees.append((last_revision, basis_tree))
2102
self.set_parent_trees(parent_trees)
2105
resolve(self, filenames, ignore_misses=True, recursive=True)
2107
if basis_tree is not None:
1666
resolve(self, filenames, ignore_misses=True)
2109
1667
return conflicts
2111
def revision_tree(self, revision_id):
2112
"""See Tree.revision_tree.
2114
WorkingTree can supply revision_trees for the basis revision only
2115
because there is only one cached inventory in the bzr directory.
2117
if revision_id == self.last_revision():
2119
xml = self.read_basis_inventory()
2120
except errors.NoSuchFile:
2124
inv = xml7.serializer_v7.read_inventory_from_string(xml)
2125
# dont use the repository revision_tree api because we want
2126
# to supply the inventory.
2127
if inv.revision_id == revision_id:
2128
return revisiontree.RevisionTree(self.branch.repository,
2130
except errors.BadInventoryFormat:
2132
# raise if there was no inventory, or if we read the wrong inventory.
2133
raise errors.NoSuchRevisionInTree(self, revision_id)
2135
1669
# XXX: This method should be deprecated in favour of taking in a proper
2136
1670
# new Inventory object.
2137
1671
@needs_tree_write_lock
2138
1672
def set_inventory(self, new_inventory_list):
2139
1673
from bzrlib.inventory import (Inventory,
2140
1674
InventoryDirectory,
2143
1678
inv = Inventory(self.get_root_id())
2266
1784
# cant set that until we update the working trees last revision to be
2267
1785
# one from the new branch, because it will just get absorbed by the
2268
1786
# parent de-duplication logic.
2270
1788
# We MUST save it even if an error occurs, because otherwise the users
2271
1789
# local work is unreferenced and will appear to have been lost.
2275
1793
last_rev = self.get_parent_ids()[0]
2276
1794
except IndexError:
2277
last_rev = _mod_revision.NULL_REVISION
2278
if revision is None:
2279
revision = self.branch.last_revision()
2281
old_tip = old_tip or _mod_revision.NULL_REVISION
2283
if not _mod_revision.is_null(old_tip) and old_tip != last_rev:
2284
# the branch we are bound to was updated
2285
# merge those changes in first
2286
base_tree = self.basis_tree()
2287
other_tree = self.branch.repository.revision_tree(old_tip)
2288
nb_conflicts = merge.merge_inner(self.branch, other_tree,
2289
base_tree, this_tree=self,
2290
change_reporter=change_reporter)
2292
self.add_parent_tree((old_tip, other_tree))
2293
trace.note('Rerun update after fixing the conflicts.')
2296
if last_rev != _mod_revision.ensure_null(revision):
2297
# the working tree is up to date with the branch
2298
# we can merge the specified revision from master
2299
to_tree = self.branch.repository.revision_tree(revision)
2300
to_root_id = to_tree.get_root_id()
1796
if last_rev != self.branch.last_revision():
1797
# merge tree state up to new branch tip.
2302
1798
basis = self.basis_tree()
2305
if (basis.inventory.root is None
2306
or basis.inventory.root.file_id != to_root_id):
2307
self.set_root_id(to_root_id)
2312
# determine the branch point
2313
graph = self.branch.repository.get_graph()
2314
base_rev_id = graph.find_unique_lca(self.branch.last_revision(),
2316
base_tree = self.branch.repository.revision_tree(base_rev_id)
2318
nb_conflicts = merge.merge_inner(self.branch, to_tree, base_tree,
2320
change_reporter=change_reporter)
2321
self.set_last_revision(revision)
1799
to_tree = self.branch.basis_tree()
1800
if basis.inventory.root is None:
1801
self.set_root_id(to_tree.inventory.root.file_id)
1802
result += merge.merge_inner(
2322
1807
# TODO - dedup parents list with things merged by pull ?
2323
1808
# reuse the tree we've updated to to set the basis:
2324
parent_trees = [(revision, to_tree)]
1809
parent_trees = [(self.branch.last_revision(), to_tree)]
2325
1810
merges = self.get_parent_ids()[1:]
2326
1811
# Ideally we ask the tree for the trees here, that way the working
2327
# tree can decide whether to give us the entire tree or give us a
1812
# tree can decide whether to give us teh entire tree or give us a
2328
1813
# lazy initialised tree. dirstate for instance will have the trees
2329
1814
# in ram already, whereas a last-revision + basis-inventory tree
2330
1815
# will not, but also does not need them when setting parents.
2331
1816
for parent in merges:
2332
1817
parent_trees.append(
2333
1818
(parent, self.branch.repository.revision_tree(parent)))
2334
if not _mod_revision.is_null(old_tip):
1819
if old_tip is not None:
2335
1820
parent_trees.append(
2336
1821
(old_tip, self.branch.repository.revision_tree(old_tip)))
2337
1822
self.set_parent_trees(parent_trees)
2338
1823
last_rev = parent_trees[0][0]
1825
# the working tree had the same last-revision as the master
1826
# branch did. We may still have pivot local work from the local
1827
# branch into old_tip:
1828
if old_tip is not None:
1829
self.add_parent_tree_id(old_tip)
1830
if old_tip and old_tip != last_rev:
1831
# our last revision was not the prior branch last revision
1832
# and we have converted that last revision to a pending merge.
1833
# base is somewhere between the branch tip now
1834
# and the now pending merge
1835
from bzrlib.revision import common_ancestor
1837
base_rev_id = common_ancestor(self.branch.last_revision(),
1839
self.branch.repository)
1840
except errors.NoCommonAncestor:
1842
base_tree = self.branch.repository.revision_tree(base_rev_id)
1843
other_tree = self.branch.repository.revision_tree(old_tip)
1844
result += merge.merge_inner(
2341
1851
def _write_hashcache_if_dirty(self):
2342
1852
"""Write out the hashcache if it is dirty."""
2390
1900
file_id=self.path2id(conflicted)))
2391
1901
return conflicts
2393
def walkdirs(self, prefix=""):
2394
"""Walk the directories of this tree.
2396
returns a generator which yields items in the form:
2397
((curren_directory_path, fileid),
2398
[(file1_path, file1_name, file1_kind, (lstat), file1_id,
2401
This API returns a generator, which is only valid during the current
2402
tree transaction - within a single lock_read or lock_write duration.
2404
If the tree is not locked, it may cause an error to be raised,
2405
depending on the tree implementation.
2407
disk_top = self.abspath(prefix)
2408
if disk_top.endswith('/'):
2409
disk_top = disk_top[:-1]
2410
top_strip_len = len(disk_top) + 1
2411
inventory_iterator = self._walkdirs(prefix)
2412
disk_iterator = osutils.walkdirs(disk_top, prefix)
2414
current_disk = disk_iterator.next()
2415
disk_finished = False
2417
if not (e.errno == errno.ENOENT or
2418
(sys.platform == 'win32' and e.errno == ERROR_PATH_NOT_FOUND)):
2421
disk_finished = True
2423
current_inv = inventory_iterator.next()
2424
inv_finished = False
2425
except StopIteration:
2428
while not inv_finished or not disk_finished:
2430
((cur_disk_dir_relpath, cur_disk_dir_path_from_top),
2431
cur_disk_dir_content) = current_disk
2433
((cur_disk_dir_relpath, cur_disk_dir_path_from_top),
2434
cur_disk_dir_content) = ((None, None), None)
2435
if not disk_finished:
2436
# strip out .bzr dirs
2437
if (cur_disk_dir_path_from_top[top_strip_len:] == '' and
2438
len(cur_disk_dir_content) > 0):
2439
# osutils.walkdirs can be made nicer -
2440
# yield the path-from-prefix rather than the pathjoined
2442
bzrdir_loc = bisect_left(cur_disk_dir_content,
2444
if (bzrdir_loc < len(cur_disk_dir_content)
2445
and self.bzrdir.is_control_filename(
2446
cur_disk_dir_content[bzrdir_loc][0])):
2447
# we dont yield the contents of, or, .bzr itself.
2448
del cur_disk_dir_content[bzrdir_loc]
2450
# everything is unknown
2453
# everything is missing
2456
direction = cmp(current_inv[0][0], cur_disk_dir_relpath)
2458
# disk is before inventory - unknown
2459
dirblock = [(relpath, basename, kind, stat, None, None) for
2460
relpath, basename, kind, stat, top_path in
2461
cur_disk_dir_content]
2462
yield (cur_disk_dir_relpath, None), dirblock
2464
current_disk = disk_iterator.next()
2465
except StopIteration:
2466
disk_finished = True
2468
# inventory is before disk - missing.
2469
dirblock = [(relpath, basename, 'unknown', None, fileid, kind)
2470
for relpath, basename, dkind, stat, fileid, kind in
2472
yield (current_inv[0][0], current_inv[0][1]), dirblock
2474
current_inv = inventory_iterator.next()
2475
except StopIteration:
2478
# versioned present directory
2479
# merge the inventory and disk data together
2481
for relpath, subiterator in itertools.groupby(sorted(
2482
current_inv[1] + cur_disk_dir_content,
2483
key=operator.itemgetter(0)), operator.itemgetter(1)):
2484
path_elements = list(subiterator)
2485
if len(path_elements) == 2:
2486
inv_row, disk_row = path_elements
2487
# versioned, present file
2488
dirblock.append((inv_row[0],
2489
inv_row[1], disk_row[2],
2490
disk_row[3], inv_row[4],
2492
elif len(path_elements[0]) == 5:
2494
dirblock.append((path_elements[0][0],
2495
path_elements[0][1], path_elements[0][2],
2496
path_elements[0][3], None, None))
2497
elif len(path_elements[0]) == 6:
2498
# versioned, absent file.
2499
dirblock.append((path_elements[0][0],
2500
path_elements[0][1], 'unknown', None,
2501
path_elements[0][4], path_elements[0][5]))
2503
raise NotImplementedError('unreachable code')
2504
yield current_inv[0], dirblock
2506
current_inv = inventory_iterator.next()
2507
except StopIteration:
2510
current_disk = disk_iterator.next()
2511
except StopIteration:
2512
disk_finished = True
2514
def _walkdirs(self, prefix=""):
2515
"""Walk the directories of this tree.
2517
:prefix: is used as the directrory to start with.
2518
returns a generator which yields items in the form:
2519
((curren_directory_path, fileid),
2520
[(file1_path, file1_name, file1_kind, None, file1_id,
2523
_directory = 'directory'
2524
# get the root in the inventory
2525
inv = self.inventory
2526
top_id = inv.path2id(prefix)
2530
pending = [(prefix, '', _directory, None, top_id, None)]
2533
currentdir = pending.pop()
2534
# 0 - relpath, 1- basename, 2- kind, 3- stat, 4-id, 5-kind
2535
top_id = currentdir[4]
2537
relroot = currentdir[0] + '/'
2540
# FIXME: stash the node in pending
2542
if entry.kind == 'directory':
2543
for name, child in entry.sorted_children():
2544
dirblock.append((relroot + name, name, child.kind, None,
2545
child.file_id, child.kind
2547
yield (currentdir[0], entry.file_id), dirblock
2548
# push the user specified dirs from dirblock
2549
for dir in reversed(dirblock):
2550
if dir[2] == _directory:
2553
@needs_tree_write_lock
2554
def auto_resolve(self):
2555
"""Automatically resolve text conflicts according to contents.
2557
Only text conflicts are auto_resolvable. Files with no conflict markers
2558
are considered 'resolved', because bzr always puts conflict markers
2559
into files that have text conflicts. The corresponding .THIS .BASE and
2560
.OTHER files are deleted, as per 'resolve'.
2561
:return: a tuple of ConflictLists: (un_resolved, resolved).
2563
un_resolved = _mod_conflicts.ConflictList()
2564
resolved = _mod_conflicts.ConflictList()
2565
conflict_re = re.compile('^(<{7}|={7}|>{7})')
2566
for conflict in self.conflicts():
2567
if (conflict.typestring != 'text conflict' or
2568
self.kind(conflict.file_id) != 'file'):
2569
un_resolved.append(conflict)
2571
my_file = open(self.id2abspath(conflict.file_id), 'rb')
2573
for line in my_file:
2574
if conflict_re.search(line):
2575
un_resolved.append(conflict)
2578
resolved.append(conflict)
2581
resolved.remove_files(self)
2582
self.set_conflicts(un_resolved)
2583
return un_resolved, resolved
2586
def _check(self, references):
2587
"""Check the tree for consistency.
2589
:param references: A dict with keys matching the items returned by
2590
self._get_check_refs(), and values from looking those keys up in
2593
tree_basis = self.basis_tree()
2594
tree_basis.lock_read()
2596
repo_basis = references[('trees', self.last_revision())]
2597
if len(list(repo_basis.iter_changes(tree_basis))) > 0:
2598
raise errors.BzrCheckError(
2599
"Mismatched basis inventory content.")
2604
def _validate(self):
2605
"""Validate internal structures.
2607
This is meant mostly for the test suite. To give it a chance to detect
2608
corruption after actions have occurred. The default implementation is a
2611
:return: None. An exception should be raised if there is an error.
2615
def _get_rules_searcher(self, default_searcher):
2616
"""See Tree._get_rules_searcher."""
2617
if self._rules_searcher is None:
2618
self._rules_searcher = super(WorkingTree,
2619
self)._get_rules_searcher(default_searcher)
2620
return self._rules_searcher
2622
def get_shelf_manager(self):
2623
"""Return the ShelfManager for this WorkingTree."""
2624
from bzrlib.shelf import ShelfManager
2625
return ShelfManager(self, self._transport)
2628
1904
class WorkingTree2(WorkingTree):
2629
1905
"""This is the Format 2 working tree.
2631
This was the first weave based working tree.
1907
This was the first weave based working tree.
2632
1908
- uses os locks for locking.
2633
1909
- uses the branch last-revision.
2636
def __init__(self, *args, **kwargs):
2637
super(WorkingTree2, self).__init__(*args, **kwargs)
2638
# WorkingTree2 has more of a constraint that self._inventory must
2639
# exist. Because this is an older format, we don't mind the overhead
2640
# caused by the extra computation here.
2642
# Newer WorkingTree's should only have self._inventory set when they
2644
if self._inventory is None:
2645
self.read_working_inventory()
2647
def _get_check_refs(self):
2648
"""Return the references needed to perform a check of this tree."""
2649
return [('trees', self.last_revision())]
2651
1912
def lock_tree_write(self):
2652
1913
"""See WorkingTree.lock_tree_write().
2654
1915
In Format2 WorkingTrees we have a single lock for the branch and tree
2655
1916
so lock_tree_write() degrades to lock_write().
2657
:return: An object with an unlock method which will release the lock
2660
1918
self.branch.lock_write()
2662
self._control_files.lock_write()
1920
return self._control_files.lock_write()
2665
1922
self.branch.unlock()
2668
1925
def unlock(self):
2669
# do non-implementation specific cleanup
2672
1926
# we share control files:
2673
1927
if self._control_files._lock_count == 3:
2674
1928
# _inventory_is_modified is always False during a read lock.
2675
1929
if self._inventory_is_modified:
2677
1931
self._write_hashcache_if_dirty()
2679
1933
# reverse order of locking.
2681
1935
return self._control_files.unlock()
2856
2096
def unregister_format(klass, format):
2097
assert klass._formats[format.get_format_string()] is format
2857
2098
del klass._formats[format.get_format_string()]
2860
2102
class WorkingTreeFormat2(WorkingTreeFormat):
2861
"""The second working tree format.
2103
"""The second working tree format.
2863
2105
This format modified the hash cache from the format 1 hash cache.
2866
upgrade_recommended = True
2868
2108
def get_format_description(self):
2869
2109
"""See WorkingTreeFormat.get_format_description()."""
2870
2110
return "Working tree format 2"
2872
def _stub_initialize_on_transport(self, transport, file_mode):
2873
"""Workaround: create control files for a remote working tree.
2112
def stub_initialize_remote(self, control_files):
2113
"""As a special workaround create critical control files for a remote working tree
2875
2115
This ensures that it can later be updated and dealt with locally,
2876
since BzrDirFormat6 and BzrDirFormat5 cannot represent dirs with
2116
since BzrDirFormat6 and BzrDirFormat5 cannot represent dirs with
2877
2117
no working tree. (See bug #43064).
2879
2119
sio = StringIO()
2880
inv = inventory.Inventory()
2881
xml5.serializer_v5.write_inventory(inv, sio, working=True)
2121
xml5.serializer_v5.write_inventory(inv, sio)
2883
transport.put_file('inventory', sio, file_mode)
2884
transport.put_bytes('pending-merges', '', file_mode)
2886
def initialize(self, a_bzrdir, revision_id=None, from_branch=None,
2887
accelerator_tree=None, hardlink=False):
2123
control_files.put('inventory', sio)
2125
control_files.put_utf8('pending-merges', '')
2128
def initialize(self, a_bzrdir, revision_id=None):
2888
2129
"""See WorkingTreeFormat.initialize()."""
2889
2130
if not isinstance(a_bzrdir.transport, LocalTransport):
2890
2131
raise errors.NotLocalUrl(a_bzrdir.transport.base)
2891
if from_branch is not None:
2892
branch = from_branch
2894
branch = a_bzrdir.open_branch()
2895
if revision_id is None:
2896
revision_id = _mod_revision.ensure_null(branch.last_revision())
2899
branch.generate_revision_history(revision_id)
2902
inv = inventory.Inventory()
2132
branch = a_bzrdir.open_branch()
2133
if revision_id is not None:
2136
revision_history = branch.revision_history()
2138
position = revision_history.index(revision_id)
2140
raise errors.NoSuchRevision(branch, revision_id)
2141
branch.set_revision_history(revision_history[:position + 1])
2144
revision = branch.last_revision()
2903
2146
wt = WorkingTree2(a_bzrdir.root_transport.local_abspath('.'),
2906
2149
_internal=True,
2908
2151
_bzrdir=a_bzrdir)
2909
basis_tree = branch.repository.revision_tree(revision_id)
2152
basis_tree = branch.repository.revision_tree(revision)
2910
2153
if basis_tree.inventory.root is not None:
2911
wt.set_root_id(basis_tree.get_root_id())
2154
wt.set_root_id(basis_tree.inventory.root.file_id)
2912
2155
# set the parent list and cache the basis tree.
2913
if _mod_revision.is_null(revision_id):
2916
parent_trees = [(revision_id, basis_tree)]
2917
wt.set_parent_trees(parent_trees)
2156
wt.set_parent_trees([(revision, basis_tree)])
2918
2157
transform.build_tree(basis_tree, wt)
3051
2268
raise NotImplementedError
3052
2269
if not isinstance(a_bzrdir.transport, LocalTransport):
3053
2270
raise errors.NotLocalUrl(a_bzrdir.transport.base)
3054
wt = self._open(a_bzrdir, self._open_control_files(a_bzrdir))
2271
return self._open(a_bzrdir, self._open_control_files(a_bzrdir))
3057
2273
def _open(self, a_bzrdir, control_files):
3058
2274
"""Open the tree itself.
3060
2276
:param a_bzrdir: the dir for the tree.
3061
2277
:param control_files: the control files for the tree.
3063
return self._tree_class(a_bzrdir.root_transport.local_abspath('.'),
3067
_control_files=control_files)
2279
return WorkingTree3(a_bzrdir.root_transport.local_abspath('.'),
2283
_control_files=control_files)
3069
2285
def __str__(self):
3070
2286
return self.get_format_string()
3073
__default_format = WorkingTreeFormat6()
2289
# formats which have no format string are not discoverable
2290
# and not independently creatable, so are not registered.
2291
__default_format = WorkingTreeFormat3()
3074
2292
WorkingTreeFormat.register_format(__default_format)
3075
WorkingTreeFormat.register_format(WorkingTreeFormat5())
3076
WorkingTreeFormat.register_format(WorkingTreeFormat4())
3077
WorkingTreeFormat.register_format(WorkingTreeFormat3())
3078
2293
WorkingTreeFormat.set_default_format(__default_format)
3079
# formats which have no format string are not discoverable
3080
# and not independently creatable, so are not registered.
3081
2294
_legacy_formats = [WorkingTreeFormat2(),
2298
class WorkingTreeTestProviderAdapter(object):
2299
"""A tool to generate a suite testing multiple workingtree formats at once.
2301
This is done by copying the test once for each transport and injecting
2302
the transport_server, transport_readonly_server, and workingtree_format
2303
classes into each copy. Each copy is also given a new id() to make it
2307
def __init__(self, transport_server, transport_readonly_server, formats):
2308
self._transport_server = transport_server
2309
self._transport_readonly_server = transport_readonly_server
2310
self._formats = formats
2312
def _clone_test(self, test, bzrdir_format, workingtree_format, variation):
2313
"""Clone test for adaption."""
2314
new_test = deepcopy(test)
2315
new_test.transport_server = self._transport_server
2316
new_test.transport_readonly_server = self._transport_readonly_server
2317
new_test.bzrdir_format = bzrdir_format
2318
new_test.workingtree_format = workingtree_format
2319
def make_new_test_id():
2320
new_id = "%s(%s)" % (test.id(), variation)
2321
return lambda: new_id
2322
new_test.id = make_new_test_id()
2325
def adapt(self, test):
2326
from bzrlib.tests import TestSuite
2327
result = TestSuite()
2328
for workingtree_format, bzrdir_format in self._formats:
2329
new_test = self._clone_test(
2332
workingtree_format, workingtree_format.__class__.__name__)
2333
result.addTest(new_test)
added
removed
bzrlib/workingtree.py
