13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
17
17
"""WorkingTree object and friends.
19
19
A WorkingTree represents the editable working copy of a branch.
20
Operations which represent the WorkingTree are also done here,
21
such as renaming or adding files. The WorkingTree has an inventory
22
which is updated by these operations. A commit produces a
20
Operations which represent the WorkingTree are also done here,
21
such as renaming or adding files. The WorkingTree has an inventory
22
which is updated by these operations. A commit produces a
23
23
new revision based on the workingtree and its inventory.
25
25
At the moment every WorkingTree has its own branch. Remote
51
59
conflicts as _mod_conflicts,
60
68
revision as _mod_revision,
69
80
import bzrlib.branch
70
81
from bzrlib.transport import get_transport
71
from bzrlib.workingtree_4 import (
83
from bzrlib.workingtree_4 import WorkingTreeFormat4
78
86
from bzrlib import symbol_versioning
79
87
from bzrlib.decorators import needs_read_lock, needs_write_lock
80
from bzrlib.lockable_files import LockableFiles
88
from bzrlib.inventory import InventoryEntry, Inventory, ROOT_ID, TreeReference
89
from bzrlib.lockable_files import LockableFiles, TransportLock
81
90
from bzrlib.lockdir import LockDir
82
91
import bzrlib.mutabletree
83
92
from bzrlib.mutabletree import needs_tree_write_lock
84
from bzrlib import osutils
85
93
from bzrlib.osutils import (
93
103
supports_executable,
95
from bzrlib.filters import filtered_input_file
96
105
from bzrlib.trace import mutter, note
97
106
from bzrlib.transport.local import LocalTransport
98
from bzrlib.revision import CURRENT_REVISION
107
from bzrlib.progress import DummyProgress, ProgressPhase
108
from bzrlib.revision import NULL_REVISION, CURRENT_REVISION
99
109
from bzrlib.rio import RioReader, rio_file, Stanza
100
from bzrlib.symbol_versioning import (
102
DEPRECATED_PARAMETER,
110
from bzrlib.symbol_versioning import (deprecated_passed,
113
DEPRECATED_PARAMETER,
106
120
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
121
CONFLICT_HEADER_1 = "BZR conflict list format 1"
112
123
ERROR_PATH_NOT_FOUND = 3 # WindowsError errno code, equivalent to ENOENT
126
@deprecated_function(zero_thirteen)
127
def gen_file_id(name):
128
"""Return new file id for the basename 'name'.
130
Use bzrlib.generate_ids.gen_file_id() instead
132
return generate_ids.gen_file_id(name)
135
@deprecated_function(zero_thirteen)
137
"""Return a new tree-root file id.
139
This has been deprecated in favor of bzrlib.generate_ids.gen_root_id()
141
return generate_ids.gen_root_id()
115
144
class TreeEntry(object):
116
145
"""An entry that implements the minimum interface used by commands.
118
This needs further inspection, it may be better to have
147
This needs further inspection, it may be better to have
119
148
InventoryEntries without ids - though that seems wrong. For now,
120
149
this is a parallel hierarchy to InventoryEntry, and needs to become
121
150
one of several things: decorates to that hierarchy, children of, or
285
290
self._control_files.break_lock()
286
291
self.branch.break_lock()
288
def _get_check_refs(self):
289
"""Return the references needed to perform a check of this tree.
291
The default implementation returns no refs, and is only suitable for
292
trees that have no local caching and can commit on ghosts at any time.
294
:seealso: bzrlib.check for details about check_refs.
298
293
def requires_rich_root(self):
299
294
return self._format.requires_rich_root
301
296
def supports_tree_reference(self):
304
def supports_content_filtering(self):
305
return self._format.supports_content_filtering()
307
def supports_views(self):
308
return self.views.supports_views()
310
299
def _set_inventory(self, inv, dirty):
311
300
"""Set the internal cached inventory.
422
390
# at this point ?
424
392
return self.branch.repository.revision_tree(revision_id)
425
except (errors.RevisionNotPresent, errors.NoSuchRevision):
393
except errors.RevisionNotPresent:
426
394
# 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
395
# occured. If the revision is present, its a problem, if its not
429
397
if self.branch.repository.has_revision(revision_id):
431
399
# the basis tree is a ghost so return an empty tree.
432
return self.branch.repository.revision_tree(
433
_mod_revision.NULL_REVISION)
400
return self.branch.repository.revision_tree(None)
435
402
def _cleanup(self):
436
403
self._flush_ignore_list_cache()
406
@deprecated_method(zero_eight)
407
def create(branch, directory):
408
"""Create a workingtree for branch at directory.
410
If existing_directory already exists it must have a .bzr directory.
411
If it does not exist, it will be created.
413
This returns a new WorkingTree object for the new checkout.
415
TODO FIXME RBC 20060124 when we have checkout formats in place this
416
should accept an optional revisionid to checkout [and reject this if
417
checking out into the same dir as a pre-checkout-aware branch format.]
419
XXX: When BzrDir is present, these should be created through that
422
warnings.warn('delete WorkingTree.create', stacklevel=3)
423
transport = get_transport(directory)
424
if branch.bzrdir.root_transport.base == transport.base:
426
return branch.bzrdir.create_workingtree()
427
# different directory,
428
# create a branch reference
429
# and now a working tree.
430
raise NotImplementedError
433
@deprecated_method(zero_eight)
434
def create_standalone(directory):
435
"""Create a checkout and a branch and a repo at directory.
437
Directory must exist and be empty.
439
please use BzrDir.create_standalone_workingtree
441
return bzrdir.BzrDir.create_standalone_workingtree(directory)
438
443
def relpath(self, path):
439
444
"""Return the local path portion from a given path.
441
The path may be absolute or relative. If its a relative path it is
446
The path may be absolute or relative. If its a relative path it is
442
447
interpreted relative to the python current working directory.
444
449
return osutils.relpath(self.basedir, path)
446
451
def has_filename(self, filename):
447
452
return osutils.lexists(self.abspath(filename))
449
def get_file(self, file_id, path=None, filtered=True):
450
return self.get_file_with_stat(file_id, path, filtered=filtered)[0]
452
def get_file_with_stat(self, file_id, path=None, filtered=True,
454
"""See Tree.get_file_with_stat."""
454
def get_file(self, file_id, path=None):
456
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()
457
return self.get_file_byname(path)
459
def get_file_text(self, file_id):
460
return self.get_file(file_id).read()
462
def get_file_byname(self, filename):
463
return file(self.abspath(filename), 'rb')
485
466
def annotate_iter(self, file_id, default_revision=CURRENT_REVISION):
492
473
incorrectly attributed to CURRENT_REVISION (but after committing, the
493
474
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)]
476
basis = self.basis_tree()
479
changes = self._iter_changes(basis, True, [self.id2path(file_id)],
480
require_versioned=True).next()
481
changed_content, kind = changes[2], changes[6]
482
if not changed_content:
483
return basis.annotate_iter(file_id)
487
if kind[0] != 'file':
490
old_lines = list(basis.annotate_iter(file_id))
492
for tree in self.branch.repository.revision_trees(
493
self.get_parent_ids()[1:]):
494
if file_id not in tree:
496
old.append(list(tree.annotate_iter(file_id)))
497
return annotate.reannotate(old, self.get_file(file_id).readlines(),
532
502
def _get_ancestors(self, default_revision):
533
503
ancestors = set([default_revision])
570
540
def clone(self, to_bzrdir, revision_id=None):
571
541
"""Duplicate this working tree into to_bzr, including all state.
573
543
Specifically modified files are kept as modified, but
574
544
ignored and unknown files are discarded.
576
546
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
549
If not None, the cloned tree will have its last revision set to
550
revision, and and difference between the source trees last revision
581
551
and this one merged in.
583
553
# assumes the target bzr dir format is compatible.
584
result = to_bzrdir.create_workingtree()
554
result = self._format.initialize(to_bzrdir)
585
555
self.copy_content_into(result, revision_id)
638
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):
655
604
return self._inventory[file_id].executable
657
_is_executable_from_path_and_stat = \
658
_is_executable_from_path_and_stat_from_basis
660
606
def is_executable(self, file_id, path=None):
663
609
mode = os.lstat(self.abspath(path)).st_mode
664
610
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
612
@needs_tree_write_lock
670
613
def _add(self, files, ids, kinds):
671
614
"""See MutableTree._add."""
672
615
# TODO: Re-adding a file that is removed in the working copy
673
616
# should probably put it back with the previous ID.
674
# the read and write working inventory should not occur in this
617
# the read and write working inventory should not occur in this
675
618
# function - they should be part of lock_write and unlock.
676
619
inv = self.inventory
677
620
for f, file_id, kind in zip(files, ids, kinds):
621
assert kind is not None
678
622
if file_id is None:
679
623
inv.add_path(f, kind=kind)
767
719
kind = 'tree-reference'
768
720
return kind, None, None, None
769
721
elif kind == 'symlink':
770
target = osutils.readlink(abspath)
771
return ('symlink', None, None, target)
722
return ('symlink', None, None, os.readlink(abspath))
773
724
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(
726
@deprecated_method(zero_eleven)
728
def pending_merges(self):
729
"""Return a list of pending merges.
731
These are revisions that have been merged into the working
732
directory but not yet committed.
734
As of 0.11 this is deprecated. Please see WorkingTree.get_parent_ids()
735
instead - which is available on all tree objects.
737
return self.get_parent_ids()[1:]
782
739
def _check_parents_for_ghosts(self, revision_ids, allow_leftmost_as_ghost):
783
740
"""Common ghost checking functionality from set_parent_*.
794
751
def _set_merges_from_parent_ids(self, parent_ids):
795
752
merges = parent_ids[1:]
796
self._transport.put_bytes('pending-merges', '\n'.join(merges),
797
mode=self.bzrdir._get_file_mode())
799
def _filter_parent_ids_by_ancestry(self, revision_ids):
800
"""Check that all merged revisions are proper 'heads'.
802
This will always return the first revision_id, and any merged revisions
805
if len(revision_ids) == 0:
807
graph = self.branch.repository.get_graph()
808
heads = graph.heads(revision_ids)
809
new_revision_ids = revision_ids[:1]
810
for revision_id in revision_ids[1:]:
811
if revision_id in heads and revision_id not in new_revision_ids:
812
new_revision_ids.append(revision_id)
813
if new_revision_ids != revision_ids:
814
trace.mutter('requested to set revision_ids = %s,'
815
' but filtered to %s', revision_ids, new_revision_ids)
816
return new_revision_ids
753
self._control_files.put_bytes('pending-merges', '\n'.join(merges))
818
755
@needs_tree_write_lock
819
756
def set_parent_ids(self, revision_ids, allow_leftmost_as_ghost=False):
820
757
"""Set the parent ids to revision_ids.
822
759
See also set_parent_trees. This api will try to retrieve the tree data
823
760
for each element of revision_ids from the trees repository. If you have
824
761
tree data already available, it is more efficient to use
914
846
branch.last_revision().
916
848
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:
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:
939
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()
849
pb = bzrlib.ui.ui_factory.nested_progress_bar()
851
merger = Merger(self.branch, this_tree=self, pb=pb)
852
merger.pp = ProgressPhase("Merge phase", 5, pb)
853
merger.pp.next_phase()
854
# check that there are no
856
merger.check_basis(check_clean=True, require_commits=False)
857
if to_revision is None:
858
to_revision = _mod_revision.ensure_null(branch.last_revision())
859
merger.other_rev_id = to_revision
860
if _mod_revision.is_null(merger.other_rev_id):
861
raise errors.NoCommits(branch)
862
self.branch.fetch(branch, last_revision=merger.other_rev_id)
863
merger.other_basis = merger.other_rev_id
864
merger.other_tree = self.branch.repository.revision_tree(
866
merger.other_branch = branch
867
merger.pp.next_phase()
868
if from_revision is None:
871
merger.set_base_revision(from_revision, branch)
872
if merger.base_rev_id == merger.other_rev_id:
873
raise errors.PointlessMerge
874
merger.backup_files = False
875
if merge_type is None:
876
merger.merge_type = Merge3Merger
878
merger.merge_type = merge_type
879
merger.set_interesting_files(None)
880
merger.show_base = False
881
merger.reprocess = False
882
conflicts = merger.do_merge()
950
889
def merge_modified(self):
951
890
"""Return a dictionary of files modified by a merge.
953
The list is initialized by WorkingTree.set_merge_modified, which is
892
The list is initialized by WorkingTree.set_merge_modified, which is
954
893
typically called after we make some automatic updates to the tree
955
894
because of a merge.
958
897
still in the working inventory and have that text hash.
961
hashfile = self._transport.get('merge-hashes')
900
hashfile = self._control_files.get('merge-hashes')
962
901
except errors.NoSuchFile:
967
if hashfile.next() != MERGE_MODIFIED_HEADER_1 + '\n':
968
raise errors.MergeModifiedFormatError()
969
except StopIteration:
905
if hashfile.next() != MERGE_MODIFIED_HEADER_1 + '\n':
970
906
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
907
except StopIteration:
908
raise errors.MergeModifiedFormatError()
909
for s in RioReader(hashfile):
910
# RioReader reads in Unicode, so convert file_ids back to utf8
911
file_id = osutils.safe_file_id(s.get("file_id"), warn=False)
912
if file_id not in self.inventory:
914
text_hash = s.get("hash")
915
if text_hash == self.get_file_sha1(file_id):
916
merge_hashes[file_id] = text_hash
983
919
@needs_write_lock
984
920
def mkdir(self, path, file_id=None):
1036
970
other_tree.unlock()
1037
971
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
973
def _directory_is_tree_reference(self, relpath):
974
# as a special case, if a directory contains control files then
1052
975
# it's a tree reference, except that the root of the tree is not
1053
976
return relpath and osutils.isdir(self.abspath(relpath) + u"/.bzr")
1054
977
# TODO: We could ask all the control formats whether they
1076
999
transport = transport.clone(name)
1077
1000
transport.ensure_base()
1078
1001
return transport
1080
1003
sub_path = self.id2path(file_id)
1081
1004
branch_transport = mkdirs(sub_path)
1082
1005
if format is None:
1083
format = self.bzrdir.cloning_metadir()
1006
format = bzrdir.format_registry.make_bzrdir('dirstate-with-subtree')
1084
1007
branch_transport.ensure_base()
1085
1008
branch_bzrdir = format.initialize_on_transport(branch_transport)
1087
1010
repo = branch_bzrdir.find_repository()
1088
1011
except errors.NoRepositoryPresent:
1089
1012
repo = branch_bzrdir.create_repository()
1090
if not repo.supports_rich_root():
1091
raise errors.RootNotRich()
1013
assert repo.supports_rich_root()
1015
if not repo.supports_rich_root():
1016
raise errors.RootNotRich()
1092
1017
new_branch = branch_bzrdir.create_branch()
1093
1018
new_branch.pull(self.branch)
1094
1019
for parent_id in self.get_parent_ids():
1096
1021
tree_transport = self.bzrdir.root_transport.clone(sub_path)
1097
1022
if tree_transport.base != branch_transport.base:
1098
1023
tree_bzrdir = format.initialize_on_transport(tree_transport)
1099
branch.BranchReferenceFormat().initialize(tree_bzrdir,
1100
target_branch=new_branch)
1024
branch.BranchReferenceFormat().initialize(tree_bzrdir, new_branch)
1102
1026
tree_bzrdir = branch_bzrdir
1103
wt = tree_bzrdir.create_workingtree(_mod_revision.NULL_REVISION)
1027
wt = tree_bzrdir.create_workingtree(NULL_REVISION)
1104
1028
wt.set_parent_ids(self.get_parent_ids())
1105
1029
my_inv = self.inventory
1106
child_inv = inventory.Inventory(root_id=None)
1030
child_inv = Inventory(root_id=None)
1107
1031
new_root = my_inv[file_id]
1108
1032
my_inv.remove_recursive_id(file_id)
1109
1033
new_root.parent_id = None
1127
1051
sio = StringIO()
1128
1052
self._serialize(self._inventory, sio)
1130
self._transport.put_file('inventory', sio,
1131
mode=self.bzrdir._get_file_mode())
1054
self._control_files.put('inventory', sio)
1132
1055
self._inventory_is_modified = False
1134
1057
def _kind(self, relpath):
1135
1058
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).
1060
def list_files(self, include_root=False):
1061
"""Recursively list all files as (path, class, kind, id, entry).
1140
1063
Lists, but does not descend into unversioned directories.
1141
1065
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
1068
Skips the control directory.
1148
1070
# list_files is an iterator, so @needs_read_lock doesn't work properly
1149
1071
# with it. So callers should be careful to always read_lock the tree.
1164
1086
fk_entries = {'directory':TreeDirectory, 'file':TreeFile, 'symlink':TreeLink}
1166
1088
# directory file_id, relative path, absolute path, reverse sorted children
1167
if from_dir is not None:
1168
from_dir_id = inv.path2id(from_dir)
1169
if from_dir_id is None:
1170
# Directory not versioned
1172
from_dir_abspath = pathjoin(self.basedir, from_dir)
1174
from_dir_id = inv.root.file_id
1175
from_dir_abspath = self.basedir
1176
children = os.listdir(from_dir_abspath)
1089
children = os.listdir(self.basedir)
1177
1090
children.sort()
1178
# jam 20060527 The kernel sized tree seems equivalent whether we
1091
# jam 20060527 The kernel sized tree seems equivalent whether we
1179
1092
# use a deque and popleft to keep them sorted, or if we use a plain
1180
1093
# list and just reverse() them.
1181
1094
children = collections.deque(children)
1182
stack = [(from_dir_id, u'', from_dir_abspath, children)]
1095
stack = [(inv.root.file_id, u'', self.basedir, children)]
1184
1097
from_dir_id, from_dir_relpath, from_dir_abspath, children = stack[-1]
1239
1152
except KeyError:
1240
1153
yield fp[1:], c, fk, None, TreeEntry()
1243
1156
if fk != 'directory':
1246
# But do this child first if recursing down
1248
new_children = os.listdir(fap)
1250
new_children = collections.deque(new_children)
1251
stack.append((f_ie.file_id, fp, fap, new_children))
1252
# Break out of inner loop,
1253
# so that we start outer loop with child
1159
# But do this child first
1160
new_children = os.listdir(fap)
1162
new_children = collections.deque(new_children)
1163
stack.append((f_ie.file_id, fp, fap, new_children))
1164
# Break out of inner loop,
1165
# so that we start outer loop with child
1256
1168
# if we finished all children, pop it off the stack
1493
1400
from_tail = splitpath(from_rel)[-1]
1494
1401
from_id = inv.path2id(from_rel)
1495
1402
if from_id is None:
1496
# if file is missing in the inventory maybe it's in the basis_tree
1497
basis_tree = self.branch.basis_tree()
1498
from_id = basis_tree.path2id(from_rel)
1500
raise errors.BzrRenameFailedError(from_rel,to_rel,
1501
errors.NotVersionedError(path=str(from_rel)))
1502
# put entry back in the inventory so we can rename it
1503
from_entry = basis_tree.inventory[from_id].copy()
1506
from_entry = inv[from_id]
1403
raise errors.BzrRenameFailedError(from_rel,to_rel,
1404
errors.NotVersionedError(path=str(from_rel)))
1405
from_entry = inv[from_id]
1507
1406
from_parent_id = from_entry.parent_id
1508
1407
to_dir, to_tail = os.path.split(to_rel)
1509
1408
to_dir_id = inv.path2id(to_dir)
1571
1470
:raises: NoSuchId if any fileid is not currently versioned.
1573
1472
for file_id in file_ids:
1574
if file_id not in self._inventory:
1575
raise errors.NoSuchId(self, file_id)
1576
for file_id in file_ids:
1577
1473
if self._inventory.has_id(file_id):
1578
1474
self._inventory.remove_recursive_id(file_id)
1476
raise errors.NoSuchId(self, file_id)
1579
1477
if len(file_ids):
1580
# in the future this should just set a dirty bit to wait for the
1478
# in the future this should just set a dirty bit to wait for the
1581
1479
# final unlock. However, until all methods of workingtree start
1582
# with the current in -memory inventory rather than triggering
1480
# with the current in -memory inventory rather than triggering
1583
1481
# a read, it is more complex - we need to teach read_inventory
1584
1482
# to know when to read, and when to not read first... and possibly
1585
1483
# to save first when the in memory one may be corrupted.
1586
1484
# so for now, we just only write it if it is indeed dirty.
1587
1485
# - RBC 20060907
1588
1486
self._write_inventory(self._inventory)
1488
@deprecated_method(zero_eight)
1489
def iter_conflicts(self):
1490
"""List all files in the tree that have text or content conflicts.
1491
DEPRECATED. Use conflicts instead."""
1492
return self._iter_conflicts()
1590
1494
def _iter_conflicts(self):
1591
1495
conflicted = set()
1601
1505
@needs_write_lock
1602
1506
def pull(self, source, overwrite=False, stop_revision=None,
1603
change_reporter=None, possible_transports=None, local=False):
1507
change_reporter=None, possible_transports=None):
1508
top_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1604
1509
source.lock_read()
1511
pp = ProgressPhase("Pull phase", 2, top_pb)
1606
1513
old_revision_info = self.branch.last_revision_info()
1607
1514
basis_tree = self.basis_tree()
1608
1515
count = self.branch.pull(source, overwrite, stop_revision,
1609
possible_transports=possible_transports,
1516
possible_transports=possible_transports)
1611
1517
new_revision_info = self.branch.last_revision_info()
1612
1518
if new_revision_info != old_revision_info:
1613
1520
repository = self.branch.repository
1521
pb = bzrlib.ui.ui_factory.nested_progress_bar()
1614
1522
basis_tree.lock_read()
1616
1524
new_basis_tree = self.branch.basis_tree()
1619
1527
new_basis_tree,
1621
1529
this_tree=self,
1623
1531
change_reporter=change_reporter)
1624
basis_root_id = basis_tree.get_root_id()
1625
new_root_id = new_basis_tree.get_root_id()
1626
if basis_root_id != new_root_id:
1627
self.set_root_id(new_root_id)
1532
if (basis_tree.inventory.root is None and
1533
new_basis_tree.inventory.root is not None):
1534
self.set_root_id(new_basis_tree.inventory.root.file_id)
1629
1537
basis_tree.unlock()
1630
1538
# TODO - dedup parents list with things merged by pull ?
1631
1539
# reuse the revisiontree we merged against to set the new
1633
1541
parent_trees = [(self.branch.last_revision(), new_basis_tree)]
1634
# we have to pull the merge trees out again, because
1635
# merge_inner has set the ids. - this corner is not yet
1542
# we have to pull the merge trees out again, because
1543
# merge_inner has set the ids. - this corner is not yet
1636
1544
# layered well enough to prevent double handling.
1637
1545
# XXX TODO: Fix the double handling: telling the tree about
1638
1546
# the already known parent data is wasteful.
1734
1636
r"""Check whether the filename matches an ignore pattern.
1736
1638
Patterns containing '/' or '\' need to match the whole path;
1737
others match against only the last component. Patterns starting
1738
with '!' are ignore exceptions. Exceptions take precedence
1739
over regular patterns and cause the filename to not be ignored.
1639
others match against only the last component.
1741
1641
If the file is ignored, returns the pattern which caused it to
1742
1642
be ignored, otherwise None. So this can simply be used as a
1743
1643
boolean if desired."""
1744
1644
if getattr(self, '_ignoreglobster', None) is None:
1745
self._ignoreglobster = globbing.ExceptionGlobster(self.get_ignore_list())
1645
self._ignoreglobster = globbing.Globster(self.get_ignore_list())
1746
1646
return self._ignoreglobster.match(filename)
1748
1648
def kind(self, file_id):
1749
1649
return file_kind(self.id2abspath(file_id))
1751
def stored_kind(self, file_id):
1752
"""See Tree.stored_kind"""
1753
return self.inventory[file_id].kind
1755
1651
def _comparison_data(self, entry, path):
1756
1652
abspath = self.abspath(path)
1798
1694
raise errors.ObjectNotLocked(self)
1800
1696
def lock_read(self):
1801
"""Lock the tree for reading.
1803
This also locks the branch, and can be unlocked via self.unlock().
1805
:return: An object with an unlock method which will release the lock
1697
"""See Branch.lock_read, and WorkingTree.unlock."""
1808
1698
if not self.is_locked():
1809
1699
self._reset_data()
1810
1700
self.branch.lock_read()
1812
self._control_files.lock_read()
1702
return self._control_files.lock_read()
1815
1704
self.branch.unlock()
1818
1707
def lock_tree_write(self):
1819
"""See MutableTree.lock_tree_write, and WorkingTree.unlock.
1821
:return: An object with an unlock method which will release the lock
1708
"""See MutableTree.lock_tree_write, and WorkingTree.unlock."""
1824
1709
if not self.is_locked():
1825
1710
self._reset_data()
1826
1711
self.branch.lock_read()
1828
self._control_files.lock_write()
1713
return self._control_files.lock_write()
1831
1715
self.branch.unlock()
1834
1718
def lock_write(self):
1835
"""See MutableTree.lock_write, and WorkingTree.unlock.
1837
:return: An object with an unlock method which will release the lock
1719
"""See MutableTree.lock_write, and WorkingTree.unlock."""
1840
1720
if not self.is_locked():
1841
1721
self._reset_data()
1842
1722
self.branch.lock_write()
1844
self._control_files.lock_write()
1724
return self._control_files.lock_write()
1847
1726
self.branch.unlock()
1903
1778
# as commit already has that ready-to-use [while the format is the
1904
1779
# same, that is].
1906
# this double handles the inventory - unpack and repack -
1781
# this double handles the inventory - unpack and repack -
1907
1782
# but is easier to understand. We can/should put a conditional
1908
1783
# in here based on whether the inventory is in the latest format
1909
1784
# - perhaps we should repack all inventories on a repository
1911
1786
# the fast path is to copy the raw xml from the repository. If the
1912
# xml contains 'revision_id="', then we assume the right
1787
# xml contains 'revision_id="', then we assume the right
1913
1788
# revision_id is set. We must check for this full string, because a
1914
1789
# root node id can legitimately look like 'revision_id' but cannot
1915
1790
# contain a '"'.
1916
xml = self.branch.repository._get_inventory_xml(new_revision)
1791
xml = self.branch.repository.get_inventory_xml(new_revision)
1917
1792
firstline = xml.split('\n', 1)[0]
1918
if (not 'revision_id="' in firstline or
1793
if (not 'revision_id="' in firstline or
1919
1794
'format="7"' not in firstline):
1920
inv = self.branch.repository._serializer.read_inventory_from_string(
1795
inv = self.branch.repository.deserialise_inventory(
1922
1797
xml = self._create_basis_xml_from_inventory(new_revision, inv)
1923
1798
self._write_basis_inventory(xml)
1924
1799
except (errors.NoSuchRevision, errors.RevisionNotPresent):
1927
1802
def read_basis_inventory(self):
1928
1803
"""Read the cached basis inventory."""
1929
1804
path = self._basis_inventory_name()
1930
return self._transport.get_bytes(path)
1805
return self._control_files.get(path).read()
1932
1807
@needs_read_lock
1933
1808
def read_working_inventory(self):
1934
1809
"""Read the working inventory.
1936
1811
:raises errors.InventoryModified: read_working_inventory will fail
1937
1812
when the current in memory inventory has been modified.
1939
# conceptually this should be an implementation detail of the tree.
1814
# conceptually this should be an implementation detail of the tree.
1940
1815
# XXX: Deprecate this.
1941
1816
# ElementTree does its own conversion from UTF-8, so open in
1943
1818
if self._inventory_is_modified:
1944
1819
raise errors.InventoryModified(self)
1945
f = self._transport.get('inventory')
1947
result = self._deserialize(f)
1820
result = self._deserialize(self._control_files.get('inventory'))
1950
1821
self._set_inventory(result, dirty=False)
1968
1839
new_files=set()
1969
1840
unknown_nested_files=set()
1971
to_file = sys.stdout
1973
1842
def recurse_directory_to_add_files(directory):
1974
1843
# Recurse directory and add all files
1975
1844
# so we can check if they have changed.
1976
1845
for parent_info, file_infos in\
1977
self.walkdirs(directory):
1978
for relpath, basename, kind, lstat, fileid, kind in file_infos:
1846
osutils.walkdirs(self.abspath(directory),
1848
for relpath, basename, kind, lstat, abspath in file_infos:
1979
1849
# Is it versioned or ignored?
1980
1850
if self.path2id(relpath) or self.is_ignored(relpath):
1981
1851
# Add nested content for deletion.
2006
1877
has_changed_files = len(unknown_nested_files) > 0
2007
1878
if not has_changed_files:
2008
1879
for (file_id, path, content_change, versioned, parent_id, name,
2009
kind, executable) in self.iter_changes(self.basis_tree(),
1880
kind, executable) in self._iter_changes(self.basis_tree(),
2010
1881
include_unchanged=True, require_versioned=False,
2011
1882
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
1883
# Check if it's an unknown (but not ignored) OR
1884
# changed (but not deleted) :
1885
if not self.is_ignored(path[1]) and (
1886
versioned == (False, False) or
1887
content_change and kind[1] != None):
2020
1888
has_changed_files = True
2083
1950
' as of bzr 0.91. Please use None (the default) instead.',
2084
1951
DeprecationWarning, stacklevel=2)
2085
1952
if old_tree is None:
2086
basis_tree = self.basis_tree()
2087
basis_tree.lock_read()
2088
old_tree = basis_tree
1953
old_tree = self.basis_tree()
1954
conflicts = transform.revert(self, old_tree, filenames, backups, pb,
1956
if filenames is None:
1957
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:
1960
resolve(self, filenames, ignore_misses=True)
2109
1961
return conflicts
2111
1963
def revision_tree(self, revision_id):
2159
2012
@needs_tree_write_lock
2160
2013
def set_root_id(self, file_id):
2161
2014
"""Set the root id for this tree."""
2163
2016
if file_id is None:
2165
'WorkingTree.set_root_id with fileid=None')
2166
file_id = osutils.safe_file_id(file_id)
2017
symbol_versioning.warn(symbol_versioning.zero_twelve
2018
% 'WorkingTree.set_root_id with fileid=None',
2023
file_id = osutils.safe_file_id(file_id)
2167
2024
self._set_root_id(file_id)
2169
2026
def _set_root_id(self, file_id):
2170
2027
"""Set the root id for this tree, in a format specific manner.
2172
:param file_id: The file id to assign to the root. It must not be
2029
:param file_id: The file id to assign to the root. It must not be
2173
2030
present in the current inventory or an error will occur. It must
2174
2031
not be None, but rather a valid file id.
2195
2052
def unlock(self):
2196
2053
"""See Branch.unlock.
2198
2055
WorkingTree locking just uses the Branch locking facilities.
2199
2056
This is current because all working trees have an embedded branch
2200
2057
within them. IF in the future, we were to make branch data shareable
2201
between multiple working trees, i.e. via shared storage, then we
2058
between multiple working trees, i.e. via shared storage, then we
2202
2059
would probably want to lock both the local tree, and the branch.
2204
2061
raise NotImplementedError(self.unlock)
2208
def update(self, change_reporter=None, possible_transports=None,
2209
revision=None, old_tip=_marker):
2063
def update(self, change_reporter=None, possible_transports=None):
2210
2064
"""Update a working tree along its branch.
2212
2066
This will update the branch if its bound too, which means we have
2266
2113
# cant set that until we update the working trees last revision to be
2267
2114
# one from the new branch, because it will just get absorbed by the
2268
2115
# parent de-duplication logic.
2270
2117
# We MUST save it even if an error occurs, because otherwise the users
2271
2118
# local work is unreferenced and will appear to have been lost.
2275
2122
last_rev = self.get_parent_ids()[0]
2276
2123
except IndexError:
2277
2124
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()
2125
if last_rev != _mod_revision.ensure_null(self.branch.last_revision()):
2126
# merge tree state up to new branch tip.
2302
2127
basis = self.basis_tree()
2303
2128
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)
2130
to_tree = self.branch.basis_tree()
2131
if basis.inventory.root is None:
2132
self.set_root_id(to_tree.inventory.root.file_id)
2134
result += merge.merge_inner(
2139
change_reporter=change_reporter)
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
2142
# TODO - dedup parents list with things merged by pull ?
2323
2143
# reuse the tree we've updated to to set the basis:
2324
parent_trees = [(revision, to_tree)]
2144
parent_trees = [(self.branch.last_revision(), to_tree)]
2325
2145
merges = self.get_parent_ids()[1:]
2326
2146
# 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
2147
# tree can decide whether to give us teh entire tree or give us a
2328
2148
# lazy initialised tree. dirstate for instance will have the trees
2329
2149
# in ram already, whereas a last-revision + basis-inventory tree
2330
2150
# will not, but also does not need them when setting parents.
2331
2151
for parent in merges:
2332
2152
parent_trees.append(
2333
2153
(parent, self.branch.repository.revision_tree(parent)))
2334
if not _mod_revision.is_null(old_tip):
2154
if (old_tip is not None and not _mod_revision.is_null(old_tip)):
2335
2155
parent_trees.append(
2336
2156
(old_tip, self.branch.repository.revision_tree(old_tip)))
2337
2157
self.set_parent_trees(parent_trees)
2338
2158
last_rev = parent_trees[0][0]
2160
# the working tree had the same last-revision as the master
2161
# branch did. We may still have pivot local work from the local
2162
# branch into old_tip:
2163
if (old_tip is not None and not _mod_revision.is_null(old_tip)):
2164
self.add_parent_tree_id(old_tip)
2165
if (old_tip is not None and not _mod_revision.is_null(old_tip)
2166
and old_tip != last_rev):
2167
# our last revision was not the prior branch last revision
2168
# and we have converted that last revision to a pending merge.
2169
# base is somewhere between the branch tip now
2170
# and the now pending merge
2172
# Since we just modified the working tree and inventory, flush out
2173
# the current state, before we modify it again.
2174
# TODO: jam 20070214 WorkingTree3 doesn't require this, dirstate
2175
# requires it only because TreeTransform directly munges the
2176
# inventory and calls tree._write_inventory(). Ultimately we
2177
# should be able to remove this extra flush.
2179
graph = self.branch.repository.get_graph()
2180
base_rev_id = graph.find_unique_lca(self.branch.last_revision(),
2182
base_tree = self.branch.repository.revision_tree(base_rev_id)
2183
other_tree = self.branch.repository.revision_tree(old_tip)
2184
result += merge.merge_inner(
2189
change_reporter=change_reporter)
2341
2192
def _write_hashcache_if_dirty(self):
2342
2193
"""Write out the hashcache if it is dirty."""
2426
2277
current_inv = None
2427
2278
inv_finished = True
2428
2279
while not inv_finished or not disk_finished:
2430
((cur_disk_dir_relpath, cur_disk_dir_path_from_top),
2431
cur_disk_dir_content) = current_disk
2433
((cur_disk_dir_relpath, cur_disk_dir_path_from_top),
2434
cur_disk_dir_content) = ((None, None), None)
2435
2280
if not disk_finished:
2436
2281
# strip out .bzr dirs
2437
if (cur_disk_dir_path_from_top[top_strip_len:] == '' and
2438
len(cur_disk_dir_content) > 0):
2439
# osutils.walkdirs can be made nicer -
2282
if current_disk[0][1][top_strip_len:] == '':
2283
# osutils.walkdirs can be made nicer -
2440
2284
# yield the path-from-prefix rather than the pathjoined
2442
bzrdir_loc = bisect_left(cur_disk_dir_content,
2444
if (bzrdir_loc < len(cur_disk_dir_content)
2445
and self.bzrdir.is_control_filename(
2446
cur_disk_dir_content[bzrdir_loc][0])):
2286
bzrdir_loc = bisect_left(current_disk[1], ('.bzr', '.bzr'))
2287
if current_disk[1][bzrdir_loc][0] == '.bzr':
2447
2288
# we dont yield the contents of, or, .bzr itself.
2448
del cur_disk_dir_content[bzrdir_loc]
2289
del current_disk[1][bzrdir_loc]
2449
2290
if inv_finished:
2450
2291
# everything is unknown
2453
2294
# everything is missing
2456
direction = cmp(current_inv[0][0], cur_disk_dir_relpath)
2297
direction = cmp(current_inv[0][0], current_disk[0][0])
2457
2298
if direction > 0:
2458
2299
# disk is before inventory - unknown
2459
2300
dirblock = [(relpath, basename, kind, stat, None, None) for
2460
relpath, basename, kind, stat, top_path in
2461
cur_disk_dir_content]
2462
yield (cur_disk_dir_relpath, None), dirblock
2301
relpath, basename, kind, stat, top_path in current_disk[1]]
2302
yield (current_disk[0][0], None), dirblock
2464
2304
current_disk = disk_iterator.next()
2465
2305
except StopIteration:
2540
2379
# FIXME: stash the node in pending
2541
2380
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
2381
for name, child in entry.sorted_children():
2382
dirblock.append((relroot + name, name, child.kind, None,
2383
child.file_id, child.kind
2547
2385
yield (currentdir[0], entry.file_id), dirblock
2548
2386
# push the user specified dirs from dirblock
2549
2387
for dir in reversed(dirblock):
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
2435
class WorkingTree2(WorkingTree):
2629
2436
"""This is the Format 2 working tree.
2631
This was the first weave based working tree.
2438
This was the first weave based working tree.
2632
2439
- uses os locks for locking.
2633
2440
- uses the branch last-revision.
2697
2496
def _last_revision(self):
2698
2497
"""See Mutable.last_revision."""
2700
return self._transport.get_bytes('last-revision')
2499
return self._control_files.get('last-revision').read()
2701
2500
except errors.NoSuchFile:
2702
2501
return _mod_revision.NULL_REVISION
2704
2503
def _change_last_revision(self, revision_id):
2705
2504
"""See WorkingTree._change_last_revision."""
2706
if revision_id is None or revision_id == _mod_revision.NULL_REVISION:
2505
if revision_id is None or revision_id == NULL_REVISION:
2708
self._transport.delete('last-revision')
2507
self._control_files._transport.delete('last-revision')
2709
2508
except errors.NoSuchFile:
2713
self._transport.put_bytes('last-revision', revision_id,
2714
mode=self.bzrdir._get_file_mode())
2512
self._control_files.put_bytes('last-revision', revision_id)
2717
def _get_check_refs(self):
2718
"""Return the references needed to perform a check of this tree."""
2719
return [('trees', self.last_revision())]
2721
2515
@needs_tree_write_lock
2722
2516
def set_conflicts(self, conflicts):
2723
self._put_rio('conflicts', conflicts.to_stanzas(),
2517
self._put_rio('conflicts', conflicts.to_stanzas(),
2724
2518
CONFLICT_HEADER_1)
2726
2520
@needs_tree_write_lock
2869
2668
"""See WorkingTreeFormat.get_format_description()."""
2870
2669
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.
2671
def stub_initialize_remote(self, control_files):
2672
"""As a special workaround create critical control files for a remote working tree
2875
2674
This ensures that it can later be updated and dealt with locally,
2876
since BzrDirFormat6 and BzrDirFormat5 cannot represent dirs with
2675
since BzrDirFormat6 and BzrDirFormat5 cannot represent dirs with
2877
2676
no working tree. (See bug #43064).
2879
2678
sio = StringIO()
2880
inv = inventory.Inventory()
2881
2680
xml5.serializer_v5.write_inventory(inv, sio, working=True)
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):
2682
control_files.put('inventory', sio)
2684
control_files.put_bytes('pending-merges', '')
2687
def initialize(self, a_bzrdir, revision_id=None):
2888
2688
"""See WorkingTreeFormat.initialize()."""
2889
2689
if not isinstance(a_bzrdir.transport, LocalTransport):
2890
2690
raise errors.NotLocalUrl(a_bzrdir.transport.base)
2891
if from_branch is not None:
2892
branch = from_branch
2894
branch = a_bzrdir.open_branch()
2691
branch = a_bzrdir.open_branch()
2895
2692
if revision_id is None:
2896
2693
revision_id = _mod_revision.ensure_null(branch.last_revision())
2897
2694
branch.lock_write()
2974
2771
def _open_control_files(self, a_bzrdir):
2975
2772
transport = a_bzrdir.get_workingtree_transport(None)
2976
return LockableFiles(transport, self._lock_file_name,
2773
return LockableFiles(transport, self._lock_file_name,
2977
2774
self._lock_class)
2979
def initialize(self, a_bzrdir, revision_id=None, from_branch=None,
2980
accelerator_tree=None, hardlink=False):
2776
def initialize(self, a_bzrdir, revision_id=None):
2981
2777
"""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,
2779
revision_id allows creating a working tree at a different
2780
revision than the branch is at.
2992
2782
if not isinstance(a_bzrdir.transport, LocalTransport):
2993
2783
raise errors.NotLocalUrl(a_bzrdir.transport.base)
added
removed
bzrlib/workingtree.py
