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
44
from bisect import bisect_left
46
from copy import deepcopy
48
55
from bzrlib import (
51
57
conflicts as _mod_conflicts,
60
revision as _mod_revision,
69
73
import bzrlib.branch
70
74
from bzrlib.transport import get_transport
71
from bzrlib.workingtree_4 import (
76
from bzrlib.workingtree_4 import WorkingTreeFormat4
78
79
from bzrlib import symbol_versioning
79
80
from bzrlib.decorators import needs_read_lock, needs_write_lock
80
from bzrlib.lock import LogicalLockResult
81
from bzrlib.lockable_files import LockableFiles
81
from bzrlib.inventory import InventoryEntry, Inventory, ROOT_ID
82
from bzrlib.lockable_files import LockableFiles, TransportLock
82
83
from bzrlib.lockdir import LockDir
83
84
import bzrlib.mutabletree
84
85
from bzrlib.mutabletree import needs_tree_write_lock
85
from bzrlib import osutils
86
86
from bzrlib.osutils import (
94
96
supports_executable,
96
from bzrlib.filters import filtered_input_file
97
98
from bzrlib.trace import mutter, note
98
99
from bzrlib.transport.local import LocalTransport
99
from bzrlib.revision import CURRENT_REVISION
100
from bzrlib.progress import DummyProgress, ProgressPhase
101
from bzrlib.revision import NULL_REVISION, CURRENT_REVISION
100
102
from bzrlib.rio import RioReader, rio_file, Stanza
101
from bzrlib.symbol_versioning import (
103
DEPRECATED_PARAMETER,
103
from bzrlib.symbol_versioning import (deprecated_passed,
106
DEPRECATED_PARAMETER,
107
113
MERGE_MODIFIED_HEADER_1 = "BZR merge-modified list format 1"
108
# TODO: Modifying the conflict objects or their type is currently nearly
109
# impossible as there is no clear relationship between the working tree format
110
# and the conflict list file format.
111
114
CONFLICT_HEADER_1 = "BZR conflict list format 1"
113
ERROR_PATH_NOT_FOUND = 3 # WindowsError errno code, equivalent to ENOENT
117
@deprecated_function(zero_thirteen)
118
def gen_file_id(name):
119
"""Return new file id for the basename 'name'.
121
Use bzrlib.generate_ids.gen_file_id() instead
123
return generate_ids.gen_file_id(name)
126
@deprecated_function(zero_thirteen)
128
"""Return a new tree-root file id.
130
This has been deprecated in favor of bzrlib.generate_ids.gen_root_id()
132
return generate_ids.gen_root_id()
116
135
class TreeEntry(object):
117
136
"""An entry that implements the minimum interface used by commands.
119
This needs further inspection, it may be better to have
138
This needs further inspection, it may be better to have
120
139
InventoryEntries without ids - though that seems wrong. For now,
121
140
this is a parallel hierarchy to InventoryEntry, and needs to become
122
141
one of several things: decorates to that hierarchy, children of, or
193
"""Construct a WorkingTree instance. This is not a public API.
207
"""Construct a WorkingTree for basedir.
195
:param branch: A branch to override probing for the branch.
209
If the branch is not supplied, it is opened automatically.
210
If the branch is supplied, it must be the branch for this basedir.
211
(branch.base is not cross checked, because for remote branches that
212
would be meaningless).
197
214
self._format = _format
198
215
self.bzrdir = _bzrdir
199
216
if not _internal:
200
raise errors.BzrError("Please use bzrdir.open_workingtree or "
201
"WorkingTree.open() to obtain a WorkingTree.")
217
# not created via open etc.
218
warnings.warn("WorkingTree() is deprecated as of bzr version 0.8. "
219
"Please use bzrdir.open_workingtree or WorkingTree.open().",
222
wt = WorkingTree.open(basedir)
223
self._branch = wt.branch
224
self.basedir = wt.basedir
225
self._control_files = wt._control_files
226
self._hashcache = wt._hashcache
227
self._set_inventory(wt._inventory, dirty=False)
228
self._format = wt._format
229
self.bzrdir = wt.bzrdir
230
assert isinstance(basedir, basestring), \
231
"base directory %r is not a string" % basedir
202
232
basedir = safe_unicode(basedir)
203
233
mutter("opening working tree %r", basedir)
204
234
if deprecated_passed(branch):
236
warnings.warn("WorkingTree(..., branch=XXX) is deprecated"
237
" as of bzr 0.8. Please use bzrdir.open_workingtree() or"
238
" WorkingTree.open().",
205
242
self._branch = branch
207
244
self._branch = self.bzrdir.open_branch()
423
392
# at this point ?
425
394
return self.branch.repository.revision_tree(revision_id)
426
except (errors.RevisionNotPresent, errors.NoSuchRevision):
395
except errors.RevisionNotPresent:
427
396
# the basis tree *may* be a ghost or a low level error may have
428
# occurred. If the revision is present, its a problem, if its not
397
# occured. If the revision is present, its a problem, if its not
430
399
if self.branch.repository.has_revision(revision_id):
432
401
# the basis tree is a ghost so return an empty tree.
433
return self.branch.repository.revision_tree(
434
_mod_revision.NULL_REVISION)
437
self._flush_ignore_list_cache()
402
return self.branch.repository.revision_tree(None)
405
@deprecated_method(zero_eight)
406
def create(branch, directory):
407
"""Create a workingtree for branch at directory.
409
If existing_directory already exists it must have a .bzr directory.
410
If it does not exist, it will be created.
412
This returns a new WorkingTree object for the new checkout.
414
TODO FIXME RBC 20060124 when we have checkout formats in place this
415
should accept an optional revisionid to checkout [and reject this if
416
checking out into the same dir as a pre-checkout-aware branch format.]
418
XXX: When BzrDir is present, these should be created through that
421
warnings.warn('delete WorkingTree.create', stacklevel=3)
422
transport = get_transport(directory)
423
if branch.bzrdir.root_transport.base == transport.base:
425
return branch.bzrdir.create_workingtree()
426
# different directory,
427
# create a branch reference
428
# and now a working tree.
429
raise NotImplementedError
432
@deprecated_method(zero_eight)
433
def create_standalone(directory):
434
"""Create a checkout and a branch and a repo at directory.
436
Directory must exist and be empty.
438
please use BzrDir.create_standalone_workingtree
440
return bzrdir.BzrDir.create_standalone_workingtree(directory)
439
442
def relpath(self, path):
440
443
"""Return the local path portion from a given path.
442
The path may be absolute or relative. If its a relative path it is
445
The path may be absolute or relative. If its a relative path it is
443
446
interpreted relative to the python current working directory.
445
448
return osutils.relpath(self.basedir, path)
447
450
def has_filename(self, filename):
448
451
return osutils.lexists(self.abspath(filename))
450
def get_file(self, file_id, path=None, filtered=True):
451
return self.get_file_with_stat(file_id, path, filtered=filtered)[0]
453
def get_file_with_stat(self, file_id, path=None, filtered=True,
455
"""See Tree.get_file_with_stat."""
457
path = self.id2path(file_id)
458
file_obj = self.get_file_byname(path, filtered=False)
459
stat_value = _fstat(file_obj.fileno())
460
if filtered and self.supports_content_filtering():
461
filters = self._content_filter_stack(path)
462
file_obj = filtered_input_file(file_obj, filters)
463
return (file_obj, stat_value)
465
def get_file_text(self, file_id, path=None, filtered=True):
466
return self.get_file(file_id, path=path, filtered=filtered).read()
468
def get_file_byname(self, filename, filtered=True):
469
path = self.abspath(filename)
471
if filtered and self.supports_content_filtering():
472
filters = self._content_filter_stack(filename)
473
return filtered_input_file(f, filters)
477
def get_file_lines(self, file_id, path=None, filtered=True):
478
"""See Tree.get_file_lines()"""
479
file = self.get_file(file_id, path, filtered=filtered)
481
return file.readlines()
486
def annotate_iter(self, file_id, default_revision=CURRENT_REVISION):
453
def get_file(self, file_id):
454
return self.get_file_byname(self.id2path(file_id))
456
def get_file_text(self, file_id):
457
return self.get_file(file_id).read()
459
def get_file_byname(self, filename):
460
return file(self.abspath(filename), 'rb')
462
def annotate_iter(self, file_id):
487
463
"""See Tree.annotate_iter
489
465
This implementation will use the basis tree implementation if possible.
493
469
incorrectly attributed to CURRENT_REVISION (but after committing, the
494
470
attribution will be correct).
496
maybe_file_parent_keys = []
497
for parent_id in self.get_parent_ids():
499
parent_tree = self.revision_tree(parent_id)
500
except errors.NoSuchRevisionInTree:
501
parent_tree = self.branch.repository.revision_tree(parent_id)
502
parent_tree.lock_read()
504
if file_id not in parent_tree:
506
ie = parent_tree.inventory[file_id]
507
if ie.kind != 'file':
508
# Note: this is slightly unnecessary, because symlinks and
509
# directories have a "text" which is the empty text, and we
510
# know that won't mess up annotations. But it seems cleaner
512
parent_text_key = (file_id, ie.revision)
513
if parent_text_key not in maybe_file_parent_keys:
514
maybe_file_parent_keys.append(parent_text_key)
517
graph = _mod_graph.Graph(self.branch.repository.texts)
518
heads = graph.heads(maybe_file_parent_keys)
519
file_parent_keys = []
520
for key in maybe_file_parent_keys:
522
file_parent_keys.append(key)
524
# Now we have the parents of this content
525
annotator = self.branch.repository.texts.get_annotator()
526
text = self.get_file(file_id).read()
527
this_key =(file_id, default_revision)
528
annotator.add_special_text(this_key, file_parent_keys, text)
529
annotations = [(key[-1], line)
530
for key, line in annotator.annotate_flat(this_key)]
533
def _get_ancestors(self, default_revision):
534
ancestors = set([default_revision])
535
for parent_id in self.get_parent_ids():
536
ancestors.update(self.branch.repository.get_ancestry(
537
parent_id, topo_sorted=False))
472
basis = self.basis_tree()
473
changes = self._iter_changes(basis, True, [file_id]).next()
474
changed_content, kind = changes[2], changes[6]
475
if not changed_content:
476
return basis.annotate_iter(file_id)
480
if kind[0] != 'file':
483
old_lines = list(basis.annotate_iter(file_id))
485
for tree in self.branch.repository.revision_trees(
486
self.get_parent_ids()[1:]):
487
if file_id not in tree:
489
old.append(list(tree.annotate_iter(file_id)))
490
return annotate.reannotate(old, self.get_file(file_id).readlines(),
540
493
def get_parent_ids(self):
541
494
"""See Tree.get_parent_ids.
543
496
This implementation reads the pending merges list and last_revision
544
497
value and uses that to decide what the parents list should be.
546
last_rev = _mod_revision.ensure_null(self._last_revision())
547
if _mod_revision.NULL_REVISION == last_rev:
499
last_rev = self._last_revision()
550
503
parents = [last_rev]
552
merges_bytes = self._transport.get_bytes('pending-merges')
505
merges_file = self._control_files.get_utf8('pending-merges')
553
506
except errors.NoSuchFile:
556
for l in osutils.split_lines(merges_bytes):
557
revision_id = l.rstrip('\n')
558
parents.append(revision_id)
509
for l in merges_file.readlines():
510
parents.append(l.rstrip('\n'))
562
514
def get_root_id(self):
563
515
"""Return the id of this trees root"""
564
516
return self._inventory.root.file_id
566
518
def _get_store_filename(self, file_id):
567
519
## XXX: badly named; this is not in the store at all
568
520
return self.abspath(self.id2path(file_id))
571
def clone(self, to_bzrdir, revision_id=None):
523
def clone(self, to_bzrdir, revision_id=None, basis=None):
572
524
"""Duplicate this working tree into to_bzr, including all state.
574
526
Specifically modified files are kept as modified, but
575
527
ignored and unknown files are discarded.
577
529
If you want to make a new line of development, see bzrdir.sprout()
580
If not None, the cloned tree will have its last revision set to
581
revision, and difference between the source trees last revision
532
If not None, the cloned tree will have its last revision set to
533
revision, and and difference between the source trees last revision
582
534
and this one merged in.
537
If not None, a closer copy of a tree which may have some files in
538
common, and which file content should be preferentially copied from.
584
540
# assumes the target bzr dir format is compatible.
585
result = to_bzrdir.create_workingtree()
541
result = self._format.initialize(to_bzrdir)
586
542
self.copy_content_into(result, revision_id)
637
584
def get_file_mtime(self, file_id, path=None):
639
path = self.inventory.id2path(file_id)
586
path = self._inventory.id2path(file_id)
640
587
return os.lstat(self.abspath(path)).st_mtime
642
def _is_executable_from_path_and_stat_from_basis(self, path, stat_result):
643
file_id = self.path2id(path)
645
# For unversioned files on win32, we just assume they are not
648
return self._inventory[file_id].executable
650
def _is_executable_from_path_and_stat_from_stat(self, path, stat_result):
651
mode = stat_result.st_mode
652
return bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode)
654
589
if not supports_executable():
655
590
def is_executable(self, file_id, path=None):
656
591
return self._inventory[file_id].executable
658
_is_executable_from_path_and_stat = \
659
_is_executable_from_path_and_stat_from_basis
661
593
def is_executable(self, file_id, path=None):
663
path = self.id2path(file_id)
595
path = self._inventory.id2path(file_id)
664
596
mode = os.lstat(self.abspath(path)).st_mode
665
597
return bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode)
667
_is_executable_from_path_and_stat = \
668
_is_executable_from_path_and_stat_from_stat
670
@needs_tree_write_lock
671
600
def _add(self, files, ids, kinds):
672
601
"""See MutableTree._add."""
673
602
# TODO: Re-adding a file that is removed in the working copy
674
603
# should probably put it back with the previous ID.
675
# the read and write working inventory should not occur in this
604
# the read and write working inventory should not occur in this
676
605
# function - they should be part of lock_write and unlock.
606
inv = self.read_working_inventory()
678
607
for f, file_id, kind in zip(files, ids, kinds):
608
assert kind is not None
679
609
if file_id is None:
680
610
inv.add_path(f, kind=kind)
682
612
inv.add_path(f, kind=kind, file_id=file_id)
683
self._inventory_is_modified = True
613
self._write_inventory(inv)
685
615
@needs_tree_write_lock
686
616
def _gather_kinds(self, files, kinds):
747
677
self.set_parent_ids(parents, allow_leftmost_as_ghost=True)
749
def path_content_summary(self, path, _lstat=os.lstat,
750
_mapper=osutils.file_kind_from_stat_mode):
751
"""See Tree.path_content_summary."""
752
abspath = self.abspath(path)
754
stat_result = _lstat(abspath)
756
if getattr(e, 'errno', None) == errno.ENOENT:
758
return ('missing', None, None, None)
759
# propagate other errors
761
kind = _mapper(stat_result.st_mode)
763
return self._file_content_summary(path, stat_result)
764
elif kind == 'directory':
765
# perhaps it looks like a plain directory, but it's really a
767
if self._directory_is_tree_reference(path):
768
kind = 'tree-reference'
769
return kind, None, None, None
770
elif kind == 'symlink':
771
target = osutils.readlink(abspath)
772
return ('symlink', None, None, target)
774
return (kind, None, None, None)
776
def _file_content_summary(self, path, stat_result):
777
size = stat_result.st_size
778
executable = self._is_executable_from_path_and_stat(path, stat_result)
779
# try for a stat cache lookup
780
return ('file', size, executable, self._sha_from_stat(
679
@deprecated_method(zero_eleven)
681
def pending_merges(self):
682
"""Return a list of pending merges.
684
These are revisions that have been merged into the working
685
directory but not yet committed.
687
As of 0.11 this is deprecated. Please see WorkingTree.get_parent_ids()
688
instead - which is available on all tree objects.
690
return self.get_parent_ids()[1:]
783
692
def _check_parents_for_ghosts(self, revision_ids, allow_leftmost_as_ghost):
784
693
"""Common ghost checking functionality from set_parent_*.
884
765
def set_merge_modified(self, modified_hashes):
885
766
def iter_stanzas():
886
767
for file_id, hash in modified_hashes.iteritems():
887
yield Stanza(file_id=file_id.decode('utf8'), hash=hash)
768
yield Stanza(file_id=file_id, hash=hash)
888
769
self._put_rio('merge-hashes', iter_stanzas(), MERGE_MODIFIED_HEADER_1)
890
def _sha_from_stat(self, path, stat_result):
891
"""Get a sha digest from the tree's stat cache.
893
The default implementation assumes no stat cache is present.
895
:param path: The path.
896
:param stat_result: The stat result being looked up.
771
@needs_tree_write_lock
900
772
def _put_rio(self, filename, stanzas, header):
901
self._must_be_locked()
902
773
my_file = rio_file(stanzas, header)
903
self._transport.put_file(filename, my_file,
904
mode=self.bzrdir._get_file_mode())
774
self._control_files.put(filename, my_file)
906
776
@needs_write_lock # because merge pulls data into the branch.
907
def merge_from_branch(self, branch, to_revision=None, from_revision=None,
908
merge_type=None, force=False):
777
def merge_from_branch(self, branch, to_revision=None):
909
778
"""Merge from a branch into this working tree.
911
780
:param branch: The branch to merge from.
915
784
branch.last_revision().
917
786
from bzrlib.merge import Merger, Merge3Merger
918
merger = Merger(self.branch, this_tree=self)
919
# check that there are no local alterations
920
if not force and self.has_changes():
921
raise errors.UncommittedChanges(self)
922
if to_revision is None:
923
to_revision = _mod_revision.ensure_null(branch.last_revision())
924
merger.other_rev_id = to_revision
925
if _mod_revision.is_null(merger.other_rev_id):
926
raise errors.NoCommits(branch)
927
self.branch.fetch(branch, last_revision=merger.other_rev_id)
928
merger.other_basis = merger.other_rev_id
929
merger.other_tree = self.branch.repository.revision_tree(
931
merger.other_branch = branch
932
if from_revision is None:
787
pb = bzrlib.ui.ui_factory.nested_progress_bar()
789
merger = Merger(self.branch, this_tree=self, pb=pb)
790
merger.pp = ProgressPhase("Merge phase", 5, pb)
791
merger.pp.next_phase()
792
# check that there are no
794
merger.check_basis(check_clean=True, require_commits=False)
795
if to_revision is None:
796
to_revision = branch.last_revision()
797
merger.other_rev_id = to_revision
798
if merger.other_rev_id is None:
799
raise error.NoCommits(branch)
800
self.branch.fetch(branch, last_revision=merger.other_rev_id)
801
merger.other_basis = merger.other_rev_id
802
merger.other_tree = self.branch.repository.revision_tree(
804
merger.pp.next_phase()
933
805
merger.find_base()
935
merger.set_base_revision(from_revision, branch)
936
if merger.base_rev_id == merger.other_rev_id:
937
raise errors.PointlessMerge
938
merger.backup_files = False
939
if merge_type is None:
806
if merger.base_rev_id == merger.other_rev_id:
807
raise errors.PointlessMerge
808
merger.backup_files = False
940
809
merger.merge_type = Merge3Merger
942
merger.merge_type = merge_type
943
merger.set_interesting_files(None)
944
merger.show_base = False
945
merger.reprocess = False
946
conflicts = merger.do_merge()
810
merger.set_interesting_files(None)
811
merger.show_base = False
812
merger.reprocess = False
813
conflicts = merger.do_merge()
951
820
def merge_modified(self):
952
"""Return a dictionary of files modified by a merge.
954
The list is initialized by WorkingTree.set_merge_modified, which is
955
typically called after we make some automatic updates to the tree
958
This returns a map of file_id->sha1, containing only files which are
959
still in the working inventory and have that text hash.
962
hashfile = self._transport.get('merge-hashes')
822
hashfile = self._control_files.get('merge-hashes')
963
823
except errors.NoSuchFile:
968
if hashfile.next() != MERGE_MODIFIED_HEADER_1 + '\n':
969
raise errors.MergeModifiedFormatError()
970
except StopIteration:
827
if hashfile.next() != MERGE_MODIFIED_HEADER_1 + '\n':
971
828
raise errors.MergeModifiedFormatError()
972
for s in RioReader(hashfile):
973
# RioReader reads in Unicode, so convert file_ids back to utf8
974
file_id = osutils.safe_file_id(s.get("file_id"), warn=False)
975
if file_id not in self.inventory:
977
text_hash = s.get("hash")
978
if text_hash == self.get_file_sha1(file_id):
979
merge_hashes[file_id] = text_hash
829
except StopIteration:
830
raise errors.MergeModifiedFormatError()
831
for s in RioReader(hashfile):
832
file_id = s.get("file_id")
833
if file_id not in self.inventory:
836
if hash == self.get_file_sha1(file_id):
837
merge_hashes[file_id] = hash
984
840
@needs_write_lock
985
841
def mkdir(self, path, file_id=None):
993
849
def get_symlink_target(self, file_id):
994
abspath = self.id2abspath(file_id)
995
target = osutils.readlink(abspath)
999
def subsume(self, other_tree):
1000
def add_children(inventory, entry):
1001
for child_entry in entry.children.values():
1002
inventory._byid[child_entry.file_id] = child_entry
1003
if child_entry.kind == 'directory':
1004
add_children(inventory, child_entry)
1005
if other_tree.get_root_id() == self.get_root_id():
1006
raise errors.BadSubsumeSource(self, other_tree,
1007
'Trees have the same root')
1009
other_tree_path = self.relpath(other_tree.basedir)
1010
except errors.PathNotChild:
1011
raise errors.BadSubsumeSource(self, other_tree,
1012
'Tree is not contained by the other')
1013
new_root_parent = self.path2id(osutils.dirname(other_tree_path))
1014
if new_root_parent is None:
1015
raise errors.BadSubsumeSource(self, other_tree,
1016
'Parent directory is not versioned.')
1017
# We need to ensure that the result of a fetch will have a
1018
# versionedfile for the other_tree root, and only fetching into
1019
# RepositoryKnit2 guarantees that.
1020
if not self.branch.repository.supports_rich_root():
1021
raise errors.SubsumeTargetNeedsUpgrade(other_tree)
1022
other_tree.lock_tree_write()
1024
new_parents = other_tree.get_parent_ids()
1025
other_root = other_tree.inventory.root
1026
other_root.parent_id = new_root_parent
1027
other_root.name = osutils.basename(other_tree_path)
1028
self.inventory.add(other_root)
1029
add_children(self.inventory, other_root)
1030
self._write_inventory(self.inventory)
1031
# normally we don't want to fetch whole repositories, but i think
1032
# here we really do want to consolidate the whole thing.
1033
for parent_id in other_tree.get_parent_ids():
1034
self.branch.fetch(other_tree.branch, parent_id)
1035
self.add_parent_tree_id(parent_id)
1038
other_tree.bzrdir.retire_bzrdir()
1040
def _setup_directory_is_tree_reference(self):
1041
if self._branch.repository._format.supports_tree_reference:
1042
self._directory_is_tree_reference = \
1043
self._directory_may_be_tree_reference
1045
self._directory_is_tree_reference = \
1046
self._directory_is_never_tree_reference
1048
def _directory_is_never_tree_reference(self, relpath):
1051
def _directory_may_be_tree_reference(self, relpath):
1052
# as a special case, if a directory contains control files then
1053
# it's a tree reference, except that the root of the tree is not
1054
return relpath and osutils.isdir(self.abspath(relpath) + u"/.bzr")
1055
# TODO: We could ask all the control formats whether they
1056
# recognize this directory, but at the moment there's no cheap api
1057
# to do that. Since we probably can only nest bzr checkouts and
1058
# they always use this name it's ok for now. -- mbp 20060306
1060
# FIXME: There is an unhandled case here of a subdirectory
1061
# containing .bzr but not a branch; that will probably blow up
1062
# when you try to commit it. It might happen if there is a
1063
# checkout in a subdirectory. This can be avoided by not adding
1066
@needs_tree_write_lock
1067
def extract(self, file_id, format=None):
1068
"""Extract a subtree from this tree.
1070
A new branch will be created, relative to the path for this tree.
1074
segments = osutils.splitpath(path)
1075
transport = self.branch.bzrdir.root_transport
1076
for name in segments:
1077
transport = transport.clone(name)
1078
transport.ensure_base()
1081
sub_path = self.id2path(file_id)
1082
branch_transport = mkdirs(sub_path)
1084
format = self.bzrdir.cloning_metadir()
1085
branch_transport.ensure_base()
1086
branch_bzrdir = format.initialize_on_transport(branch_transport)
1088
repo = branch_bzrdir.find_repository()
1089
except errors.NoRepositoryPresent:
1090
repo = branch_bzrdir.create_repository()
1091
if not repo.supports_rich_root():
1092
raise errors.RootNotRich()
1093
new_branch = branch_bzrdir.create_branch()
1094
new_branch.pull(self.branch)
1095
for parent_id in self.get_parent_ids():
1096
new_branch.fetch(self.branch, parent_id)
1097
tree_transport = self.bzrdir.root_transport.clone(sub_path)
1098
if tree_transport.base != branch_transport.base:
1099
tree_bzrdir = format.initialize_on_transport(tree_transport)
1100
branch.BranchReferenceFormat().initialize(tree_bzrdir,
1101
target_branch=new_branch)
1103
tree_bzrdir = branch_bzrdir
1104
wt = tree_bzrdir.create_workingtree(_mod_revision.NULL_REVISION)
1105
wt.set_parent_ids(self.get_parent_ids())
1106
my_inv = self.inventory
1107
child_inv = inventory.Inventory(root_id=None)
1108
new_root = my_inv[file_id]
1109
my_inv.remove_recursive_id(file_id)
1110
new_root.parent_id = None
1111
child_inv.add(new_root)
1112
self._write_inventory(my_inv)
1113
wt._write_inventory(child_inv)
1116
def _serialize(self, inventory, out_file):
1117
xml5.serializer_v5.write_inventory(self._inventory, out_file,
1120
def _deserialize(selt, in_file):
1121
return xml5.serializer_v5.read_inventory(in_file)
850
return os.readlink(self.id2abspath(file_id))
852
def file_class(self, filename):
853
if self.path2id(filename):
855
elif self.is_ignored(filename):
1123
860
def flush(self):
1124
861
"""Write the in memory inventory to disk."""
1126
863
if self._control_files._lock_mode != 'w':
1127
864
raise errors.NotWriteLocked(self)
1128
865
sio = StringIO()
1129
self._serialize(self._inventory, sio)
866
xml5.serializer_v5.write_inventory(self._inventory, sio)
1131
self._transport.put_file('inventory', sio,
1132
mode=self.bzrdir._get_file_mode())
868
self._control_files.put('inventory', sio)
1133
869
self._inventory_is_modified = False
1135
def _kind(self, relpath):
1136
return osutils.file_kind(self.abspath(relpath))
1138
def list_files(self, include_root=False, from_dir=None, recursive=True):
1139
"""List all files as (path, class, kind, id, entry).
871
def list_files(self, include_root=False):
872
"""Recursively list all files as (path, class, kind, id, entry).
1141
874
Lists, but does not descend into unversioned directories.
1142
876
This does not include files that have been deleted in this
1143
tree. Skips the control directory.
1145
:param include_root: if True, return an entry for the root
1146
:param from_dir: start from this directory or None for the root
1147
:param recursive: whether to recurse into subdirectories or not
879
Skips the control directory.
1149
# list_files is an iterator, so @needs_read_lock doesn't work properly
1150
# with it. So callers should be careful to always read_lock the tree.
1151
if not self.is_locked():
1152
raise errors.ObjectNotLocked(self)
1154
inv = self.inventory
1155
if from_dir is None and include_root is True:
881
inv = self._inventory
882
if include_root is True:
1156
883
yield ('', 'V', 'directory', inv.root.file_id, inv.root)
1157
884
# Convert these into local objects to save lookup times
1158
885
pathjoin = osutils.pathjoin
1159
file_kind = self._kind
886
file_kind = osutils.file_kind
1161
888
# transport.base ends in a slash, we want the piece
1162
889
# between the last two slashes
1789
1492
@needs_read_lock
1790
1493
def _last_revision(self):
1791
1494
"""helper for get_parent_ids."""
1792
return _mod_revision.ensure_null(self.branch.last_revision())
1495
return self.branch.last_revision()
1794
1497
def is_locked(self):
1795
1498
return self._control_files.is_locked()
1797
def _must_be_locked(self):
1798
if not self.is_locked():
1799
raise errors.ObjectNotLocked(self)
1801
1500
def lock_read(self):
1802
"""Lock the tree for reading.
1804
This also locks the branch, and can be unlocked via self.unlock().
1806
:return: A bzrlib.lock.LogicalLockResult.
1808
if not self.is_locked():
1501
"""See Branch.lock_read, and WorkingTree.unlock."""
1810
1502
self.branch.lock_read()
1812
self._control_files.lock_read()
1813
return LogicalLockResult(self.unlock)
1504
return self._control_files.lock_read()
1815
1506
self.branch.unlock()
1818
1509
def lock_tree_write(self):
1819
"""See MutableTree.lock_tree_write, and WorkingTree.unlock.
1821
:return: A bzrlib.lock.LogicalLockResult.
1823
if not self.is_locked():
1510
"""See MutableTree.lock_tree_write, and WorkingTree.unlock."""
1825
1511
self.branch.lock_read()
1827
self._control_files.lock_write()
1828
return LogicalLockResult(self.unlock)
1513
return self._control_files.lock_write()
1830
1515
self.branch.unlock()
1833
1518
def lock_write(self):
1834
"""See MutableTree.lock_write, and WorkingTree.unlock.
1836
:return: A bzrlib.lock.LogicalLockResult.
1838
if not self.is_locked():
1519
"""See MutableTree.lock_write, and WorkingTree.unlock."""
1840
1520
self.branch.lock_write()
1842
self._control_files.lock_write()
1843
return LogicalLockResult(self.unlock)
1522
return self._control_files.lock_write()
1845
1524
self.branch.unlock()
1925
1594
def read_basis_inventory(self):
1926
1595
"""Read the cached basis inventory."""
1927
1596
path = self._basis_inventory_name()
1928
return self._transport.get_bytes(path)
1597
return self._control_files.get(path).read()
1930
1599
@needs_read_lock
1931
1600
def read_working_inventory(self):
1932
1601
"""Read the working inventory.
1934
1603
:raises errors.InventoryModified: read_working_inventory will fail
1935
1604
when the current in memory inventory has been modified.
1937
# conceptually this should be an implementation detail of the tree.
1606
# conceptually this should be an implementation detail of the tree.
1938
1607
# XXX: Deprecate this.
1939
1608
# ElementTree does its own conversion from UTF-8, so open in
1941
1610
if self._inventory_is_modified:
1942
1611
raise errors.InventoryModified(self)
1943
f = self._transport.get('inventory')
1945
result = self._deserialize(f)
1612
result = xml5.serializer_v5.read_inventory(
1613
self._control_files.get('inventory'))
1948
1614
self._set_inventory(result, dirty=False)
1951
1617
@needs_tree_write_lock
1952
def remove(self, files, verbose=False, to_file=None, keep_files=True,
1954
"""Remove nominated files from the working inventory.
1956
:files: File paths relative to the basedir.
1957
:keep_files: If true, the files will also be kept.
1958
:force: Delete files and directories, even if they are changed and
1959
even if the directories are not empty.
1618
def remove(self, files, verbose=False, to_file=None):
1619
"""Remove nominated files from the working inventory..
1621
This does not remove their text. This does not run on XXX on what? RBC
1623
TODO: Refuse to remove modified files unless --force is given?
1625
TODO: Do something useful with directories.
1627
TODO: Should this remove the text or not? Tough call; not
1628
removing may be useful and the user can just use use rm, and
1629
is the opposite of add. Removing it is consistent with most
1630
other tools. Maybe an option.
1632
## TODO: Normalize names
1633
## TODO: Remove nested loops; better scalability
1961
1634
if isinstance(files, basestring):
1962
1635
files = [files]
1967
unknown_nested_files=set()
1969
to_file = sys.stdout
1971
def recurse_directory_to_add_files(directory):
1972
# Recurse directory and add all files
1973
# so we can check if they have changed.
1974
for parent_info, file_infos in\
1975
self.walkdirs(directory):
1976
for relpath, basename, kind, lstat, fileid, kind in file_infos:
1977
# Is it versioned or ignored?
1978
if self.path2id(relpath) or self.is_ignored(relpath):
1979
# Add nested content for deletion.
1980
new_files.add(relpath)
1982
# Files which are not versioned and not ignored
1983
# should be treated as unknown.
1984
unknown_nested_files.add((relpath, None, kind))
1986
for filename in files:
1987
# Get file name into canonical form.
1988
abspath = self.abspath(filename)
1989
filename = self.relpath(abspath)
1990
if len(filename) > 0:
1991
new_files.add(filename)
1992
recurse_directory_to_add_files(filename)
1994
files = list(new_files)
1997
return # nothing to do
1999
# Sort needed to first handle directory content before the directory
2000
files.sort(reverse=True)
2002
# Bail out if we are going to delete files we shouldn't
2003
if not keep_files and not force:
2004
has_changed_files = len(unknown_nested_files) > 0
2005
if not has_changed_files:
2006
for (file_id, path, content_change, versioned, parent_id, name,
2007
kind, executable) in self.iter_changes(self.basis_tree(),
2008
include_unchanged=True, require_versioned=False,
2009
want_unversioned=True, specific_files=files):
2010
if versioned == (False, False):
2011
# The record is unknown ...
2012
if not self.is_ignored(path[1]):
2013
# ... but not ignored
2014
has_changed_files = True
2016
elif content_change and (kind[1] is not None):
2017
# Versioned and changed, but not deleted
2018
has_changed_files = True
2021
if has_changed_files:
2022
# Make delta show ALL applicable changes in error message.
2023
tree_delta = self.changes_from(self.basis_tree(),
2024
require_versioned=False, want_unversioned=True,
2025
specific_files=files)
2026
for unknown_file in unknown_nested_files:
2027
if unknown_file not in tree_delta.unversioned:
2028
tree_delta.unversioned.extend((unknown_file,))
2029
raise errors.BzrRemoveChangedFilesError(tree_delta)
2031
# Build inv_delta and delete files where applicable,
2032
# do this before any modifications to inventory.
1637
inv = self.inventory
1639
# do this before any modifications
2033
1640
for f in files:
2034
fid = self.path2id(f)
1641
fid = inv.path2id(f)
2037
message = "%s is not versioned." % (f,)
2040
# having removed it, it must be either ignored or unknown
2041
if self.is_ignored(f):
2045
# XXX: Really should be a more abstract reporter interface
2046
kind_ch = osutils.kind_marker(self.kind(fid))
2047
to_file.write(new_status + ' ' + f + kind_ch + '\n')
2049
inv_delta.append((f, None, fid, None))
2050
message = "removed %s" % (f,)
2053
abs_path = self.abspath(f)
2054
if osutils.lexists(abs_path):
2055
if (osutils.isdir(abs_path) and
2056
len(os.listdir(abs_path)) > 0):
2058
osutils.rmtree(abs_path)
2060
message = "%s is not an empty directory "\
2061
"and won't be deleted." % (f,)
2063
osutils.delete_any(abs_path)
2064
message = "deleted %s" % (f,)
2065
elif message is not None:
2066
# Only care if we haven't done anything yet.
2067
message = "%s does not exist." % (f,)
2069
# Print only one message (if any) per file.
2070
if message is not None:
2072
self.apply_inventory_delta(inv_delta)
1643
# TODO: Perhaps make this just a warning, and continue?
1644
# This tends to happen when
1645
raise errors.NotVersionedError(path=f)
1647
# having remove it, it must be either ignored or unknown
1648
if self.is_ignored(f):
1652
textui.show_status(new_status, inv[fid].kind, f,
1656
self._write_inventory(inv)
2074
1658
@needs_tree_write_lock
2075
def revert(self, filenames=None, old_tree=None, backups=True,
2076
pb=None, report_changes=False):
1659
def revert(self, filenames, old_tree=None, backups=True,
1660
pb=DummyProgress(), report_changes=False):
2077
1661
from bzrlib.conflicts import resolve
2080
symbol_versioning.warn('Using [] to revert all files is deprecated'
2081
' as of bzr 0.91. Please use None (the default) instead.',
2082
DeprecationWarning, stacklevel=2)
2083
1662
if old_tree is None:
2084
basis_tree = self.basis_tree()
2085
basis_tree.lock_read()
2086
old_tree = basis_tree
1663
old_tree = self.basis_tree()
1664
conflicts = transform.revert(self, old_tree, filenames, backups, pb,
1666
if not len(filenames):
1667
self.set_parent_ids(self.get_parent_ids()[:1])
2090
conflicts = transform.revert(self, old_tree, filenames, backups, pb,
2092
if filenames is None and len(self.get_parent_ids()) > 1:
2094
last_revision = self.last_revision()
2095
if last_revision != _mod_revision.NULL_REVISION:
2096
if basis_tree is None:
2097
basis_tree = self.basis_tree()
2098
basis_tree.lock_read()
2099
parent_trees.append((last_revision, basis_tree))
2100
self.set_parent_trees(parent_trees)
2103
resolve(self, filenames, ignore_misses=True, recursive=True)
2105
if basis_tree is not None:
1670
resolve(self, filenames, ignore_misses=True)
2107
1671
return conflicts
2109
1673
def revision_tree(self, revision_id):
2264
1812
# cant set that until we update the working trees last revision to be
2265
1813
# one from the new branch, because it will just get absorbed by the
2266
1814
# parent de-duplication logic.
2268
1816
# We MUST save it even if an error occurs, because otherwise the users
2269
1817
# local work is unreferenced and will appear to have been lost.
2273
1821
last_rev = self.get_parent_ids()[0]
2274
1822
except IndexError:
2275
last_rev = _mod_revision.NULL_REVISION
2276
if revision is None:
2277
revision = self.branch.last_revision()
2279
old_tip = old_tip or _mod_revision.NULL_REVISION
2281
if not _mod_revision.is_null(old_tip) and old_tip != last_rev:
2282
# the branch we are bound to was updated
2283
# merge those changes in first
2284
base_tree = self.basis_tree()
2285
other_tree = self.branch.repository.revision_tree(old_tip)
2286
nb_conflicts = merge.merge_inner(self.branch, other_tree,
2287
base_tree, this_tree=self,
2288
change_reporter=change_reporter)
2290
self.add_parent_tree((old_tip, other_tree))
2291
trace.note('Rerun update after fixing the conflicts.')
2294
if last_rev != _mod_revision.ensure_null(revision):
2295
# the working tree is up to date with the branch
2296
# we can merge the specified revision from master
2297
to_tree = self.branch.repository.revision_tree(revision)
2298
to_root_id = to_tree.get_root_id()
1824
if last_rev != self.branch.last_revision():
1825
# merge tree state up to new branch tip.
2300
1826
basis = self.basis_tree()
2303
if (basis.inventory.root is None
2304
or basis.inventory.root.file_id != to_root_id):
2305
self.set_root_id(to_root_id)
2310
# determine the branch point
2311
graph = self.branch.repository.get_graph()
2312
base_rev_id = graph.find_unique_lca(self.branch.last_revision(),
2314
base_tree = self.branch.repository.revision_tree(base_rev_id)
2316
nb_conflicts = merge.merge_inner(self.branch, to_tree, base_tree,
2318
change_reporter=change_reporter)
2319
self.set_last_revision(revision)
1827
to_tree = self.branch.basis_tree()
1828
if basis.inventory.root is None:
1829
self.set_root_id(to_tree.inventory.root.file_id)
1830
result += merge.merge_inner(
2320
1835
# TODO - dedup parents list with things merged by pull ?
2321
1836
# reuse the tree we've updated to to set the basis:
2322
parent_trees = [(revision, to_tree)]
1837
parent_trees = [(self.branch.last_revision(), to_tree)]
2323
1838
merges = self.get_parent_ids()[1:]
2324
1839
# Ideally we ask the tree for the trees here, that way the working
2325
# tree can decide whether to give us the entire tree or give us a
1840
# tree can decide whether to give us teh entire tree or give us a
2326
1841
# lazy initialised tree. dirstate for instance will have the trees
2327
1842
# in ram already, whereas a last-revision + basis-inventory tree
2328
1843
# will not, but also does not need them when setting parents.
2329
1844
for parent in merges:
2330
1845
parent_trees.append(
2331
1846
(parent, self.branch.repository.revision_tree(parent)))
2332
if not _mod_revision.is_null(old_tip):
1847
if old_tip is not None:
2333
1848
parent_trees.append(
2334
1849
(old_tip, self.branch.repository.revision_tree(old_tip)))
2335
1850
self.set_parent_trees(parent_trees)
2336
1851
last_rev = parent_trees[0][0]
1853
# the working tree had the same last-revision as the master
1854
# branch did. We may still have pivot local work from the local
1855
# branch into old_tip:
1856
if old_tip is not None:
1857
self.add_parent_tree_id(old_tip)
1858
if old_tip and old_tip != last_rev:
1859
# our last revision was not the prior branch last revision
1860
# and we have converted that last revision to a pending merge.
1861
# base is somewhere between the branch tip now
1862
# and the now pending merge
1863
from bzrlib.revision import common_ancestor
1865
base_rev_id = common_ancestor(self.branch.last_revision(),
1867
self.branch.repository)
1868
except errors.NoCommonAncestor:
1870
base_tree = self.branch.repository.revision_tree(base_rev_id)
1871
other_tree = self.branch.repository.revision_tree(old_tip)
1872
result += merge.merge_inner(
2339
1879
def _write_hashcache_if_dirty(self):
2340
1880
"""Write out the hashcache if it is dirty."""
2538
2044
# FIXME: stash the node in pending
2539
2045
entry = inv[top_id]
2540
if entry.kind == 'directory':
2541
for name, child in entry.sorted_children():
2542
dirblock.append((relroot + name, name, child.kind, None,
2543
child.file_id, child.kind
2046
for name, child in entry.sorted_children():
2047
dirblock.append((relroot + name, name, child.kind, None,
2048
child.file_id, child.kind
2545
2050
yield (currentdir[0], entry.file_id), dirblock
2546
2051
# push the user specified dirs from dirblock
2547
2052
for dir in reversed(dirblock):
2548
2053
if dir[2] == _directory:
2549
2054
pending.append(dir)
2551
@needs_tree_write_lock
2552
def auto_resolve(self):
2553
"""Automatically resolve text conflicts according to contents.
2555
Only text conflicts are auto_resolvable. Files with no conflict markers
2556
are considered 'resolved', because bzr always puts conflict markers
2557
into files that have text conflicts. The corresponding .THIS .BASE and
2558
.OTHER files are deleted, as per 'resolve'.
2559
:return: a tuple of ConflictLists: (un_resolved, resolved).
2561
un_resolved = _mod_conflicts.ConflictList()
2562
resolved = _mod_conflicts.ConflictList()
2563
conflict_re = re.compile('^(<{7}|={7}|>{7})')
2564
for conflict in self.conflicts():
2565
if (conflict.typestring != 'text conflict' or
2566
self.kind(conflict.file_id) != 'file'):
2567
un_resolved.append(conflict)
2569
my_file = open(self.id2abspath(conflict.file_id), 'rb')
2571
for line in my_file:
2572
if conflict_re.search(line):
2573
un_resolved.append(conflict)
2576
resolved.append(conflict)
2579
resolved.remove_files(self)
2580
self.set_conflicts(un_resolved)
2581
return un_resolved, resolved
2584
def _check(self, references):
2585
"""Check the tree for consistency.
2587
:param references: A dict with keys matching the items returned by
2588
self._get_check_refs(), and values from looking those keys up in
2591
tree_basis = self.basis_tree()
2592
tree_basis.lock_read()
2594
repo_basis = references[('trees', self.last_revision())]
2595
if len(list(repo_basis.iter_changes(tree_basis))) > 0:
2596
raise errors.BzrCheckError(
2597
"Mismatched basis inventory content.")
2602
def _validate(self):
2603
"""Validate internal structures.
2605
This is meant mostly for the test suite. To give it a chance to detect
2606
corruption after actions have occurred. The default implementation is a
2609
:return: None. An exception should be raised if there is an error.
2613
def _get_rules_searcher(self, default_searcher):
2614
"""See Tree._get_rules_searcher."""
2615
if self._rules_searcher is None:
2616
self._rules_searcher = super(WorkingTree,
2617
self)._get_rules_searcher(default_searcher)
2618
return self._rules_searcher
2620
def get_shelf_manager(self):
2621
"""Return the ShelfManager for this WorkingTree."""
2622
from bzrlib.shelf import ShelfManager
2623
return ShelfManager(self, self._transport)
2626
2057
class WorkingTree2(WorkingTree):
2627
2058
"""This is the Format 2 working tree.
2629
This was the first weave based working tree.
2060
This was the first weave based working tree.
2630
2061
- uses os locks for locking.
2631
2062
- uses the branch last-revision.
2634
def __init__(self, *args, **kwargs):
2635
super(WorkingTree2, self).__init__(*args, **kwargs)
2636
# WorkingTree2 has more of a constraint that self._inventory must
2637
# exist. Because this is an older format, we don't mind the overhead
2638
# caused by the extra computation here.
2640
# Newer WorkingTree's should only have self._inventory set when they
2642
if self._inventory is None:
2643
self.read_working_inventory()
2645
def _get_check_refs(self):
2646
"""Return the references needed to perform a check of this tree."""
2647
return [('trees', self.last_revision())]
2649
2065
def lock_tree_write(self):
2650
2066
"""See WorkingTree.lock_tree_write().
2652
2068
In Format2 WorkingTrees we have a single lock for the branch and tree
2653
2069
so lock_tree_write() degrades to lock_write().
2655
:return: An object with an unlock method which will release the lock
2658
2071
self.branch.lock_write()
2660
self._control_files.lock_write()
2073
return self._control_files.lock_write()
2663
2075
self.branch.unlock()
2666
2078
def unlock(self):
2667
# do non-implementation specific cleanup
2670
2079
# we share control files:
2671
2080
if self._control_files._lock_count == 3:
2672
2081
# _inventory_is_modified is always False during a read lock.
2673
2082
if self._inventory_is_modified:
2675
2084
self._write_hashcache_if_dirty()
2677
2086
# reverse order of locking.
2679
2088
return self._control_files.unlock()
2854
2250
def unregister_format(klass, format):
2251
assert klass._formats[format.get_format_string()] is format
2855
2252
del klass._formats[format.get_format_string()]
2858
2256
class WorkingTreeFormat2(WorkingTreeFormat):
2859
"""The second working tree format.
2257
"""The second working tree format.
2861
2259
This format modified the hash cache from the format 1 hash cache.
2864
upgrade_recommended = True
2866
2262
def get_format_description(self):
2867
2263
"""See WorkingTreeFormat.get_format_description()."""
2868
2264
return "Working tree format 2"
2870
def _stub_initialize_on_transport(self, transport, file_mode):
2871
"""Workaround: create control files for a remote working tree.
2266
def stub_initialize_remote(self, control_files):
2267
"""As a special workaround create critical control files for a remote working tree
2873
2269
This ensures that it can later be updated and dealt with locally,
2874
since BzrDirFormat6 and BzrDirFormat5 cannot represent dirs with
2270
since BzrDirFormat6 and BzrDirFormat5 cannot represent dirs with
2875
2271
no working tree. (See bug #43064).
2877
2273
sio = StringIO()
2878
inv = inventory.Inventory()
2879
xml5.serializer_v5.write_inventory(inv, sio, working=True)
2275
xml5.serializer_v5.write_inventory(inv, sio)
2881
transport.put_file('inventory', sio, file_mode)
2882
transport.put_bytes('pending-merges', '', file_mode)
2884
def initialize(self, a_bzrdir, revision_id=None, from_branch=None,
2885
accelerator_tree=None, hardlink=False):
2277
control_files.put('inventory', sio)
2279
control_files.put_utf8('pending-merges', '')
2282
def initialize(self, a_bzrdir, revision_id=None):
2886
2283
"""See WorkingTreeFormat.initialize()."""
2887
2284
if not isinstance(a_bzrdir.transport, LocalTransport):
2888
2285
raise errors.NotLocalUrl(a_bzrdir.transport.base)
2889
if from_branch is not None:
2890
branch = from_branch
2892
branch = a_bzrdir.open_branch()
2893
if revision_id is None:
2894
revision_id = _mod_revision.ensure_null(branch.last_revision())
2897
branch.generate_revision_history(revision_id)
2900
inv = inventory.Inventory()
2286
branch = a_bzrdir.open_branch()
2287
if revision_id is not None:
2290
revision_history = branch.revision_history()
2292
position = revision_history.index(revision_id)
2294
raise errors.NoSuchRevision(branch, revision_id)
2295
branch.set_revision_history(revision_history[:position + 1])
2298
revision = branch.last_revision()
2901
2300
wt = WorkingTree2(a_bzrdir.root_transport.local_abspath('.'),
2904
2303
_internal=True,
2906
2305
_bzrdir=a_bzrdir)
2907
basis_tree = branch.repository.revision_tree(revision_id)
2306
basis_tree = branch.repository.revision_tree(revision)
2908
2307
if basis_tree.inventory.root is not None:
2909
wt.set_root_id(basis_tree.get_root_id())
2308
wt.set_root_id(basis_tree.inventory.root.file_id)
2910
2309
# set the parent list and cache the basis tree.
2911
if _mod_revision.is_null(revision_id):
2914
parent_trees = [(revision_id, basis_tree)]
2915
wt.set_parent_trees(parent_trees)
2310
wt.set_parent_trees([(revision, basis_tree)])
2916
2311
transform.build_tree(basis_tree, wt)
2962
2355
_lock_file_name = 'lock'
2963
2356
_lock_class = LockDir
2965
_tree_class = WorkingTree3
2967
def __get_matchingbzrdir(self):
2968
return bzrdir.BzrDirMetaFormat1()
2970
_matchingbzrdir = property(__get_matchingbzrdir)
2972
2358
def _open_control_files(self, a_bzrdir):
2973
2359
transport = a_bzrdir.get_workingtree_transport(None)
2974
return LockableFiles(transport, self._lock_file_name,
2360
return LockableFiles(transport, self._lock_file_name,
2975
2361
self._lock_class)
2977
def initialize(self, a_bzrdir, revision_id=None, from_branch=None,
2978
accelerator_tree=None, hardlink=False):
2363
def initialize(self, a_bzrdir, revision_id=None):
2979
2364
"""See WorkingTreeFormat.initialize().
2981
:param revision_id: if supplied, create a working tree at a different
2982
revision than the branch is at.
2983
:param accelerator_tree: A tree which can be used for retrieving file
2984
contents more quickly than the revision tree, i.e. a workingtree.
2985
The revision tree will be used for cases where accelerator_tree's
2986
content is different.
2987
:param hardlink: If true, hard-link files from accelerator_tree,
2366
revision_id allows creating a working tree at a different
2367
revision than the branch is at.
2990
2369
if not isinstance(a_bzrdir.transport, LocalTransport):
2991
2370
raise errors.NotLocalUrl(a_bzrdir.transport.base)
3049
2422
raise NotImplementedError
3050
2423
if not isinstance(a_bzrdir.transport, LocalTransport):
3051
2424
raise errors.NotLocalUrl(a_bzrdir.transport.base)
3052
wt = self._open(a_bzrdir, self._open_control_files(a_bzrdir))
2425
return self._open(a_bzrdir, self._open_control_files(a_bzrdir))
3055
2427
def _open(self, a_bzrdir, control_files):
3056
2428
"""Open the tree itself.
3058
2430
:param a_bzrdir: the dir for the tree.
3059
2431
:param control_files: the control files for the tree.
3061
return self._tree_class(a_bzrdir.root_transport.local_abspath('.'),
3065
_control_files=control_files)
2433
return WorkingTree3(a_bzrdir.root_transport.local_abspath('.'),
2437
_control_files=control_files)
3067
2439
def __str__(self):
3068
2440
return self.get_format_string()
3071
__default_format = WorkingTreeFormat6()
2443
__default_format = WorkingTreeFormat3()
3072
2444
WorkingTreeFormat.register_format(__default_format)
3073
WorkingTreeFormat.register_format(WorkingTreeFormat5())
3074
2445
WorkingTreeFormat.register_format(WorkingTreeFormat4())
3075
WorkingTreeFormat.register_format(WorkingTreeFormat3())
3076
2446
WorkingTreeFormat.set_default_format(__default_format)
3077
2447
# formats which have no format string are not discoverable
3078
2448
# and not independently creatable, so are not registered.
3079
2449
_legacy_formats = [WorkingTreeFormat2(),
2453
class WorkingTreeTestProviderAdapter(object):
2454
"""A tool to generate a suite testing multiple workingtree formats at once.
2456
This is done by copying the test once for each transport and injecting
2457
the transport_server, transport_readonly_server, and workingtree_format
2458
classes into each copy. Each copy is also given a new id() to make it
2462
def __init__(self, transport_server, transport_readonly_server, formats):
2463
self._transport_server = transport_server
2464
self._transport_readonly_server = transport_readonly_server
2465
self._formats = formats
2467
def _clone_test(self, test, bzrdir_format, workingtree_format, variation):
2468
"""Clone test for adaption."""
2469
new_test = deepcopy(test)
2470
new_test.transport_server = self._transport_server
2471
new_test.transport_readonly_server = self._transport_readonly_server
2472
new_test.bzrdir_format = bzrdir_format
2473
new_test.workingtree_format = workingtree_format
2474
def make_new_test_id():
2475
new_id = "%s(%s)" % (test.id(), variation)
2476
return lambda: new_id
2477
new_test.id = make_new_test_id()
2480
def adapt(self, test):
2481
from bzrlib.tests import TestSuite
2482
result = TestSuite()
2483
for workingtree_format, bzrdir_format in self._formats:
2484
new_test = self._clone_test(
2487
workingtree_format, workingtree_format.__class__.__name__)
2488
result.addTest(new_test)
added
removed
bzrlib/workingtree.py
