19
19
A WorkingTree represents the editable working copy of a branch.
20
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
new revision based on the workingtree and its inventory.
21
such as renaming or adding files.
25
23
At the moment every WorkingTree has its own branch. Remote
26
24
WorkingTrees aren't supported.
28
To get a WorkingTree, call bzrdir.open_workingtree() or
26
To get a WorkingTree, call controldir.open_workingtree() or
29
27
WorkingTree.open(dir).
30
from __future__ import absolute_import
33
from cStringIO import StringIO
37
from bzrlib.lazy_import import lazy_import
39
from .lazy_import import lazy_import
38
40
lazy_import(globals(), """
39
41
from bisect import bisect_left
51
48
conflicts as _mod_conflicts,
51
filters as _mod_filters,
60
54
revision as _mod_revision,
70
from bzrlib.transport import get_transport
71
from bzrlib.workingtree_4 import (
78
from bzrlib import symbol_versioning
79
from bzrlib.decorators import needs_read_lock, needs_write_lock
80
from bzrlib.lockable_files import LockableFiles
81
from bzrlib.lockdir import LockDir
82
import bzrlib.mutabletree
83
from bzrlib.mutabletree import needs_tree_write_lock
84
from bzrlib import osutils
85
from bzrlib.osutils import (
95
from bzrlib.filters import filtered_input_file
96
from bzrlib.trace import mutter, note
97
from bzrlib.transport.local import LocalTransport
98
from bzrlib.revision import CURRENT_REVISION
99
from bzrlib.rio import RioReader, rio_file, Stanza
100
from bzrlib.symbol_versioning import (
102
DEPRECATED_PARAMETER,
106
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
CONFLICT_HEADER_1 = "BZR conflict list format 1"
66
from .i18n import gettext
67
from . import mutabletree
71
from .trace import mutter, note
112
74
ERROR_PATH_NOT_FOUND = 3 # WindowsError errno code, equivalent to ENOENT
77
class SettingFileIdUnsupported(errors.BzrError):
79
_fmt = "This format does not support setting file ids."""
115
82
class TreeEntry(object):
116
83
"""An entry that implements the minimum interface used by commands.
183
147
return views.DisabledViews(self)
185
149
def __init__(self, basedir='.',
186
branch=DEPRECATED_PARAMETER,
192
155
"""Construct a WorkingTree instance. This is not a public API.
194
157
:param branch: A branch to override probing for the branch.
196
159
self._format = _format
197
self.bzrdir = _bzrdir
160
self.controldir = _controldir
198
161
if not _internal:
199
raise errors.BzrError("Please use bzrdir.open_workingtree or "
162
raise errors.BzrError("Please use controldir.open_workingtree or "
200
163
"WorkingTree.open() to obtain a WorkingTree.")
201
basedir = safe_unicode(basedir)
164
basedir = osutils.safe_unicode(basedir)
202
165
mutter("opening working tree %r", basedir)
203
if deprecated_passed(branch):
166
if branch is not None:
204
167
self._branch = branch
206
self._branch = self.bzrdir.open_branch()
207
self.basedir = realpath(basedir)
208
# if branch is at our basedir and is a format 6 or less
209
if isinstance(self._format, WorkingTreeFormat2):
210
# share control object
211
self._control_files = self.branch.control_files
213
# assume all other formats have their own control files.
214
self._control_files = _control_files
215
self._transport = self._control_files._transport
216
# update the whole cache up front and write to disk if anything changed;
217
# in the future we might want to do this more selectively
218
# two possible ways offer themselves : in self._unlock, write the cache
219
# if needed, or, when the cache sees a change, append it to the hash
220
# cache file, and have the parser take the most recent entry for a
222
wt_trans = self.bzrdir.get_workingtree_transport(None)
223
cache_filename = wt_trans.local_abspath('stat-cache')
224
self._hashcache = hashcache.HashCache(basedir, cache_filename,
225
self.bzrdir._get_file_mode(),
226
self._content_filter_stack_provider())
229
# is this scan needed ? it makes things kinda slow.
236
if _inventory is None:
237
# This will be acquired on lock_read() or lock_write()
238
self._inventory_is_modified = False
239
self._inventory = None
241
# the caller of __init__ has provided an inventory,
242
# we assume they know what they are doing - as its only
243
# the Format factory and creation methods that are
244
# permitted to do this.
245
self._set_inventory(_inventory, dirty=False)
246
self._detect_case_handling()
169
self._branch = self.controldir.open_branch()
170
self.basedir = osutils.realpath(basedir)
171
self._transport = _transport
247
172
self._rules_searcher = None
248
173
self.views = self._make_views()
251
176
def user_transport(self):
252
return self.bzrdir.user_transport
177
return self.controldir.user_transport
255
180
def control_transport(self):
256
181
return self._transport
258
def _detect_case_handling(self):
259
wt_trans = self.bzrdir.get_workingtree_transport(None)
261
wt_trans.stat("FoRMaT")
262
except errors.NoSuchFile:
263
self.case_sensitive = True
265
self.case_sensitive = False
267
self._setup_directory_is_tree_reference()
183
def is_control_filename(self, filename):
184
"""True if filename is the name of a control file in this tree.
186
:param filename: A filename within the tree. This is a relative path
187
from the root of this tree.
189
This is true IF and ONLY IF the filename is part of the meta data
190
that bzr controls in this tree. I.E. a random .bzr directory placed
191
on disk will not be a control file for this tree.
193
return self.controldir.is_control_filename(filename)
269
195
branch = property(
270
196
fget=lambda self: self._branch,
347
270
path = osutils.getcwd()
348
control, relpath = bzrdir.BzrDir.open_containing(path)
271
control, relpath = controldir.ControlDir.open_containing(path)
350
272
return control.open_workingtree(), relpath
275
def open_containing_paths(file_list, default_directory=None,
276
canonicalize=True, apply_view=True):
277
"""Open the WorkingTree that contains a set of paths.
279
Fail if the paths given are not all in a single tree.
281
This is used for the many command-line interfaces that take a list of
282
any number of files and that require they all be in the same tree.
284
if default_directory is None:
285
default_directory = u'.'
286
# recommended replacement for builtins.internal_tree_files
287
if file_list is None or len(file_list) == 0:
288
tree = WorkingTree.open_containing(default_directory)[0]
289
# XXX: doesn't really belong here, and seems to have the strange
290
# side effect of making it return a bunch of files, not the whole
291
# tree -- mbp 20100716
292
if tree.supports_views() and apply_view:
293
view_files = tree.views.lookup_view()
295
file_list = view_files
296
view_str = views.view_display_str(view_files)
297
note(gettext("Ignoring files outside view. View is %s") % view_str)
298
return tree, file_list
299
if default_directory == u'.':
302
seed = default_directory
303
file_list = [osutils.pathjoin(default_directory, f)
305
tree = WorkingTree.open_containing(seed)[0]
306
return tree, tree.safe_relpath_files(file_list, canonicalize,
307
apply_view=apply_view)
309
def safe_relpath_files(self, file_list, canonicalize=True, apply_view=True):
310
"""Convert file_list into a list of relpaths in tree.
312
:param self: A tree to operate on.
313
:param file_list: A list of user provided paths or None.
314
:param apply_view: if True and a view is set, apply it or check that
315
specified files are within it
316
:return: A list of relative paths.
317
:raises errors.PathNotChild: When a provided path is in a different self
320
if file_list is None:
322
if self.supports_views() and apply_view:
323
view_files = self.views.lookup_view()
327
# self.relpath exists as a "thunk" to osutils, but canonical_relpath
328
# doesn't - fix that up here before we enter the loop.
330
fixer = lambda p: osutils.canonical_relpath(self.basedir, p)
333
for filename in file_list:
334
relpath = fixer(osutils.dereference_path(filename))
335
if view_files and not osutils.is_inside_any(view_files, relpath):
336
raise views.FileOutsideView(filename, view_files)
337
new_list.append(relpath)
353
341
def open_downlevel(path=None):
354
342
"""Open an unsupported working tree.
356
Only intended for advanced situations like upgrading part of a bzrdir.
344
Only intended for advanced situations like upgrading part of a controldir.
358
346
return WorkingTree.open(path, _unsupported=True)
361
349
def find_trees(location):
362
350
def list_current(transport):
363
return [d for d in transport.list_dir('') if d != '.bzr']
364
def evaluate(bzrdir):
351
return [d for d in transport.list_dir('')
352
if not controldir.is_control_filename(d)]
353
def evaluate(controldir):
366
tree = bzrdir.open_workingtree()
355
tree = controldir.open_workingtree()
367
356
except errors.NoWorkingTree:
368
357
return True, None
370
359
return True, tree
371
transport = get_transport(location)
372
iterator = bzrdir.BzrDir.find_bzrdirs(transport, evaluate=evaluate,
360
t = transport.get_transport(location)
361
iterator = controldir.ControlDir.find_controldirs(t, evaluate=evaluate,
373
362
list_current=list_current)
374
return [t for t in iterator if t is not None]
376
# should be deprecated - this is slow and in any case treating them as a
377
# container is (we now know) bad style -- mbp 20070302
378
## @deprecated_method(zero_fifteen)
380
"""Iterate through file_ids for this tree.
382
file_ids are in a WorkingTree if they are in the working inventory
383
and the working file exists.
385
inv = self._inventory
386
for path, ie in inv.iter_entries():
387
if osutils.lexists(self.abspath(path)):
390
def all_file_ids(self):
391
"""See Tree.iter_all_file_ids"""
392
return set(self.inventory)
363
return [tr for tr in iterator if tr is not None]
394
365
def __repr__(self):
395
366
return "<%s of %s>" % (self.__class__.__name__,
396
367
getattr(self, 'basedir', None))
398
369
def abspath(self, filename):
399
return pathjoin(self.basedir, filename)
370
return osutils.pathjoin(self.basedir, filename)
401
372
def basis_tree(self):
402
373
"""Return RevisionTree for the current last revision.
557
474
parents.append(revision_id)
561
477
def get_root_id(self):
562
478
"""Return the id of this trees root"""
563
return self._inventory.root.file_id
565
def _get_store_filename(self, file_id):
566
## XXX: badly named; this is not in the store at all
567
return self.abspath(self.id2path(file_id))
570
def clone(self, to_bzrdir, revision_id=None):
479
raise NotImplementedError(self.get_root_id)
481
def clone(self, to_controldir, revision_id=None):
571
482
"""Duplicate this working tree into to_bzr, including all state.
573
484
Specifically modified files are kept as modified, but
574
485
ignored and unknown files are discarded.
576
If you want to make a new line of development, see bzrdir.sprout()
487
If you want to make a new line of development, see ControlDir.sprout()
579
490
If not None, the cloned tree will have its last revision set to
580
491
revision, and difference between the source trees last revision
581
492
and this one merged in.
583
# assumes the target bzr dir format is compatible.
584
result = to_bzrdir.create_workingtree()
585
self.copy_content_into(result, revision_id)
494
with self.lock_read():
495
# assumes the target bzr dir format is compatible.
496
result = to_controldir.create_workingtree()
497
self.copy_content_into(result, revision_id)
589
500
def copy_content_into(self, tree, revision_id=None):
590
501
"""Copy the current content and user files of this tree into tree."""
591
tree.set_root_id(self.get_root_id())
592
if revision_id is None:
593
merge.transform_tree(tree, self)
595
# TODO now merge from tree.last_revision to revision (to preserve
596
# user local changes)
597
merge.transform_tree(tree, self)
598
tree.set_parent_ids([revision_id])
502
with self.lock_read():
503
tree.set_root_id(self.get_root_id())
504
if revision_id is None:
505
merge.transform_tree(tree, self)
507
# TODO now merge from tree.last_revision to revision (to
508
# preserve user local changes)
510
other_tree = self.revision_tree(revision_id)
511
except errors.NoSuchRevision:
512
other_tree = self.branch.repository.revision_tree(
515
merge.transform_tree(tree, other_tree)
516
if revision_id == _mod_revision.NULL_REVISION:
519
new_parents = [revision_id]
520
tree.set_parent_ids(new_parents)
600
522
def id2abspath(self, file_id):
601
523
return self.abspath(self.id2path(file_id))
603
def has_id(self, file_id):
604
# files that have been deleted are excluded
606
if not inv.has_id(file_id):
608
path = inv.id2path(file_id)
609
return osutils.lexists(self.abspath(path))
611
def has_or_had_id(self, file_id):
612
if file_id == self.inventory.root.file_id:
614
return self.inventory.has_id(file_id)
616
__contains__ = has_id
618
525
def get_file_size(self, file_id):
619
526
"""See Tree.get_file_size"""
620
527
# XXX: this returns the on-disk size; it should probably return the
623
530
return os.path.getsize(self.id2abspath(file_id))
625
532
if e.errno != errno.ENOENT:
631
def get_file_sha1(self, file_id, path=None, stat_value=None):
633
path = self._inventory.id2path(file_id)
634
return self._hashcache.get_sha1(path, stat_value)
636
def get_file_mtime(self, file_id, path=None):
638
path = self.inventory.id2path(file_id)
639
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
if not supports_executable():
654
def is_executable(self, file_id, path=None):
655
return self._inventory[file_id].executable
657
_is_executable_from_path_and_stat = \
658
_is_executable_from_path_and_stat_from_basis
660
def is_executable(self, file_id, path=None):
662
path = self.id2path(file_id)
663
mode = os.lstat(self.abspath(path)).st_mode
664
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
def _add(self, files, ids, kinds):
671
"""See MutableTree._add."""
672
# TODO: Re-adding a file that is removed in the working copy
673
# should probably put it back with the previous ID.
674
# the read and write working inventory should not occur in this
675
# function - they should be part of lock_write and unlock.
677
for f, file_id, kind in zip(files, ids, kinds):
679
inv.add_path(f, kind=kind)
681
inv.add_path(f, kind=kind, file_id=file_id)
682
self._inventory_is_modified = True
684
@needs_tree_write_lock
685
537
def _gather_kinds(self, files, kinds):
686
538
"""See MutableTree._gather_kinds."""
687
for pos, f in enumerate(files):
688
if kinds[pos] is None:
689
fullpath = normpath(self.abspath(f))
691
kinds[pos] = file_kind(fullpath)
693
if e.errno == errno.ENOENT:
694
raise errors.NoSuchFile(fullpath)
539
with self.lock_tree_write():
540
for pos, f in enumerate(files):
541
if kinds[pos] is None:
542
fullpath = osutils.normpath(self.abspath(f))
544
kinds[pos] = osutils.file_kind(fullpath)
546
if e.errno == errno.ENOENT:
547
raise errors.NoSuchFile(fullpath)
697
549
def add_parent_tree_id(self, revision_id, allow_leftmost_as_ghost=False):
698
550
"""Add revision_id as a parent.
828
680
:param revision_ids: The revision_ids to set as the parent ids of this
829
681
working tree. Any of these may be ghosts.
831
self._check_parents_for_ghosts(revision_ids,
832
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
if len(revision_ids) > 0:
839
self.set_last_revision(revision_ids[0])
841
self.set_last_revision(_mod_revision.NULL_REVISION)
843
self._set_merges_from_parent_ids(revision_ids)
845
@needs_tree_write_lock
846
def set_parent_trees(self, parents_list, allow_leftmost_as_ghost=False):
847
"""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)
852
self._check_parents_for_ghosts(parent_ids,
853
allow_leftmost_as_ghost=allow_leftmost_as_ghost)
855
parent_ids = self._filter_parent_ids_by_ancestry(parent_ids)
857
if len(parent_ids) == 0:
858
leftmost_parent_id = _mod_revision.NULL_REVISION
859
leftmost_parent_tree = None
861
leftmost_parent_id, leftmost_parent_tree = parents_list[0]
863
if self._change_last_revision(leftmost_parent_id):
864
if leftmost_parent_tree is None:
865
# If we don't have a tree, fall back to reading the
866
# parent tree from the repository.
867
self._cache_basis_inventory(leftmost_parent_id)
683
with self.lock_tree_write():
684
self._check_parents_for_ghosts(revision_ids,
685
allow_leftmost_as_ghost=allow_leftmost_as_ghost)
686
for revision_id in revision_ids:
687
_mod_revision.check_not_reserved_id(revision_id)
689
revision_ids = self._filter_parent_ids_by_ancestry(revision_ids)
691
if len(revision_ids) > 0:
692
self.set_last_revision(revision_ids[0])
869
inv = leftmost_parent_tree.inventory
870
xml = self._create_basis_xml_from_inventory(
871
leftmost_parent_id, inv)
872
self._write_basis_inventory(xml)
873
self._set_merges_from_parent_ids(parent_ids)
875
@needs_tree_write_lock
694
self.set_last_revision(_mod_revision.NULL_REVISION)
696
self._set_merges_from_parent_ids(revision_ids)
876
698
def set_pending_merges(self, rev_list):
877
parents = self.get_parent_ids()
878
leftmost = parents[:1]
879
new_parents = leftmost + rev_list
880
self.set_parent_ids(new_parents)
699
with self.lock_tree_write():
700
parents = self.get_parent_ids()
701
leftmost = parents[:1]
702
new_parents = leftmost + rev_list
703
self.set_parent_ids(new_parents)
882
@needs_tree_write_lock
883
705
def set_merge_modified(self, modified_hashes):
885
for file_id, hash in modified_hashes.iteritems():
886
yield Stanza(file_id=file_id.decode('utf8'), hash=hash)
887
self._put_rio('merge-hashes', iter_stanzas(), MERGE_MODIFIED_HEADER_1)
706
"""Set the merge modified hashes."""
707
raise NotImplementedError(self.set_merge_modified)
889
709
def _sha_from_stat(self, path, stat_result):
890
710
"""Get a sha digest from the tree's stat cache.
913
726
of the branch when it is supplied. If None, to_revision defaults to
914
727
branch.last_revision().
916
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()
729
from .merge import Merger, Merge3Merger
730
with self.lock_write():
731
merger = Merger(self.branch, this_tree=self)
732
# check that there are no local alterations
733
if not force and self.has_changes():
734
raise errors.UncommittedChanges(self)
735
if to_revision is None:
736
to_revision = _mod_revision.ensure_null(branch.last_revision())
737
merger.other_rev_id = to_revision
738
if _mod_revision.is_null(merger.other_rev_id):
739
raise errors.NoCommits(branch)
740
self.branch.fetch(branch, last_revision=merger.other_rev_id)
741
merger.other_basis = merger.other_rev_id
742
merger.other_tree = self.branch.repository.revision_tree(
744
merger.other_branch = branch
745
if from_revision is None:
748
merger.set_base_revision(from_revision, branch)
749
if merger.base_rev_id == merger.other_rev_id:
750
raise errors.PointlessMerge
751
merger.backup_files = False
752
if merge_type is None:
753
merger.merge_type = Merge3Merger
755
merger.merge_type = merge_type
756
merger.set_interesting_files(None)
757
merger.show_base = False
758
merger.reprocess = False
759
conflicts = merger.do_merge()
950
763
def merge_modified(self):
951
764
"""Return a dictionary of files modified by a merge.
957
770
This returns a map of file_id->sha1, containing only files which are
958
771
still in the working inventory and have that text hash.
961
hashfile = self._transport.get('merge-hashes')
962
except errors.NoSuchFile:
967
if hashfile.next() != MERGE_MODIFIED_HEADER_1 + '\n':
968
raise errors.MergeModifiedFormatError()
969
except StopIteration:
970
raise errors.MergeModifiedFormatError()
971
for s in RioReader(hashfile):
972
# RioReader reads in Unicode, so convert file_ids back to utf8
973
file_id = osutils.safe_file_id(s.get("file_id"), warn=False)
974
if file_id not in self.inventory:
976
text_hash = s.get("hash")
977
if text_hash == self.get_file_sha1(file_id):
978
merge_hashes[file_id] = text_hash
773
raise NotImplementedError(self.merge_modified)
984
775
def mkdir(self, path, file_id=None):
985
776
"""See MutableTree.mkdir()."""
986
777
if file_id is None:
987
778
file_id = generate_ids.gen_file_id(os.path.basename(path))
988
os.mkdir(self.abspath(path))
989
self.add(path, file_id, 'directory')
779
elif not self.supports_setting_file_ids():
780
raise SettingFileIdUnsupported()
781
with self.lock_write():
782
os.mkdir(self.abspath(path))
783
self.add(path, file_id, 'directory')
992
def get_symlink_target(self, file_id):
993
abspath = self.id2abspath(file_id)
786
def get_symlink_target(self, file_id, path=None):
788
abspath = self.abspath(path)
790
abspath = self.id2abspath(file_id)
994
791
target = osutils.readlink(abspath)
998
794
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()
795
raise NotImplementedError(self.subsume)
1039
797
def _setup_directory_is_tree_reference(self):
1040
798
if self._branch.repository._format.supports_tree_reference:
1062
820
# checkout in a subdirectory. This can be avoided by not adding
1063
821
# it. mbp 20070306
1065
@needs_tree_write_lock
1066
823
def extract(self, file_id, format=None):
1067
824
"""Extract a subtree from this tree.
1069
826
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)
828
raise NotImplementedError(self.extract)
1122
830
def flush(self):
1123
"""Write the in memory inventory to disk."""
1124
# TODO: Maybe this should only write on dirty ?
1125
if self._control_files._lock_mode != 'w':
1126
raise errors.NotWriteLocked(self)
1128
self._serialize(self._inventory, sio)
1130
self._transport.put_file('inventory', sio,
1131
mode=self.bzrdir._get_file_mode())
1132
self._inventory_is_modified = False
831
"""Write the in memory meta data to disk."""
832
raise NotImplementedError(self.flush)
1134
834
def _kind(self, relpath):
1135
835
return osutils.file_kind(self.abspath(relpath))
1145
845
:param from_dir: start from this directory or None for the root
1146
846
:param recursive: whether to recurse into subdirectories or not
1148
# list_files is an iterator, so @needs_read_lock doesn't work properly
1149
# with it. So callers should be careful to always read_lock the tree.
1150
if not self.is_locked():
1151
raise errors.ObjectNotLocked(self)
1153
inv = self.inventory
1154
if from_dir is None and include_root is True:
1155
yield ('', 'V', 'directory', inv.root.file_id, inv.root)
1156
# Convert these into local objects to save lookup times
1157
pathjoin = osutils.pathjoin
1158
file_kind = self._kind
1160
# transport.base ends in a slash, we want the piece
1161
# between the last two slashes
1162
transport_base_dir = self.bzrdir.transport.base.rsplit('/', 2)[1]
1164
fk_entries = {'directory':TreeDirectory, 'file':TreeFile, 'symlink':TreeLink}
1166
# 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)
1178
# jam 20060527 The kernel sized tree seems equivalent whether we
1179
# use a deque and popleft to keep them sorted, or if we use a plain
1180
# list and just reverse() them.
1181
children = collections.deque(children)
1182
stack = [(from_dir_id, u'', from_dir_abspath, children)]
1184
from_dir_id, from_dir_relpath, from_dir_abspath, children = stack[-1]
1187
f = children.popleft()
1188
## TODO: If we find a subdirectory with its own .bzr
1189
## directory, then that is a separate tree and we
1190
## should exclude it.
1192
# the bzrdir for this tree
1193
if transport_base_dir == f:
1196
# we know that from_dir_relpath and from_dir_abspath never end in a slash
1197
# and 'f' doesn't begin with one, we can do a string op, rather
1198
# than the checks of pathjoin(), all relative paths will have an extra slash
1200
fp = from_dir_relpath + '/' + f
1203
fap = from_dir_abspath + '/' + f
1205
f_ie = inv.get_child(from_dir_id, f)
1208
elif self.is_ignored(fp[1:]):
1211
# we may not have found this file, because of a unicode issue
1212
f_norm, can_access = osutils.normalized_filename(f)
1213
if f == f_norm or not can_access:
1214
# No change, so treat this file normally
1217
# this file can be accessed by a normalized path
1218
# check again if it is versioned
1219
# these lines are repeated here for performance
1221
fp = from_dir_relpath + '/' + f
1222
fap = from_dir_abspath + '/' + f
1223
f_ie = inv.get_child(from_dir_id, f)
1226
elif self.is_ignored(fp[1:]):
1233
# make a last minute entry
1235
yield fp[1:], c, fk, f_ie.file_id, f_ie
1238
yield fp[1:], c, fk, None, fk_entries[fk]()
1240
yield fp[1:], c, fk, None, TreeEntry()
1243
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
1256
# if we finished all children, pop it off the stack
1259
@needs_tree_write_lock
1260
def move(self, from_paths, to_dir=None, after=False, **kwargs):
848
raise NotImplementedError(self.list_files)
850
def move(self, from_paths, to_dir=None, after=False):
1261
851
"""Rename files.
1263
to_dir must exist in the inventory.
853
to_dir must be known to the working tree.
1265
855
If to_dir exists and is a directory, the files are moved into
1266
856
it, keeping their old names.
1292
881
This returns a list of (from_path, to_path) pairs for each
1293
882
entry that is moved.
1298
# check for deprecated use of signature
1300
to_dir = kwargs.get('to_name', None)
1302
raise TypeError('You must supply a target directory')
1304
symbol_versioning.warn('The parameter to_name was deprecated'
1305
' in version 0.13. Use to_dir instead',
1308
# check destination directory
1309
if isinstance(from_paths, basestring):
1311
inv = self.inventory
1312
to_abs = self.abspath(to_dir)
1313
if not isdir(to_abs):
1314
raise errors.BzrMoveFailedError('',to_dir,
1315
errors.NotADirectory(to_abs))
1316
if not self.has_filename(to_dir):
1317
raise errors.BzrMoveFailedError('',to_dir,
1318
errors.NotInWorkingDirectory(to_dir))
1319
to_dir_id = inv.path2id(to_dir)
1320
if to_dir_id is None:
1321
raise errors.BzrMoveFailedError('',to_dir,
1322
errors.NotVersionedError(path=str(to_dir)))
1324
to_dir_ie = inv[to_dir_id]
1325
if to_dir_ie.kind != 'directory':
1326
raise errors.BzrMoveFailedError('',to_dir,
1327
errors.NotADirectory(to_abs))
1329
# create rename entries and tuples
1330
for from_rel in from_paths:
1331
from_tail = splitpath(from_rel)[-1]
1332
from_id = inv.path2id(from_rel)
1334
raise errors.BzrMoveFailedError(from_rel,to_dir,
1335
errors.NotVersionedError(path=str(from_rel)))
1337
from_entry = inv[from_id]
1338
from_parent_id = from_entry.parent_id
1339
to_rel = pathjoin(to_dir, from_tail)
1340
rename_entry = WorkingTree._RenameEntry(from_rel=from_rel,
1342
from_tail=from_tail,
1343
from_parent_id=from_parent_id,
1344
to_rel=to_rel, to_tail=from_tail,
1345
to_parent_id=to_dir_id)
1346
rename_entries.append(rename_entry)
1347
rename_tuples.append((from_rel, to_rel))
1349
# determine which move mode to use. checks also for movability
1350
rename_entries = self._determine_mv_mode(rename_entries, after)
1352
original_modified = self._inventory_is_modified
1355
self._inventory_is_modified = True
1356
self._move(rename_entries)
1358
# restore the inventory on error
1359
self._inventory_is_modified = original_modified
1361
self._write_inventory(inv)
1362
return rename_tuples
1364
def _determine_mv_mode(self, rename_entries, after=False):
1365
"""Determines for each from-to pair if both inventory and working tree
1366
or only the inventory has to be changed.
1368
Also does basic plausability tests.
1370
inv = self.inventory
1372
for rename_entry in rename_entries:
1373
# store to local variables for easier reference
1374
from_rel = rename_entry.from_rel
1375
from_id = rename_entry.from_id
1376
to_rel = rename_entry.to_rel
1377
to_id = inv.path2id(to_rel)
1378
only_change_inv = False
1380
# check the inventory for source and destination
1382
raise errors.BzrMoveFailedError(from_rel,to_rel,
1383
errors.NotVersionedError(path=str(from_rel)))
1384
if to_id is not None:
1385
raise errors.BzrMoveFailedError(from_rel,to_rel,
1386
errors.AlreadyVersionedError(path=str(to_rel)))
1388
# try to determine the mode for rename (only change inv or change
1389
# inv and file system)
1391
if not self.has_filename(to_rel):
1392
raise errors.BzrMoveFailedError(from_id,to_rel,
1393
errors.NoSuchFile(path=str(to_rel),
1394
extra="New file has not been created yet"))
1395
only_change_inv = True
1396
elif not self.has_filename(from_rel) and self.has_filename(to_rel):
1397
only_change_inv = True
1398
elif self.has_filename(from_rel) and not self.has_filename(to_rel):
1399
only_change_inv = False
1400
elif (not self.case_sensitive
1401
and from_rel.lower() == to_rel.lower()
1402
and self.has_filename(from_rel)):
1403
only_change_inv = False
1405
# something is wrong, so lets determine what exactly
1406
if not self.has_filename(from_rel) and \
1407
not self.has_filename(to_rel):
1408
raise errors.BzrRenameFailedError(from_rel,to_rel,
1409
errors.PathsDoNotExist(paths=(str(from_rel),
1412
raise errors.RenameFailedFilesExist(from_rel, to_rel)
1413
rename_entry.only_change_inv = only_change_inv
1414
return rename_entries
1416
def _move(self, rename_entries):
1417
"""Moves a list of files.
1419
Depending on the value of the flag 'only_change_inv', the
1420
file will be moved on the file system or not.
1422
inv = self.inventory
1425
for entry in rename_entries:
1427
self._move_entry(entry)
1429
self._rollback_move(moved)
1433
def _rollback_move(self, moved):
1434
"""Try to rollback a previous move in case of an filesystem error."""
1435
inv = self.inventory
1438
self._move_entry(WorkingTree._RenameEntry(
1439
entry.to_rel, entry.from_id,
1440
entry.to_tail, entry.to_parent_id, entry.from_rel,
1441
entry.from_tail, entry.from_parent_id,
1442
entry.only_change_inv))
1443
except errors.BzrMoveFailedError, e:
1444
raise errors.BzrMoveFailedError( '', '', "Rollback failed."
1445
" The working tree is in an inconsistent state."
1446
" Please consider doing a 'bzr revert'."
1447
" Error message is: %s" % e)
1449
def _move_entry(self, entry):
1450
inv = self.inventory
1451
from_rel_abs = self.abspath(entry.from_rel)
1452
to_rel_abs = self.abspath(entry.to_rel)
1453
if from_rel_abs == to_rel_abs:
1454
raise errors.BzrMoveFailedError(entry.from_rel, entry.to_rel,
1455
"Source and target are identical.")
1457
if not entry.only_change_inv:
1459
osutils.rename(from_rel_abs, to_rel_abs)
1461
raise errors.BzrMoveFailedError(entry.from_rel,
1463
inv.rename(entry.from_id, entry.to_parent_id, entry.to_tail)
1465
@needs_tree_write_lock
884
raise NotImplementedError(self.move)
1466
886
def rename_one(self, from_rel, to_rel, after=False):
1467
887
"""Rename one file.
1487
906
Everything else results in an error.
1489
inv = self.inventory
1492
# create rename entries and tuples
1493
from_tail = splitpath(from_rel)[-1]
1494
from_id = inv.path2id(from_rel)
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]
1507
from_parent_id = from_entry.parent_id
1508
to_dir, to_tail = os.path.split(to_rel)
1509
to_dir_id = inv.path2id(to_dir)
1510
rename_entry = WorkingTree._RenameEntry(from_rel=from_rel,
1512
from_tail=from_tail,
1513
from_parent_id=from_parent_id,
1514
to_rel=to_rel, to_tail=to_tail,
1515
to_parent_id=to_dir_id)
1516
rename_entries.append(rename_entry)
1518
# determine which move mode to use. checks also for movability
1519
rename_entries = self._determine_mv_mode(rename_entries, after)
1521
# check if the target changed directory and if the target directory is
1523
if to_dir_id is None:
1524
raise errors.BzrMoveFailedError(from_rel,to_rel,
1525
errors.NotVersionedError(path=str(to_dir)))
1527
# all checks done. now we can continue with our actual work
1528
mutter('rename_one:\n'
1533
' to_dir_id {%s}\n',
1534
from_id, from_rel, to_rel, to_dir, to_dir_id)
1536
self._move(rename_entries)
1537
self._write_inventory(inv)
1539
class _RenameEntry(object):
1540
def __init__(self, from_rel, from_id, from_tail, from_parent_id,
1541
to_rel, to_tail, to_parent_id, only_change_inv=False):
1542
self.from_rel = from_rel
1543
self.from_id = from_id
1544
self.from_tail = from_tail
1545
self.from_parent_id = from_parent_id
1546
self.to_rel = to_rel
1547
self.to_tail = to_tail
1548
self.to_parent_id = to_parent_id
1549
self.only_change_inv = only_change_inv
908
raise NotImplementedError(self.rename_one)
1552
910
def unknowns(self):
1553
911
"""Return all unknown files.
1555
913
These are files in the working directory that are not versioned or
1556
914
control files or ignored.
1558
# force the extras method to be fully executed before returning, to
1559
# prevent race conditions with the lock
1561
[subp for subp in self.extras() if not self.is_ignored(subp)])
916
with self.lock_read():
917
# force the extras method to be fully executed before returning, to
918
# prevent race conditions with the lock
920
[subp for subp in self.extras() if not self.is_ignored(subp)])
1563
@needs_tree_write_lock
1564
922
def unversion(self, file_ids):
1565
923
"""Remove the file ids in file_ids from the current versioned set.
1859
1098
when their last revision is set.
1861
1100
if _mod_revision.is_null(new_revision):
1862
self.branch.set_revision_history([])
1101
self.branch.set_last_revision_info(0, new_revision)
1103
_mod_revision.check_not_reserved_id(new_revision)
1865
1105
self.branch.generate_revision_history(new_revision)
1866
1106
except errors.NoSuchRevision:
1867
1107
# not present in the repo - dont try to set it deeper than the tip
1868
self.branch.set_revision_history([new_revision])
1108
self.branch._set_revision_history([new_revision])
1871
def _write_basis_inventory(self, xml):
1872
"""Write the basis inventory XML to the basis-inventory file"""
1873
path = self._basis_inventory_name()
1875
self._transport.put_file(path, sio,
1876
mode=self.bzrdir._get_file_mode())
1878
def _create_basis_xml_from_inventory(self, revision_id, inventory):
1879
"""Create the text that will be saved in basis-inventory"""
1880
inventory.revision_id = revision_id
1881
return xml7.serializer_v7.write_inventory_to_string(inventory)
1883
def _cache_basis_inventory(self, new_revision):
1884
"""Cache new_revision as the basis inventory."""
1885
# TODO: this should allow the ready-to-use inventory to be passed in,
1886
# as commit already has that ready-to-use [while the format is the
1889
# this double handles the inventory - unpack and repack -
1890
# but is easier to understand. We can/should put a conditional
1891
# in here based on whether the inventory is in the latest format
1892
# - perhaps we should repack all inventories on a repository
1894
# the fast path is to copy the raw xml from the repository. If the
1895
# xml contains 'revision_id="', then we assume the right
1896
# revision_id is set. We must check for this full string, because a
1897
# root node id can legitimately look like 'revision_id' but cannot
1899
xml = self.branch.repository._get_inventory_xml(new_revision)
1900
firstline = xml.split('\n', 1)[0]
1901
if (not 'revision_id="' in firstline or
1902
'format="7"' not in firstline):
1903
inv = self.branch.repository._serializer.read_inventory_from_string(
1905
xml = self._create_basis_xml_from_inventory(new_revision, inv)
1906
self._write_basis_inventory(xml)
1907
except (errors.NoSuchRevision, errors.RevisionNotPresent):
1910
def read_basis_inventory(self):
1911
"""Read the cached basis inventory."""
1912
path = self._basis_inventory_name()
1913
return self._transport.get_bytes(path)
1916
def read_working_inventory(self):
1917
"""Read the working inventory.
1919
:raises errors.InventoryModified: read_working_inventory will fail
1920
when the current in memory inventory has been modified.
1922
# conceptually this should be an implementation detail of the tree.
1923
# XXX: Deprecate this.
1924
# ElementTree does its own conversion from UTF-8, so open in
1926
if self._inventory_is_modified:
1927
raise errors.InventoryModified(self)
1928
f = self._transport.get('inventory')
1930
result = self._deserialize(f)
1933
self._set_inventory(result, dirty=False)
1936
@needs_tree_write_lock
1937
1111
def remove(self, files, verbose=False, to_file=None, keep_files=True,
1939
"""Remove nominated files from the working inventory.
1113
"""Remove nominated files from the working tree metadata.
1941
1115
:files: File paths relative to the basedir.
1942
1116
:keep_files: If true, the files will also be kept.
1943
1117
:force: Delete files and directories, even if they are changed and
1944
1118
even if the directories are not empty.
1946
if isinstance(files, basestring):
1120
if isinstance(files, (str, text_type)):
1947
1121
files = [files]
1125
all_files = set() # specified and nested files
1952
1126
unknown_nested_files=set()
1953
1127
if to_file is None:
1954
1128
to_file = sys.stdout
1130
files_to_backup = []
1956
1132
def recurse_directory_to_add_files(directory):
1957
1133
# Recurse directory and add all files
1958
1134
# so we can check if they have changed.
1959
for parent_info, file_infos in\
1960
self.walkdirs(directory):
1135
for parent_info, file_infos in self.walkdirs(directory):
1961
1136
for relpath, basename, kind, lstat, fileid, kind in file_infos:
1962
1137
# Is it versioned or ignored?
1963
if self.path2id(relpath) or self.is_ignored(relpath):
1138
if self.path2id(relpath):
1964
1139
# Add nested content for deletion.
1965
new_files.add(relpath)
1140
all_files.add(relpath)
1967
# Files which are not versioned and not ignored
1142
# Files which are not versioned
1968
1143
# should be treated as unknown.
1969
unknown_nested_files.add((relpath, None, kind))
1971
for filename in files:
1972
# Get file name into canonical form.
1973
abspath = self.abspath(filename)
1974
filename = self.relpath(abspath)
1975
if len(filename) > 0:
1976
new_files.add(filename)
1977
recurse_directory_to_add_files(filename)
1979
files = list(new_files)
1982
return # nothing to do
1984
# Sort needed to first handle directory content before the directory
1985
files.sort(reverse=True)
1987
# Bail out if we are going to delete files we shouldn't
1988
if not keep_files and not force:
1989
has_changed_files = len(unknown_nested_files) > 0
1990
if not has_changed_files:
1144
files_to_backup.append(relpath)
1146
with self.lock_tree_write():
1147
for filename in files:
1148
# Get file name into canonical form.
1149
abspath = self.abspath(filename)
1150
filename = self.relpath(abspath)
1151
if len(filename) > 0:
1152
all_files.add(filename)
1153
recurse_directory_to_add_files(filename)
1155
files = list(all_files)
1158
return # nothing to do
1160
# Sort needed to first handle directory content before the directory
1161
files.sort(reverse=True)
1163
# Bail out if we are going to delete files we shouldn't
1164
if not keep_files and not force:
1991
1165
for (file_id, path, content_change, versioned, parent_id, name,
1992
1166
kind, executable) in self.iter_changes(self.basis_tree(),
1993
1167
include_unchanged=True, require_versioned=False,
1994
1168
want_unversioned=True, specific_files=files):
1995
if versioned == (False, False):
1996
# The record is unknown ...
1997
if not self.is_ignored(path[1]):
1998
# ... but not ignored
1999
has_changed_files = True
2001
elif content_change and (kind[1] is not None):
2002
# Versioned and changed, but not deleted
2003
has_changed_files = True
2006
if has_changed_files:
2007
# Make delta show ALL applicable changes in error message.
2008
tree_delta = self.changes_from(self.basis_tree(),
2009
require_versioned=False, want_unversioned=True,
2010
specific_files=files)
2011
for unknown_file in unknown_nested_files:
2012
if unknown_file not in tree_delta.unversioned:
2013
tree_delta.unversioned.extend((unknown_file,))
2014
raise errors.BzrRemoveChangedFilesError(tree_delta)
2016
# Build inv_delta and delete files where applicable,
2017
# do this before any modifications to inventory.
2019
fid = self.path2id(f)
2022
message = "%s is not versioned." % (f,)
2025
# having removed it, it must be either ignored or unknown
2026
if self.is_ignored(f):
2030
# XXX: Really should be a more abstract reporter interface
2031
kind_ch = osutils.kind_marker(self.kind(fid))
2032
to_file.write(new_status + ' ' + f + kind_ch + '\n')
2034
inv_delta.append((f, None, fid, None))
2035
message = "removed %s" % (f,)
2038
abs_path = self.abspath(f)
2039
if osutils.lexists(abs_path):
2040
if (osutils.isdir(abs_path) and
2041
len(os.listdir(abs_path)) > 0):
2043
osutils.rmtree(abs_path)
2045
message = "%s is not an empty directory "\
2046
"and won't be deleted." % (f,)
2048
osutils.delete_any(abs_path)
2049
message = "deleted %s" % (f,)
2050
elif message is not None:
2051
# Only care if we haven't done anything yet.
2052
message = "%s does not exist." % (f,)
2054
# Print only one message (if any) per file.
2055
if message is not None:
2057
self.apply_inventory_delta(inv_delta)
2059
@needs_tree_write_lock
1169
if versioned[0] == False:
1170
# The record is unknown or newly added
1171
files_to_backup.append(path[1])
1172
elif (content_change and (kind[1] is not None) and
1173
osutils.is_inside_any(files, path[1])):
1174
# Versioned and changed, but not deleted, and still
1175
# in one of the dirs to be deleted.
1176
files_to_backup.append(path[1])
1178
def backup(file_to_backup):
1179
backup_name = self.controldir._available_backup_name(file_to_backup)
1180
osutils.rename(abs_path, self.abspath(backup_name))
1181
return "removed %s (but kept a copy: %s)" % (file_to_backup,
1184
# Build inv_delta and delete files where applicable,
1185
# do this before any modifications to meta data.
1187
fid = self.path2id(f)
1190
message = "%s is not versioned." % (f,)
1193
# having removed it, it must be either ignored or unknown
1194
if self.is_ignored(f):
1198
# XXX: Really should be a more abstract reporter interface
1199
kind_ch = osutils.kind_marker(self.kind(fid))
1200
to_file.write(new_status + ' ' + f + kind_ch + '\n')
1202
inv_delta.append((f, None, fid, None))
1203
message = "removed %s" % (f,)
1206
abs_path = self.abspath(f)
1207
if osutils.lexists(abs_path):
1208
if (osutils.isdir(abs_path) and
1209
len(os.listdir(abs_path)) > 0):
1211
osutils.rmtree(abs_path)
1212
message = "deleted %s" % (f,)
1216
if f in files_to_backup:
1219
osutils.delete_any(abs_path)
1220
message = "deleted %s" % (f,)
1221
elif message is not None:
1222
# Only care if we haven't done anything yet.
1223
message = "%s does not exist." % (f,)
1225
# Print only one message (if any) per file.
1226
if message is not None:
1228
self.apply_inventory_delta(inv_delta)
2060
1230
def revert(self, filenames=None, old_tree=None, backups=True,
2061
1231
pb=None, report_changes=False):
2062
from bzrlib.conflicts import resolve
2065
symbol_versioning.warn('Using [] to revert all files is deprecated'
2066
' as of bzr 0.91. Please use None (the default) instead.',
2067
DeprecationWarning, stacklevel=2)
2068
if old_tree is None:
2069
basis_tree = self.basis_tree()
2070
basis_tree.lock_read()
2071
old_tree = basis_tree
2075
conflicts = transform.revert(self, old_tree, filenames, backups, pb,
2077
if filenames is None and len(self.get_parent_ids()) > 1:
2079
last_revision = self.last_revision()
2080
if last_revision != _mod_revision.NULL_REVISION:
2081
if basis_tree is None:
2082
basis_tree = self.basis_tree()
2083
basis_tree.lock_read()
2084
parent_trees.append((last_revision, basis_tree))
2085
self.set_parent_trees(parent_trees)
1232
from .conflicts import resolve
1233
with self.lock_tree_write():
1234
if old_tree is None:
1235
basis_tree = self.basis_tree()
1236
basis_tree.lock_read()
1237
old_tree = basis_tree
2088
resolve(self, filenames, ignore_misses=True, recursive=True)
2090
if basis_tree is not None:
1241
conflicts = transform.revert(self, old_tree, filenames, backups, pb,
1243
if filenames is None and len(self.get_parent_ids()) > 1:
1245
last_revision = self.last_revision()
1246
if last_revision != _mod_revision.NULL_REVISION:
1247
if basis_tree is None:
1248
basis_tree = self.basis_tree()
1249
basis_tree.lock_read()
1250
parent_trees.append((last_revision, basis_tree))
1251
self.set_parent_trees(parent_trees)
1254
resolve(self, filenames, ignore_misses=True, recursive=True)
1256
if basis_tree is not None:
1260
def store_uncommitted(self):
1261
"""Store uncommitted changes from the tree in the branch."""
1262
with self.lock_write():
1263
target_tree = self.basis_tree()
1264
shelf_creator = shelf.ShelfCreator(self, target_tree)
1266
if not shelf_creator.shelve_all():
1268
self.branch.store_uncommitted(shelf_creator)
1269
shelf_creator.transform()
1271
shelf_creator.finalize()
1272
note('Uncommitted changes stored in branch "%s".', self.branch.nick)
1274
def restore_uncommitted(self):
1275
"""Restore uncommitted changes from the branch into the tree."""
1276
with self.lock_write():
1277
unshelver = self.branch.get_unshelver(self)
1278
if unshelver is None:
1281
merger = unshelver.make_merger()
1282
merger.ignore_zero = True
1284
self.branch.store_uncommitted(None)
1286
unshelver.finalize()
2094
1288
def revision_tree(self, revision_id):
2095
1289
"""See Tree.revision_tree.
2253
1393
# We MUST save it even if an error occurs, because otherwise the users
2254
1394
# local work is unreferenced and will appear to have been lost.
2258
last_rev = self.get_parent_ids()[0]
2260
last_rev = _mod_revision.NULL_REVISION
2261
if revision is None:
2262
revision = self.branch.last_revision()
2264
old_tip = old_tip or _mod_revision.NULL_REVISION
2266
if not _mod_revision.is_null(old_tip) and old_tip != last_rev:
2267
# the branch we are bound to was updated
2268
# merge those changes in first
2269
base_tree = self.basis_tree()
2270
other_tree = self.branch.repository.revision_tree(old_tip)
2271
nb_conflicts = merge.merge_inner(self.branch, other_tree,
2272
base_tree, this_tree=self,
2273
change_reporter=change_reporter)
2275
self.add_parent_tree((old_tip, other_tree))
2276
trace.note('Rerun update after fixing the conflicts.')
2279
if last_rev != _mod_revision.ensure_null(revision):
2280
# the working tree is up to date with the branch
2281
# we can merge the specified revision from master
2282
to_tree = self.branch.repository.revision_tree(revision)
2283
to_root_id = to_tree.get_root_id()
2285
basis = self.basis_tree()
2288
if (basis.inventory.root is None
2289
or basis.inventory.root.file_id != to_root_id):
2290
self.set_root_id(to_root_id)
2295
# determine the branch point
2296
graph = self.branch.repository.get_graph()
2297
base_rev_id = graph.find_unique_lca(self.branch.last_revision(),
2299
base_tree = self.branch.repository.revision_tree(base_rev_id)
2301
nb_conflicts = merge.merge_inner(self.branch, to_tree, base_tree,
2303
change_reporter=change_reporter)
2304
self.set_last_revision(revision)
2305
# TODO - dedup parents list with things merged by pull ?
2306
# reuse the tree we've updated to to set the basis:
2307
parent_trees = [(revision, to_tree)]
2308
merges = self.get_parent_ids()[1:]
2309
# Ideally we ask the tree for the trees here, that way the working
2310
# tree can decide whether to give us the entire tree or give us a
2311
# lazy initialised tree. dirstate for instance will have the trees
2312
# in ram already, whereas a last-revision + basis-inventory tree
2313
# will not, but also does not need them when setting parents.
2314
for parent in merges:
2315
parent_trees.append(
2316
(parent, self.branch.repository.revision_tree(parent)))
2317
if not _mod_revision.is_null(old_tip):
2318
parent_trees.append(
2319
(old_tip, self.branch.repository.revision_tree(old_tip)))
2320
self.set_parent_trees(parent_trees)
2321
last_rev = parent_trees[0][0]
2324
def _write_hashcache_if_dirty(self):
2325
"""Write out the hashcache if it is dirty."""
2326
if self._hashcache.needs_write:
2328
self._hashcache.write()
2330
if e.errno not in (errno.EPERM, errno.EACCES):
2332
# TODO: jam 20061219 Should this be a warning? A single line
2333
# warning might be sufficient to let the user know what
2335
mutter('Could not write hashcache for %s\nError: %s',
2336
self._hashcache.cache_file_name(), e)
2338
@needs_tree_write_lock
2339
def _write_inventory(self, inv):
2340
"""Write inventory as the current inventory."""
2341
self._set_inventory(inv, dirty=True)
1396
with self.lock_tree_write():
1399
last_rev = self.get_parent_ids()[0]
1401
last_rev = _mod_revision.NULL_REVISION
1402
if revision is None:
1403
revision = self.branch.last_revision()
1405
old_tip = old_tip or _mod_revision.NULL_REVISION
1407
if not _mod_revision.is_null(old_tip) and old_tip != last_rev:
1408
# the branch we are bound to was updated
1409
# merge those changes in first
1410
base_tree = self.basis_tree()
1411
other_tree = self.branch.repository.revision_tree(old_tip)
1412
nb_conflicts = merge.merge_inner(self.branch, other_tree,
1413
base_tree, this_tree=self,
1414
change_reporter=change_reporter,
1415
show_base=show_base)
1417
self.add_parent_tree((old_tip, other_tree))
1418
note(gettext('Rerun update after fixing the conflicts.'))
1421
if last_rev != _mod_revision.ensure_null(revision):
1422
# the working tree is up to date with the branch
1423
# we can merge the specified revision from master
1424
to_tree = self.branch.repository.revision_tree(revision)
1425
to_root_id = to_tree.get_root_id()
1427
basis = self.basis_tree()
1428
with basis.lock_read():
1429
if (basis.get_root_id() is None or basis.get_root_id() != to_root_id):
1430
self.set_root_id(to_root_id)
1433
# determine the branch point
1434
graph = self.branch.repository.get_graph()
1435
base_rev_id = graph.find_unique_lca(self.branch.last_revision(),
1437
base_tree = self.branch.repository.revision_tree(base_rev_id)
1439
nb_conflicts = merge.merge_inner(self.branch, to_tree, base_tree,
1441
change_reporter=change_reporter,
1442
show_base=show_base)
1443
self.set_last_revision(revision)
1444
# TODO - dedup parents list with things merged by pull ?
1445
# reuse the tree we've updated to to set the basis:
1446
parent_trees = [(revision, to_tree)]
1447
merges = self.get_parent_ids()[1:]
1448
# Ideally we ask the tree for the trees here, that way the working
1449
# tree can decide whether to give us the entire tree or give us a
1450
# lazy initialised tree. dirstate for instance will have the trees
1451
# in ram already, whereas a last-revision + basis-inventory tree
1452
# will not, but also does not need them when setting parents.
1453
for parent in merges:
1454
parent_trees.append(
1455
(parent, self.branch.repository.revision_tree(parent)))
1456
if not _mod_revision.is_null(old_tip):
1457
parent_trees.append(
1458
(old_tip, self.branch.repository.revision_tree(old_tip)))
1459
self.set_parent_trees(parent_trees)
1460
last_rev = parent_trees[0][0]
2344
1463
def set_conflicts(self, arg):
2345
1464
raise errors.UnsupportedOperation(self.set_conflicts, self)
2605
1668
def get_shelf_manager(self):
2606
1669
"""Return the ShelfManager for this WorkingTree."""
2607
from bzrlib.shelf import ShelfManager
1670
from .shelf import ShelfManager
2608
1671
return ShelfManager(self, self._transport)
2611
class WorkingTree2(WorkingTree):
2612
"""This is the Format 2 working tree.
2614
This was the first weave based working tree.
2615
- uses os locks for locking.
2616
- uses the branch last-revision.
2619
def __init__(self, *args, **kwargs):
2620
super(WorkingTree2, self).__init__(*args, **kwargs)
2621
# WorkingTree2 has more of a constraint that self._inventory must
2622
# exist. Because this is an older format, we don't mind the overhead
2623
# caused by the extra computation here.
2625
# Newer WorkingTree's should only have self._inventory set when they
2627
if self._inventory is None:
2628
self.read_working_inventory()
2630
def _get_check_refs(self):
2631
"""Return the references needed to perform a check of this tree."""
2632
return [('trees', self.last_revision())]
2634
def lock_tree_write(self):
2635
"""See WorkingTree.lock_tree_write().
2637
In Format2 WorkingTrees we have a single lock for the branch and tree
2638
so lock_tree_write() degrades to lock_write().
2640
self.branch.lock_write()
2642
return self._control_files.lock_write()
2644
self.branch.unlock()
2648
# do non-implementation specific cleanup
2651
# we share control files:
2652
if self._control_files._lock_count == 3:
2653
# _inventory_is_modified is always False during a read lock.
2654
if self._inventory_is_modified:
2656
self._write_hashcache_if_dirty()
2658
# reverse order of locking.
2660
return self._control_files.unlock()
2662
self.branch.unlock()
2665
class WorkingTree3(WorkingTree):
2666
"""This is the Format 3 working tree.
2668
This differs from the base WorkingTree by:
2669
- having its own file lock
2670
- having its own last-revision property.
2672
This is new in bzr 0.8
2676
def _last_revision(self):
2677
"""See Mutable.last_revision."""
2679
return self._transport.get_bytes('last-revision')
2680
except errors.NoSuchFile:
2681
return _mod_revision.NULL_REVISION
2683
def _change_last_revision(self, revision_id):
2684
"""See WorkingTree._change_last_revision."""
2685
if revision_id is None or revision_id == _mod_revision.NULL_REVISION:
2687
self._transport.delete('last-revision')
2688
except errors.NoSuchFile:
2692
self._transport.put_bytes('last-revision', revision_id,
2693
mode=self.bzrdir._get_file_mode())
2696
def _get_check_refs(self):
2697
"""Return the references needed to perform a check of this tree."""
2698
return [('trees', self.last_revision())]
2700
@needs_tree_write_lock
2701
def set_conflicts(self, conflicts):
2702
self._put_rio('conflicts', conflicts.to_stanzas(),
2705
@needs_tree_write_lock
2706
def add_conflicts(self, new_conflicts):
2707
conflict_set = set(self.conflicts())
2708
conflict_set.update(set(list(new_conflicts)))
2709
self.set_conflicts(_mod_conflicts.ConflictList(sorted(conflict_set,
2710
key=_mod_conflicts.Conflict.sort_key)))
2713
def conflicts(self):
2715
confile = self._transport.get('conflicts')
2716
except errors.NoSuchFile:
2717
return _mod_conflicts.ConflictList()
2720
if confile.next() != CONFLICT_HEADER_1 + '\n':
2721
raise errors.ConflictFormatError()
2722
except StopIteration:
2723
raise errors.ConflictFormatError()
2724
return _mod_conflicts.ConflictList.from_stanzas(RioReader(confile))
2729
# do non-implementation specific cleanup
2731
if self._control_files._lock_count == 1:
2732
# _inventory_is_modified is always False during a read lock.
2733
if self._inventory_is_modified:
2735
self._write_hashcache_if_dirty()
2736
# reverse order of locking.
2738
return self._control_files.unlock()
2740
self.branch.unlock()
2743
def get_conflicted_stem(path):
2744
for suffix in _mod_conflicts.CONFLICT_SUFFIXES:
2745
if path.endswith(suffix):
2746
return path[:-len(suffix)]
2749
class WorkingTreeFormat(object):
1674
class WorkingTreeFormatRegistry(controldir.ControlComponentFormatRegistry):
1675
"""Registry for working tree formats."""
1677
def __init__(self, other_registry=None):
1678
super(WorkingTreeFormatRegistry, self).__init__(other_registry)
1679
self._default_format = None
1680
self._default_format_key = None
1682
def get_default(self):
1683
"""Return the current default format."""
1684
if (self._default_format_key is not None and
1685
self._default_format is None):
1686
self._default_format = self.get(self._default_format_key)
1687
return self._default_format
1689
def set_default(self, format):
1690
"""Set the default format."""
1691
self._default_format = format
1692
self._default_format_key = None
1694
def set_default_key(self, format_string):
1695
"""Set the default format by its format string."""
1696
self._default_format_key = format_string
1697
self._default_format = None
1700
format_registry = WorkingTreeFormatRegistry()
1703
class WorkingTreeFormat(controldir.ControlComponentFormat):
2750
1704
"""An encapsulation of the initialization and open routines for a format.
2752
1706
Formats provide three things:
2823
1778
"""True if this format supports stored views."""
2827
def register_format(klass, format):
2828
klass._formats[format.get_format_string()] = format
2831
def set_default_format(klass, format):
2832
klass._default_format = format
2835
def unregister_format(klass, format):
2836
del klass._formats[format.get_format_string()]
2839
class WorkingTreeFormat2(WorkingTreeFormat):
2840
"""The second working tree format.
2842
This format modified the hash cache from the format 1 hash cache.
2845
upgrade_recommended = True
2847
def get_format_description(self):
2848
"""See WorkingTreeFormat.get_format_description()."""
2849
return "Working tree format 2"
2851
def _stub_initialize_on_transport(self, transport, file_mode):
2852
"""Workaround: create control files for a remote working tree.
2854
This ensures that it can later be updated and dealt with locally,
2855
since BzrDirFormat6 and BzrDirFormat5 cannot represent dirs with
2856
no working tree. (See bug #43064).
2859
inv = inventory.Inventory()
2860
xml5.serializer_v5.write_inventory(inv, sio, working=True)
2862
transport.put_file('inventory', sio, file_mode)
2863
transport.put_bytes('pending-merges', '', file_mode)
2865
def initialize(self, a_bzrdir, revision_id=None, from_branch=None,
2866
accelerator_tree=None, hardlink=False):
2867
"""See WorkingTreeFormat.initialize()."""
2868
if not isinstance(a_bzrdir.transport, LocalTransport):
2869
raise errors.NotLocalUrl(a_bzrdir.transport.base)
2870
if from_branch is not None:
2871
branch = from_branch
2873
branch = a_bzrdir.open_branch()
2874
if revision_id is None:
2875
revision_id = _mod_revision.ensure_null(branch.last_revision())
2878
branch.generate_revision_history(revision_id)
2881
inv = inventory.Inventory()
2882
wt = WorkingTree2(a_bzrdir.root_transport.local_abspath('.'),
2888
basis_tree = branch.repository.revision_tree(revision_id)
2889
if basis_tree.inventory.root is not None:
2890
wt.set_root_id(basis_tree.get_root_id())
2891
# set the parent list and cache the basis tree.
2892
if _mod_revision.is_null(revision_id):
2895
parent_trees = [(revision_id, basis_tree)]
2896
wt.set_parent_trees(parent_trees)
2897
transform.build_tree(basis_tree, wt)
2901
super(WorkingTreeFormat2, self).__init__()
2902
self._matchingbzrdir = bzrdir.BzrDirFormat6()
2904
def open(self, a_bzrdir, _found=False):
2905
"""Return the WorkingTree object for a_bzrdir
2907
_found is a private parameter, do not use it. It is used to indicate
2908
if format probing has already been done.
2911
# we are being called directly and must probe.
2912
raise NotImplementedError
2913
if not isinstance(a_bzrdir.transport, LocalTransport):
2914
raise errors.NotLocalUrl(a_bzrdir.transport.base)
2915
wt = WorkingTree2(a_bzrdir.root_transport.local_abspath('.'),
2921
class WorkingTreeFormat3(WorkingTreeFormat):
2922
"""The second working tree format updated to record a format marker.
2925
- exists within a metadir controlling .bzr
2926
- includes an explicit version marker for the workingtree control
2927
files, separate from the BzrDir format
2928
- modifies the hash cache format
2930
- uses a LockDir to guard access for writes.
2933
upgrade_recommended = True
2935
def get_format_string(self):
2936
"""See WorkingTreeFormat.get_format_string()."""
2937
return "Bazaar-NG Working Tree format 3"
2939
def get_format_description(self):
2940
"""See WorkingTreeFormat.get_format_description()."""
2941
return "Working tree format 3"
2943
_lock_file_name = 'lock'
2944
_lock_class = LockDir
2946
_tree_class = WorkingTree3
2948
def __get_matchingbzrdir(self):
2949
return bzrdir.BzrDirMetaFormat1()
2951
_matchingbzrdir = property(__get_matchingbzrdir)
2953
def _open_control_files(self, a_bzrdir):
2954
transport = a_bzrdir.get_workingtree_transport(None)
2955
return LockableFiles(transport, self._lock_file_name,
2958
def initialize(self, a_bzrdir, revision_id=None, from_branch=None,
2959
accelerator_tree=None, hardlink=False):
2960
"""See WorkingTreeFormat.initialize().
2962
:param revision_id: if supplied, create a working tree at a different
2963
revision than the branch is at.
2964
:param accelerator_tree: A tree which can be used for retrieving file
2965
contents more quickly than the revision tree, i.e. a workingtree.
2966
The revision tree will be used for cases where accelerator_tree's
2967
content is different.
2968
:param hardlink: If true, hard-link files from accelerator_tree,
2971
if not isinstance(a_bzrdir.transport, LocalTransport):
2972
raise errors.NotLocalUrl(a_bzrdir.transport.base)
2973
transport = a_bzrdir.get_workingtree_transport(self)
2974
control_files = self._open_control_files(a_bzrdir)
2975
control_files.create_lock()
2976
control_files.lock_write()
2977
transport.put_bytes('format', self.get_format_string(),
2978
mode=a_bzrdir._get_file_mode())
2979
if from_branch is not None:
2980
branch = from_branch
2982
branch = a_bzrdir.open_branch()
2983
if revision_id is None:
2984
revision_id = _mod_revision.ensure_null(branch.last_revision())
2985
# WorkingTree3 can handle an inventory which has a unique root id.
2986
# as of bzr 0.12. However, bzr 0.11 and earlier fail to handle
2987
# those trees. And because there isn't a format bump inbetween, we
2988
# are maintaining compatibility with older clients.
2989
# inv = Inventory(root_id=gen_root_id())
2990
inv = self._initial_inventory()
2991
wt = self._tree_class(a_bzrdir.root_transport.local_abspath('.'),
2997
_control_files=control_files)
2998
wt.lock_tree_write()
3000
basis_tree = branch.repository.revision_tree(revision_id)
3001
# only set an explicit root id if there is one to set.
3002
if basis_tree.inventory.root is not None:
3003
wt.set_root_id(basis_tree.get_root_id())
3004
if revision_id == _mod_revision.NULL_REVISION:
3005
wt.set_parent_trees([])
3007
wt.set_parent_trees([(revision_id, basis_tree)])
3008
transform.build_tree(basis_tree, wt)
3010
# Unlock in this order so that the unlock-triggers-flush in
3011
# WorkingTree is given a chance to fire.
3012
control_files.unlock()
3016
def _initial_inventory(self):
3017
return inventory.Inventory()
3020
super(WorkingTreeFormat3, self).__init__()
3022
def open(self, a_bzrdir, _found=False):
3023
"""Return the WorkingTree object for a_bzrdir
3025
_found is a private parameter, do not use it. It is used to indicate
3026
if format probing has already been done.
3029
# we are being called directly and must probe.
3030
raise NotImplementedError
3031
if not isinstance(a_bzrdir.transport, LocalTransport):
3032
raise errors.NotLocalUrl(a_bzrdir.transport.base)
3033
wt = self._open(a_bzrdir, self._open_control_files(a_bzrdir))
3036
def _open(self, a_bzrdir, control_files):
3037
"""Open the tree itself.
3039
:param a_bzrdir: the dir for the tree.
3040
:param control_files: the control files for the tree.
3042
return self._tree_class(a_bzrdir.root_transport.local_abspath('.'),
3046
_control_files=control_files)
3049
return self.get_format_string()
3052
__default_format = WorkingTreeFormat6()
3053
WorkingTreeFormat.register_format(__default_format)
3054
WorkingTreeFormat.register_format(WorkingTreeFormat5())
3055
WorkingTreeFormat.register_format(WorkingTreeFormat4())
3056
WorkingTreeFormat.register_format(WorkingTreeFormat3())
3057
WorkingTreeFormat.set_default_format(__default_format)
3058
# formats which have no format string are not discoverable
3059
# and not independently creatable, so are not registered.
3060
_legacy_formats = [WorkingTreeFormat2(),
1781
def get_controldir_for_branch(self):
1782
"""Get the control directory format for creating branches.
1784
This is to support testing of working tree formats that can not exist
1785
in the same control directory as a branch.
1787
return self._matchingcontroldir
1790
format_registry.register_lazy("Bazaar Working Tree Format 4 (bzr 0.15)\n",
1791
"breezy.bzr.workingtree_4", "WorkingTreeFormat4")
1792
format_registry.register_lazy("Bazaar Working Tree Format 5 (bzr 1.11)\n",
1793
"breezy.bzr.workingtree_4", "WorkingTreeFormat5")
1794
format_registry.register_lazy("Bazaar Working Tree Format 6 (bzr 1.14)\n",
1795
"breezy.bzr.workingtree_4", "WorkingTreeFormat6")
1796
format_registry.register_lazy("Bazaar-NG Working Tree format 3",
1797
"breezy.bzr.workingtree_3", "WorkingTreeFormat3")
1798
format_registry.set_default_key("Bazaar Working Tree Format 6 (bzr 1.14)\n")
added
removed
breezy/workingtree.py
