29
29
WorkingTree.open(dir).
32
# TODO: Give the workingtree sole responsibility for the working inventory;
33
# remove the variable and references to it from the branch. This may require
34
# updating the commit code so as to update the inventory within the working
35
# copy, and making sure there's only one WorkingTree for any directory on disk.
36
# At the moment they may alias the inventory and have old copies of it in
37
# memory. (Now done? -- mbp 20060309)
39
33
from cStringIO import StringIO
42
37
from bzrlib.lazy_import import lazy_import
43
38
lazy_import(globals(), """
44
39
from bisect import bisect_left
46
from copy import deepcopy
55
48
from bzrlib import (
57
51
conflicts as _mod_conflicts,
61
revision as _mod_revision,
74
from bzrlib.transport import get_transport
76
from bzrlib.workingtree_4 import WorkingTreeFormat4
71
from bzrlib.workingtree_4 import (
79
78
from bzrlib import symbol_versioning
80
79
from bzrlib.decorators import needs_read_lock, needs_write_lock
81
from bzrlib.inventory import InventoryEntry, Inventory, ROOT_ID
82
from bzrlib.lockable_files import LockableFiles, TransportLock
80
from bzrlib.lock import LogicalLockResult
81
from bzrlib.lockable_files import LockableFiles
83
82
from bzrlib.lockdir import LockDir
84
83
import bzrlib.mutabletree
85
84
from bzrlib.mutabletree import needs_tree_write_lock
85
from bzrlib import osutils
86
86
from bzrlib.osutils import (
96
94
supports_executable,
96
from bzrlib.filters import filtered_input_file
98
97
from bzrlib.trace import mutter, note
99
98
from bzrlib.transport.local import LocalTransport
100
from bzrlib.progress import DummyProgress, ProgressPhase
101
from bzrlib.revision import NULL_REVISION, CURRENT_REVISION
99
from bzrlib.revision import CURRENT_REVISION
102
100
from bzrlib.rio import RioReader, rio_file, Stanza
103
from bzrlib.symbol_versioning import (deprecated_passed,
106
DEPRECATED_PARAMETER,
101
from bzrlib.symbol_versioning import (
103
DEPRECATED_PARAMETER,
113
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.
114
111
CONFLICT_HEADER_1 = "BZR conflict list format 1"
117
@deprecated_function(zero_thirteen)
118
def gen_file_id(name):
119
"""Return new file id for the basename 'name'.
121
Use bzrlib.generate_ids.gen_file_id() instead
123
return generate_ids.gen_file_id(name)
126
@deprecated_function(zero_thirteen)
128
"""Return a new tree-root file id.
130
This has been deprecated in favor of bzrlib.generate_ids.gen_root_id()
132
return generate_ids.gen_root_id()
113
ERROR_PATH_NOT_FOUND = 3 # WindowsError errno code, equivalent to ENOENT
135
116
class TreeEntry(object):
136
117
"""An entry that implements the minimum interface used by commands.
138
This needs further inspection, it may be better to have
119
This needs further inspection, it may be better to have
139
120
InventoryEntries without ids - though that seems wrong. For now,
140
121
this is a parallel hierarchy to InventoryEntry, and needs to become
141
122
one of several things: decorates to that hierarchy, children of, or
207
"""Construct a WorkingTree for basedir.
196
"""Construct a WorkingTree instance. This is not a public API.
209
If the branch is not supplied, it is opened automatically.
210
If the branch is supplied, it must be the branch for this basedir.
211
(branch.base is not cross checked, because for remote branches that
212
would be meaningless).
198
:param branch: A branch to override probing for the branch.
214
200
self._format = _format
215
201
self.bzrdir = _bzrdir
216
202
if not _internal:
217
# not created via open etc.
218
warnings.warn("WorkingTree() is deprecated as of bzr version 0.8. "
219
"Please use bzrdir.open_workingtree or WorkingTree.open().",
222
wt = WorkingTree.open(basedir)
223
self._branch = wt.branch
224
self.basedir = wt.basedir
225
self._control_files = wt._control_files
226
self._hashcache = wt._hashcache
227
self._set_inventory(wt._inventory, dirty=False)
228
self._format = wt._format
229
self.bzrdir = wt.bzrdir
230
assert isinstance(basedir, basestring), \
231
"base directory %r is not a string" % basedir
203
raise errors.BzrError("Please use bzrdir.open_workingtree or "
204
"WorkingTree.open() to obtain a WorkingTree.")
232
205
basedir = safe_unicode(basedir)
233
206
mutter("opening working tree %r", basedir)
234
207
if deprecated_passed(branch):
236
warnings.warn("WorkingTree(..., branch=XXX) is deprecated"
237
" as of bzr 0.8. Please use bzrdir.open_workingtree() or"
238
" WorkingTree.open().",
242
208
self._branch = branch
244
210
self._branch = self.bzrdir.open_branch()
342
351
path = osutils.getcwd()
343
352
control, relpath = bzrdir.BzrDir.open_containing(path)
345
353
return control.open_workingtree(), relpath
356
def open_containing_paths(file_list, default_directory='.',
357
canonicalize=True, apply_view=True):
358
"""Open the WorkingTree that contains a set of paths.
360
Fail if the paths given are not all in a single tree.
362
This is used for the many command-line interfaces that take a list of
363
any number of files and that require they all be in the same tree.
365
# recommended replacement for builtins.internal_tree_files
366
if file_list is None or len(file_list) == 0:
367
tree = WorkingTree.open_containing(default_directory)[0]
368
# XXX: doesn't really belong here, and seems to have the strange
369
# side effect of making it return a bunch of files, not the whole
370
# tree -- mbp 20100716
371
if tree.supports_views() and apply_view:
372
view_files = tree.views.lookup_view()
374
file_list = view_files
375
view_str = views.view_display_str(view_files)
376
note("Ignoring files outside view. View is %s" % view_str)
377
return tree, file_list
378
tree = WorkingTree.open_containing(file_list[0])[0]
379
return tree, tree.safe_relpath_files(file_list, canonicalize,
380
apply_view=apply_view)
382
def safe_relpath_files(self, file_list, canonicalize=True, apply_view=True):
383
"""Convert file_list into a list of relpaths in tree.
385
:param self: A tree to operate on.
386
:param file_list: A list of user provided paths or None.
387
:param apply_view: if True and a view is set, apply it or check that
388
specified files are within it
389
:return: A list of relative paths.
390
:raises errors.PathNotChild: When a provided path is in a different self
393
if file_list is None:
395
if self.supports_views() and apply_view:
396
view_files = self.views.lookup_view()
400
# self.relpath exists as a "thunk" to osutils, but canonical_relpath
401
# doesn't - fix that up here before we enter the loop.
403
fixer = lambda p: osutils.canonical_relpath(self.basedir, p)
406
for filename in file_list:
407
relpath = fixer(osutils.dereference_path(filename))
408
if view_files and not osutils.is_inside_any(view_files, relpath):
409
raise errors.FileOutsideView(filename, view_files)
410
new_list.append(relpath)
348
414
def open_downlevel(path=None):
349
415
"""Open an unsupported working tree.
392
483
# at this point ?
394
485
return self.branch.repository.revision_tree(revision_id)
395
except errors.RevisionNotPresent:
486
except (errors.RevisionNotPresent, errors.NoSuchRevision):
396
487
# the basis tree *may* be a ghost or a low level error may have
397
# occured. If the revision is present, its a problem, if its not
488
# occurred. If the revision is present, its a problem, if its not
399
490
if self.branch.repository.has_revision(revision_id):
401
492
# the basis tree is a ghost so return an empty tree.
402
return self.branch.repository.revision_tree(None)
405
@deprecated_method(zero_eight)
406
def create(branch, directory):
407
"""Create a workingtree for branch at directory.
409
If existing_directory already exists it must have a .bzr directory.
410
If it does not exist, it will be created.
412
This returns a new WorkingTree object for the new checkout.
414
TODO FIXME RBC 20060124 when we have checkout formats in place this
415
should accept an optional revisionid to checkout [and reject this if
416
checking out into the same dir as a pre-checkout-aware branch format.]
418
XXX: When BzrDir is present, these should be created through that
421
warnings.warn('delete WorkingTree.create', stacklevel=3)
422
transport = get_transport(directory)
423
if branch.bzrdir.root_transport.base == transport.base:
425
return branch.bzrdir.create_workingtree()
426
# different directory,
427
# create a branch reference
428
# and now a working tree.
429
raise NotImplementedError
432
@deprecated_method(zero_eight)
433
def create_standalone(directory):
434
"""Create a checkout and a branch and a repo at directory.
436
Directory must exist and be empty.
438
please use BzrDir.create_standalone_workingtree
440
return bzrdir.BzrDir.create_standalone_workingtree(directory)
493
return self.branch.repository.revision_tree(
494
_mod_revision.NULL_REVISION)
497
self._flush_ignore_list_cache()
442
499
def relpath(self, path):
443
500
"""Return the local path portion from a given path.
445
The path may be absolute or relative. If its a relative path it is
502
The path may be absolute or relative. If its a relative path it is
446
503
interpreted relative to the python current working directory.
448
505
return osutils.relpath(self.basedir, path)
450
507
def has_filename(self, filename):
451
508
return osutils.lexists(self.abspath(filename))
453
def get_file(self, file_id):
454
file_id = osutils.safe_file_id(file_id)
455
return self.get_file_byname(self.id2path(file_id))
457
def get_file_text(self, file_id):
458
file_id = osutils.safe_file_id(file_id)
459
return self.get_file(file_id).read()
461
def get_file_byname(self, filename):
462
return file(self.abspath(filename), 'rb')
510
def get_file(self, file_id, path=None, filtered=True):
511
return self.get_file_with_stat(file_id, path, filtered=filtered)[0]
513
def get_file_with_stat(self, file_id, path=None, filtered=True,
515
"""See Tree.get_file_with_stat."""
517
path = self.id2path(file_id)
518
file_obj = self.get_file_byname(path, filtered=False)
519
stat_value = _fstat(file_obj.fileno())
520
if filtered and self.supports_content_filtering():
521
filters = self._content_filter_stack(path)
522
file_obj = filtered_input_file(file_obj, filters)
523
return (file_obj, stat_value)
525
def get_file_text(self, file_id, path=None, filtered=True):
526
my_file = self.get_file(file_id, path=path, filtered=filtered)
528
return my_file.read()
532
def get_file_byname(self, filename, filtered=True):
533
path = self.abspath(filename)
535
if filtered and self.supports_content_filtering():
536
filters = self._content_filter_stack(filename)
537
return filtered_input_file(f, filters)
541
def get_file_lines(self, file_id, path=None, filtered=True):
542
"""See Tree.get_file_lines()"""
543
file = self.get_file(file_id, path, filtered=filtered)
545
return file.readlines()
465
def annotate_iter(self, file_id):
550
def annotate_iter(self, file_id, default_revision=CURRENT_REVISION):
466
551
"""See Tree.annotate_iter
468
553
This implementation will use the basis tree implementation if possible.
472
557
incorrectly attributed to CURRENT_REVISION (but after committing, the
473
558
attribution will be correct).
475
file_id = osutils.safe_file_id(file_id)
476
basis = self.basis_tree()
477
changes = self._iter_changes(basis, True, [self.id2path(file_id)],
478
require_versioned=True).next()
479
changed_content, kind = changes[2], changes[6]
480
if not changed_content:
481
return basis.annotate_iter(file_id)
485
if kind[0] != 'file':
488
old_lines = list(basis.annotate_iter(file_id))
490
for tree in self.branch.repository.revision_trees(
491
self.get_parent_ids()[1:]):
492
if file_id not in tree:
494
old.append(list(tree.annotate_iter(file_id)))
495
return annotate.reannotate(old, self.get_file(file_id).readlines(),
560
maybe_file_parent_keys = []
561
for parent_id in self.get_parent_ids():
563
parent_tree = self.revision_tree(parent_id)
564
except errors.NoSuchRevisionInTree:
565
parent_tree = self.branch.repository.revision_tree(parent_id)
566
parent_tree.lock_read()
568
if file_id not in parent_tree:
570
ie = parent_tree.inventory[file_id]
571
if ie.kind != 'file':
572
# Note: this is slightly unnecessary, because symlinks and
573
# directories have a "text" which is the empty text, and we
574
# know that won't mess up annotations. But it seems cleaner
576
parent_text_key = (file_id, ie.revision)
577
if parent_text_key not in maybe_file_parent_keys:
578
maybe_file_parent_keys.append(parent_text_key)
581
graph = _mod_graph.Graph(self.branch.repository.texts)
582
heads = graph.heads(maybe_file_parent_keys)
583
file_parent_keys = []
584
for key in maybe_file_parent_keys:
586
file_parent_keys.append(key)
588
# Now we have the parents of this content
589
annotator = self.branch.repository.texts.get_annotator()
590
text = self.get_file_text(file_id)
591
this_key =(file_id, default_revision)
592
annotator.add_special_text(this_key, file_parent_keys, text)
593
annotations = [(key[-1], line)
594
for key, line in annotator.annotate_flat(this_key)]
597
def _get_ancestors(self, default_revision):
598
ancestors = set([default_revision])
599
for parent_id in self.get_parent_ids():
600
ancestors.update(self.branch.repository.get_ancestry(
601
parent_id, topo_sorted=False))
498
604
def get_parent_ids(self):
499
605
"""See Tree.get_parent_ids.
501
607
This implementation reads the pending merges list and last_revision
502
608
value and uses that to decide what the parents list should be.
504
last_rev = self._last_revision()
610
last_rev = _mod_revision.ensure_null(self._last_revision())
611
if _mod_revision.NULL_REVISION == last_rev:
508
614
parents = [last_rev]
510
merges_file = self._control_files.get('pending-merges')
616
merges_bytes = self._transport.get_bytes('pending-merges')
511
617
except errors.NoSuchFile:
514
for l in merges_file.readlines():
515
revision_id = osutils.safe_revision_id(l.rstrip('\n'))
620
for l in osutils.split_lines(merges_bytes):
621
revision_id = l.rstrip('\n')
516
622
parents.append(revision_id)
520
626
def get_root_id(self):
521
627
"""Return the id of this trees root"""
522
628
return self._inventory.root.file_id
524
630
def _get_store_filename(self, file_id):
525
631
## XXX: badly named; this is not in the store at all
526
file_id = osutils.safe_file_id(file_id)
527
632
return self.abspath(self.id2path(file_id))
530
def clone(self, to_bzrdir, revision_id=None, basis=None):
635
def clone(self, to_bzrdir, revision_id=None):
531
636
"""Duplicate this working tree into to_bzr, including all state.
533
638
Specifically modified files are kept as modified, but
534
639
ignored and unknown files are discarded.
536
641
If you want to make a new line of development, see bzrdir.sprout()
539
If not None, the cloned tree will have its last revision set to
540
revision, and and difference between the source trees last revision
644
If not None, the cloned tree will have its last revision set to
645
revision, and difference between the source trees last revision
541
646
and this one merged in.
544
If not None, a closer copy of a tree which may have some files in
545
common, and which file content should be preferentially copied from.
547
648
# assumes the target bzr dir format is compatible.
548
result = self._format.initialize(to_bzrdir)
649
result = to_bzrdir.create_workingtree()
549
650
self.copy_content_into(result, revision_id)
583
681
__contains__ = has_id
585
683
def get_file_size(self, file_id):
586
file_id = osutils.safe_file_id(file_id)
587
return os.path.getsize(self.id2abspath(file_id))
684
"""See Tree.get_file_size"""
685
# XXX: this returns the on-disk size; it should probably return the
688
return os.path.getsize(self.id2abspath(file_id))
690
if e.errno != errno.ENOENT:
590
696
def get_file_sha1(self, file_id, path=None, stat_value=None):
591
file_id = osutils.safe_file_id(file_id)
593
698
path = self._inventory.id2path(file_id)
594
699
return self._hashcache.get_sha1(path, stat_value)
596
701
def get_file_mtime(self, file_id, path=None):
597
file_id = osutils.safe_file_id(file_id)
599
703
path = self.inventory.id2path(file_id)
600
704
return os.lstat(self.abspath(path)).st_mtime
706
def _is_executable_from_path_and_stat_from_basis(self, path, stat_result):
707
file_id = self.path2id(path)
709
# For unversioned files on win32, we just assume they are not
712
return self._inventory[file_id].executable
714
def _is_executable_from_path_and_stat_from_stat(self, path, stat_result):
715
mode = stat_result.st_mode
716
return bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode)
602
718
if not supports_executable():
603
719
def is_executable(self, file_id, path=None):
604
file_id = osutils.safe_file_id(file_id)
605
720
return self._inventory[file_id].executable
722
_is_executable_from_path_and_stat = \
723
_is_executable_from_path_and_stat_from_basis
607
725
def is_executable(self, file_id, path=None):
609
file_id = osutils.safe_file_id(file_id)
610
727
path = self.id2path(file_id)
611
728
mode = os.lstat(self.abspath(path)).st_mode
612
729
return bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode)
731
_is_executable_from_path_and_stat = \
732
_is_executable_from_path_and_stat_from_stat
734
@needs_tree_write_lock
615
735
def _add(self, files, ids, kinds):
616
736
"""See MutableTree._add."""
617
737
# TODO: Re-adding a file that is removed in the working copy
618
738
# should probably put it back with the previous ID.
619
# the read and write working inventory should not occur in this
739
# the read and write working inventory should not occur in this
620
740
# function - they should be part of lock_write and unlock.
621
inv = self.read_working_inventory()
622
742
for f, file_id, kind in zip(files, ids, kinds):
623
assert kind is not None
624
743
if file_id is None:
625
744
inv.add_path(f, kind=kind)
627
file_id = osutils.safe_file_id(file_id)
628
746
inv.add_path(f, kind=kind, file_id=file_id)
629
self._write_inventory(inv)
747
self._inventory_is_modified = True
631
749
@needs_tree_write_lock
632
750
def _gather_kinds(self, files, kinds):
693
811
self.set_parent_ids(parents, allow_leftmost_as_ghost=True)
695
@deprecated_method(zero_eleven)
697
def pending_merges(self):
698
"""Return a list of pending merges.
700
These are revisions that have been merged into the working
701
directory but not yet committed.
703
As of 0.11 this is deprecated. Please see WorkingTree.get_parent_ids()
704
instead - which is available on all tree objects.
706
return self.get_parent_ids()[1:]
813
def path_content_summary(self, path, _lstat=os.lstat,
814
_mapper=osutils.file_kind_from_stat_mode):
815
"""See Tree.path_content_summary."""
816
abspath = self.abspath(path)
818
stat_result = _lstat(abspath)
820
if getattr(e, 'errno', None) == errno.ENOENT:
822
return ('missing', None, None, None)
823
# propagate other errors
825
kind = _mapper(stat_result.st_mode)
827
return self._file_content_summary(path, stat_result)
828
elif kind == 'directory':
829
# perhaps it looks like a plain directory, but it's really a
831
if self._directory_is_tree_reference(path):
832
kind = 'tree-reference'
833
return kind, None, None, None
834
elif kind == 'symlink':
835
target = osutils.readlink(abspath)
836
return ('symlink', None, None, target)
838
return (kind, None, None, None)
840
def _file_content_summary(self, path, stat_result):
841
size = stat_result.st_size
842
executable = self._is_executable_from_path_and_stat(path, stat_result)
843
# try for a stat cache lookup
844
return ('file', size, executable, self._sha_from_stat(
708
847
def _check_parents_for_ghosts(self, revision_ids, allow_leftmost_as_ghost):
709
848
"""Common ghost checking functionality from set_parent_*.
720
859
def _set_merges_from_parent_ids(self, parent_ids):
721
860
merges = parent_ids[1:]
722
self._control_files.put_bytes('pending-merges', '\n'.join(merges))
861
self._transport.put_bytes('pending-merges', '\n'.join(merges),
862
mode=self.bzrdir._get_file_mode())
864
def _filter_parent_ids_by_ancestry(self, revision_ids):
865
"""Check that all merged revisions are proper 'heads'.
867
This will always return the first revision_id, and any merged revisions
870
if len(revision_ids) == 0:
872
graph = self.branch.repository.get_graph()
873
heads = graph.heads(revision_ids)
874
new_revision_ids = revision_ids[:1]
875
for revision_id in revision_ids[1:]:
876
if revision_id in heads and revision_id not in new_revision_ids:
877
new_revision_ids.append(revision_id)
878
if new_revision_ids != revision_ids:
879
trace.mutter('requested to set revision_ids = %s,'
880
' but filtered to %s', revision_ids, new_revision_ids)
881
return new_revision_ids
724
883
@needs_tree_write_lock
725
884
def set_parent_ids(self, revision_ids, allow_leftmost_as_ghost=False):
726
885
"""Set the parent ids to revision_ids.
728
887
See also set_parent_trees. This api will try to retrieve the tree data
729
888
for each element of revision_ids from the trees repository. If you have
730
889
tree data already available, it is more efficient to use
734
893
:param revision_ids: The revision_ids to set as the parent ids of this
735
894
working tree. Any of these may be ghosts.
737
revision_ids = [osutils.safe_revision_id(r) for r in revision_ids]
738
896
self._check_parents_for_ghosts(revision_ids,
739
897
allow_leftmost_as_ghost=allow_leftmost_as_ghost)
898
for revision_id in revision_ids:
899
_mod_revision.check_not_reserved_id(revision_id)
901
revision_ids = self._filter_parent_ids_by_ancestry(revision_ids)
741
903
if len(revision_ids) > 0:
742
904
self.set_last_revision(revision_ids[0])
744
self.set_last_revision(None)
906
self.set_last_revision(_mod_revision.NULL_REVISION)
746
908
self._set_merges_from_parent_ids(revision_ids)
748
910
@needs_tree_write_lock
749
911
def set_parent_trees(self, parents_list, allow_leftmost_as_ghost=False):
750
912
"""See MutableTree.set_parent_trees."""
751
parent_ids = [osutils.safe_revision_id(rev) for (rev, tree) in parents_list]
913
parent_ids = [rev for (rev, tree) in parents_list]
914
for revision_id in parent_ids:
915
_mod_revision.check_not_reserved_id(revision_id)
753
917
self._check_parents_for_ghosts(parent_ids,
754
918
allow_leftmost_as_ghost=allow_leftmost_as_ghost)
920
parent_ids = self._filter_parent_ids_by_ancestry(parent_ids)
756
922
if len(parent_ids) == 0:
757
leftmost_parent_id = None
923
leftmost_parent_id = _mod_revision.NULL_REVISION
758
924
leftmost_parent_tree = None
760
926
leftmost_parent_id, leftmost_parent_tree = parents_list[0]
801
979
branch.last_revision().
803
981
from bzrlib.merge import Merger, Merge3Merger
804
pb = bzrlib.ui.ui_factory.nested_progress_bar()
806
merger = Merger(self.branch, this_tree=self, pb=pb)
807
merger.pp = ProgressPhase("Merge phase", 5, pb)
808
merger.pp.next_phase()
809
# check that there are no
811
merger.check_basis(check_clean=True, require_commits=False)
812
if to_revision is None:
813
to_revision = branch.last_revision()
815
to_revision = osutils.safe_revision_id(to_revision)
816
merger.other_rev_id = to_revision
817
if merger.other_rev_id is None:
818
raise error.NoCommits(branch)
819
self.branch.fetch(branch, last_revision=merger.other_rev_id)
820
merger.other_basis = merger.other_rev_id
821
merger.other_tree = self.branch.repository.revision_tree(
823
merger.pp.next_phase()
982
merger = Merger(self.branch, this_tree=self)
983
# check that there are no local alterations
984
if not force and self.has_changes():
985
raise errors.UncommittedChanges(self)
986
if to_revision is None:
987
to_revision = _mod_revision.ensure_null(branch.last_revision())
988
merger.other_rev_id = to_revision
989
if _mod_revision.is_null(merger.other_rev_id):
990
raise errors.NoCommits(branch)
991
self.branch.fetch(branch, last_revision=merger.other_rev_id)
992
merger.other_basis = merger.other_rev_id
993
merger.other_tree = self.branch.repository.revision_tree(
995
merger.other_branch = branch
996
if from_revision is None:
824
997
merger.find_base()
825
if merger.base_rev_id == merger.other_rev_id:
826
raise errors.PointlessMerge
827
merger.backup_files = False
999
merger.set_base_revision(from_revision, branch)
1000
if merger.base_rev_id == merger.other_rev_id:
1001
raise errors.PointlessMerge
1002
merger.backup_files = False
1003
if merge_type is None:
828
1004
merger.merge_type = Merge3Merger
829
merger.set_interesting_files(None)
830
merger.show_base = False
831
merger.reprocess = False
832
conflicts = merger.do_merge()
1006
merger.merge_type = merge_type
1007
merger.set_interesting_files(None)
1008
merger.show_base = False
1009
merger.reprocess = False
1010
conflicts = merger.do_merge()
1011
merger.set_pending()
836
1012
return conflicts
838
1014
@needs_read_lock
839
1015
def merge_modified(self):
1016
"""Return a dictionary of files modified by a merge.
1018
The list is initialized by WorkingTree.set_merge_modified, which is
1019
typically called after we make some automatic updates to the tree
1022
This returns a map of file_id->sha1, containing only files which are
1023
still in the working inventory and have that text hash.
841
hashfile = self._control_files.get('merge-hashes')
1026
hashfile = self._transport.get('merge-hashes')
842
1027
except errors.NoSuchFile:
846
if hashfile.next() != MERGE_MODIFIED_HEADER_1 + '\n':
1032
if hashfile.next() != MERGE_MODIFIED_HEADER_1 + '\n':
1033
raise errors.MergeModifiedFormatError()
1034
except StopIteration:
847
1035
raise errors.MergeModifiedFormatError()
848
except StopIteration:
849
raise errors.MergeModifiedFormatError()
850
for s in RioReader(hashfile):
851
file_id = s.get("file_id")
852
if file_id not in self.inventory:
855
if hash == self.get_file_sha1(file_id):
856
merge_hashes[file_id] = hash
1036
for s in RioReader(hashfile):
1037
# RioReader reads in Unicode, so convert file_ids back to utf8
1038
file_id = osutils.safe_file_id(s.get("file_id"), warn=False)
1039
if file_id not in self.inventory:
1041
text_hash = s.get("hash")
1042
if text_hash == self.get_file_sha1(file_id):
1043
merge_hashes[file_id] = text_hash
859
1048
@needs_write_lock
860
1049
def mkdir(self, path, file_id=None):
868
1057
def get_symlink_target(self, file_id):
869
return os.readlink(self.id2abspath(file_id))
871
def file_class(self, filename):
872
if self.path2id(filename):
874
elif self.is_ignored(filename):
1058
abspath = self.id2abspath(file_id)
1059
target = osutils.readlink(abspath)
1063
def subsume(self, other_tree):
1064
def add_children(inventory, entry):
1065
for child_entry in entry.children.values():
1066
inventory._byid[child_entry.file_id] = child_entry
1067
if child_entry.kind == 'directory':
1068
add_children(inventory, child_entry)
1069
if other_tree.get_root_id() == self.get_root_id():
1070
raise errors.BadSubsumeSource(self, other_tree,
1071
'Trees have the same root')
1073
other_tree_path = self.relpath(other_tree.basedir)
1074
except errors.PathNotChild:
1075
raise errors.BadSubsumeSource(self, other_tree,
1076
'Tree is not contained by the other')
1077
new_root_parent = self.path2id(osutils.dirname(other_tree_path))
1078
if new_root_parent is None:
1079
raise errors.BadSubsumeSource(self, other_tree,
1080
'Parent directory is not versioned.')
1081
# We need to ensure that the result of a fetch will have a
1082
# versionedfile for the other_tree root, and only fetching into
1083
# RepositoryKnit2 guarantees that.
1084
if not self.branch.repository.supports_rich_root():
1085
raise errors.SubsumeTargetNeedsUpgrade(other_tree)
1086
other_tree.lock_tree_write()
1088
new_parents = other_tree.get_parent_ids()
1089
other_root = other_tree.inventory.root
1090
other_root.parent_id = new_root_parent
1091
other_root.name = osutils.basename(other_tree_path)
1092
self.inventory.add(other_root)
1093
add_children(self.inventory, other_root)
1094
self._write_inventory(self.inventory)
1095
# normally we don't want to fetch whole repositories, but i think
1096
# here we really do want to consolidate the whole thing.
1097
for parent_id in other_tree.get_parent_ids():
1098
self.branch.fetch(other_tree.branch, parent_id)
1099
self.add_parent_tree_id(parent_id)
1102
other_tree.bzrdir.retire_bzrdir()
1104
def _setup_directory_is_tree_reference(self):
1105
if self._branch.repository._format.supports_tree_reference:
1106
self._directory_is_tree_reference = \
1107
self._directory_may_be_tree_reference
1109
self._directory_is_tree_reference = \
1110
self._directory_is_never_tree_reference
1112
def _directory_is_never_tree_reference(self, relpath):
1115
def _directory_may_be_tree_reference(self, relpath):
1116
# as a special case, if a directory contains control files then
1117
# it's a tree reference, except that the root of the tree is not
1118
return relpath and osutils.isdir(self.abspath(relpath) + u"/.bzr")
1119
# TODO: We could ask all the control formats whether they
1120
# recognize this directory, but at the moment there's no cheap api
1121
# to do that. Since we probably can only nest bzr checkouts and
1122
# they always use this name it's ok for now. -- mbp 20060306
1124
# FIXME: There is an unhandled case here of a subdirectory
1125
# containing .bzr but not a branch; that will probably blow up
1126
# when you try to commit it. It might happen if there is a
1127
# checkout in a subdirectory. This can be avoided by not adding
1130
@needs_tree_write_lock
1131
def extract(self, file_id, format=None):
1132
"""Extract a subtree from this tree.
1134
A new branch will be created, relative to the path for this tree.
1138
segments = osutils.splitpath(path)
1139
transport = self.branch.bzrdir.root_transport
1140
for name in segments:
1141
transport = transport.clone(name)
1142
transport.ensure_base()
1145
sub_path = self.id2path(file_id)
1146
branch_transport = mkdirs(sub_path)
1148
format = self.bzrdir.cloning_metadir()
1149
branch_transport.ensure_base()
1150
branch_bzrdir = format.initialize_on_transport(branch_transport)
1152
repo = branch_bzrdir.find_repository()
1153
except errors.NoRepositoryPresent:
1154
repo = branch_bzrdir.create_repository()
1155
if not repo.supports_rich_root():
1156
raise errors.RootNotRich()
1157
new_branch = branch_bzrdir.create_branch()
1158
new_branch.pull(self.branch)
1159
for parent_id in self.get_parent_ids():
1160
new_branch.fetch(self.branch, parent_id)
1161
tree_transport = self.bzrdir.root_transport.clone(sub_path)
1162
if tree_transport.base != branch_transport.base:
1163
tree_bzrdir = format.initialize_on_transport(tree_transport)
1164
branch.BranchReferenceFormat().initialize(tree_bzrdir,
1165
target_branch=new_branch)
1167
tree_bzrdir = branch_bzrdir
1168
wt = tree_bzrdir.create_workingtree(_mod_revision.NULL_REVISION)
1169
wt.set_parent_ids(self.get_parent_ids())
1170
my_inv = self.inventory
1171
child_inv = inventory.Inventory(root_id=None)
1172
new_root = my_inv[file_id]
1173
my_inv.remove_recursive_id(file_id)
1174
new_root.parent_id = None
1175
child_inv.add(new_root)
1176
self._write_inventory(my_inv)
1177
wt._write_inventory(child_inv)
1180
def _serialize(self, inventory, out_file):
1181
xml5.serializer_v5.write_inventory(self._inventory, out_file,
1184
def _deserialize(selt, in_file):
1185
return xml5.serializer_v5.read_inventory(in_file)
879
1187
def flush(self):
880
1188
"""Write the in memory inventory to disk."""
882
1190
if self._control_files._lock_mode != 'w':
883
1191
raise errors.NotWriteLocked(self)
884
1192
sio = StringIO()
885
xml5.serializer_v5.write_inventory(self._inventory, sio)
1193
self._serialize(self._inventory, sio)
887
self._control_files.put('inventory', sio)
1195
self._transport.put_file('inventory', sio,
1196
mode=self.bzrdir._get_file_mode())
888
1197
self._inventory_is_modified = False
890
def list_files(self, include_root=False):
891
"""Recursively list all files as (path, class, kind, id, entry).
1199
def _kind(self, relpath):
1200
return osutils.file_kind(self.abspath(relpath))
1202
def list_files(self, include_root=False, from_dir=None, recursive=True):
1203
"""List all files as (path, class, kind, id, entry).
893
1205
Lists, but does not descend into unversioned directories.
895
1206
This does not include files that have been deleted in this
1207
tree. Skips the control directory.
898
Skips the control directory.
1209
:param include_root: if True, return an entry for the root
1210
:param from_dir: start from this directory or None for the root
1211
:param recursive: whether to recurse into subdirectories or not
900
1213
# list_files is an iterator, so @needs_read_lock doesn't work properly
901
1214
# with it. So callers should be careful to always read_lock the tree.
988
1309
except KeyError:
989
1310
yield fp[1:], c, fk, None, TreeEntry()
992
1313
if fk != 'directory':
995
# But do this child first
996
new_children = os.listdir(fap)
998
new_children = collections.deque(new_children)
999
stack.append((f_ie.file_id, fp, fap, new_children))
1000
# Break out of inner loop,
1001
# so that we start outer loop with child
1316
# But do this child first if recursing down
1318
new_children = os.listdir(fap)
1320
new_children = collections.deque(new_children)
1321
stack.append((f_ie.file_id, fp, fap, new_children))
1322
# Break out of inner loop,
1323
# so that we start outer loop with child
1004
1326
# if we finished all children, pop it off the stack
1007
1329
@needs_tree_write_lock
1008
def move(self, from_paths, to_dir=None, after=False, **kwargs):
1330
def move(self, from_paths, to_dir=None, after=False):
1009
1331
"""Rename files.
1011
1333
to_dir must exist in the inventory.
1013
1335
If to_dir exists and is a directory, the files are moved into
1014
it, keeping their old names.
1336
it, keeping their old names.
1016
1338
Note that to_dir is only the last component of the new name;
1017
1339
this doesn't change the directory.
1520
1851
@needs_read_lock
1521
1852
def _last_revision(self):
1522
1853
"""helper for get_parent_ids."""
1523
return self.branch.last_revision()
1854
return _mod_revision.ensure_null(self.branch.last_revision())
1525
1856
def is_locked(self):
1526
1857
return self._control_files.is_locked()
1859
def _must_be_locked(self):
1860
if not self.is_locked():
1861
raise errors.ObjectNotLocked(self)
1528
1863
def lock_read(self):
1529
"""See Branch.lock_read, and WorkingTree.unlock."""
1864
"""Lock the tree for reading.
1866
This also locks the branch, and can be unlocked via self.unlock().
1868
:return: A bzrlib.lock.LogicalLockResult.
1870
if not self.is_locked():
1530
1872
self.branch.lock_read()
1532
return self._control_files.lock_read()
1874
self._control_files.lock_read()
1875
return LogicalLockResult(self.unlock)
1534
1877
self.branch.unlock()
1537
1880
def lock_tree_write(self):
1538
"""See MutableTree.lock_tree_write, and WorkingTree.unlock."""
1881
"""See MutableTree.lock_tree_write, and WorkingTree.unlock.
1883
:return: A bzrlib.lock.LogicalLockResult.
1885
if not self.is_locked():
1539
1887
self.branch.lock_read()
1541
return self._control_files.lock_write()
1889
self._control_files.lock_write()
1890
return LogicalLockResult(self.unlock)
1543
1892
self.branch.unlock()
1546
1895
def lock_write(self):
1547
"""See MutableTree.lock_write, and WorkingTree.unlock."""
1896
"""See MutableTree.lock_write, and WorkingTree.unlock.
1898
:return: A bzrlib.lock.LogicalLockResult.
1900
if not self.is_locked():
1548
1902
self.branch.lock_write()
1550
return self._control_files.lock_write()
1904
self._control_files.lock_write()
1905
return LogicalLockResult(self.unlock)
1552
1907
self.branch.unlock()
1626
1987
def read_basis_inventory(self):
1627
1988
"""Read the cached basis inventory."""
1628
1989
path = self._basis_inventory_name()
1629
return self._control_files.get(path).read()
1990
return self._transport.get_bytes(path)
1631
1992
@needs_read_lock
1632
1993
def read_working_inventory(self):
1633
1994
"""Read the working inventory.
1635
1996
:raises errors.InventoryModified: read_working_inventory will fail
1636
1997
when the current in memory inventory has been modified.
1638
# conceptually this should be an implementation detail of the tree.
1999
# conceptually this should be an implementation detail of the tree.
1639
2000
# XXX: Deprecate this.
1640
2001
# ElementTree does its own conversion from UTF-8, so open in
1642
2003
if self._inventory_is_modified:
1643
2004
raise errors.InventoryModified(self)
1644
result = xml5.serializer_v5.read_inventory(
1645
self._control_files.get('inventory'))
2005
f = self._transport.get('inventory')
2007
result = self._deserialize(f)
1646
2010
self._set_inventory(result, dirty=False)
1649
2013
@needs_tree_write_lock
1650
def remove(self, files, verbose=False, to_file=None):
1651
"""Remove nominated files from the working inventory..
1653
This does not remove their text. This does not run on XXX on what? RBC
1655
TODO: Refuse to remove modified files unless --force is given?
1657
TODO: Do something useful with directories.
1659
TODO: Should this remove the text or not? Tough call; not
1660
removing may be useful and the user can just use use rm, and
1661
is the opposite of add. Removing it is consistent with most
1662
other tools. Maybe an option.
2014
def remove(self, files, verbose=False, to_file=None, keep_files=True,
2016
"""Remove nominated files from the working inventory.
2018
:files: File paths relative to the basedir.
2019
:keep_files: If true, the files will also be kept.
2020
:force: Delete files and directories, even if they are changed and
2021
even if the directories are not empty.
1664
## TODO: Normalize names
1665
## TODO: Remove nested loops; better scalability
1666
2023
if isinstance(files, basestring):
1667
2024
files = [files]
1669
inv = self.inventory
1671
# do this before any modifications
2028
all_files = set() # specified and nested files
2029
unknown_nested_files=set()
2031
to_file = sys.stdout
2033
files_to_backup = []
2035
def recurse_directory_to_add_files(directory):
2036
# Recurse directory and add all files
2037
# so we can check if they have changed.
2038
for parent_info, file_infos in self.walkdirs(directory):
2039
for relpath, basename, kind, lstat, fileid, kind in file_infos:
2040
# Is it versioned or ignored?
2041
if self.path2id(relpath):
2042
# Add nested content for deletion.
2043
all_files.add(relpath)
2045
# Files which are not versioned
2046
# should be treated as unknown.
2047
files_to_backup.append(relpath)
2049
for filename in files:
2050
# Get file name into canonical form.
2051
abspath = self.abspath(filename)
2052
filename = self.relpath(abspath)
2053
if len(filename) > 0:
2054
all_files.add(filename)
2055
recurse_directory_to_add_files(filename)
2057
files = list(all_files)
2060
return # nothing to do
2062
# Sort needed to first handle directory content before the directory
2063
files.sort(reverse=True)
2065
# Bail out if we are going to delete files we shouldn't
2066
if not keep_files and not force:
2067
for (file_id, path, content_change, versioned, parent_id, name,
2068
kind, executable) in self.iter_changes(self.basis_tree(),
2069
include_unchanged=True, require_versioned=False,
2070
want_unversioned=True, specific_files=files):
2071
if versioned[0] == False:
2072
# The record is unknown or newly added
2073
files_to_backup.append(path[1])
2074
elif (content_change and (kind[1] is not None) and
2075
osutils.is_inside_any(files, path[1])):
2076
# Versioned and changed, but not deleted, and still
2077
# in one of the dirs to be deleted.
2078
files_to_backup.append(path[1])
2080
def backup(file_to_backup):
2081
backup_name = self.bzrdir.generate_backup_name(file_to_backup)
2082
osutils.rename(abs_path, self.abspath(backup_name))
2083
return "removed %s (but kept a copy: %s)" % (file_to_backup, backup_name)
2085
# Build inv_delta and delete files where applicable,
2086
# do this before any modifications to inventory.
1672
2087
for f in files:
1673
fid = inv.path2id(f)
2088
fid = self.path2id(f)
1675
note("%s is not versioned."%f)
2091
message = "%s is not versioned." % (f,)
1678
# having remove it, it must be either ignored or unknown
2094
# having removed it, it must be either ignored or unknown
1679
2095
if self.is_ignored(f):
1680
2096
new_status = 'I'
1682
2098
new_status = '?'
1683
textui.show_status(new_status, inv[fid].kind, f,
1687
self._write_inventory(inv)
2099
# XXX: Really should be a more abstract reporter interface
2100
kind_ch = osutils.kind_marker(self.kind(fid))
2101
to_file.write(new_status + ' ' + f + kind_ch + '\n')
2103
inv_delta.append((f, None, fid, None))
2104
message = "removed %s" % (f,)
2107
abs_path = self.abspath(f)
2108
if osutils.lexists(abs_path):
2109
if (osutils.isdir(abs_path) and
2110
len(os.listdir(abs_path)) > 0):
2112
osutils.rmtree(abs_path)
2113
message = "deleted %s" % (f,)
2117
if f in files_to_backup:
2120
osutils.delete_any(abs_path)
2121
message = "deleted %s" % (f,)
2122
elif message is not None:
2123
# Only care if we haven't done anything yet.
2124
message = "%s does not exist." % (f,)
2126
# Print only one message (if any) per file.
2127
if message is not None:
2129
self.apply_inventory_delta(inv_delta)
1689
2131
@needs_tree_write_lock
1690
def revert(self, filenames, old_tree=None, backups=True,
1691
pb=DummyProgress(), report_changes=False):
2132
def revert(self, filenames=None, old_tree=None, backups=True,
2133
pb=None, report_changes=False):
1692
2134
from bzrlib.conflicts import resolve
2137
symbol_versioning.warn('Using [] to revert all files is deprecated'
2138
' as of bzr 0.91. Please use None (the default) instead.',
2139
DeprecationWarning, stacklevel=2)
1693
2140
if old_tree is None:
1694
old_tree = self.basis_tree()
1695
conflicts = transform.revert(self, old_tree, filenames, backups, pb,
1697
if not len(filenames):
1698
self.set_parent_ids(self.get_parent_ids()[:1])
2141
basis_tree = self.basis_tree()
2142
basis_tree.lock_read()
2143
old_tree = basis_tree
1701
resolve(self, filenames, ignore_misses=True)
2147
conflicts = transform.revert(self, old_tree, filenames, backups, pb,
2149
if filenames is None and len(self.get_parent_ids()) > 1:
2151
last_revision = self.last_revision()
2152
if last_revision != _mod_revision.NULL_REVISION:
2153
if basis_tree is None:
2154
basis_tree = self.basis_tree()
2155
basis_tree.lock_read()
2156
parent_trees.append((last_revision, basis_tree))
2157
self.set_parent_trees(parent_trees)
2160
resolve(self, filenames, ignore_misses=True, recursive=True)
2162
if basis_tree is not None:
1702
2164
return conflicts
1704
2166
def revision_tree(self, revision_id):
1854
2321
# cant set that until we update the working trees last revision to be
1855
2322
# one from the new branch, because it will just get absorbed by the
1856
2323
# parent de-duplication logic.
1858
2325
# We MUST save it even if an error occurs, because otherwise the users
1859
2326
# local work is unreferenced and will appear to have been lost.
1863
2330
last_rev = self.get_parent_ids()[0]
1864
2331
except IndexError:
1866
if last_rev != self.branch.last_revision():
1867
# merge tree state up to new branch tip.
2332
last_rev = _mod_revision.NULL_REVISION
2333
if revision is None:
2334
revision = self.branch.last_revision()
2336
old_tip = old_tip or _mod_revision.NULL_REVISION
2338
if not _mod_revision.is_null(old_tip) and old_tip != last_rev:
2339
# the branch we are bound to was updated
2340
# merge those changes in first
2341
base_tree = self.basis_tree()
2342
other_tree = self.branch.repository.revision_tree(old_tip)
2343
nb_conflicts = merge.merge_inner(self.branch, other_tree,
2344
base_tree, this_tree=self,
2345
change_reporter=change_reporter)
2347
self.add_parent_tree((old_tip, other_tree))
2348
trace.note('Rerun update after fixing the conflicts.')
2351
if last_rev != _mod_revision.ensure_null(revision):
2352
# the working tree is up to date with the branch
2353
# we can merge the specified revision from master
2354
to_tree = self.branch.repository.revision_tree(revision)
2355
to_root_id = to_tree.get_root_id()
1868
2357
basis = self.basis_tree()
1869
2358
basis.lock_read()
1871
to_tree = self.branch.basis_tree()
1872
if basis.inventory.root is None and self.inventory.root is None:
1873
self.set_root_id(to_tree.inventory.root.file_id)
1874
result += merge.merge_inner(
2360
if (basis.inventory.root is None
2361
or basis.inventory.root.file_id != to_root_id):
2362
self.set_root_id(to_root_id)
2367
# determine the branch point
2368
graph = self.branch.repository.get_graph()
2369
base_rev_id = graph.find_unique_lca(self.branch.last_revision(),
2371
base_tree = self.branch.repository.revision_tree(base_rev_id)
2373
nb_conflicts = merge.merge_inner(self.branch, to_tree, base_tree,
2375
change_reporter=change_reporter)
2376
self.set_last_revision(revision)
1881
2377
# TODO - dedup parents list with things merged by pull ?
1882
2378
# reuse the tree we've updated to to set the basis:
1883
parent_trees = [(self.branch.last_revision(), to_tree)]
2379
parent_trees = [(revision, to_tree)]
1884
2380
merges = self.get_parent_ids()[1:]
1885
2381
# Ideally we ask the tree for the trees here, that way the working
1886
# tree can decide whether to give us teh entire tree or give us a
2382
# tree can decide whether to give us the entire tree or give us a
1887
2383
# lazy initialised tree. dirstate for instance will have the trees
1888
2384
# in ram already, whereas a last-revision + basis-inventory tree
1889
2385
# will not, but also does not need them when setting parents.
1890
2386
for parent in merges:
1891
2387
parent_trees.append(
1892
2388
(parent, self.branch.repository.revision_tree(parent)))
1893
if old_tip is not None:
2389
if not _mod_revision.is_null(old_tip):
1894
2390
parent_trees.append(
1895
2391
(old_tip, self.branch.repository.revision_tree(old_tip)))
1896
2392
self.set_parent_trees(parent_trees)
1897
2393
last_rev = parent_trees[0][0]
1899
# the working tree had the same last-revision as the master
1900
# branch did. We may still have pivot local work from the local
1901
# branch into old_tip:
1902
if old_tip is not None:
1903
self.add_parent_tree_id(old_tip)
1904
if old_tip and old_tip != last_rev:
1905
# our last revision was not the prior branch last revision
1906
# and we have converted that last revision to a pending merge.
1907
# base is somewhere between the branch tip now
1908
# and the now pending merge
1910
# Since we just modified the working tree and inventory, flush out
1911
# the current state, before we modify it again.
1912
# TODO: jam 20070214 WorkingTree3 doesn't require this, dirstate
1913
# requires it only because TreeTransform directly munges the
1914
# inventory and calls tree._write_inventory(). Ultimately we
1915
# should be able to remove this extra flush.
1917
from bzrlib.revision import common_ancestor
1919
base_rev_id = common_ancestor(self.branch.last_revision(),
1921
self.branch.repository)
1922
except errors.NoCommonAncestor:
1924
base_tree = self.branch.repository.revision_tree(base_rev_id)
1925
other_tree = self.branch.repository.revision_tree(old_tip)
1926
result += merge.merge_inner(
1933
2396
def _write_hashcache_if_dirty(self):
1934
2397
"""Write out the hashcache if it is dirty."""
2106
2595
# FIXME: stash the node in pending
2107
2596
entry = inv[top_id]
2108
for name, child in entry.sorted_children():
2109
dirblock.append((relroot + name, name, child.kind, None,
2110
child.file_id, child.kind
2597
if entry.kind == 'directory':
2598
for name, child in entry.sorted_children():
2599
dirblock.append((relroot + name, name, child.kind, None,
2600
child.file_id, child.kind
2112
2602
yield (currentdir[0], entry.file_id), dirblock
2113
2603
# push the user specified dirs from dirblock
2114
2604
for dir in reversed(dirblock):
2115
2605
if dir[2] == _directory:
2116
2606
pending.append(dir)
2608
@needs_tree_write_lock
2609
def auto_resolve(self):
2610
"""Automatically resolve text conflicts according to contents.
2612
Only text conflicts are auto_resolvable. Files with no conflict markers
2613
are considered 'resolved', because bzr always puts conflict markers
2614
into files that have text conflicts. The corresponding .THIS .BASE and
2615
.OTHER files are deleted, as per 'resolve'.
2616
:return: a tuple of ConflictLists: (un_resolved, resolved).
2618
un_resolved = _mod_conflicts.ConflictList()
2619
resolved = _mod_conflicts.ConflictList()
2620
conflict_re = re.compile('^(<{7}|={7}|>{7})')
2621
for conflict in self.conflicts():
2622
if (conflict.typestring != 'text conflict' or
2623
self.kind(conflict.file_id) != 'file'):
2624
un_resolved.append(conflict)
2626
my_file = open(self.id2abspath(conflict.file_id), 'rb')
2628
for line in my_file:
2629
if conflict_re.search(line):
2630
un_resolved.append(conflict)
2633
resolved.append(conflict)
2636
resolved.remove_files(self)
2637
self.set_conflicts(un_resolved)
2638
return un_resolved, resolved
2641
def _check(self, references):
2642
"""Check the tree for consistency.
2644
:param references: A dict with keys matching the items returned by
2645
self._get_check_refs(), and values from looking those keys up in
2648
tree_basis = self.basis_tree()
2649
tree_basis.lock_read()
2651
repo_basis = references[('trees', self.last_revision())]
2652
if len(list(repo_basis.iter_changes(tree_basis))) > 0:
2653
raise errors.BzrCheckError(
2654
"Mismatched basis inventory content.")
2659
def _validate(self):
2660
"""Validate internal structures.
2662
This is meant mostly for the test suite. To give it a chance to detect
2663
corruption after actions have occurred. The default implementation is a
2666
:return: None. An exception should be raised if there is an error.
2670
def _get_rules_searcher(self, default_searcher):
2671
"""See Tree._get_rules_searcher."""
2672
if self._rules_searcher is None:
2673
self._rules_searcher = super(WorkingTree,
2674
self)._get_rules_searcher(default_searcher)
2675
return self._rules_searcher
2677
def get_shelf_manager(self):
2678
"""Return the ShelfManager for this WorkingTree."""
2679
from bzrlib.shelf import ShelfManager
2680
return ShelfManager(self, self._transport)
2119
2683
class WorkingTree2(WorkingTree):
2120
2684
"""This is the Format 2 working tree.
2122
This was the first weave based working tree.
2686
This was the first weave based working tree.
2123
2687
- uses os locks for locking.
2124
2688
- uses the branch last-revision.
2691
def __init__(self, *args, **kwargs):
2692
super(WorkingTree2, self).__init__(*args, **kwargs)
2693
# WorkingTree2 has more of a constraint that self._inventory must
2694
# exist. Because this is an older format, we don't mind the overhead
2695
# caused by the extra computation here.
2697
# Newer WorkingTree's should only have self._inventory set when they
2699
if self._inventory is None:
2700
self.read_working_inventory()
2702
def _get_check_refs(self):
2703
"""Return the references needed to perform a check of this tree."""
2704
return [('trees', self.last_revision())]
2127
2706
def lock_tree_write(self):
2128
2707
"""See WorkingTree.lock_tree_write().
2130
2709
In Format2 WorkingTrees we have a single lock for the branch and tree
2131
2710
so lock_tree_write() degrades to lock_write().
2712
:return: An object with an unlock method which will release the lock
2133
2715
self.branch.lock_write()
2135
return self._control_files.lock_write()
2717
self._control_files.lock_write()
2137
2720
self.branch.unlock()
2140
2723
def unlock(self):
2724
# do non-implementation specific cleanup
2141
2727
# we share control files:
2142
2728
if self._control_files._lock_count == 3:
2143
2729
# _inventory_is_modified is always False during a read lock.
2144
2730
if self._inventory_is_modified:
2146
2732
self._write_hashcache_if_dirty()
2148
2734
# reverse order of locking.
2150
2736
return self._control_files.unlock()
2313
2911
def unregister_format(klass, format):
2314
assert klass._formats[format.get_format_string()] is format
2315
2912
del klass._formats[format.get_format_string()]
2319
2915
class WorkingTreeFormat2(WorkingTreeFormat):
2320
"""The second working tree format.
2916
"""The second working tree format.
2322
2918
This format modified the hash cache from the format 1 hash cache.
2921
upgrade_recommended = True
2325
2923
def get_format_description(self):
2326
2924
"""See WorkingTreeFormat.get_format_description()."""
2327
2925
return "Working tree format 2"
2329
def stub_initialize_remote(self, control_files):
2330
"""As a special workaround create critical control files for a remote working tree
2927
def _stub_initialize_on_transport(self, transport, file_mode):
2928
"""Workaround: create control files for a remote working tree.
2332
2930
This ensures that it can later be updated and dealt with locally,
2333
since BzrDirFormat6 and BzrDirFormat5 cannot represent dirs with
2931
since BzrDirFormat6 and BzrDirFormat5 cannot represent dirs with
2334
2932
no working tree. (See bug #43064).
2336
2934
sio = StringIO()
2338
xml5.serializer_v5.write_inventory(inv, sio)
2935
inv = inventory.Inventory()
2936
xml5.serializer_v5.write_inventory(inv, sio, working=True)
2340
control_files.put('inventory', sio)
2342
control_files.put_bytes('pending-merges', '')
2345
def initialize(self, a_bzrdir, revision_id=None):
2938
transport.put_file('inventory', sio, file_mode)
2939
transport.put_bytes('pending-merges', '', file_mode)
2941
def initialize(self, a_bzrdir, revision_id=None, from_branch=None,
2942
accelerator_tree=None, hardlink=False):
2346
2943
"""See WorkingTreeFormat.initialize()."""
2347
2944
if not isinstance(a_bzrdir.transport, LocalTransport):
2348
2945
raise errors.NotLocalUrl(a_bzrdir.transport.base)
2349
branch = a_bzrdir.open_branch()
2350
if revision_id is not None:
2351
revision_id = osutils.safe_revision_id(revision_id)
2354
revision_history = branch.revision_history()
2356
position = revision_history.index(revision_id)
2358
raise errors.NoSuchRevision(branch, revision_id)
2359
branch.set_revision_history(revision_history[:position + 1])
2362
revision = branch.last_revision()
2946
if from_branch is not None:
2947
branch = from_branch
2949
branch = a_bzrdir.open_branch()
2950
if revision_id is None:
2951
revision_id = _mod_revision.ensure_null(branch.last_revision())
2954
branch.generate_revision_history(revision_id)
2957
inv = inventory.Inventory()
2364
2958
wt = WorkingTree2(a_bzrdir.root_transport.local_abspath('.'),
2367
2961
_internal=True,
2369
2963
_bzrdir=a_bzrdir)
2370
basis_tree = branch.repository.revision_tree(revision)
2964
basis_tree = branch.repository.revision_tree(revision_id)
2371
2965
if basis_tree.inventory.root is not None:
2372
wt.set_root_id(basis_tree.inventory.root.file_id)
2966
wt.set_root_id(basis_tree.get_root_id())
2373
2967
# set the parent list and cache the basis tree.
2374
wt.set_parent_trees([(revision, basis_tree)])
2968
if _mod_revision.is_null(revision_id):
2971
parent_trees = [(revision_id, basis_tree)]
2972
wt.set_parent_trees(parent_trees)
2375
2973
transform.build_tree(basis_tree, wt)
2419
3019
_lock_file_name = 'lock'
2420
3020
_lock_class = LockDir
3022
_tree_class = WorkingTree3
3024
def __get_matchingbzrdir(self):
3025
return bzrdir.BzrDirMetaFormat1()
3027
_matchingbzrdir = property(__get_matchingbzrdir)
2422
3029
def _open_control_files(self, a_bzrdir):
2423
3030
transport = a_bzrdir.get_workingtree_transport(None)
2424
return LockableFiles(transport, self._lock_file_name,
3031
return LockableFiles(transport, self._lock_file_name,
2425
3032
self._lock_class)
2427
def initialize(self, a_bzrdir, revision_id=None):
3034
def initialize(self, a_bzrdir, revision_id=None, from_branch=None,
3035
accelerator_tree=None, hardlink=False):
2428
3036
"""See WorkingTreeFormat.initialize().
2430
revision_id allows creating a working tree at a different
2431
revision than the branch is at.
3038
:param revision_id: if supplied, create a working tree at a different
3039
revision than the branch is at.
3040
:param accelerator_tree: A tree which can be used for retrieving file
3041
contents more quickly than the revision tree, i.e. a workingtree.
3042
The revision tree will be used for cases where accelerator_tree's
3043
content is different.
3044
:param hardlink: If true, hard-link files from accelerator_tree,
2433
3047
if not isinstance(a_bzrdir.transport, LocalTransport):
2434
3048
raise errors.NotLocalUrl(a_bzrdir.transport.base)
2488
3106
raise NotImplementedError
2489
3107
if not isinstance(a_bzrdir.transport, LocalTransport):
2490
3108
raise errors.NotLocalUrl(a_bzrdir.transport.base)
2491
return self._open(a_bzrdir, self._open_control_files(a_bzrdir))
3109
wt = self._open(a_bzrdir, self._open_control_files(a_bzrdir))
2493
3112
def _open(self, a_bzrdir, control_files):
2494
3113
"""Open the tree itself.
2496
3115
:param a_bzrdir: the dir for the tree.
2497
3116
:param control_files: the control files for the tree.
2499
return WorkingTree3(a_bzrdir.root_transport.local_abspath('.'),
2503
_control_files=control_files)
3118
return self._tree_class(a_bzrdir.root_transport.local_abspath('.'),
3122
_control_files=control_files)
2505
3124
def __str__(self):
2506
3125
return self.get_format_string()
2509
__default_format = WorkingTreeFormat3()
3128
__default_format = WorkingTreeFormat6()
2510
3129
WorkingTreeFormat.register_format(__default_format)
3130
WorkingTreeFormat.register_format(WorkingTreeFormat5())
2511
3131
WorkingTreeFormat.register_format(WorkingTreeFormat4())
3132
WorkingTreeFormat.register_format(WorkingTreeFormat3())
2512
3133
WorkingTreeFormat.set_default_format(__default_format)
2513
3134
# formats which have no format string are not discoverable
2514
3135
# and not independently creatable, so are not registered.
2515
3136
_legacy_formats = [WorkingTreeFormat2(),
2519
class WorkingTreeTestProviderAdapter(object):
2520
"""A tool to generate a suite testing multiple workingtree formats at once.
2522
This is done by copying the test once for each transport and injecting
2523
the transport_server, transport_readonly_server, and workingtree_format
2524
classes into each copy. Each copy is also given a new id() to make it
2528
def __init__(self, transport_server, transport_readonly_server, formats):
2529
self._transport_server = transport_server
2530
self._transport_readonly_server = transport_readonly_server
2531
self._formats = formats
2533
def _clone_test(self, test, bzrdir_format, workingtree_format, variation):
2534
"""Clone test for adaption."""
2535
new_test = deepcopy(test)
2536
new_test.transport_server = self._transport_server
2537
new_test.transport_readonly_server = self._transport_readonly_server
2538
new_test.bzrdir_format = bzrdir_format
2539
new_test.workingtree_format = workingtree_format
2540
def make_new_test_id():
2541
new_id = "%s(%s)" % (test.id(), variation)
2542
return lambda: new_id
2543
new_test.id = make_new_test_id()
2546
def adapt(self, test):
2547
from bzrlib.tests import TestSuite
2548
result = TestSuite()
2549
for workingtree_format, bzrdir_format in self._formats:
2550
new_test = self._clone_test(
2553
workingtree_format, workingtree_format.__class__.__name__)
2554
result.addTest(new_test)
added
removed
bzrlib/workingtree.py
