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.lockable_files import LockableFiles
81
from bzrlib.inventory import InventoryEntry, Inventory, ROOT_ID
82
from bzrlib.lockable_files import LockableFiles, TransportLock
81
83
from bzrlib.lockdir import LockDir
82
84
import bzrlib.mutabletree
83
85
from bzrlib.mutabletree import needs_tree_write_lock
84
from bzrlib import osutils
85
86
from bzrlib.osutils import (
93
96
supports_executable,
95
from bzrlib.filters import filtered_input_file
96
98
from bzrlib.trace import mutter, note
97
99
from bzrlib.transport.local import LocalTransport
98
from bzrlib.revision import CURRENT_REVISION
100
from bzrlib.progress import DummyProgress, ProgressPhase
101
from bzrlib.revision import NULL_REVISION, CURRENT_REVISION
99
102
from bzrlib.rio import RioReader, rio_file, Stanza
100
from bzrlib.symbol_versioning import (
102
DEPRECATED_PARAMETER,
103
from bzrlib.symbol_versioning import (deprecated_passed,
106
DEPRECATED_PARAMETER,
106
113
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
114
CONFLICT_HEADER_1 = "BZR conflict list format 1"
112
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()
115
135
class TreeEntry(object):
116
136
"""An entry that implements the minimum interface used by commands.
118
This needs further inspection, it may be better to have
138
This needs further inspection, it may be better to have
119
139
InventoryEntries without ids - though that seems wrong. For now,
120
140
this is a parallel hierarchy to InventoryEntry, and needs to become
121
141
one of several things: decorates to that hierarchy, children of, or
192
"""Construct a WorkingTree instance. This is not a public API.
207
"""Construct a WorkingTree for basedir.
194
: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).
196
214
self._format = _format
197
215
self.bzrdir = _bzrdir
198
216
if not _internal:
199
raise errors.BzrError("Please use bzrdir.open_workingtree or "
200
"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
201
232
basedir = safe_unicode(basedir)
202
233
mutter("opening working tree %r", basedir)
203
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().",
204
242
self._branch = branch
206
244
self._branch = self.bzrdir.open_branch()
422
392
# at this point ?
424
394
return self.branch.repository.revision_tree(revision_id)
425
except (errors.RevisionNotPresent, errors.NoSuchRevision):
395
except errors.RevisionNotPresent:
426
396
# 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
397
# occured. If the revision is present, its a problem, if its not
429
399
if self.branch.repository.has_revision(revision_id):
431
401
# 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()
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)
438
442
def relpath(self, path):
439
443
"""Return the local path portion from a given path.
441
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
442
446
interpreted relative to the python current working directory.
444
448
return osutils.relpath(self.basedir, path)
446
450
def has_filename(self, filename):
447
451
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()
453
def get_file(self, file_id):
454
file_id = osutils.safe_file_id(file_id)
455
return self.get_file_byname(self.id2path(file_id))
457
def get_file_text(self, file_id):
458
file_id = osutils.safe_file_id(file_id)
459
return self.get_file(file_id).read()
461
def get_file_byname(self, filename):
462
return file(self.abspath(filename), 'rb')
485
def annotate_iter(self, file_id, default_revision=CURRENT_REVISION):
465
def annotate_iter(self, file_id):
486
466
"""See Tree.annotate_iter
488
468
This implementation will use the basis tree implementation if possible.
492
472
incorrectly attributed to CURRENT_REVISION (but after committing, the
493
473
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))
475
file_id = osutils.safe_file_id(file_id)
476
basis = self.basis_tree()
477
changes = self._iter_changes(basis, True, [self.id2path(file_id)],
478
require_versioned=True).next()
479
changed_content, kind = changes[2], changes[6]
480
if not changed_content:
481
return basis.annotate_iter(file_id)
485
if kind[0] != 'file':
488
old_lines = list(basis.annotate_iter(file_id))
490
for tree in self.branch.repository.revision_trees(
491
self.get_parent_ids()[1:]):
492
if file_id not in tree:
494
old.append(list(tree.annotate_iter(file_id)))
495
return annotate.reannotate(old, self.get_file(file_id).readlines(),
539
498
def get_parent_ids(self):
540
499
"""See Tree.get_parent_ids.
542
501
This implementation reads the pending merges list and last_revision
543
502
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:
504
last_rev = self._last_revision()
549
508
parents = [last_rev]
551
merges_bytes = self._transport.get_bytes('pending-merges')
510
merges_file = self._control_files.get('pending-merges')
552
511
except errors.NoSuchFile:
555
for l in osutils.split_lines(merges_bytes):
556
revision_id = l.rstrip('\n')
514
for l in merges_file.readlines():
515
revision_id = osutils.safe_revision_id(l.rstrip('\n'))
557
516
parents.append(revision_id)
561
520
def get_root_id(self):
562
521
"""Return the id of this trees root"""
563
522
return self._inventory.root.file_id
565
524
def _get_store_filename(self, file_id):
566
525
## XXX: badly named; this is not in the store at all
526
file_id = osutils.safe_file_id(file_id)
567
527
return self.abspath(self.id2path(file_id))
570
def clone(self, to_bzrdir, revision_id=None):
530
def clone(self, to_bzrdir, revision_id=None, basis=None):
571
531
"""Duplicate this working tree into to_bzr, including all state.
573
533
Specifically modified files are kept as modified, but
574
534
ignored and unknown files are discarded.
576
536
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
539
If not None, the cloned tree will have its last revision set to
540
revision, and and difference between the source trees last revision
581
541
and this one merged in.
544
If not None, a closer copy of a tree which may have some files in
545
common, and which file content should be preferentially copied from.
583
547
# assumes the target bzr dir format is compatible.
584
result = to_bzrdir.create_workingtree()
548
result = self._format.initialize(to_bzrdir)
585
549
self.copy_content_into(result, revision_id)
616
583
__contains__ = has_id
618
585
def get_file_size(self, file_id):
619
"""See Tree.get_file_size"""
620
# XXX: this returns the on-disk size; it should probably return the
623
return os.path.getsize(self.id2abspath(file_id))
625
if e.errno != errno.ENOENT:
586
file_id = osutils.safe_file_id(file_id)
587
return os.path.getsize(self.id2abspath(file_id))
631
590
def get_file_sha1(self, file_id, path=None, stat_value=None):
591
file_id = osutils.safe_file_id(file_id)
633
593
path = self._inventory.id2path(file_id)
634
594
return self._hashcache.get_sha1(path, stat_value)
636
596
def get_file_mtime(self, file_id, path=None):
597
file_id = osutils.safe_file_id(file_id)
638
path = self.inventory.id2path(file_id)
599
path = self._inventory.id2path(file_id)
639
600
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
602
if not supports_executable():
654
603
def is_executable(self, file_id, path=None):
604
file_id = osutils.safe_file_id(file_id)
655
605
return self._inventory[file_id].executable
657
_is_executable_from_path_and_stat = \
658
_is_executable_from_path_and_stat_from_basis
660
607
def is_executable(self, file_id, path=None):
609
file_id = osutils.safe_file_id(file_id)
662
610
path = self.id2path(file_id)
663
611
mode = os.lstat(self.abspath(path)).st_mode
664
612
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
615
def _add(self, files, ids, kinds):
671
616
"""See MutableTree._add."""
672
617
# TODO: Re-adding a file that is removed in the working copy
673
618
# should probably put it back with the previous ID.
674
# the read and write working inventory should not occur in this
619
# the read and write working inventory should not occur in this
675
620
# function - they should be part of lock_write and unlock.
621
inv = self.read_working_inventory()
677
622
for f, file_id, kind in zip(files, ids, kinds):
623
assert kind is not None
678
624
if file_id is None:
679
625
inv.add_path(f, kind=kind)
627
file_id = osutils.safe_file_id(file_id)
681
628
inv.add_path(f, kind=kind, file_id=file_id)
682
self._inventory_is_modified = True
629
self._write_inventory(inv)
684
631
@needs_tree_write_lock
685
632
def _gather_kinds(self, files, kinds):
746
693
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(
695
@deprecated_method(zero_eleven)
697
def pending_merges(self):
698
"""Return a list of pending merges.
700
These are revisions that have been merged into the working
701
directory but not yet committed.
703
As of 0.11 this is deprecated. Please see WorkingTree.get_parent_ids()
704
instead - which is available on all tree objects.
706
return self.get_parent_ids()[1:]
782
708
def _check_parents_for_ghosts(self, revision_ids, allow_leftmost_as_ghost):
783
709
"""Common ghost checking functionality from set_parent_*.
828
734
:param revision_ids: The revision_ids to set as the parent ids of this
829
735
working tree. Any of these may be ghosts.
737
revision_ids = [osutils.safe_revision_id(r) for r in revision_ids]
831
738
self._check_parents_for_ghosts(revision_ids,
832
739
allow_leftmost_as_ghost=allow_leftmost_as_ghost)
833
for revision_id in revision_ids:
834
_mod_revision.check_not_reserved_id(revision_id)
836
revision_ids = self._filter_parent_ids_by_ancestry(revision_ids)
838
741
if len(revision_ids) > 0:
839
742
self.set_last_revision(revision_ids[0])
841
self.set_last_revision(_mod_revision.NULL_REVISION)
744
self.set_last_revision(None)
843
746
self._set_merges_from_parent_ids(revision_ids)
845
748
@needs_tree_write_lock
846
749
def set_parent_trees(self, parents_list, allow_leftmost_as_ghost=False):
847
750
"""See MutableTree.set_parent_trees."""
848
parent_ids = [rev for (rev, tree) in parents_list]
849
for revision_id in parent_ids:
850
_mod_revision.check_not_reserved_id(revision_id)
751
parent_ids = [osutils.safe_revision_id(rev) for (rev, tree) in parents_list]
852
753
self._check_parents_for_ghosts(parent_ids,
853
754
allow_leftmost_as_ghost=allow_leftmost_as_ghost)
855
parent_ids = self._filter_parent_ids_by_ancestry(parent_ids)
857
756
if len(parent_ids) == 0:
858
leftmost_parent_id = _mod_revision.NULL_REVISION
757
leftmost_parent_id = None
859
758
leftmost_parent_tree = None
861
760
leftmost_parent_id, leftmost_parent_tree = parents_list[0]
914
801
branch.last_revision().
916
803
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:
804
pb = bzrlib.ui.ui_factory.nested_progress_bar()
806
merger = Merger(self.branch, this_tree=self, pb=pb)
807
merger.pp = ProgressPhase("Merge phase", 5, pb)
808
merger.pp.next_phase()
809
# check that there are no
811
merger.check_basis(check_clean=True, require_commits=False)
812
if to_revision is None:
813
to_revision = branch.last_revision()
815
to_revision = osutils.safe_revision_id(to_revision)
816
merger.other_rev_id = to_revision
817
if merger.other_rev_id is None:
818
raise error.NoCommits(branch)
819
self.branch.fetch(branch, last_revision=merger.other_rev_id)
820
merger.other_basis = merger.other_rev_id
821
merger.other_tree = self.branch.repository.revision_tree(
823
merger.pp.next_phase()
932
824
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:
825
if merger.base_rev_id == merger.other_rev_id:
826
raise errors.PointlessMerge
827
merger.backup_files = False
939
828
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()
829
merger.set_interesting_files(None)
830
merger.show_base = False
831
merger.reprocess = False
832
conflicts = merger.do_merge()
950
839
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')
841
hashfile = self._control_files.get('merge-hashes')
962
842
except errors.NoSuchFile:
967
if hashfile.next() != MERGE_MODIFIED_HEADER_1 + '\n':
968
raise errors.MergeModifiedFormatError()
969
except StopIteration:
846
if hashfile.next() != MERGE_MODIFIED_HEADER_1 + '\n':
970
847
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
848
except StopIteration:
849
raise errors.MergeModifiedFormatError()
850
for s in RioReader(hashfile):
851
file_id = s.get("file_id")
852
if file_id not in self.inventory:
855
if hash == self.get_file_sha1(file_id):
856
merge_hashes[file_id] = hash
983
859
@needs_write_lock
984
860
def mkdir(self, path, file_id=None):
992
868
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)
869
return os.readlink(self.id2abspath(file_id))
871
def file_class(self, filename):
872
if self.path2id(filename):
874
elif self.is_ignored(filename):
1122
879
def flush(self):
1123
880
"""Write the in memory inventory to disk."""
1125
882
if self._control_files._lock_mode != 'w':
1126
883
raise errors.NotWriteLocked(self)
1127
884
sio = StringIO()
1128
self._serialize(self._inventory, sio)
885
xml5.serializer_v5.write_inventory(self._inventory, sio)
1130
self._transport.put_file('inventory', sio,
1131
mode=self.bzrdir._get_file_mode())
887
self._control_files.put('inventory', sio)
1132
888
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).
890
def list_files(self, include_root=False):
891
"""Recursively list all files as (path, class, kind, id, entry).
1140
893
Lists, but does not descend into unversioned directories.
1141
895
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
898
Skips the control directory.
1148
900
# list_files is an iterator, so @needs_read_lock doesn't work properly
1149
901
# with it. So callers should be careful to always read_lock the tree.
1927
1626
def read_basis_inventory(self):
1928
1627
"""Read the cached basis inventory."""
1929
1628
path = self._basis_inventory_name()
1930
return self._transport.get_bytes(path)
1629
return self._control_files.get(path).read()
1932
1631
@needs_read_lock
1933
1632
def read_working_inventory(self):
1934
1633
"""Read the working inventory.
1936
1635
:raises errors.InventoryModified: read_working_inventory will fail
1937
1636
when the current in memory inventory has been modified.
1939
# conceptually this should be an implementation detail of the tree.
1638
# conceptually this should be an implementation detail of the tree.
1940
1639
# XXX: Deprecate this.
1941
1640
# ElementTree does its own conversion from UTF-8, so open in
1943
1642
if self._inventory_is_modified:
1944
1643
raise errors.InventoryModified(self)
1945
f = self._transport.get('inventory')
1947
result = self._deserialize(f)
1644
result = xml5.serializer_v5.read_inventory(
1645
self._control_files.get('inventory'))
1950
1646
self._set_inventory(result, dirty=False)
1953
1649
@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.
1650
def remove(self, files, verbose=False, to_file=None):
1651
"""Remove nominated files from the working inventory..
1653
This does not remove their text. This does not run on XXX on what? RBC
1655
TODO: Refuse to remove modified files unless --force is given?
1657
TODO: Do something useful with directories.
1659
TODO: Should this remove the text or not? Tough call; not
1660
removing may be useful and the user can just use use rm, and
1661
is the opposite of add. Removing it is consistent with most
1662
other tools. Maybe an option.
1664
## TODO: Normalize names
1665
## TODO: Remove nested loops; better scalability
1963
1666
if isinstance(files, basestring):
1964
1667
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.
1669
inv = self.inventory
1671
# do this before any modifications
2035
1672
for f in files:
2036
fid = self.path2id(f)
1673
fid = inv.path2id(f)
2039
message = "%s is not versioned." % (f,)
1675
note("%s is not versioned."%f)
2042
# having removed it, it must be either ignored or unknown
1678
# having remove it, it must be either ignored or unknown
2043
1679
if self.is_ignored(f):
2044
1680
new_status = 'I'
2046
1682
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)
1683
textui.show_status(new_status, inv[fid].kind, f,
1687
self._write_inventory(inv)
2076
1689
@needs_tree_write_lock
2077
def revert(self, filenames=None, old_tree=None, backups=True,
2078
pb=None, report_changes=False):
1690
def revert(self, filenames, old_tree=None, backups=True,
1691
pb=DummyProgress(), report_changes=False):
2079
1692
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
1693
if old_tree is None:
2086
basis_tree = self.basis_tree()
2087
basis_tree.lock_read()
2088
old_tree = basis_tree
1694
old_tree = self.basis_tree()
1695
conflicts = transform.revert(self, old_tree, filenames, backups, pb,
1697
if not len(filenames):
1698
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:
1701
resolve(self, filenames, ignore_misses=True)
2109
1702
return conflicts
2111
1704
def revision_tree(self, revision_id):
2266
1854
# cant set that until we update the working trees last revision to be
2267
1855
# one from the new branch, because it will just get absorbed by the
2268
1856
# parent de-duplication logic.
2270
1858
# We MUST save it even if an error occurs, because otherwise the users
2271
1859
# local work is unreferenced and will appear to have been lost.
2275
1863
last_rev = self.get_parent_ids()[0]
2276
1864
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()
1866
if last_rev != self.branch.last_revision():
1867
# merge tree state up to new branch tip.
2302
1868
basis = self.basis_tree()
2303
1869
basis.lock_read()
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)
1871
to_tree = self.branch.basis_tree()
1872
if basis.inventory.root is None and self.inventory.root is None:
1873
self.set_root_id(to_tree.inventory.root.file_id)
1874
result += merge.merge_inner(
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)
2322
1881
# TODO - dedup parents list with things merged by pull ?
2323
1882
# reuse the tree we've updated to to set the basis:
2324
parent_trees = [(revision, to_tree)]
1883
parent_trees = [(self.branch.last_revision(), to_tree)]
2325
1884
merges = self.get_parent_ids()[1:]
2326
1885
# 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
1886
# tree can decide whether to give us teh entire tree or give us a
2328
1887
# lazy initialised tree. dirstate for instance will have the trees
2329
1888
# in ram already, whereas a last-revision + basis-inventory tree
2330
1889
# will not, but also does not need them when setting parents.
2331
1890
for parent in merges:
2332
1891
parent_trees.append(
2333
1892
(parent, self.branch.repository.revision_tree(parent)))
2334
if not _mod_revision.is_null(old_tip):
1893
if old_tip is not None:
2335
1894
parent_trees.append(
2336
1895
(old_tip, self.branch.repository.revision_tree(old_tip)))
2337
1896
self.set_parent_trees(parent_trees)
2338
1897
last_rev = parent_trees[0][0]
1899
# the working tree had the same last-revision as the master
1900
# branch did. We may still have pivot local work from the local
1901
# branch into old_tip:
1902
if old_tip is not None:
1903
self.add_parent_tree_id(old_tip)
1904
if old_tip and old_tip != last_rev:
1905
# our last revision was not the prior branch last revision
1906
# and we have converted that last revision to a pending merge.
1907
# base is somewhere between the branch tip now
1908
# and the now pending merge
1910
# Since we just modified the working tree and inventory, flush out
1911
# the current state, before we modify it again.
1912
# TODO: jam 20070214 WorkingTree3 doesn't require this, dirstate
1913
# requires it only because TreeTransform directly munges the
1914
# inventory and calls tree._write_inventory(). Ultimately we
1915
# should be able to remove this extra flush.
1917
from bzrlib.revision import common_ancestor
1919
base_rev_id = common_ancestor(self.branch.last_revision(),
1921
self.branch.repository)
1922
except errors.NoCommonAncestor:
1924
base_tree = self.branch.repository.revision_tree(base_rev_id)
1925
other_tree = self.branch.repository.revision_tree(old_tip)
1926
result += merge.merge_inner(
2341
1933
def _write_hashcache_if_dirty(self):
2342
1934
"""Write out the hashcache if it is dirty."""
2540
2106
# FIXME: stash the node in pending
2541
2107
entry = inv[top_id]
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
2108
for name, child in entry.sorted_children():
2109
dirblock.append((relroot + name, name, child.kind, None,
2110
child.file_id, child.kind
2547
2112
yield (currentdir[0], entry.file_id), dirblock
2548
2113
# push the user specified dirs from dirblock
2549
2114
for dir in reversed(dirblock):
2550
2115
if dir[2] == _directory:
2551
2116
pending.append(dir)
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
2119
class WorkingTree2(WorkingTree):
2629
2120
"""This is the Format 2 working tree.
2631
This was the first weave based working tree.
2122
This was the first weave based working tree.
2632
2123
- uses os locks for locking.
2633
2124
- 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
2127
def lock_tree_write(self):
2652
2128
"""See WorkingTree.lock_tree_write().
2654
2130
In Format2 WorkingTrees we have a single lock for the branch and tree
2655
2131
so lock_tree_write() degrades to lock_write().
2657
:return: An object with an unlock method which will release the lock
2660
2133
self.branch.lock_write()
2662
self._control_files.lock_write()
2135
return self._control_files.lock_write()
2665
2137
self.branch.unlock()
2668
2140
def unlock(self):
2669
# do non-implementation specific cleanup
2672
2141
# we share control files:
2673
2142
if self._control_files._lock_count == 3:
2674
2143
# _inventory_is_modified is always False during a read lock.
2675
2144
if self._inventory_is_modified:
2677
2146
self._write_hashcache_if_dirty()
2679
2148
# reverse order of locking.
2681
2150
return self._control_files.unlock()
2856
2313
def unregister_format(klass, format):
2314
assert klass._formats[format.get_format_string()] is format
2857
2315
del klass._formats[format.get_format_string()]
2860
2319
class WorkingTreeFormat2(WorkingTreeFormat):
2861
"""The second working tree format.
2320
"""The second working tree format.
2863
2322
This format modified the hash cache from the format 1 hash cache.
2866
upgrade_recommended = True
2868
2325
def get_format_description(self):
2869
2326
"""See WorkingTreeFormat.get_format_description()."""
2870
2327
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.
2329
def stub_initialize_remote(self, control_files):
2330
"""As a special workaround create critical control files for a remote working tree
2875
2332
This ensures that it can later be updated and dealt with locally,
2876
since BzrDirFormat6 and BzrDirFormat5 cannot represent dirs with
2333
since BzrDirFormat6 and BzrDirFormat5 cannot represent dirs with
2877
2334
no working tree. (See bug #43064).
2879
2336
sio = StringIO()
2880
inv = inventory.Inventory()
2881
xml5.serializer_v5.write_inventory(inv, sio, working=True)
2338
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):
2340
control_files.put('inventory', sio)
2342
control_files.put_bytes('pending-merges', '')
2345
def initialize(self, a_bzrdir, revision_id=None):
2888
2346
"""See WorkingTreeFormat.initialize()."""
2889
2347
if not isinstance(a_bzrdir.transport, LocalTransport):
2890
2348
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()
2349
branch = a_bzrdir.open_branch()
2350
if revision_id is not None:
2351
revision_id = osutils.safe_revision_id(revision_id)
2354
revision_history = branch.revision_history()
2356
position = revision_history.index(revision_id)
2358
raise errors.NoSuchRevision(branch, revision_id)
2359
branch.set_revision_history(revision_history[:position + 1])
2362
revision = branch.last_revision()
2903
2364
wt = WorkingTree2(a_bzrdir.root_transport.local_abspath('.'),
2906
2367
_internal=True,
2908
2369
_bzrdir=a_bzrdir)
2909
basis_tree = branch.repository.revision_tree(revision_id)
2370
basis_tree = branch.repository.revision_tree(revision)
2910
2371
if basis_tree.inventory.root is not None:
2911
wt.set_root_id(basis_tree.get_root_id())
2372
wt.set_root_id(basis_tree.inventory.root.file_id)
2912
2373
# 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)
2374
wt.set_parent_trees([(revision, basis_tree)])
2918
2375
transform.build_tree(basis_tree, wt)
2964
2419
_lock_file_name = 'lock'
2965
2420
_lock_class = LockDir
2967
_tree_class = WorkingTree3
2969
def __get_matchingbzrdir(self):
2970
return bzrdir.BzrDirMetaFormat1()
2972
_matchingbzrdir = property(__get_matchingbzrdir)
2974
2422
def _open_control_files(self, a_bzrdir):
2975
2423
transport = a_bzrdir.get_workingtree_transport(None)
2976
return LockableFiles(transport, self._lock_file_name,
2424
return LockableFiles(transport, self._lock_file_name,
2977
2425
self._lock_class)
2979
def initialize(self, a_bzrdir, revision_id=None, from_branch=None,
2980
accelerator_tree=None, hardlink=False):
2427
def initialize(self, a_bzrdir, revision_id=None):
2981
2428
"""See WorkingTreeFormat.initialize().
2983
:param revision_id: if supplied, create a working tree at a different
2984
revision than the branch is at.
2985
:param accelerator_tree: A tree which can be used for retrieving file
2986
contents more quickly than the revision tree, i.e. a workingtree.
2987
The revision tree will be used for cases where accelerator_tree's
2988
content is different.
2989
:param hardlink: If true, hard-link files from accelerator_tree,
2430
revision_id allows creating a working tree at a different
2431
revision than the branch is at.
2992
2433
if not isinstance(a_bzrdir.transport, LocalTransport):
2993
2434
raise errors.NotLocalUrl(a_bzrdir.transport.base)
3051
2488
raise NotImplementedError
3052
2489
if not isinstance(a_bzrdir.transport, LocalTransport):
3053
2490
raise errors.NotLocalUrl(a_bzrdir.transport.base)
3054
wt = self._open(a_bzrdir, self._open_control_files(a_bzrdir))
2491
return self._open(a_bzrdir, self._open_control_files(a_bzrdir))
3057
2493
def _open(self, a_bzrdir, control_files):
3058
2494
"""Open the tree itself.
3060
2496
:param a_bzrdir: the dir for the tree.
3061
2497
: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)
2499
return WorkingTree3(a_bzrdir.root_transport.local_abspath('.'),
2503
_control_files=control_files)
3069
2505
def __str__(self):
3070
2506
return self.get_format_string()
3073
__default_format = WorkingTreeFormat6()
2509
__default_format = WorkingTreeFormat3()
3074
2510
WorkingTreeFormat.register_format(__default_format)
3075
WorkingTreeFormat.register_format(WorkingTreeFormat5())
3076
2511
WorkingTreeFormat.register_format(WorkingTreeFormat4())
3077
WorkingTreeFormat.register_format(WorkingTreeFormat3())
3078
2512
WorkingTreeFormat.set_default_format(__default_format)
3079
2513
# formats which have no format string are not discoverable
3080
2514
# and not independently creatable, so are not registered.
3081
2515
_legacy_formats = [WorkingTreeFormat2(),
2519
class WorkingTreeTestProviderAdapter(object):
2520
"""A tool to generate a suite testing multiple workingtree formats at once.
2522
This is done by copying the test once for each transport and injecting
2523
the transport_server, transport_readonly_server, and workingtree_format
2524
classes into each copy. Each copy is also given a new id() to make it
2528
def __init__(self, transport_server, transport_readonly_server, formats):
2529
self._transport_server = transport_server
2530
self._transport_readonly_server = transport_readonly_server
2531
self._formats = formats
2533
def _clone_test(self, test, bzrdir_format, workingtree_format, variation):
2534
"""Clone test for adaption."""
2535
new_test = deepcopy(test)
2536
new_test.transport_server = self._transport_server
2537
new_test.transport_readonly_server = self._transport_readonly_server
2538
new_test.bzrdir_format = bzrdir_format
2539
new_test.workingtree_format = workingtree_format
2540
def make_new_test_id():
2541
new_id = "%s(%s)" % (test.id(), variation)
2542
return lambda: new_id
2543
new_test.id = make_new_test_id()
2546
def adapt(self, test):
2547
from bzrlib.tests import TestSuite
2548
result = TestSuite()
2549
for workingtree_format, bzrdir_format in self._formats:
2550
new_test = self._clone_test(
2553
workingtree_format, workingtree_format.__class__.__name__)
2554
result.addTest(new_test)
added
removed
bzrlib/workingtree.py
