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
from bisect import bisect_left
51
45
conflicts as _mod_conflicts,
48
filters as _mod_filters,
60
51
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.lock import LogicalLockResult
81
from bzrlib.lockable_files import LockableFiles
82
from bzrlib.lockdir import LockDir
83
import bzrlib.mutabletree
84
from bzrlib.mutabletree import needs_tree_write_lock
85
from bzrlib import osutils
86
from bzrlib.osutils import (
96
from bzrlib.filters import filtered_input_file
97
from bzrlib.trace import mutter, note
98
from bzrlib.transport.local import LocalTransport
99
from bzrlib.revision import CURRENT_REVISION
100
from bzrlib.rio import RioReader, rio_file, Stanza
101
from bzrlib.symbol_versioning import (
103
DEPRECATED_PARAMETER,
107
MERGE_MODIFIED_HEADER_1 = "BZR merge-modified list format 1"
108
# TODO: Modifying the conflict objects or their type is currently nearly
109
# impossible as there is no clear relationship between the working tree format
110
# and the conflict list file format.
111
CONFLICT_HEADER_1 = "BZR conflict list format 1"
61
from .i18n import gettext
62
from . import mutabletree
63
from .trace import mutter, note
113
66
ERROR_PATH_NOT_FOUND = 3 # WindowsError errno code, equivalent to ENOENT
116
class TreeEntry(object):
117
"""An entry that implements the minimum interface used by commands.
119
This needs further inspection, it may be better to have
120
InventoryEntries without ids - though that seems wrong. For now,
121
this is a parallel hierarchy to InventoryEntry, and needs to become
122
one of several things: decorates to that hierarchy, children of, or
124
Another note is that these objects are currently only used when there is
125
no InventoryEntry available - i.e. for unversioned objects.
126
Perhaps they should be UnversionedEntry et al. ? - RBC 20051003
129
def __eq__(self, other):
130
# yes, this us ugly, TODO: best practice __eq__ style.
131
return (isinstance(other, TreeEntry)
132
and other.__class__ == self.__class__)
134
def kind_character(self):
138
class TreeDirectory(TreeEntry):
139
"""See TreeEntry. This is a directory in a working tree."""
141
def __eq__(self, other):
142
return (isinstance(other, TreeDirectory)
143
and other.__class__ == self.__class__)
145
def kind_character(self):
149
class TreeFile(TreeEntry):
150
"""See TreeEntry. This is a regular file in a working tree."""
152
def __eq__(self, other):
153
return (isinstance(other, TreeFile)
154
and other.__class__ == self.__class__)
156
def kind_character(self):
160
class TreeLink(TreeEntry):
161
"""See TreeEntry. This is a symlink in a working tree."""
163
def __eq__(self, other):
164
return (isinstance(other, TreeLink)
165
and other.__class__ == self.__class__)
167
def kind_character(self):
171
class WorkingTree(bzrlib.mutabletree.MutableTree,
172
bzrdir.ControlComponent):
69
class SettingFileIdUnsupported(errors.BzrError):
71
_fmt = "This format does not support setting file ids."
74
class ShelvingUnsupported(errors.BzrError):
76
_fmt = "This format does not support shelving changes."
79
class WorkingTree(mutabletree.MutableTree, controldir.ControlComponent):
173
80
"""Working copy tree.
175
The inventory is held in the `Branch` working-inventory, and the
176
files are in a directory on disk.
178
It is possible for a `WorkingTree` to have a filename which is
179
not listed in the Inventory and vice versa.
82
:ivar basedir: The root of the tree on disk. This is a unicode path object
83
(as opposed to a URL).
182
86
# override this to set the strategy for storing views
184
88
return views.DisabledViews(self)
186
90
def __init__(self, basedir='.',
187
branch=DEPRECATED_PARAMETER,
193
96
"""Construct a WorkingTree instance. This is not a public API.
195
98
:param branch: A branch to override probing for the branch.
197
100
self._format = _format
198
self.bzrdir = _bzrdir
101
self.controldir = _controldir
199
102
if not _internal:
200
raise errors.BzrError("Please use bzrdir.open_workingtree or "
201
"WorkingTree.open() to obtain a WorkingTree.")
202
basedir = safe_unicode(basedir)
103
raise errors.BzrError("Please use controldir.open_workingtree or "
104
"WorkingTree.open() to obtain a WorkingTree.")
105
basedir = osutils.safe_unicode(basedir)
203
106
mutter("opening working tree %r", basedir)
204
if deprecated_passed(branch):
107
if branch is not None:
205
108
self._branch = branch
207
self._branch = self.bzrdir.open_branch()
208
self.basedir = realpath(basedir)
209
# if branch is at our basedir and is a format 6 or less
210
if isinstance(self._format, WorkingTreeFormat2):
211
# share control object
212
self._control_files = self.branch.control_files
214
# assume all other formats have their own control files.
215
self._control_files = _control_files
216
self._transport = self._control_files._transport
217
# update the whole cache up front and write to disk if anything changed;
218
# in the future we might want to do this more selectively
219
# two possible ways offer themselves : in self._unlock, write the cache
220
# if needed, or, when the cache sees a change, append it to the hash
221
# cache file, and have the parser take the most recent entry for a
223
wt_trans = self.bzrdir.get_workingtree_transport(None)
224
cache_filename = wt_trans.local_abspath('stat-cache')
225
self._hashcache = hashcache.HashCache(basedir, cache_filename,
226
self.bzrdir._get_file_mode(),
227
self._content_filter_stack_provider())
230
# is this scan needed ? it makes things kinda slow.
237
if _inventory is None:
238
# This will be acquired on lock_read() or lock_write()
239
self._inventory_is_modified = False
240
self._inventory = None
242
# the caller of __init__ has provided an inventory,
243
# we assume they know what they are doing - as its only
244
# the Format factory and creation methods that are
245
# permitted to do this.
246
self._set_inventory(_inventory, dirty=False)
247
self._detect_case_handling()
110
self._branch = self.controldir.open_branch()
111
self.basedir = osutils.realpath(basedir)
112
self._transport = _transport
248
113
self._rules_searcher = None
249
114
self.views = self._make_views()
252
117
def user_transport(self):
253
return self.bzrdir.user_transport
118
return self.controldir.user_transport
256
121
def control_transport(self):
257
122
return self._transport
259
def _detect_case_handling(self):
260
wt_trans = self.bzrdir.get_workingtree_transport(None)
262
wt_trans.stat("FoRMaT")
263
except errors.NoSuchFile:
264
self.case_sensitive = True
266
self.case_sensitive = False
268
self._setup_directory_is_tree_reference()
124
def is_control_filename(self, filename):
125
"""True if filename is the name of a control file in this tree.
127
:param filename: A filename within the tree. This is a relative path
128
from the root of this tree.
130
This is true IF and ONLY IF the filename is part of the meta data
131
that bzr controls in this tree. I.E. a random .bzr directory placed
132
on disk will not be a control file for this tree.
134
return self.controldir.is_control_filename(filename)
270
136
branch = property(
271
137
fget=lambda self: self._branch,
348
216
path = osutils.getcwd()
349
control, relpath = bzrdir.BzrDir.open_containing(path)
217
control, relpath = controldir.ControlDir.open_containing(path)
351
218
return control.open_workingtree(), relpath
221
def open_containing_paths(file_list, default_directory=None,
222
canonicalize=True, apply_view=True):
223
"""Open the WorkingTree that contains a set of paths.
225
Fail if the paths given are not all in a single tree.
227
This is used for the many command-line interfaces that take a list of
228
any number of files and that require they all be in the same tree.
230
if default_directory is None:
231
default_directory = u'.'
232
# recommended replacement for builtins.internal_tree_files
233
if file_list is None or len(file_list) == 0:
234
tree = WorkingTree.open_containing(default_directory)[0]
235
# XXX: doesn't really belong here, and seems to have the strange
236
# side effect of making it return a bunch of files, not the whole
237
# tree -- mbp 20100716
238
if tree.supports_views() and apply_view:
239
view_files = tree.views.lookup_view()
241
file_list = view_files
242
view_str = views.view_display_str(view_files)
243
note(gettext("Ignoring files outside view. View is %s") % view_str)
244
return tree, file_list
245
if default_directory == u'.':
248
seed = default_directory
249
file_list = [osutils.pathjoin(default_directory, f)
251
tree = WorkingTree.open_containing(seed)[0]
252
return tree, tree.safe_relpath_files(file_list, canonicalize,
253
apply_view=apply_view)
255
def safe_relpath_files(self, file_list, canonicalize=True, apply_view=True):
256
"""Convert file_list into a list of relpaths in tree.
258
:param self: A tree to operate on.
259
:param file_list: A list of user provided paths or None.
260
:param apply_view: if True and a view is set, apply it or check that
261
specified files are within it
262
:return: A list of relative paths.
263
:raises errors.PathNotChild: When a provided path is in a different self
266
if file_list is None:
268
if self.supports_views() and apply_view:
269
view_files = self.views.lookup_view()
273
# self.relpath exists as a "thunk" to osutils, but canonical_relpath
274
# doesn't - fix that up here before we enter the loop.
277
return osutils.canonical_relpath(self.basedir, p)
280
for filename in file_list:
281
relpath = fixer(osutils.dereference_path(filename))
282
if view_files and not osutils.is_inside_any(view_files, relpath):
283
raise views.FileOutsideView(filename, view_files)
284
new_list.append(relpath)
354
288
def open_downlevel(path=None):
355
289
"""Open an unsupported working tree.
357
Only intended for advanced situations like upgrading part of a bzrdir.
291
Only intended for advanced situations like upgrading part of a controldir.
359
293
return WorkingTree.open(path, _unsupported=True)
362
296
def find_trees(location):
363
297
def list_current(transport):
364
return [d for d in transport.list_dir('') if d != '.bzr']
365
def evaluate(bzrdir):
298
return [d for d in transport.list_dir('')
299
if not controldir.is_control_filename(d)]
301
def evaluate(controldir):
367
tree = bzrdir.open_workingtree()
303
tree = controldir.open_workingtree()
368
304
except errors.NoWorkingTree:
369
305
return True, None
371
307
return True, tree
372
transport = get_transport(location)
373
iterator = bzrdir.BzrDir.find_bzrdirs(transport, evaluate=evaluate,
374
list_current=list_current)
375
return [t for t in iterator if t is not None]
377
# should be deprecated - this is slow and in any case treating them as a
378
# container is (we now know) bad style -- mbp 20070302
379
## @deprecated_method(zero_fifteen)
381
"""Iterate through file_ids for this tree.
383
file_ids are in a WorkingTree if they are in the working inventory
384
and the working file exists.
386
inv = self._inventory
387
for path, ie in inv.iter_entries():
388
if osutils.lexists(self.abspath(path)):
391
def all_file_ids(self):
392
"""See Tree.iter_all_file_ids"""
393
return set(self.inventory)
308
t = transport.get_transport(location)
309
iterator = controldir.ControlDir.find_controldirs(t, evaluate=evaluate,
310
list_current=list_current)
311
return [tr for tr in iterator if tr is not None]
395
313
def __repr__(self):
396
314
return "<%s of %s>" % (self.__class__.__name__,
397
315
getattr(self, 'basedir', None))
399
317
def abspath(self, filename):
400
return pathjoin(self.basedir, filename)
318
return osutils.pathjoin(self.basedir, filename)
402
320
def basis_tree(self):
403
321
"""Return RevisionTree for the current last revision.
447
362
def has_filename(self, filename):
448
363
return osutils.lexists(self.abspath(filename))
450
def get_file(self, file_id, path=None, filtered=True):
451
return self.get_file_with_stat(file_id, path, filtered=filtered)[0]
365
def get_file(self, path, filtered=True):
366
return self.get_file_with_stat(path, filtered=filtered)[0]
453
def get_file_with_stat(self, file_id, path=None, filtered=True,
368
def get_file_with_stat(self, path, filtered=True,
369
_fstat=osutils.fstat):
455
370
"""See Tree.get_file_with_stat."""
457
path = self.id2path(file_id)
458
file_obj = self.get_file_byname(path, filtered=False)
371
abspath = self.abspath(path)
373
file_obj = open(abspath, 'rb')
374
except EnvironmentError as e:
375
if e.errno == errno.ENOENT:
376
raise errors.NoSuchFile(path)
459
378
stat_value = _fstat(file_obj.fileno())
460
379
if filtered and self.supports_content_filtering():
461
380
filters = self._content_filter_stack(path)
462
file_obj = filtered_input_file(file_obj, filters)
381
file_obj = _mod_filters.filtered_input_file(file_obj, filters)
463
382
return (file_obj, stat_value)
465
def get_file_text(self, file_id, path=None, filtered=True):
466
return self.get_file(file_id, path=path, filtered=filtered).read()
468
def get_file_byname(self, filename, filtered=True):
469
path = self.abspath(filename)
471
if filtered and self.supports_content_filtering():
472
filters = self._content_filter_stack(filename)
473
return filtered_input_file(f, filters)
477
def get_file_lines(self, file_id, path=None, filtered=True):
384
def get_file_text(self, path, filtered=True):
385
with self.get_file(path, filtered=filtered) as my_file:
386
return my_file.read()
388
def get_file_lines(self, path, filtered=True):
478
389
"""See Tree.get_file_lines()"""
479
file = self.get_file(file_id, path, filtered=filtered)
390
with self.get_file(path, filtered=filtered) as file:
481
391
return file.readlines()
486
def annotate_iter(self, file_id, default_revision=CURRENT_REVISION):
487
"""See Tree.annotate_iter
489
This implementation will use the basis tree implementation if possible.
490
Lines not in the basis are attributed to CURRENT_REVISION
492
If there are pending merges, lines added by those merges will be
493
incorrectly attributed to CURRENT_REVISION (but after committing, the
494
attribution will be correct).
496
maybe_file_parent_keys = []
497
for parent_id in self.get_parent_ids():
499
parent_tree = self.revision_tree(parent_id)
500
except errors.NoSuchRevisionInTree:
501
parent_tree = self.branch.repository.revision_tree(parent_id)
502
parent_tree.lock_read()
504
if file_id not in parent_tree:
506
ie = parent_tree.inventory[file_id]
507
if ie.kind != 'file':
508
# Note: this is slightly unnecessary, because symlinks and
509
# directories have a "text" which is the empty text, and we
510
# know that won't mess up annotations. But it seems cleaner
512
parent_text_key = (file_id, ie.revision)
513
if parent_text_key not in maybe_file_parent_keys:
514
maybe_file_parent_keys.append(parent_text_key)
517
graph = _mod_graph.Graph(self.branch.repository.texts)
518
heads = graph.heads(maybe_file_parent_keys)
519
file_parent_keys = []
520
for key in maybe_file_parent_keys:
522
file_parent_keys.append(key)
524
# Now we have the parents of this content
525
annotator = self.branch.repository.texts.get_annotator()
526
text = self.get_file(file_id).read()
527
this_key =(file_id, default_revision)
528
annotator.add_special_text(this_key, file_parent_keys, text)
529
annotations = [(key[-1], line)
530
for key, line in annotator.annotate_flat(this_key)]
533
def _get_ancestors(self, default_revision):
534
ancestors = set([default_revision])
535
for parent_id in self.get_parent_ids():
536
ancestors.update(self.branch.repository.get_ancestry(
537
parent_id, topo_sorted=False))
540
393
def get_parent_ids(self):
541
394
"""See Tree.get_parent_ids.
556
409
for l in osutils.split_lines(merges_bytes):
557
revision_id = l.rstrip('\n')
410
revision_id = l.rstrip(b'\n')
558
411
parents.append(revision_id)
562
414
def get_root_id(self):
563
415
"""Return the id of this trees root"""
564
return self._inventory.root.file_id
566
def _get_store_filename(self, file_id):
567
## XXX: badly named; this is not in the store at all
568
return self.abspath(self.id2path(file_id))
571
def clone(self, to_bzrdir, revision_id=None):
416
raise NotImplementedError(self.get_root_id)
418
def clone(self, to_controldir, revision_id=None):
572
419
"""Duplicate this working tree into to_bzr, including all state.
574
421
Specifically modified files are kept as modified, but
575
422
ignored and unknown files are discarded.
577
If you want to make a new line of development, see bzrdir.sprout()
424
If you want to make a new line of development, see ControlDir.sprout()
580
427
If not None, the cloned tree will have its last revision set to
581
428
revision, and difference between the source trees last revision
582
429
and this one merged in.
584
# assumes the target bzr dir format is compatible.
585
result = to_bzrdir.create_workingtree()
586
self.copy_content_into(result, revision_id)
431
with self.lock_read():
432
# assumes the target bzr dir format is compatible.
433
result = to_controldir.create_workingtree()
434
self.copy_content_into(result, revision_id)
590
437
def copy_content_into(self, tree, revision_id=None):
591
438
"""Copy the current content and user files of this tree into tree."""
592
tree.set_root_id(self.get_root_id())
593
if revision_id is None:
594
merge.transform_tree(tree, self)
596
# TODO now merge from tree.last_revision to revision (to preserve
597
# user local changes)
598
merge.transform_tree(tree, self)
599
tree.set_parent_ids([revision_id])
601
def id2abspath(self, file_id):
602
return self.abspath(self.id2path(file_id))
604
def has_id(self, file_id):
605
# files that have been deleted are excluded
607
if not inv.has_id(file_id):
609
path = inv.id2path(file_id)
610
return osutils.lexists(self.abspath(path))
612
def has_or_had_id(self, file_id):
613
if file_id == self.inventory.root.file_id:
615
return self.inventory.has_id(file_id)
617
__contains__ = has_id
619
def get_file_size(self, file_id):
439
with self.lock_read():
440
tree.set_root_id(self.get_root_id())
441
if revision_id is None:
442
merge.transform_tree(tree, self)
444
# TODO now merge from tree.last_revision to revision (to
445
# preserve user local changes)
447
other_tree = self.revision_tree(revision_id)
448
except errors.NoSuchRevision:
449
other_tree = self.branch.repository.revision_tree(
452
merge.transform_tree(tree, other_tree)
453
if revision_id == _mod_revision.NULL_REVISION:
456
new_parents = [revision_id]
457
tree.set_parent_ids(new_parents)
459
def get_file_size(self, path):
620
460
"""See Tree.get_file_size"""
621
461
# XXX: this returns the on-disk size; it should probably return the
624
return os.path.getsize(self.id2abspath(file_id))
464
return os.path.getsize(self.abspath(path))
626
466
if e.errno != errno.ENOENT:
632
def get_file_sha1(self, file_id, path=None, stat_value=None):
634
path = self._inventory.id2path(file_id)
635
return self._hashcache.get_sha1(path, stat_value)
637
def get_file_mtime(self, file_id, path=None):
639
path = self.inventory.id2path(file_id)
640
return os.lstat(self.abspath(path)).st_mtime
642
def _is_executable_from_path_and_stat_from_basis(self, path, stat_result):
643
file_id = self.path2id(path)
645
# For unversioned files on win32, we just assume they are not
648
return self._inventory[file_id].executable
650
def _is_executable_from_path_and_stat_from_stat(self, path, stat_result):
651
mode = stat_result.st_mode
652
return bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode)
654
if not supports_executable():
655
def is_executable(self, file_id, path=None):
656
return self._inventory[file_id].executable
658
_is_executable_from_path_and_stat = \
659
_is_executable_from_path_and_stat_from_basis
661
def is_executable(self, file_id, path=None):
663
path = self.id2path(file_id)
664
mode = os.lstat(self.abspath(path)).st_mode
665
return bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode)
667
_is_executable_from_path_and_stat = \
668
_is_executable_from_path_and_stat_from_stat
670
@needs_tree_write_lock
671
def _add(self, files, ids, kinds):
672
"""See MutableTree._add."""
673
# TODO: Re-adding a file that is removed in the working copy
674
# should probably put it back with the previous ID.
675
# the read and write working inventory should not occur in this
676
# function - they should be part of lock_write and unlock.
678
for f, file_id, kind in zip(files, ids, kinds):
680
inv.add_path(f, kind=kind)
682
inv.add_path(f, kind=kind, file_id=file_id)
683
self._inventory_is_modified = True
685
@needs_tree_write_lock
686
471
def _gather_kinds(self, files, kinds):
687
472
"""See MutableTree._gather_kinds."""
688
for pos, f in enumerate(files):
689
if kinds[pos] is None:
690
fullpath = normpath(self.abspath(f))
692
kinds[pos] = file_kind(fullpath)
694
if e.errno == errno.ENOENT:
695
raise errors.NoSuchFile(fullpath)
473
with self.lock_tree_write():
474
for pos, f in enumerate(files):
475
if kinds[pos] is None:
476
fullpath = osutils.normpath(self.abspath(f))
478
kinds[pos] = osutils.file_kind(fullpath)
480
if e.errno == errno.ENOENT:
481
raise errors.NoSuchFile(fullpath)
698
483
def add_parent_tree_id(self, revision_id, allow_leftmost_as_ghost=False):
699
484
"""Add revision_id as a parent.
829
614
:param revision_ids: The revision_ids to set as the parent ids of this
830
615
working tree. Any of these may be ghosts.
832
self._check_parents_for_ghosts(revision_ids,
833
allow_leftmost_as_ghost=allow_leftmost_as_ghost)
834
for revision_id in revision_ids:
835
_mod_revision.check_not_reserved_id(revision_id)
837
revision_ids = self._filter_parent_ids_by_ancestry(revision_ids)
839
if len(revision_ids) > 0:
840
self.set_last_revision(revision_ids[0])
842
self.set_last_revision(_mod_revision.NULL_REVISION)
844
self._set_merges_from_parent_ids(revision_ids)
846
@needs_tree_write_lock
847
def set_parent_trees(self, parents_list, allow_leftmost_as_ghost=False):
848
"""See MutableTree.set_parent_trees."""
849
parent_ids = [rev for (rev, tree) in parents_list]
850
for revision_id in parent_ids:
851
_mod_revision.check_not_reserved_id(revision_id)
853
self._check_parents_for_ghosts(parent_ids,
854
allow_leftmost_as_ghost=allow_leftmost_as_ghost)
856
parent_ids = self._filter_parent_ids_by_ancestry(parent_ids)
858
if len(parent_ids) == 0:
859
leftmost_parent_id = _mod_revision.NULL_REVISION
860
leftmost_parent_tree = None
862
leftmost_parent_id, leftmost_parent_tree = parents_list[0]
864
if self._change_last_revision(leftmost_parent_id):
865
if leftmost_parent_tree is None:
866
# If we don't have a tree, fall back to reading the
867
# parent tree from the repository.
868
self._cache_basis_inventory(leftmost_parent_id)
617
with self.lock_tree_write():
618
self._check_parents_for_ghosts(revision_ids,
619
allow_leftmost_as_ghost=allow_leftmost_as_ghost)
620
for revision_id in revision_ids:
621
_mod_revision.check_not_reserved_id(revision_id)
623
revision_ids = self._filter_parent_ids_by_ancestry(revision_ids)
625
if len(revision_ids) > 0:
626
self.set_last_revision(revision_ids[0])
870
inv = leftmost_parent_tree.inventory
871
xml = self._create_basis_xml_from_inventory(
872
leftmost_parent_id, inv)
873
self._write_basis_inventory(xml)
874
self._set_merges_from_parent_ids(parent_ids)
876
@needs_tree_write_lock
628
self.set_last_revision(_mod_revision.NULL_REVISION)
630
self._set_merges_from_parent_ids(revision_ids)
877
632
def set_pending_merges(self, rev_list):
878
parents = self.get_parent_ids()
879
leftmost = parents[:1]
880
new_parents = leftmost + rev_list
881
self.set_parent_ids(new_parents)
633
with self.lock_tree_write():
634
parents = self.get_parent_ids()
635
leftmost = parents[:1]
636
new_parents = leftmost + rev_list
637
self.set_parent_ids(new_parents)
883
@needs_tree_write_lock
884
639
def set_merge_modified(self, modified_hashes):
886
for file_id, hash in modified_hashes.iteritems():
887
yield Stanza(file_id=file_id.decode('utf8'), hash=hash)
888
self._put_rio('merge-hashes', iter_stanzas(), MERGE_MODIFIED_HEADER_1)
640
"""Set the merge modified hashes."""
641
raise NotImplementedError(self.set_merge_modified)
890
643
def _sha_from_stat(self, path, stat_result):
891
644
"""Get a sha digest from the tree's stat cache.
914
660
of the branch when it is supplied. If None, to_revision defaults to
915
661
branch.last_revision().
917
from bzrlib.merge import Merger, Merge3Merger
918
merger = Merger(self.branch, this_tree=self)
919
# check that there are no local alterations
920
if not force and self.has_changes():
921
raise errors.UncommittedChanges(self)
922
if to_revision is None:
923
to_revision = _mod_revision.ensure_null(branch.last_revision())
924
merger.other_rev_id = to_revision
925
if _mod_revision.is_null(merger.other_rev_id):
926
raise errors.NoCommits(branch)
927
self.branch.fetch(branch, last_revision=merger.other_rev_id)
928
merger.other_basis = merger.other_rev_id
929
merger.other_tree = self.branch.repository.revision_tree(
931
merger.other_branch = branch
932
if from_revision is None:
935
merger.set_base_revision(from_revision, branch)
936
if merger.base_rev_id == merger.other_rev_id:
937
raise errors.PointlessMerge
938
merger.backup_files = False
939
if merge_type is None:
940
merger.merge_type = Merge3Merger
942
merger.merge_type = merge_type
943
merger.set_interesting_files(None)
944
merger.show_base = False
945
merger.reprocess = False
946
conflicts = merger.do_merge()
663
from .merge import Merger, Merge3Merger
664
with self.lock_write():
665
merger = Merger(self.branch, this_tree=self)
666
# check that there are no local alterations
667
if not force and self.has_changes():
668
raise errors.UncommittedChanges(self)
669
if to_revision is None:
670
to_revision = _mod_revision.ensure_null(branch.last_revision())
671
merger.other_rev_id = to_revision
672
if _mod_revision.is_null(merger.other_rev_id):
673
raise errors.NoCommits(branch)
674
self.branch.fetch(branch, last_revision=merger.other_rev_id)
675
merger.other_basis = merger.other_rev_id
676
merger.other_tree = self.branch.repository.revision_tree(
678
merger.other_branch = branch
679
if from_revision is None:
682
merger.set_base_revision(from_revision, branch)
683
if merger.base_rev_id == merger.other_rev_id:
684
raise errors.PointlessMerge
685
merger.backup_files = False
686
if merge_type is None:
687
merger.merge_type = Merge3Merger
689
merger.merge_type = merge_type
690
merger.set_interesting_files(None)
691
merger.show_base = False
692
merger.reprocess = False
693
conflicts = merger.do_merge()
951
697
def merge_modified(self):
952
698
"""Return a dictionary of files modified by a merge.
956
702
because of a merge.
958
704
This returns a map of file_id->sha1, containing only files which are
959
still in the working inventory and have that text hash.
705
still in the working tree and have that text hash.
962
hashfile = self._transport.get('merge-hashes')
963
except errors.NoSuchFile:
968
if hashfile.next() != MERGE_MODIFIED_HEADER_1 + '\n':
969
raise errors.MergeModifiedFormatError()
970
except StopIteration:
971
raise errors.MergeModifiedFormatError()
972
for s in RioReader(hashfile):
973
# RioReader reads in Unicode, so convert file_ids back to utf8
974
file_id = osutils.safe_file_id(s.get("file_id"), warn=False)
975
if file_id not in self.inventory:
977
text_hash = s.get("hash")
978
if text_hash == self.get_file_sha1(file_id):
979
merge_hashes[file_id] = text_hash
707
raise NotImplementedError(self.merge_modified)
985
709
def mkdir(self, path, file_id=None):
986
710
"""See MutableTree.mkdir()."""
987
711
if file_id is None:
988
file_id = generate_ids.gen_file_id(os.path.basename(path))
989
os.mkdir(self.abspath(path))
990
self.add(path, file_id, 'directory')
712
if self.supports_setting_file_ids():
713
file_id = generate_ids.gen_file_id(os.path.basename(path))
715
if not self.supports_setting_file_ids():
716
raise SettingFileIdUnsupported()
717
with self.lock_write():
718
os.mkdir(self.abspath(path))
719
self.add(path, file_id, 'directory')
993
def get_symlink_target(self, file_id):
994
abspath = self.id2abspath(file_id)
722
def get_symlink_target(self, path):
723
abspath = self.abspath(path)
995
724
target = osutils.readlink(abspath)
999
727
def subsume(self, other_tree):
1000
def add_children(inventory, entry):
1001
for child_entry in entry.children.values():
1002
inventory._byid[child_entry.file_id] = child_entry
1003
if child_entry.kind == 'directory':
1004
add_children(inventory, child_entry)
1005
if other_tree.get_root_id() == self.get_root_id():
1006
raise errors.BadSubsumeSource(self, other_tree,
1007
'Trees have the same root')
1009
other_tree_path = self.relpath(other_tree.basedir)
1010
except errors.PathNotChild:
1011
raise errors.BadSubsumeSource(self, other_tree,
1012
'Tree is not contained by the other')
1013
new_root_parent = self.path2id(osutils.dirname(other_tree_path))
1014
if new_root_parent is None:
1015
raise errors.BadSubsumeSource(self, other_tree,
1016
'Parent directory is not versioned.')
1017
# We need to ensure that the result of a fetch will have a
1018
# versionedfile for the other_tree root, and only fetching into
1019
# RepositoryKnit2 guarantees that.
1020
if not self.branch.repository.supports_rich_root():
1021
raise errors.SubsumeTargetNeedsUpgrade(other_tree)
1022
other_tree.lock_tree_write()
1024
new_parents = other_tree.get_parent_ids()
1025
other_root = other_tree.inventory.root
1026
other_root.parent_id = new_root_parent
1027
other_root.name = osutils.basename(other_tree_path)
1028
self.inventory.add(other_root)
1029
add_children(self.inventory, other_root)
1030
self._write_inventory(self.inventory)
1031
# normally we don't want to fetch whole repositories, but i think
1032
# here we really do want to consolidate the whole thing.
1033
for parent_id in other_tree.get_parent_ids():
1034
self.branch.fetch(other_tree.branch, parent_id)
1035
self.add_parent_tree_id(parent_id)
1038
other_tree.bzrdir.retire_bzrdir()
728
raise NotImplementedError(self.subsume)
1040
730
def _setup_directory_is_tree_reference(self):
1041
731
if self._branch.repository._format.supports_tree_reference:
1063
753
# checkout in a subdirectory. This can be avoided by not adding
1064
754
# it. mbp 20070306
1066
@needs_tree_write_lock
1067
def extract(self, file_id, format=None):
756
def extract(self, path, format=None):
1068
757
"""Extract a subtree from this tree.
1070
759
A new branch will be created, relative to the path for this tree.
1074
segments = osutils.splitpath(path)
1075
transport = self.branch.bzrdir.root_transport
1076
for name in segments:
1077
transport = transport.clone(name)
1078
transport.ensure_base()
1081
sub_path = self.id2path(file_id)
1082
branch_transport = mkdirs(sub_path)
1084
format = self.bzrdir.cloning_metadir()
1085
branch_transport.ensure_base()
1086
branch_bzrdir = format.initialize_on_transport(branch_transport)
1088
repo = branch_bzrdir.find_repository()
1089
except errors.NoRepositoryPresent:
1090
repo = branch_bzrdir.create_repository()
1091
if not repo.supports_rich_root():
1092
raise errors.RootNotRich()
1093
new_branch = branch_bzrdir.create_branch()
1094
new_branch.pull(self.branch)
1095
for parent_id in self.get_parent_ids():
1096
new_branch.fetch(self.branch, parent_id)
1097
tree_transport = self.bzrdir.root_transport.clone(sub_path)
1098
if tree_transport.base != branch_transport.base:
1099
tree_bzrdir = format.initialize_on_transport(tree_transport)
1100
branch.BranchReferenceFormat().initialize(tree_bzrdir,
1101
target_branch=new_branch)
1103
tree_bzrdir = branch_bzrdir
1104
wt = tree_bzrdir.create_workingtree(_mod_revision.NULL_REVISION)
1105
wt.set_parent_ids(self.get_parent_ids())
1106
my_inv = self.inventory
1107
child_inv = inventory.Inventory(root_id=None)
1108
new_root = my_inv[file_id]
1109
my_inv.remove_recursive_id(file_id)
1110
new_root.parent_id = None
1111
child_inv.add(new_root)
1112
self._write_inventory(my_inv)
1113
wt._write_inventory(child_inv)
1116
def _serialize(self, inventory, out_file):
1117
xml5.serializer_v5.write_inventory(self._inventory, out_file,
1120
def _deserialize(selt, in_file):
1121
return xml5.serializer_v5.read_inventory(in_file)
761
raise NotImplementedError(self.extract)
1123
763
def flush(self):
1124
"""Write the in memory inventory to disk."""
1125
# TODO: Maybe this should only write on dirty ?
1126
if self._control_files._lock_mode != 'w':
1127
raise errors.NotWriteLocked(self)
1129
self._serialize(self._inventory, sio)
1131
self._transport.put_file('inventory', sio,
1132
mode=self.bzrdir._get_file_mode())
1133
self._inventory_is_modified = False
764
"""Write the in memory meta data to disk."""
765
raise NotImplementedError(self.flush)
1135
def _kind(self, relpath):
767
def kind(self, relpath):
1136
768
return osutils.file_kind(self.abspath(relpath))
1138
770
def list_files(self, include_root=False, from_dir=None, recursive=True):
1146
778
:param from_dir: start from this directory or None for the root
1147
779
:param recursive: whether to recurse into subdirectories or not
1149
# list_files is an iterator, so @needs_read_lock doesn't work properly
1150
# with it. So callers should be careful to always read_lock the tree.
1151
if not self.is_locked():
1152
raise errors.ObjectNotLocked(self)
1154
inv = self.inventory
1155
if from_dir is None and include_root is True:
1156
yield ('', 'V', 'directory', inv.root.file_id, inv.root)
1157
# Convert these into local objects to save lookup times
1158
pathjoin = osutils.pathjoin
1159
file_kind = self._kind
1161
# transport.base ends in a slash, we want the piece
1162
# between the last two slashes
1163
transport_base_dir = self.bzrdir.transport.base.rsplit('/', 2)[1]
1165
fk_entries = {'directory':TreeDirectory, 'file':TreeFile, 'symlink':TreeLink}
1167
# directory file_id, relative path, absolute path, reverse sorted children
1168
if from_dir is not None:
1169
from_dir_id = inv.path2id(from_dir)
1170
if from_dir_id is None:
1171
# Directory not versioned
1173
from_dir_abspath = pathjoin(self.basedir, from_dir)
1175
from_dir_id = inv.root.file_id
1176
from_dir_abspath = self.basedir
1177
children = os.listdir(from_dir_abspath)
1179
# jam 20060527 The kernel sized tree seems equivalent whether we
1180
# use a deque and popleft to keep them sorted, or if we use a plain
1181
# list and just reverse() them.
1182
children = collections.deque(children)
1183
stack = [(from_dir_id, u'', from_dir_abspath, children)]
1185
from_dir_id, from_dir_relpath, from_dir_abspath, children = stack[-1]
1188
f = children.popleft()
1189
## TODO: If we find a subdirectory with its own .bzr
1190
## directory, then that is a separate tree and we
1191
## should exclude it.
1193
# the bzrdir for this tree
1194
if transport_base_dir == f:
1197
# we know that from_dir_relpath and from_dir_abspath never end in a slash
1198
# and 'f' doesn't begin with one, we can do a string op, rather
1199
# than the checks of pathjoin(), all relative paths will have an extra slash
1201
fp = from_dir_relpath + '/' + f
1204
fap = from_dir_abspath + '/' + f
1206
f_ie = inv.get_child(from_dir_id, f)
1209
elif self.is_ignored(fp[1:]):
1212
# we may not have found this file, because of a unicode issue
1213
f_norm, can_access = osutils.normalized_filename(f)
1214
if f == f_norm or not can_access:
1215
# No change, so treat this file normally
1218
# this file can be accessed by a normalized path
1219
# check again if it is versioned
1220
# these lines are repeated here for performance
1222
fp = from_dir_relpath + '/' + f
1223
fap = from_dir_abspath + '/' + f
1224
f_ie = inv.get_child(from_dir_id, f)
1227
elif self.is_ignored(fp[1:]):
1234
# make a last minute entry
1236
yield fp[1:], c, fk, f_ie.file_id, f_ie
1239
yield fp[1:], c, fk, None, fk_entries[fk]()
1241
yield fp[1:], c, fk, None, TreeEntry()
1244
if fk != 'directory':
1247
# But do this child first if recursing down
1249
new_children = os.listdir(fap)
1251
new_children = collections.deque(new_children)
1252
stack.append((f_ie.file_id, fp, fap, new_children))
1253
# Break out of inner loop,
1254
# so that we start outer loop with child
1257
# if we finished all children, pop it off the stack
1260
@needs_tree_write_lock
1261
def move(self, from_paths, to_dir=None, after=False, **kwargs):
781
raise NotImplementedError(self.list_files)
783
def move(self, from_paths, to_dir=None, after=False):
1262
784
"""Rename files.
1264
to_dir must exist in the inventory.
786
to_dir must be known to the working tree.
1266
788
If to_dir exists and is a directory, the files are moved into
1267
789
it, keeping their old names.
1293
814
This returns a list of (from_path, to_path) pairs for each
1294
815
entry that is moved.
1299
# check for deprecated use of signature
1301
to_dir = kwargs.get('to_name', None)
1303
raise TypeError('You must supply a target directory')
1305
symbol_versioning.warn('The parameter to_name was deprecated'
1306
' in version 0.13. Use to_dir instead',
1309
# check destination directory
1310
if isinstance(from_paths, basestring):
1312
inv = self.inventory
1313
to_abs = self.abspath(to_dir)
1314
if not isdir(to_abs):
1315
raise errors.BzrMoveFailedError('',to_dir,
1316
errors.NotADirectory(to_abs))
1317
if not self.has_filename(to_dir):
1318
raise errors.BzrMoveFailedError('',to_dir,
1319
errors.NotInWorkingDirectory(to_dir))
1320
to_dir_id = inv.path2id(to_dir)
1321
if to_dir_id is None:
1322
raise errors.BzrMoveFailedError('',to_dir,
1323
errors.NotVersionedError(path=str(to_dir)))
1325
to_dir_ie = inv[to_dir_id]
1326
if to_dir_ie.kind != 'directory':
1327
raise errors.BzrMoveFailedError('',to_dir,
1328
errors.NotADirectory(to_abs))
1330
# create rename entries and tuples
1331
for from_rel in from_paths:
1332
from_tail = splitpath(from_rel)[-1]
1333
from_id = inv.path2id(from_rel)
1335
raise errors.BzrMoveFailedError(from_rel,to_dir,
1336
errors.NotVersionedError(path=str(from_rel)))
1338
from_entry = inv[from_id]
1339
from_parent_id = from_entry.parent_id
1340
to_rel = pathjoin(to_dir, from_tail)
1341
rename_entry = WorkingTree._RenameEntry(from_rel=from_rel,
1343
from_tail=from_tail,
1344
from_parent_id=from_parent_id,
1345
to_rel=to_rel, to_tail=from_tail,
1346
to_parent_id=to_dir_id)
1347
rename_entries.append(rename_entry)
1348
rename_tuples.append((from_rel, to_rel))
1350
# determine which move mode to use. checks also for movability
1351
rename_entries = self._determine_mv_mode(rename_entries, after)
1353
original_modified = self._inventory_is_modified
1356
self._inventory_is_modified = True
1357
self._move(rename_entries)
1359
# restore the inventory on error
1360
self._inventory_is_modified = original_modified
1362
self._write_inventory(inv)
1363
return rename_tuples
1365
def _determine_mv_mode(self, rename_entries, after=False):
1366
"""Determines for each from-to pair if both inventory and working tree
1367
or only the inventory has to be changed.
1369
Also does basic plausability tests.
1371
inv = self.inventory
1373
for rename_entry in rename_entries:
1374
# store to local variables for easier reference
1375
from_rel = rename_entry.from_rel
1376
from_id = rename_entry.from_id
1377
to_rel = rename_entry.to_rel
1378
to_id = inv.path2id(to_rel)
1379
only_change_inv = False
1381
# check the inventory for source and destination
1383
raise errors.BzrMoveFailedError(from_rel,to_rel,
1384
errors.NotVersionedError(path=str(from_rel)))
1385
if to_id is not None:
1386
raise errors.BzrMoveFailedError(from_rel,to_rel,
1387
errors.AlreadyVersionedError(path=str(to_rel)))
1389
# try to determine the mode for rename (only change inv or change
1390
# inv and file system)
1392
if not self.has_filename(to_rel):
1393
raise errors.BzrMoveFailedError(from_id,to_rel,
1394
errors.NoSuchFile(path=str(to_rel),
1395
extra="New file has not been created yet"))
1396
only_change_inv = True
1397
elif not self.has_filename(from_rel) and self.has_filename(to_rel):
1398
only_change_inv = True
1399
elif self.has_filename(from_rel) and not self.has_filename(to_rel):
1400
only_change_inv = False
1401
elif (not self.case_sensitive
1402
and from_rel.lower() == to_rel.lower()
1403
and self.has_filename(from_rel)):
1404
only_change_inv = False
1406
# something is wrong, so lets determine what exactly
1407
if not self.has_filename(from_rel) and \
1408
not self.has_filename(to_rel):
1409
raise errors.BzrRenameFailedError(from_rel,to_rel,
1410
errors.PathsDoNotExist(paths=(str(from_rel),
1413
raise errors.RenameFailedFilesExist(from_rel, to_rel)
1414
rename_entry.only_change_inv = only_change_inv
1415
return rename_entries
1417
def _move(self, rename_entries):
1418
"""Moves a list of files.
1420
Depending on the value of the flag 'only_change_inv', the
1421
file will be moved on the file system or not.
1423
inv = self.inventory
1426
for entry in rename_entries:
1428
self._move_entry(entry)
1430
self._rollback_move(moved)
1434
def _rollback_move(self, moved):
1435
"""Try to rollback a previous move in case of an filesystem error."""
1436
inv = self.inventory
1439
self._move_entry(WorkingTree._RenameEntry(
1440
entry.to_rel, entry.from_id,
1441
entry.to_tail, entry.to_parent_id, entry.from_rel,
1442
entry.from_tail, entry.from_parent_id,
1443
entry.only_change_inv))
1444
except errors.BzrMoveFailedError, e:
1445
raise errors.BzrMoveFailedError( '', '', "Rollback failed."
1446
" The working tree is in an inconsistent state."
1447
" Please consider doing a 'bzr revert'."
1448
" Error message is: %s" % e)
1450
def _move_entry(self, entry):
1451
inv = self.inventory
1452
from_rel_abs = self.abspath(entry.from_rel)
1453
to_rel_abs = self.abspath(entry.to_rel)
1454
if from_rel_abs == to_rel_abs:
1455
raise errors.BzrMoveFailedError(entry.from_rel, entry.to_rel,
1456
"Source and target are identical.")
1458
if not entry.only_change_inv:
1460
osutils.rename(from_rel_abs, to_rel_abs)
1462
raise errors.BzrMoveFailedError(entry.from_rel,
1464
inv.rename(entry.from_id, entry.to_parent_id, entry.to_tail)
1466
@needs_tree_write_lock
1467
def rename_one(self, from_rel, to_rel, after=False):
1470
This can change the directory or the filename or both.
1472
rename_one has several 'modes' to work. First, it can rename a physical
1473
file and change the file_id. That is the normal mode. Second, it can
1474
only change the file_id without touching any physical file. This is
1475
the new mode introduced in version 0.15.
1477
rename_one uses the second mode if 'after == True' and 'to_rel' is not
1478
versioned but present in the working tree.
1480
rename_one uses the second mode if 'after == False' and 'from_rel' is
1481
versioned but no longer in the working tree, and 'to_rel' is not
1482
versioned but present in the working tree.
1484
rename_one uses the first mode if 'after == False' and 'from_rel' is
1485
versioned and present in the working tree, and 'to_rel' is not
1486
versioned and not present in the working tree.
1488
Everything else results in an error.
1490
inv = self.inventory
1493
# create rename entries and tuples
1494
from_tail = splitpath(from_rel)[-1]
1495
from_id = inv.path2id(from_rel)
1497
# if file is missing in the inventory maybe it's in the basis_tree
1498
basis_tree = self.branch.basis_tree()
1499
from_id = basis_tree.path2id(from_rel)
1501
raise errors.BzrRenameFailedError(from_rel,to_rel,
1502
errors.NotVersionedError(path=str(from_rel)))
1503
# put entry back in the inventory so we can rename it
1504
from_entry = basis_tree.inventory[from_id].copy()
1507
from_entry = inv[from_id]
1508
from_parent_id = from_entry.parent_id
1509
to_dir, to_tail = os.path.split(to_rel)
1510
to_dir_id = inv.path2id(to_dir)
1511
rename_entry = WorkingTree._RenameEntry(from_rel=from_rel,
1513
from_tail=from_tail,
1514
from_parent_id=from_parent_id,
1515
to_rel=to_rel, to_tail=to_tail,
1516
to_parent_id=to_dir_id)
1517
rename_entries.append(rename_entry)
1519
# determine which move mode to use. checks also for movability
1520
rename_entries = self._determine_mv_mode(rename_entries, after)
1522
# check if the target changed directory and if the target directory is
1524
if to_dir_id is None:
1525
raise errors.BzrMoveFailedError(from_rel,to_rel,
1526
errors.NotVersionedError(path=str(to_dir)))
1528
# all checks done. now we can continue with our actual work
1529
mutter('rename_one:\n'
1534
' to_dir_id {%s}\n',
1535
from_id, from_rel, to_rel, to_dir, to_dir_id)
1537
self._move(rename_entries)
1538
self._write_inventory(inv)
1540
class _RenameEntry(object):
1541
def __init__(self, from_rel, from_id, from_tail, from_parent_id,
1542
to_rel, to_tail, to_parent_id, only_change_inv=False):
1543
self.from_rel = from_rel
1544
self.from_id = from_id
1545
self.from_tail = from_tail
1546
self.from_parent_id = from_parent_id
1547
self.to_rel = to_rel
1548
self.to_tail = to_tail
1549
self.to_parent_id = to_parent_id
1550
self.only_change_inv = only_change_inv
817
raise NotImplementedError(self.move)
819
def copy_one(self, from_rel, to_rel):
820
"""Copy a file in the tree to a new location.
822
This default implementation just copies the file, then
825
:param from_rel: From location (relative to tree root)
826
:param to_rel: Target location (relative to tree root)
828
shutil.copyfile(self.abspath(from_rel), self.abspath(to_rel))
1553
831
def unknowns(self):
1554
832
"""Return all unknown files.
1556
834
These are files in the working directory that are not versioned or
1557
835
control files or ignored.
1559
# force the extras method to be fully executed before returning, to
1560
# prevent race conditions with the lock
1562
[subp for subp in self.extras() if not self.is_ignored(subp)])
1564
@needs_tree_write_lock
1565
def unversion(self, file_ids):
1566
"""Remove the file ids in file_ids from the current versioned set.
1568
When a file_id is unversioned, all of its children are automatically
837
with self.lock_read():
838
# force the extras method to be fully executed before returning, to
839
# prevent race conditions with the lock
841
[subp for subp in self.extras() if not self.is_ignored(subp)])
843
def unversion(self, paths):
844
"""Remove the path in pahs from the current versioned set.
846
When a path is unversioned, all of its children are automatically
1571
:param file_ids: The file ids to stop versioning.
1572
:raises: NoSuchId if any fileid is not currently versioned.
849
:param paths: The paths to stop versioning.
850
:raises NoSuchFile: if any path is not currently versioned.
1574
for file_id in file_ids:
1575
if file_id not in self._inventory:
1576
raise errors.NoSuchId(self, file_id)
1577
for file_id in file_ids:
1578
if self._inventory.has_id(file_id):
1579
self._inventory.remove_recursive_id(file_id)
1581
# in the future this should just set a dirty bit to wait for the
1582
# final unlock. However, until all methods of workingtree start
1583
# with the current in -memory inventory rather than triggering
1584
# a read, it is more complex - we need to teach read_inventory
1585
# to know when to read, and when to not read first... and possibly
1586
# to save first when the in memory one may be corrupted.
1587
# so for now, we just only write it if it is indeed dirty.
1589
self._write_inventory(self._inventory)
1591
def _iter_conflicts(self):
1593
for info in self.list_files():
1595
stem = get_conflicted_stem(path)
1598
if stem not in conflicted:
1599
conflicted.add(stem)
852
raise NotImplementedError(self.unversion)
1603
854
def pull(self, source, overwrite=False, stop_revision=None,
1604
change_reporter=None, possible_transports=None, local=False):
855
change_reporter=None, possible_transports=None, local=False,
857
with self.lock_write(), source.lock_read():
1607
858
old_revision_info = self.branch.last_revision_info()
1608
859
basis_tree = self.basis_tree()
1609
860
count = self.branch.pull(source, overwrite, stop_revision,
1787
965
return self._last_revision()
1790
967
def _last_revision(self):
1791
968
"""helper for get_parent_ids."""
1792
return _mod_revision.ensure_null(self.branch.last_revision())
969
with self.lock_read():
970
return _mod_revision.ensure_null(self.branch.last_revision())
1794
972
def is_locked(self):
1795
return self._control_files.is_locked()
1797
def _must_be_locked(self):
1798
if not self.is_locked():
1799
raise errors.ObjectNotLocked(self)
973
"""Check if this tree is locked."""
974
raise NotImplementedError(self.is_locked)
1801
976
def lock_read(self):
1802
977
"""Lock the tree for reading.
1804
979
This also locks the branch, and can be unlocked via self.unlock().
1806
:return: A bzrlib.lock.LogicalLockResult.
981
:return: A breezy.lock.LogicalLockResult.
1808
if not self.is_locked():
1810
self.branch.lock_read()
1812
self._control_files.lock_read()
1813
return LogicalLockResult(self.unlock)
1815
self.branch.unlock()
983
raise NotImplementedError(self.lock_read)
1818
985
def lock_tree_write(self):
1819
986
"""See MutableTree.lock_tree_write, and WorkingTree.unlock.
1821
:return: A bzrlib.lock.LogicalLockResult.
988
:return: A breezy.lock.LogicalLockResult.
1823
if not self.is_locked():
1825
self.branch.lock_read()
1827
self._control_files.lock_write()
1828
return LogicalLockResult(self.unlock)
1830
self.branch.unlock()
990
raise NotImplementedError(self.lock_tree_write)
1833
992
def lock_write(self):
1834
993
"""See MutableTree.lock_write, and WorkingTree.unlock.
1836
:return: A bzrlib.lock.LogicalLockResult.
995
:return: A breezy.lock.LogicalLockResult.
1838
if not self.is_locked():
1840
self.branch.lock_write()
1842
self._control_files.lock_write()
1843
return LogicalLockResult(self.unlock)
1845
self.branch.unlock()
997
raise NotImplementedError(self.lock_write)
1848
999
def get_physical_lock_status(self):
1849
return self._control_files.get_physical_lock_status()
1851
def _basis_inventory_name(self):
1852
return 'basis-inventory-cache'
1854
def _reset_data(self):
1855
"""Reset transient data that cannot be revalidated."""
1856
self._inventory_is_modified = False
1857
f = self._transport.get('inventory')
1859
result = self._deserialize(f)
1862
self._set_inventory(result, dirty=False)
1864
@needs_tree_write_lock
1000
raise NotImplementedError(self.get_physical_lock_status)
1865
1002
def set_last_revision(self, new_revision):
1866
1003
"""Change the last revision in the working tree."""
1867
if self._change_last_revision(new_revision):
1868
self._cache_basis_inventory(new_revision)
1004
raise NotImplementedError(self.set_last_revision)
1870
1006
def _change_last_revision(self, new_revision):
1871
1007
"""Template method part of set_last_revision to perform the change.
1874
1010
when their last revision is set.
1876
1012
if _mod_revision.is_null(new_revision):
1877
self.branch.set_revision_history([])
1013
self.branch.set_last_revision_info(0, new_revision)
1015
_mod_revision.check_not_reserved_id(new_revision)
1880
1017
self.branch.generate_revision_history(new_revision)
1881
1018
except errors.NoSuchRevision:
1882
1019
# not present in the repo - dont try to set it deeper than the tip
1883
self.branch.set_revision_history([new_revision])
1020
self.branch._set_revision_history([new_revision])
1886
def _write_basis_inventory(self, xml):
1887
"""Write the basis inventory XML to the basis-inventory file"""
1888
path = self._basis_inventory_name()
1890
self._transport.put_file(path, sio,
1891
mode=self.bzrdir._get_file_mode())
1893
def _create_basis_xml_from_inventory(self, revision_id, inventory):
1894
"""Create the text that will be saved in basis-inventory"""
1895
inventory.revision_id = revision_id
1896
return xml7.serializer_v7.write_inventory_to_string(inventory)
1898
def _cache_basis_inventory(self, new_revision):
1899
"""Cache new_revision as the basis inventory."""
1900
# TODO: this should allow the ready-to-use inventory to be passed in,
1901
# as commit already has that ready-to-use [while the format is the
1904
# this double handles the inventory - unpack and repack -
1905
# but is easier to understand. We can/should put a conditional
1906
# in here based on whether the inventory is in the latest format
1907
# - perhaps we should repack all inventories on a repository
1909
# the fast path is to copy the raw xml from the repository. If the
1910
# xml contains 'revision_id="', then we assume the right
1911
# revision_id is set. We must check for this full string, because a
1912
# root node id can legitimately look like 'revision_id' but cannot
1914
xml = self.branch.repository._get_inventory_xml(new_revision)
1915
firstline = xml.split('\n', 1)[0]
1916
if (not 'revision_id="' in firstline or
1917
'format="7"' not in firstline):
1918
inv = self.branch.repository._serializer.read_inventory_from_string(
1920
xml = self._create_basis_xml_from_inventory(new_revision, inv)
1921
self._write_basis_inventory(xml)
1922
except (errors.NoSuchRevision, errors.RevisionNotPresent):
1925
def read_basis_inventory(self):
1926
"""Read the cached basis inventory."""
1927
path = self._basis_inventory_name()
1928
return self._transport.get_bytes(path)
1931
def read_working_inventory(self):
1932
"""Read the working inventory.
1934
:raises errors.InventoryModified: read_working_inventory will fail
1935
when the current in memory inventory has been modified.
1937
# conceptually this should be an implementation detail of the tree.
1938
# XXX: Deprecate this.
1939
# ElementTree does its own conversion from UTF-8, so open in
1941
if self._inventory_is_modified:
1942
raise errors.InventoryModified(self)
1943
f = self._transport.get('inventory')
1945
result = self._deserialize(f)
1948
self._set_inventory(result, dirty=False)
1951
@needs_tree_write_lock
1952
1023
def remove(self, files, verbose=False, to_file=None, keep_files=True,
1954
"""Remove nominated files from the working inventory.
1025
"""Remove nominated files from the working tree metadata.
1956
1027
:files: File paths relative to the basedir.
1957
1028
:keep_files: If true, the files will also be kept.
1958
1029
:force: Delete files and directories, even if they are changed and
1959
1030
even if the directories are not empty.
1961
if isinstance(files, basestring):
1967
unknown_nested_files=set()
1969
to_file = sys.stdout
1971
def recurse_directory_to_add_files(directory):
1972
# Recurse directory and add all files
1973
# so we can check if they have changed.
1974
for parent_info, file_infos in\
1975
self.walkdirs(directory):
1976
for relpath, basename, kind, lstat, fileid, kind in file_infos:
1977
# Is it versioned or ignored?
1978
if self.path2id(relpath) or self.is_ignored(relpath):
1979
# Add nested content for deletion.
1980
new_files.add(relpath)
1982
# Files which are not versioned and not ignored
1983
# should be treated as unknown.
1984
unknown_nested_files.add((relpath, None, kind))
1986
for filename in files:
1987
# Get file name into canonical form.
1988
abspath = self.abspath(filename)
1989
filename = self.relpath(abspath)
1990
if len(filename) > 0:
1991
new_files.add(filename)
1992
recurse_directory_to_add_files(filename)
1994
files = list(new_files)
1997
return # nothing to do
1999
# Sort needed to first handle directory content before the directory
2000
files.sort(reverse=True)
2002
# Bail out if we are going to delete files we shouldn't
2003
if not keep_files and not force:
2004
has_changed_files = len(unknown_nested_files) > 0
2005
if not has_changed_files:
2006
for (file_id, path, content_change, versioned, parent_id, name,
2007
kind, executable) in self.iter_changes(self.basis_tree(),
2008
include_unchanged=True, require_versioned=False,
2009
want_unversioned=True, specific_files=files):
2010
if versioned == (False, False):
2011
# The record is unknown ...
2012
if not self.is_ignored(path[1]):
2013
# ... but not ignored
2014
has_changed_files = True
2016
elif content_change and (kind[1] is not None):
2017
# Versioned and changed, but not deleted
2018
has_changed_files = True
2021
if has_changed_files:
2022
# Make delta show ALL applicable changes in error message.
2023
tree_delta = self.changes_from(self.basis_tree(),
2024
require_versioned=False, want_unversioned=True,
2025
specific_files=files)
2026
for unknown_file in unknown_nested_files:
2027
if unknown_file not in tree_delta.unversioned:
2028
tree_delta.unversioned.extend((unknown_file,))
2029
raise errors.BzrRemoveChangedFilesError(tree_delta)
2031
# Build inv_delta and delete files where applicable,
2032
# do this before any modifications to inventory.
2034
fid = self.path2id(f)
2037
message = "%s is not versioned." % (f,)
2040
# having removed it, it must be either ignored or unknown
2041
if self.is_ignored(f):
2045
# XXX: Really should be a more abstract reporter interface
2046
kind_ch = osutils.kind_marker(self.kind(fid))
2047
to_file.write(new_status + ' ' + f + kind_ch + '\n')
2049
inv_delta.append((f, None, fid, None))
2050
message = "removed %s" % (f,)
2053
abs_path = self.abspath(f)
2054
if osutils.lexists(abs_path):
2055
if (osutils.isdir(abs_path) and
2056
len(os.listdir(abs_path)) > 0):
2058
osutils.rmtree(abs_path)
2060
message = "%s is not an empty directory "\
2061
"and won't be deleted." % (f,)
2063
osutils.delete_any(abs_path)
2064
message = "deleted %s" % (f,)
2065
elif message is not None:
2066
# Only care if we haven't done anything yet.
2067
message = "%s does not exist." % (f,)
2069
# Print only one message (if any) per file.
2070
if message is not None:
2072
self.apply_inventory_delta(inv_delta)
2074
@needs_tree_write_lock
1032
raise NotImplementedError(self.remove)
2075
1034
def revert(self, filenames=None, old_tree=None, backups=True,
2076
1035
pb=None, report_changes=False):
2077
from bzrlib.conflicts import resolve
2080
symbol_versioning.warn('Using [] to revert all files is deprecated'
2081
' as of bzr 0.91. Please use None (the default) instead.',
2082
DeprecationWarning, stacklevel=2)
2083
if old_tree is None:
2084
basis_tree = self.basis_tree()
2085
basis_tree.lock_read()
2086
old_tree = basis_tree
2090
conflicts = transform.revert(self, old_tree, filenames, backups, pb,
2092
if filenames is None and len(self.get_parent_ids()) > 1:
2094
last_revision = self.last_revision()
2095
if last_revision != _mod_revision.NULL_REVISION:
2096
if basis_tree is None:
2097
basis_tree = self.basis_tree()
2098
basis_tree.lock_read()
2099
parent_trees.append((last_revision, basis_tree))
2100
self.set_parent_trees(parent_trees)
1036
from .conflicts import resolve
1037
with self.lock_tree_write():
1038
if old_tree is None:
1039
basis_tree = self.basis_tree()
1040
basis_tree.lock_read()
1041
old_tree = basis_tree
2103
resolve(self, filenames, ignore_misses=True, recursive=True)
2105
if basis_tree is not None:
1045
conflicts = transform.revert(self, old_tree, filenames, backups, pb,
1047
if filenames is None and len(self.get_parent_ids()) > 1:
1049
last_revision = self.last_revision()
1050
if last_revision != _mod_revision.NULL_REVISION:
1051
if basis_tree is None:
1052
basis_tree = self.basis_tree()
1053
basis_tree.lock_read()
1054
parent_trees.append((last_revision, basis_tree))
1055
self.set_parent_trees(parent_trees)
1058
resolve(self, filenames, ignore_misses=True, recursive=True)
1060
if basis_tree is not None:
1064
def store_uncommitted(self):
1065
"""Store uncommitted changes from the tree in the branch."""
1066
raise NotImplementedError(self.store_uncommitted)
1068
def restore_uncommitted(self):
1069
"""Restore uncommitted changes from the branch into the tree."""
1070
raise NotImplementedError(self.restore_uncommitted)
2109
1072
def revision_tree(self, revision_id):
2110
1073
"""See Tree.revision_tree.
2112
WorkingTree can supply revision_trees for the basis revision only
2113
because there is only one cached inventory in the bzr directory.
1075
For trees that can be obtained from the working tree, this
1076
will do so. For other trees, it will fall back to the repository.
2115
if revision_id == self.last_revision():
2117
xml = self.read_basis_inventory()
2118
except errors.NoSuchFile:
2122
inv = xml7.serializer_v7.read_inventory_from_string(xml)
2123
# dont use the repository revision_tree api because we want
2124
# to supply the inventory.
2125
if inv.revision_id == revision_id:
2126
return revisiontree.RevisionTree(self.branch.repository,
2128
except errors.BadInventoryFormat:
2130
# raise if there was no inventory, or if we read the wrong inventory.
2131
raise errors.NoSuchRevisionInTree(self, revision_id)
2133
# XXX: This method should be deprecated in favour of taking in a proper
2134
# new Inventory object.
2135
@needs_tree_write_lock
2136
def set_inventory(self, new_inventory_list):
2137
from bzrlib.inventory import (Inventory,
2141
inv = Inventory(self.get_root_id())
2142
for path, file_id, parent, kind in new_inventory_list:
2143
name = os.path.basename(path)
2146
# fixme, there should be a factory function inv,add_??
2147
if kind == 'directory':
2148
inv.add(InventoryDirectory(file_id, name, parent))
2149
elif kind == 'file':
2150
inv.add(InventoryFile(file_id, name, parent))
2151
elif kind == 'symlink':
2152
inv.add(InventoryLink(file_id, name, parent))
2154
raise errors.BzrError("unknown kind %r" % kind)
2155
self._write_inventory(inv)
2157
@needs_tree_write_lock
1078
raise NotImplementedError(self.revision_tree)
2158
1080
def set_root_id(self, file_id):
2159
1081
"""Set the root id for this tree."""
2163
'WorkingTree.set_root_id with fileid=None')
2164
file_id = osutils.safe_file_id(file_id)
2165
self._set_root_id(file_id)
1082
if not self.supports_setting_file_ids():
1083
raise SettingFileIdUnsupported()
1084
with self.lock_tree_write():
1088
'WorkingTree.set_root_id with fileid=None')
1089
file_id = osutils.safe_file_id(file_id)
1090
self._set_root_id(file_id)
2167
1092
def _set_root_id(self, file_id):
2168
1093
"""Set the root id for this tree, in a format specific manner.
2268
1177
# We MUST save it even if an error occurs, because otherwise the users
2269
1178
# local work is unreferenced and will appear to have been lost.
2273
last_rev = self.get_parent_ids()[0]
2275
last_rev = _mod_revision.NULL_REVISION
2276
if revision is None:
2277
revision = self.branch.last_revision()
2279
old_tip = old_tip or _mod_revision.NULL_REVISION
2281
if not _mod_revision.is_null(old_tip) and old_tip != last_rev:
2282
# the branch we are bound to was updated
2283
# merge those changes in first
2284
base_tree = self.basis_tree()
2285
other_tree = self.branch.repository.revision_tree(old_tip)
2286
nb_conflicts = merge.merge_inner(self.branch, other_tree,
2287
base_tree, this_tree=self,
2288
change_reporter=change_reporter)
2290
self.add_parent_tree((old_tip, other_tree))
2291
trace.note('Rerun update after fixing the conflicts.')
2294
if last_rev != _mod_revision.ensure_null(revision):
2295
# the working tree is up to date with the branch
2296
# we can merge the specified revision from master
2297
to_tree = self.branch.repository.revision_tree(revision)
2298
to_root_id = to_tree.get_root_id()
2300
basis = self.basis_tree()
2303
if (basis.inventory.root is None
2304
or basis.inventory.root.file_id != to_root_id):
2305
self.set_root_id(to_root_id)
2310
# determine the branch point
2311
graph = self.branch.repository.get_graph()
2312
base_rev_id = graph.find_unique_lca(self.branch.last_revision(),
2314
base_tree = self.branch.repository.revision_tree(base_rev_id)
2316
nb_conflicts = merge.merge_inner(self.branch, to_tree, base_tree,
2318
change_reporter=change_reporter)
2319
self.set_last_revision(revision)
2320
# TODO - dedup parents list with things merged by pull ?
2321
# reuse the tree we've updated to to set the basis:
2322
parent_trees = [(revision, to_tree)]
2323
merges = self.get_parent_ids()[1:]
2324
# Ideally we ask the tree for the trees here, that way the working
2325
# tree can decide whether to give us the entire tree or give us a
2326
# lazy initialised tree. dirstate for instance will have the trees
2327
# in ram already, whereas a last-revision + basis-inventory tree
2328
# will not, but also does not need them when setting parents.
2329
for parent in merges:
2330
parent_trees.append(
2331
(parent, self.branch.repository.revision_tree(parent)))
2332
if not _mod_revision.is_null(old_tip):
2333
parent_trees.append(
2334
(old_tip, self.branch.repository.revision_tree(old_tip)))
2335
self.set_parent_trees(parent_trees)
2336
last_rev = parent_trees[0][0]
2339
def _write_hashcache_if_dirty(self):
2340
"""Write out the hashcache if it is dirty."""
2341
if self._hashcache.needs_write:
2343
self._hashcache.write()
2345
if e.errno not in (errno.EPERM, errno.EACCES):
2347
# TODO: jam 20061219 Should this be a warning? A single line
2348
# warning might be sufficient to let the user know what
2350
mutter('Could not write hashcache for %s\nError: %s',
2351
self._hashcache.cache_file_name(), e)
2353
@needs_tree_write_lock
2354
def _write_inventory(self, inv):
2355
"""Write inventory as the current inventory."""
2356
self._set_inventory(inv, dirty=True)
1180
with self.lock_tree_write():
1183
last_rev = self.get_parent_ids()[0]
1185
last_rev = _mod_revision.NULL_REVISION
1186
if revision is None:
1187
revision = self.branch.last_revision()
1189
old_tip = old_tip or _mod_revision.NULL_REVISION
1191
if not _mod_revision.is_null(old_tip) and old_tip != last_rev:
1192
# the branch we are bound to was updated
1193
# merge those changes in first
1194
base_tree = self.basis_tree()
1195
other_tree = self.branch.repository.revision_tree(old_tip)
1196
nb_conflicts = merge.merge_inner(self.branch, other_tree,
1197
base_tree, this_tree=self,
1198
change_reporter=change_reporter,
1199
show_base=show_base)
1201
self.add_parent_tree((old_tip, other_tree))
1202
note(gettext('Rerun update after fixing the conflicts.'))
1205
if last_rev != _mod_revision.ensure_null(revision):
1206
# the working tree is up to date with the branch
1207
# we can merge the specified revision from master
1208
to_tree = self.branch.repository.revision_tree(revision)
1209
to_root_id = to_tree.get_root_id()
1211
basis = self.basis_tree()
1212
with basis.lock_read():
1213
if (basis.get_root_id() is None or basis.get_root_id() != to_root_id):
1214
self.set_root_id(to_root_id)
1217
# determine the branch point
1218
graph = self.branch.repository.get_graph()
1219
base_rev_id = graph.find_unique_lca(self.branch.last_revision(),
1221
base_tree = self.branch.repository.revision_tree(base_rev_id)
1223
nb_conflicts = merge.merge_inner(self.branch, to_tree, base_tree,
1225
change_reporter=change_reporter,
1226
show_base=show_base)
1227
self.set_last_revision(revision)
1228
# TODO - dedup parents list with things merged by pull ?
1229
# reuse the tree we've updated to to set the basis:
1230
parent_trees = [(revision, to_tree)]
1231
merges = self.get_parent_ids()[1:]
1232
# Ideally we ask the tree for the trees here, that way the working
1233
# tree can decide whether to give us the entire tree or give us a
1234
# lazy initialised tree. dirstate for instance will have the trees
1235
# in ram already, whereas a last-revision + basis-inventory tree
1236
# will not, but also does not need them when setting parents.
1237
for parent in merges:
1238
parent_trees.append(
1239
(parent, self.branch.repository.revision_tree(parent)))
1240
if not _mod_revision.is_null(old_tip):
1241
parent_trees.append(
1242
(old_tip, self.branch.repository.revision_tree(old_tip)))
1243
self.set_parent_trees(parent_trees)
1244
last_rev = parent_trees[0][0]
2359
1247
def set_conflicts(self, arg):
2360
1248
raise errors.UnsupportedOperation(self.set_conflicts, self)
2402
1267
If the tree is not locked, it may cause an error to be raised,
2403
1268
depending on the tree implementation.
2405
disk_top = self.abspath(prefix)
2406
if disk_top.endswith('/'):
2407
disk_top = disk_top[:-1]
2408
top_strip_len = len(disk_top) + 1
2409
inventory_iterator = self._walkdirs(prefix)
2410
disk_iterator = osutils.walkdirs(disk_top, prefix)
2412
current_disk = disk_iterator.next()
2413
disk_finished = False
2415
if not (e.errno == errno.ENOENT or
2416
(sys.platform == 'win32' and e.errno == ERROR_PATH_NOT_FOUND)):
2419
disk_finished = True
2421
current_inv = inventory_iterator.next()
2422
inv_finished = False
2423
except StopIteration:
2426
while not inv_finished or not disk_finished:
2428
((cur_disk_dir_relpath, cur_disk_dir_path_from_top),
2429
cur_disk_dir_content) = current_disk
2431
((cur_disk_dir_relpath, cur_disk_dir_path_from_top),
2432
cur_disk_dir_content) = ((None, None), None)
2433
if not disk_finished:
2434
# strip out .bzr dirs
2435
if (cur_disk_dir_path_from_top[top_strip_len:] == '' and
2436
len(cur_disk_dir_content) > 0):
2437
# osutils.walkdirs can be made nicer -
2438
# yield the path-from-prefix rather than the pathjoined
2440
bzrdir_loc = bisect_left(cur_disk_dir_content,
2442
if (bzrdir_loc < len(cur_disk_dir_content)
2443
and self.bzrdir.is_control_filename(
2444
cur_disk_dir_content[bzrdir_loc][0])):
2445
# we dont yield the contents of, or, .bzr itself.
2446
del cur_disk_dir_content[bzrdir_loc]
2448
# everything is unknown
2451
# everything is missing
2454
direction = cmp(current_inv[0][0], cur_disk_dir_relpath)
2456
# disk is before inventory - unknown
2457
dirblock = [(relpath, basename, kind, stat, None, None) for
2458
relpath, basename, kind, stat, top_path in
2459
cur_disk_dir_content]
2460
yield (cur_disk_dir_relpath, None), dirblock
2462
current_disk = disk_iterator.next()
2463
except StopIteration:
2464
disk_finished = True
2466
# inventory is before disk - missing.
2467
dirblock = [(relpath, basename, 'unknown', None, fileid, kind)
2468
for relpath, basename, dkind, stat, fileid, kind in
2470
yield (current_inv[0][0], current_inv[0][1]), dirblock
2472
current_inv = inventory_iterator.next()
2473
except StopIteration:
2476
# versioned present directory
2477
# merge the inventory and disk data together
2479
for relpath, subiterator in itertools.groupby(sorted(
2480
current_inv[1] + cur_disk_dir_content,
2481
key=operator.itemgetter(0)), operator.itemgetter(1)):
2482
path_elements = list(subiterator)
2483
if len(path_elements) == 2:
2484
inv_row, disk_row = path_elements
2485
# versioned, present file
2486
dirblock.append((inv_row[0],
2487
inv_row[1], disk_row[2],
2488
disk_row[3], inv_row[4],
2490
elif len(path_elements[0]) == 5:
2492
dirblock.append((path_elements[0][0],
2493
path_elements[0][1], path_elements[0][2],
2494
path_elements[0][3], None, None))
2495
elif len(path_elements[0]) == 6:
2496
# versioned, absent file.
2497
dirblock.append((path_elements[0][0],
2498
path_elements[0][1], 'unknown', None,
2499
path_elements[0][4], path_elements[0][5]))
2501
raise NotImplementedError('unreachable code')
2502
yield current_inv[0], dirblock
2504
current_inv = inventory_iterator.next()
2505
except StopIteration:
2508
current_disk = disk_iterator.next()
2509
except StopIteration:
2510
disk_finished = True
2512
def _walkdirs(self, prefix=""):
2513
"""Walk the directories of this tree.
2515
:prefix: is used as the directrory to start with.
2516
returns a generator which yields items in the form:
2517
((curren_directory_path, fileid),
2518
[(file1_path, file1_name, file1_kind, None, file1_id,
2521
_directory = 'directory'
2522
# get the root in the inventory
2523
inv = self.inventory
2524
top_id = inv.path2id(prefix)
2528
pending = [(prefix, '', _directory, None, top_id, None)]
2531
currentdir = pending.pop()
2532
# 0 - relpath, 1- basename, 2- kind, 3- stat, 4-id, 5-kind
2533
top_id = currentdir[4]
2535
relroot = currentdir[0] + '/'
2538
# FIXME: stash the node in pending
2540
if entry.kind == 'directory':
2541
for name, child in entry.sorted_children():
2542
dirblock.append((relroot + name, name, child.kind, None,
2543
child.file_id, child.kind
2545
yield (currentdir[0], entry.file_id), dirblock
2546
# push the user specified dirs from dirblock
2547
for dir in reversed(dirblock):
2548
if dir[2] == _directory:
2551
@needs_tree_write_lock
1270
raise NotImplementedError(self.walkdirs)
2552
1272
def auto_resolve(self):
2553
1273
"""Automatically resolve text conflicts according to contents.
2556
1276
are considered 'resolved', because bzr always puts conflict markers
2557
1277
into files that have text conflicts. The corresponding .THIS .BASE and
2558
1278
.OTHER files are deleted, as per 'resolve'.
2559
1280
:return: a tuple of ConflictLists: (un_resolved, resolved).
2561
un_resolved = _mod_conflicts.ConflictList()
2562
resolved = _mod_conflicts.ConflictList()
2563
conflict_re = re.compile('^(<{7}|={7}|>{7})')
2564
for conflict in self.conflicts():
2565
if (conflict.typestring != 'text conflict' or
2566
self.kind(conflict.file_id) != 'file'):
2567
un_resolved.append(conflict)
2569
my_file = open(self.id2abspath(conflict.file_id), 'rb')
2571
for line in my_file:
2572
if conflict_re.search(line):
2573
un_resolved.append(conflict)
2576
resolved.append(conflict)
2579
resolved.remove_files(self)
2580
self.set_conflicts(un_resolved)
2581
return un_resolved, resolved
2584
def _check(self, references):
2585
"""Check the tree for consistency.
2587
:param references: A dict with keys matching the items returned by
2588
self._get_check_refs(), and values from looking those keys up in
2591
tree_basis = self.basis_tree()
2592
tree_basis.lock_read()
2594
repo_basis = references[('trees', self.last_revision())]
2595
if len(list(repo_basis.iter_changes(tree_basis))) > 0:
2596
raise errors.BzrCheckError(
2597
"Mismatched basis inventory content.")
1282
with self.lock_tree_write():
1283
un_resolved = _mod_conflicts.ConflictList()
1284
resolved = _mod_conflicts.ConflictList()
1285
conflict_re = re.compile(b'^(<{7}|={7}|>{7})')
1286
for conflict in self.conflicts():
1287
path = self.id2path(conflict.file_id)
1288
if (conflict.typestring != 'text conflict' or
1289
self.kind(path) != 'file'):
1290
un_resolved.append(conflict)
1292
with open(self.abspath(path), 'rb') as my_file:
1293
for line in my_file:
1294
if conflict_re.search(line):
1295
un_resolved.append(conflict)
1298
resolved.append(conflict)
1299
resolved.remove_files(self)
1300
self.set_conflicts(un_resolved)
1301
return un_resolved, resolved
2602
1303
def _validate(self):
2603
1304
"""Validate internal structures.
1314
def check_state(self):
1315
"""Check that the working state is/isn't valid."""
1316
raise NotImplementedError(self.check_state)
1318
def reset_state(self, revision_ids=None):
1319
"""Reset the state of the working tree.
1321
This does a hard-reset to a last-known-good state. This is a way to
1322
fix if something got corrupted (like the .bzr/checkout/dirstate file)
1324
raise NotImplementedError(self.reset_state)
2613
1326
def _get_rules_searcher(self, default_searcher):
2614
1327
"""See Tree._get_rules_searcher."""
2615
1328
if self._rules_searcher is None:
2616
1329
self._rules_searcher = super(WorkingTree,
2617
self)._get_rules_searcher(default_searcher)
1330
self)._get_rules_searcher(default_searcher)
2618
1331
return self._rules_searcher
2620
1333
def get_shelf_manager(self):
2621
1334
"""Return the ShelfManager for this WorkingTree."""
2622
from bzrlib.shelf import ShelfManager
2623
return ShelfManager(self, self._transport)
2626
class WorkingTree2(WorkingTree):
2627
"""This is the Format 2 working tree.
2629
This was the first weave based working tree.
2630
- uses os locks for locking.
2631
- uses the branch last-revision.
2634
def __init__(self, *args, **kwargs):
2635
super(WorkingTree2, self).__init__(*args, **kwargs)
2636
# WorkingTree2 has more of a constraint that self._inventory must
2637
# exist. Because this is an older format, we don't mind the overhead
2638
# caused by the extra computation here.
2640
# Newer WorkingTree's should only have self._inventory set when they
2642
if self._inventory is None:
2643
self.read_working_inventory()
2645
def _get_check_refs(self):
2646
"""Return the references needed to perform a check of this tree."""
2647
return [('trees', self.last_revision())]
2649
def lock_tree_write(self):
2650
"""See WorkingTree.lock_tree_write().
2652
In Format2 WorkingTrees we have a single lock for the branch and tree
2653
so lock_tree_write() degrades to lock_write().
2655
:return: An object with an unlock method which will release the lock
2658
self.branch.lock_write()
2660
self._control_files.lock_write()
2663
self.branch.unlock()
2667
# do non-implementation specific cleanup
2670
# we share control files:
2671
if self._control_files._lock_count == 3:
2672
# _inventory_is_modified is always False during a read lock.
2673
if self._inventory_is_modified:
2675
self._write_hashcache_if_dirty()
2677
# reverse order of locking.
2679
return self._control_files.unlock()
2681
self.branch.unlock()
2684
class WorkingTree3(WorkingTree):
2685
"""This is the Format 3 working tree.
2687
This differs from the base WorkingTree by:
2688
- having its own file lock
2689
- having its own last-revision property.
2691
This is new in bzr 0.8
2695
def _last_revision(self):
2696
"""See Mutable.last_revision."""
2698
return self._transport.get_bytes('last-revision')
2699
except errors.NoSuchFile:
2700
return _mod_revision.NULL_REVISION
2702
def _change_last_revision(self, revision_id):
2703
"""See WorkingTree._change_last_revision."""
2704
if revision_id is None or revision_id == _mod_revision.NULL_REVISION:
2706
self._transport.delete('last-revision')
2707
except errors.NoSuchFile:
2711
self._transport.put_bytes('last-revision', revision_id,
2712
mode=self.bzrdir._get_file_mode())
2715
def _get_check_refs(self):
2716
"""Return the references needed to perform a check of this tree."""
2717
return [('trees', self.last_revision())]
2719
@needs_tree_write_lock
2720
def set_conflicts(self, conflicts):
2721
self._put_rio('conflicts', conflicts.to_stanzas(),
2724
@needs_tree_write_lock
2725
def add_conflicts(self, new_conflicts):
2726
conflict_set = set(self.conflicts())
2727
conflict_set.update(set(list(new_conflicts)))
2728
self.set_conflicts(_mod_conflicts.ConflictList(sorted(conflict_set,
2729
key=_mod_conflicts.Conflict.sort_key)))
2732
def conflicts(self):
2734
confile = self._transport.get('conflicts')
2735
except errors.NoSuchFile:
2736
return _mod_conflicts.ConflictList()
2739
if confile.next() != CONFLICT_HEADER_1 + '\n':
2740
raise errors.ConflictFormatError()
2741
except StopIteration:
2742
raise errors.ConflictFormatError()
2743
return _mod_conflicts.ConflictList.from_stanzas(RioReader(confile))
2748
# do non-implementation specific cleanup
2750
if self._control_files._lock_count == 1:
2751
# _inventory_is_modified is always False during a read lock.
2752
if self._inventory_is_modified:
2754
self._write_hashcache_if_dirty()
2755
# reverse order of locking.
2757
return self._control_files.unlock()
2759
self.branch.unlock()
2762
def get_conflicted_stem(path):
2763
for suffix in _mod_conflicts.CONFLICT_SUFFIXES:
2764
if path.endswith(suffix):
2765
return path[:-len(suffix)]
2768
class WorkingTreeFormat(object):
1335
raise NotImplementedError(self.get_shelf_manager)
1337
def get_canonical_paths(self, paths):
1338
"""Like get_canonical_path() but works on multiple items.
1340
:param paths: A sequence of paths relative to the root of the tree.
1341
:return: A list of paths, with each item the corresponding input path
1342
adjusted to account for existing elements that match case
1345
with self.lock_read():
1349
def get_canonical_path(self, path):
1350
"""Returns the first item in the tree that matches a path.
1352
This is meant to allow case-insensitive path lookups on e.g.
1355
If a path matches exactly, it is returned. If no path matches exactly
1356
but more than one path matches according to the underlying file system,
1357
it is implementation defined which is returned.
1359
If no path matches according to the file system, the input path is
1360
returned, but with as many path entries that do exist changed to their
1363
If you need to resolve many names from the same tree, you should
1364
use get_canonical_paths() to avoid O(N) behaviour.
1366
:param path: A paths relative to the root of the tree.
1367
:return: The input path adjusted to account for existing elements
1368
that match case insensitively.
1370
with self.lock_read():
1371
return next(self.get_canonical_paths([path]))
1374
class WorkingTreeFormatRegistry(controldir.ControlComponentFormatRegistry):
1375
"""Registry for working tree formats."""
1377
def __init__(self, other_registry=None):
1378
super(WorkingTreeFormatRegistry, self).__init__(other_registry)
1379
self._default_format = None
1380
self._default_format_key = None
1382
def get_default(self):
1383
"""Return the current default format."""
1384
if (self._default_format_key is not None and
1385
self._default_format is None):
1386
self._default_format = self.get(self._default_format_key)
1387
return self._default_format
1389
def set_default(self, format):
1390
"""Set the default format."""
1391
self._default_format = format
1392
self._default_format_key = None
1394
def set_default_key(self, format_string):
1395
"""Set the default format by its format string."""
1396
self._default_format_key = format_string
1397
self._default_format = None
1400
format_registry = WorkingTreeFormatRegistry()
1403
class WorkingTreeFormat(controldir.ControlComponentFormat):
2769
1404
"""An encapsulation of the initialization and open routines for a format.
2771
1406
Formats provide three things:
2842
1491
"""True if this format supports stored views."""
2846
def register_format(klass, format):
2847
klass._formats[format.get_format_string()] = format
2850
def set_default_format(klass, format):
2851
klass._default_format = format
2854
def unregister_format(klass, format):
2855
del klass._formats[format.get_format_string()]
2858
class WorkingTreeFormat2(WorkingTreeFormat):
2859
"""The second working tree format.
2861
This format modified the hash cache from the format 1 hash cache.
2864
upgrade_recommended = True
2866
def get_format_description(self):
2867
"""See WorkingTreeFormat.get_format_description()."""
2868
return "Working tree format 2"
2870
def _stub_initialize_on_transport(self, transport, file_mode):
2871
"""Workaround: create control files for a remote working tree.
2873
This ensures that it can later be updated and dealt with locally,
2874
since BzrDirFormat6 and BzrDirFormat5 cannot represent dirs with
2875
no working tree. (See bug #43064).
2878
inv = inventory.Inventory()
2879
xml5.serializer_v5.write_inventory(inv, sio, working=True)
2881
transport.put_file('inventory', sio, file_mode)
2882
transport.put_bytes('pending-merges', '', file_mode)
2884
def initialize(self, a_bzrdir, revision_id=None, from_branch=None,
2885
accelerator_tree=None, hardlink=False):
2886
"""See WorkingTreeFormat.initialize()."""
2887
if not isinstance(a_bzrdir.transport, LocalTransport):
2888
raise errors.NotLocalUrl(a_bzrdir.transport.base)
2889
if from_branch is not None:
2890
branch = from_branch
2892
branch = a_bzrdir.open_branch()
2893
if revision_id is None:
2894
revision_id = _mod_revision.ensure_null(branch.last_revision())
2897
branch.generate_revision_history(revision_id)
2900
inv = inventory.Inventory()
2901
wt = WorkingTree2(a_bzrdir.root_transport.local_abspath('.'),
2907
basis_tree = branch.repository.revision_tree(revision_id)
2908
if basis_tree.inventory.root is not None:
2909
wt.set_root_id(basis_tree.get_root_id())
2910
# set the parent list and cache the basis tree.
2911
if _mod_revision.is_null(revision_id):
2914
parent_trees = [(revision_id, basis_tree)]
2915
wt.set_parent_trees(parent_trees)
2916
transform.build_tree(basis_tree, wt)
2920
super(WorkingTreeFormat2, self).__init__()
2921
self._matchingbzrdir = bzrdir.BzrDirFormat6()
2923
def open(self, a_bzrdir, _found=False):
2924
"""Return the WorkingTree object for a_bzrdir
2926
_found is a private parameter, do not use it. It is used to indicate
2927
if format probing has already been done.
2930
# we are being called directly and must probe.
2931
raise NotImplementedError
2932
if not isinstance(a_bzrdir.transport, LocalTransport):
2933
raise errors.NotLocalUrl(a_bzrdir.transport.base)
2934
wt = WorkingTree2(a_bzrdir.root_transport.local_abspath('.'),
2940
class WorkingTreeFormat3(WorkingTreeFormat):
2941
"""The second working tree format updated to record a format marker.
2944
- exists within a metadir controlling .bzr
2945
- includes an explicit version marker for the workingtree control
2946
files, separate from the BzrDir format
2947
- modifies the hash cache format
2949
- uses a LockDir to guard access for writes.
2952
upgrade_recommended = True
2954
def get_format_string(self):
2955
"""See WorkingTreeFormat.get_format_string()."""
2956
return "Bazaar-NG Working Tree format 3"
2958
def get_format_description(self):
2959
"""See WorkingTreeFormat.get_format_description()."""
2960
return "Working tree format 3"
2962
_lock_file_name = 'lock'
2963
_lock_class = LockDir
2965
_tree_class = WorkingTree3
2967
def __get_matchingbzrdir(self):
2968
return bzrdir.BzrDirMetaFormat1()
2970
_matchingbzrdir = property(__get_matchingbzrdir)
2972
def _open_control_files(self, a_bzrdir):
2973
transport = a_bzrdir.get_workingtree_transport(None)
2974
return LockableFiles(transport, self._lock_file_name,
2977
def initialize(self, a_bzrdir, revision_id=None, from_branch=None,
2978
accelerator_tree=None, hardlink=False):
2979
"""See WorkingTreeFormat.initialize().
2981
:param revision_id: if supplied, create a working tree at a different
2982
revision than the branch is at.
2983
:param accelerator_tree: A tree which can be used for retrieving file
2984
contents more quickly than the revision tree, i.e. a workingtree.
2985
The revision tree will be used for cases where accelerator_tree's
2986
content is different.
2987
:param hardlink: If true, hard-link files from accelerator_tree,
2990
if not isinstance(a_bzrdir.transport, LocalTransport):
2991
raise errors.NotLocalUrl(a_bzrdir.transport.base)
2992
transport = a_bzrdir.get_workingtree_transport(self)
2993
control_files = self._open_control_files(a_bzrdir)
2994
control_files.create_lock()
2995
control_files.lock_write()
2996
transport.put_bytes('format', self.get_format_string(),
2997
mode=a_bzrdir._get_file_mode())
2998
if from_branch is not None:
2999
branch = from_branch
3001
branch = a_bzrdir.open_branch()
3002
if revision_id is None:
3003
revision_id = _mod_revision.ensure_null(branch.last_revision())
3004
# WorkingTree3 can handle an inventory which has a unique root id.
3005
# as of bzr 0.12. However, bzr 0.11 and earlier fail to handle
3006
# those trees. And because there isn't a format bump inbetween, we
3007
# are maintaining compatibility with older clients.
3008
# inv = Inventory(root_id=gen_root_id())
3009
inv = self._initial_inventory()
3010
wt = self._tree_class(a_bzrdir.root_transport.local_abspath('.'),
3016
_control_files=control_files)
3017
wt.lock_tree_write()
3019
basis_tree = branch.repository.revision_tree(revision_id)
3020
# only set an explicit root id if there is one to set.
3021
if basis_tree.inventory.root is not None:
3022
wt.set_root_id(basis_tree.get_root_id())
3023
if revision_id == _mod_revision.NULL_REVISION:
3024
wt.set_parent_trees([])
3026
wt.set_parent_trees([(revision_id, basis_tree)])
3027
transform.build_tree(basis_tree, wt)
3029
# Unlock in this order so that the unlock-triggers-flush in
3030
# WorkingTree is given a chance to fire.
3031
control_files.unlock()
3035
def _initial_inventory(self):
3036
return inventory.Inventory()
3039
super(WorkingTreeFormat3, self).__init__()
3041
def open(self, a_bzrdir, _found=False):
3042
"""Return the WorkingTree object for a_bzrdir
3044
_found is a private parameter, do not use it. It is used to indicate
3045
if format probing has already been done.
3048
# we are being called directly and must probe.
3049
raise NotImplementedError
3050
if not isinstance(a_bzrdir.transport, LocalTransport):
3051
raise errors.NotLocalUrl(a_bzrdir.transport.base)
3052
wt = self._open(a_bzrdir, self._open_control_files(a_bzrdir))
3055
def _open(self, a_bzrdir, control_files):
3056
"""Open the tree itself.
3058
:param a_bzrdir: the dir for the tree.
3059
:param control_files: the control files for the tree.
3061
return self._tree_class(a_bzrdir.root_transport.local_abspath('.'),
3065
_control_files=control_files)
3068
return self.get_format_string()
3071
__default_format = WorkingTreeFormat6()
3072
WorkingTreeFormat.register_format(__default_format)
3073
WorkingTreeFormat.register_format(WorkingTreeFormat5())
3074
WorkingTreeFormat.register_format(WorkingTreeFormat4())
3075
WorkingTreeFormat.register_format(WorkingTreeFormat3())
3076
WorkingTreeFormat.set_default_format(__default_format)
3077
# formats which have no format string are not discoverable
3078
# and not independently creatable, so are not registered.
3079
_legacy_formats = [WorkingTreeFormat2(),
1494
def get_controldir_for_branch(self):
1495
"""Get the control directory format for creating branches.
1497
This is to support testing of working tree formats that can not exist
1498
in the same control directory as a branch.
1500
return self._matchingcontroldir
1503
format_registry.register_lazy(b"Bazaar Working Tree Format 4 (bzr 0.15)\n",
1504
"breezy.bzr.workingtree_4", "WorkingTreeFormat4")
1505
format_registry.register_lazy(b"Bazaar Working Tree Format 5 (bzr 1.11)\n",
1506
"breezy.bzr.workingtree_4", "WorkingTreeFormat5")
1507
format_registry.register_lazy(b"Bazaar Working Tree Format 6 (bzr 1.14)\n",
1508
"breezy.bzr.workingtree_4", "WorkingTreeFormat6")
1509
format_registry.register_lazy(b"Bazaar-NG Working Tree format 3",
1510
"breezy.bzr.workingtree_3", "WorkingTreeFormat3")
1511
format_registry.set_default_key(b"Bazaar Working Tree Format 6 (bzr 1.14)\n")
added
removed
breezy/workingtree.py
