51
59
conflicts as _mod_conflicts,
60
revision as _mod_revision,
69
77
import bzrlib.branch
70
78
from bzrlib.transport import get_transport
71
from bzrlib.workingtree_4 import (
80
from bzrlib.workingtree_4 import WorkingTreeFormat4
78
83
from bzrlib import symbol_versioning
79
84
from bzrlib.decorators import needs_read_lock, needs_write_lock
80
from bzrlib.lock import LogicalLockResult
81
from bzrlib.lockable_files import LockableFiles
85
from bzrlib.inventory import InventoryEntry, Inventory, ROOT_ID, TreeReference
86
from bzrlib.lockable_files import LockableFiles, TransportLock
82
87
from bzrlib.lockdir import LockDir
83
88
import bzrlib.mutabletree
84
89
from bzrlib.mutabletree import needs_tree_write_lock
85
from bzrlib import osutils
86
90
from bzrlib.osutils import (
94
100
supports_executable,
96
from bzrlib.filters import filtered_input_file
97
102
from bzrlib.trace import mutter, note
98
103
from bzrlib.transport.local import LocalTransport
99
from bzrlib.revision import CURRENT_REVISION
104
from bzrlib.progress import DummyProgress, ProgressPhase
105
from bzrlib.revision import NULL_REVISION, CURRENT_REVISION
100
106
from bzrlib.rio import RioReader, rio_file, Stanza
101
from bzrlib.symbol_versioning import (
103
DEPRECATED_PARAMETER,
107
from bzrlib.symbol_versioning import (deprecated_passed,
110
DEPRECATED_PARAMETER,
107
117
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
118
CONFLICT_HEADER_1 = "BZR conflict list format 1"
113
ERROR_PATH_NOT_FOUND = 3 # WindowsError errno code, equivalent to ENOENT
121
@deprecated_function(zero_thirteen)
122
def gen_file_id(name):
123
"""Return new file id for the basename 'name'.
125
Use bzrlib.generate_ids.gen_file_id() instead
127
return generate_ids.gen_file_id(name)
130
@deprecated_function(zero_thirteen)
132
"""Return a new tree-root file id.
134
This has been deprecated in favor of bzrlib.generate_ids.gen_root_id()
136
return generate_ids.gen_root_id()
116
139
class TreeEntry(object):
117
140
"""An entry that implements the minimum interface used by commands.
119
This needs further inspection, it may be better to have
142
This needs further inspection, it may be better to have
120
143
InventoryEntries without ids - though that seems wrong. For now,
121
144
this is a parallel hierarchy to InventoryEntry, and needs to become
122
145
one of several things: decorates to that hierarchy, children of, or
193
"""Construct a WorkingTree instance. This is not a public API.
211
"""Construct a WorkingTree for basedir.
195
:param branch: A branch to override probing for the branch.
213
If the branch is not supplied, it is opened automatically.
214
If the branch is supplied, it must be the branch for this basedir.
215
(branch.base is not cross checked, because for remote branches that
216
would be meaningless).
197
218
self._format = _format
198
219
self.bzrdir = _bzrdir
199
220
if not _internal:
200
raise errors.BzrError("Please use bzrdir.open_workingtree or "
201
"WorkingTree.open() to obtain a WorkingTree.")
221
# not created via open etc.
222
warnings.warn("WorkingTree() is deprecated as of bzr version 0.8. "
223
"Please use bzrdir.open_workingtree or WorkingTree.open().",
226
wt = WorkingTree.open(basedir)
227
self._branch = wt.branch
228
self.basedir = wt.basedir
229
self._control_files = wt._control_files
230
self._hashcache = wt._hashcache
231
self._set_inventory(wt._inventory, dirty=False)
232
self._format = wt._format
233
self.bzrdir = wt.bzrdir
234
assert isinstance(basedir, basestring), \
235
"base directory %r is not a string" % basedir
202
236
basedir = safe_unicode(basedir)
203
237
mutter("opening working tree %r", basedir)
204
238
if deprecated_passed(branch):
240
warnings.warn("WorkingTree(..., branch=XXX) is deprecated"
241
" as of bzr 0.8. Please use bzrdir.open_workingtree() or"
242
" WorkingTree.open().",
205
246
self._branch = branch
207
248
self._branch = self.bzrdir.open_branch()
423
405
# at this point ?
425
407
return self.branch.repository.revision_tree(revision_id)
426
except (errors.RevisionNotPresent, errors.NoSuchRevision):
408
except errors.RevisionNotPresent:
427
409
# the basis tree *may* be a ghost or a low level error may have
428
# occurred. If the revision is present, its a problem, if its not
410
# occured. If the revision is present, its a problem, if its not
430
412
if self.branch.repository.has_revision(revision_id):
432
414
# the basis tree is a ghost so return an empty tree.
433
return self.branch.repository.revision_tree(
434
_mod_revision.NULL_REVISION)
437
self._flush_ignore_list_cache()
415
return self.branch.repository.revision_tree(None)
418
@deprecated_method(zero_eight)
419
def create(branch, directory):
420
"""Create a workingtree for branch at directory.
422
If existing_directory already exists it must have a .bzr directory.
423
If it does not exist, it will be created.
425
This returns a new WorkingTree object for the new checkout.
427
TODO FIXME RBC 20060124 when we have checkout formats in place this
428
should accept an optional revisionid to checkout [and reject this if
429
checking out into the same dir as a pre-checkout-aware branch format.]
431
XXX: When BzrDir is present, these should be created through that
434
warnings.warn('delete WorkingTree.create', stacklevel=3)
435
transport = get_transport(directory)
436
if branch.bzrdir.root_transport.base == transport.base:
438
return branch.bzrdir.create_workingtree()
439
# different directory,
440
# create a branch reference
441
# and now a working tree.
442
raise NotImplementedError
445
@deprecated_method(zero_eight)
446
def create_standalone(directory):
447
"""Create a checkout and a branch and a repo at directory.
449
Directory must exist and be empty.
451
please use BzrDir.create_standalone_workingtree
453
return bzrdir.BzrDir.create_standalone_workingtree(directory)
439
455
def relpath(self, path):
440
456
"""Return the local path portion from a given path.
442
The path may be absolute or relative. If its a relative path it is
458
The path may be absolute or relative. If its a relative path it is
443
459
interpreted relative to the python current working directory.
445
461
return osutils.relpath(self.basedir, path)
447
463
def has_filename(self, filename):
448
464
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]
453
def get_file_with_stat(self, file_id, path=None, filtered=True,
455
"""See Tree.get_file_with_stat."""
457
path = self.id2path(file_id)
458
file_obj = self.get_file_byname(path, filtered=False)
459
stat_value = _fstat(file_obj.fileno())
460
if filtered and self.supports_content_filtering():
461
filters = self._content_filter_stack(path)
462
file_obj = filtered_input_file(file_obj, filters)
463
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):
478
"""See Tree.get_file_lines()"""
479
file = self.get_file(file_id, path, filtered=filtered)
481
return file.readlines()
466
def get_file(self, file_id):
467
file_id = osutils.safe_file_id(file_id)
468
return self.get_file_byname(self.id2path(file_id))
470
def get_file_text(self, file_id):
471
file_id = osutils.safe_file_id(file_id)
472
return self.get_file(file_id).read()
474
def get_file_byname(self, filename):
475
return file(self.abspath(filename), 'rb')
486
def annotate_iter(self, file_id, default_revision=CURRENT_REVISION):
478
def annotate_iter(self, file_id):
487
479
"""See Tree.annotate_iter
489
481
This implementation will use the basis tree implementation if possible.
493
485
incorrectly attributed to CURRENT_REVISION (but after committing, the
494
486
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))
488
file_id = osutils.safe_file_id(file_id)
489
basis = self.basis_tree()
492
changes = self._iter_changes(basis, True, [self.id2path(file_id)],
493
require_versioned=True).next()
494
changed_content, kind = changes[2], changes[6]
495
if not changed_content:
496
return basis.annotate_iter(file_id)
500
if kind[0] != 'file':
503
old_lines = list(basis.annotate_iter(file_id))
505
for tree in self.branch.repository.revision_trees(
506
self.get_parent_ids()[1:]):
507
if file_id not in tree:
509
old.append(list(tree.annotate_iter(file_id)))
510
return annotate.reannotate(old, self.get_file(file_id).readlines(),
540
515
def get_parent_ids(self):
541
516
"""See Tree.get_parent_ids.
543
518
This implementation reads the pending merges list and last_revision
544
519
value and uses that to decide what the parents list should be.
546
last_rev = _mod_revision.ensure_null(self._last_revision())
547
if _mod_revision.NULL_REVISION == last_rev:
521
last_rev = self._last_revision()
550
525
parents = [last_rev]
552
merges_bytes = self._transport.get_bytes('pending-merges')
527
merges_file = self._control_files.get('pending-merges')
553
528
except errors.NoSuchFile:
556
for l in osutils.split_lines(merges_bytes):
557
revision_id = l.rstrip('\n')
531
for l in merges_file.readlines():
532
revision_id = osutils.safe_revision_id(l.rstrip('\n'))
558
533
parents.append(revision_id)
562
537
def get_root_id(self):
563
538
"""Return the id of this trees root"""
564
539
return self._inventory.root.file_id
566
541
def _get_store_filename(self, file_id):
567
542
## XXX: badly named; this is not in the store at all
543
file_id = osutils.safe_file_id(file_id)
568
544
return self.abspath(self.id2path(file_id))
571
def clone(self, to_bzrdir, revision_id=None):
547
def clone(self, to_bzrdir, revision_id=None, basis=None):
572
548
"""Duplicate this working tree into to_bzr, including all state.
574
550
Specifically modified files are kept as modified, but
575
551
ignored and unknown files are discarded.
577
553
If you want to make a new line of development, see bzrdir.sprout()
580
If not None, the cloned tree will have its last revision set to
581
revision, and difference between the source trees last revision
556
If not None, the cloned tree will have its last revision set to
557
revision, and and difference between the source trees last revision
582
558
and this one merged in.
561
If not None, a closer copy of a tree which may have some files in
562
common, and which file content should be preferentially copied from.
584
564
# assumes the target bzr dir format is compatible.
585
result = to_bzrdir.create_workingtree()
565
result = self._format.initialize(to_bzrdir)
586
566
self.copy_content_into(result, revision_id)
617
600
__contains__ = has_id
619
602
def get_file_size(self, file_id):
620
"""See Tree.get_file_size"""
621
# XXX: this returns the on-disk size; it should probably return the
624
return os.path.getsize(self.id2abspath(file_id))
626
if e.errno != errno.ENOENT:
603
file_id = osutils.safe_file_id(file_id)
604
return os.path.getsize(self.id2abspath(file_id))
632
607
def get_file_sha1(self, file_id, path=None, stat_value=None):
608
file_id = osutils.safe_file_id(file_id)
634
610
path = self._inventory.id2path(file_id)
635
611
return self._hashcache.get_sha1(path, stat_value)
637
613
def get_file_mtime(self, file_id, path=None):
614
file_id = osutils.safe_file_id(file_id)
639
616
path = self.inventory.id2path(file_id)
640
617
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
619
if not supports_executable():
655
620
def is_executable(self, file_id, path=None):
621
file_id = osutils.safe_file_id(file_id)
656
622
return self._inventory[file_id].executable
658
_is_executable_from_path_and_stat = \
659
_is_executable_from_path_and_stat_from_basis
661
624
def is_executable(self, file_id, path=None):
626
file_id = osutils.safe_file_id(file_id)
663
627
path = self.id2path(file_id)
664
628
mode = os.lstat(self.abspath(path)).st_mode
665
629
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
631
@needs_tree_write_lock
671
632
def _add(self, files, ids, kinds):
672
633
"""See MutableTree._add."""
673
634
# TODO: Re-adding a file that is removed in the working copy
674
635
# should probably put it back with the previous ID.
675
# the read and write working inventory should not occur in this
636
# the read and write working inventory should not occur in this
676
637
# function - they should be part of lock_write and unlock.
638
inv = self.read_working_inventory()
678
639
for f, file_id, kind in zip(files, ids, kinds):
640
assert kind is not None
679
641
if file_id is None:
680
642
inv.add_path(f, kind=kind)
644
file_id = osutils.safe_file_id(file_id)
682
645
inv.add_path(f, kind=kind, file_id=file_id)
683
self._inventory_is_modified = True
646
self._write_inventory(inv)
685
648
@needs_tree_write_lock
686
649
def _gather_kinds(self, files, kinds):
747
710
self.set_parent_ids(parents, allow_leftmost_as_ghost=True)
749
def path_content_summary(self, path, _lstat=os.lstat,
750
_mapper=osutils.file_kind_from_stat_mode):
751
"""See Tree.path_content_summary."""
752
abspath = self.abspath(path)
754
stat_result = _lstat(abspath)
756
if getattr(e, 'errno', None) == errno.ENOENT:
758
return ('missing', None, None, None)
759
# propagate other errors
761
kind = _mapper(stat_result.st_mode)
763
return self._file_content_summary(path, stat_result)
764
elif kind == 'directory':
765
# perhaps it looks like a plain directory, but it's really a
767
if self._directory_is_tree_reference(path):
768
kind = 'tree-reference'
769
return kind, None, None, None
770
elif kind == 'symlink':
771
target = osutils.readlink(abspath)
772
return ('symlink', None, None, target)
774
return (kind, None, None, None)
776
def _file_content_summary(self, path, stat_result):
777
size = stat_result.st_size
778
executable = self._is_executable_from_path_and_stat(path, stat_result)
779
# try for a stat cache lookup
780
return ('file', size, executable, self._sha_from_stat(
712
@deprecated_method(zero_eleven)
714
def pending_merges(self):
715
"""Return a list of pending merges.
717
These are revisions that have been merged into the working
718
directory but not yet committed.
720
As of 0.11 this is deprecated. Please see WorkingTree.get_parent_ids()
721
instead - which is available on all tree objects.
723
return self.get_parent_ids()[1:]
783
725
def _check_parents_for_ghosts(self, revision_ids, allow_leftmost_as_ghost):
784
726
"""Common ghost checking functionality from set_parent_*.
829
751
:param revision_ids: The revision_ids to set as the parent ids of this
830
752
working tree. Any of these may be ghosts.
754
revision_ids = [osutils.safe_revision_id(r) for r in revision_ids]
832
755
self._check_parents_for_ghosts(revision_ids,
833
756
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
758
if len(revision_ids) > 0:
840
759
self.set_last_revision(revision_ids[0])
842
self.set_last_revision(_mod_revision.NULL_REVISION)
761
self.set_last_revision(None)
844
763
self._set_merges_from_parent_ids(revision_ids)
846
765
@needs_tree_write_lock
847
766
def set_parent_trees(self, parents_list, allow_leftmost_as_ghost=False):
848
767
"""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)
768
parent_ids = [osutils.safe_revision_id(rev) for (rev, tree) in parents_list]
853
770
self._check_parents_for_ghosts(parent_ids,
854
771
allow_leftmost_as_ghost=allow_leftmost_as_ghost)
856
parent_ids = self._filter_parent_ids_by_ancestry(parent_ids)
858
773
if len(parent_ids) == 0:
859
leftmost_parent_id = _mod_revision.NULL_REVISION
774
leftmost_parent_id = None
860
775
leftmost_parent_tree = None
862
777
leftmost_parent_id, leftmost_parent_tree = parents_list[0]
915
818
branch.last_revision().
917
820
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:
821
pb = bzrlib.ui.ui_factory.nested_progress_bar()
823
merger = Merger(self.branch, this_tree=self, pb=pb)
824
merger.pp = ProgressPhase("Merge phase", 5, pb)
825
merger.pp.next_phase()
826
# check that there are no
828
merger.check_basis(check_clean=True, require_commits=False)
829
if to_revision is None:
830
to_revision = branch.last_revision()
832
to_revision = osutils.safe_revision_id(to_revision)
833
merger.other_rev_id = to_revision
834
if merger.other_rev_id is None:
835
raise error.NoCommits(branch)
836
self.branch.fetch(branch, last_revision=merger.other_rev_id)
837
merger.other_basis = merger.other_rev_id
838
merger.other_tree = self.branch.repository.revision_tree(
840
merger.other_branch = branch
841
merger.pp.next_phase()
933
842
merger.find_base()
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:
843
if merger.base_rev_id == merger.other_rev_id:
844
raise errors.PointlessMerge
845
merger.backup_files = False
940
846
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()
847
merger.set_interesting_files(None)
848
merger.show_base = False
849
merger.reprocess = False
850
conflicts = merger.do_merge()
951
857
def merge_modified(self):
952
858
"""Return a dictionary of files modified by a merge.
954
The list is initialized by WorkingTree.set_merge_modified, which is
860
The list is initialized by WorkingTree.set_merge_modified, which is
955
861
typically called after we make some automatic updates to the tree
956
862
because of a merge.
1128
1010
sio = StringIO()
1129
1011
self._serialize(self._inventory, sio)
1131
self._transport.put_file('inventory', sio,
1132
mode=self.bzrdir._get_file_mode())
1013
self._control_files.put('inventory', sio)
1133
1014
self._inventory_is_modified = False
1135
1016
def _kind(self, relpath):
1136
1017
return osutils.file_kind(self.abspath(relpath))
1138
def list_files(self, include_root=False, from_dir=None, recursive=True):
1139
"""List all files as (path, class, kind, id, entry).
1019
def list_files(self, include_root=False):
1020
"""Recursively list all files as (path, class, kind, id, entry).
1141
1022
Lists, but does not descend into unversioned directories.
1142
1024
This does not include files that have been deleted in this
1143
tree. Skips the control directory.
1145
:param include_root: if True, return an entry for the root
1146
:param from_dir: start from this directory or None for the root
1147
:param recursive: whether to recurse into subdirectories or not
1027
Skips the control directory.
1149
1029
# list_files is an iterator, so @needs_read_lock doesn't work properly
1150
1030
# with it. So callers should be careful to always read_lock the tree.
1925
1766
def read_basis_inventory(self):
1926
1767
"""Read the cached basis inventory."""
1927
1768
path = self._basis_inventory_name()
1928
return self._transport.get_bytes(path)
1769
return self._control_files.get(path).read()
1930
1771
@needs_read_lock
1931
1772
def read_working_inventory(self):
1932
1773
"""Read the working inventory.
1934
1775
:raises errors.InventoryModified: read_working_inventory will fail
1935
1776
when the current in memory inventory has been modified.
1937
# conceptually this should be an implementation detail of the tree.
1778
# conceptually this should be an implementation detail of the tree.
1938
1779
# XXX: Deprecate this.
1939
1780
# ElementTree does its own conversion from UTF-8, so open in
1941
1782
if self._inventory_is_modified:
1942
1783
raise errors.InventoryModified(self)
1943
f = self._transport.get('inventory')
1945
result = self._deserialize(f)
1784
result = self._deserialize(self._control_files.get('inventory'))
1948
1785
self._set_inventory(result, dirty=False)
1951
1788
@needs_tree_write_lock
1952
def remove(self, files, verbose=False, to_file=None, keep_files=True,
1954
"""Remove nominated files from the working inventory.
1956
:files: File paths relative to the basedir.
1957
:keep_files: If true, the files will also be kept.
1958
:force: Delete files and directories, even if they are changed and
1959
even if the directories are not empty.
1789
def remove(self, files, verbose=False, to_file=None):
1790
"""Remove nominated files from the working inventory..
1792
This does not remove their text. This does not run on XXX on what? RBC
1794
TODO: Refuse to remove modified files unless --force is given?
1796
TODO: Do something useful with directories.
1798
TODO: Should this remove the text or not? Tough call; not
1799
removing may be useful and the user can just use use rm, and
1800
is the opposite of add. Removing it is consistent with most
1801
other tools. Maybe an option.
1803
## TODO: Normalize names
1804
## TODO: Remove nested loops; better scalability
1961
1805
if isinstance(files, basestring):
1962
1806
files = [files]
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 self.walkdirs(directory):
1975
for relpath, basename, kind, lstat, fileid, kind in file_infos:
1976
# Is it versioned or ignored?
1977
if self.path2id(relpath) or self.is_ignored(relpath):
1978
# Add nested content for deletion.
1979
new_files.add(relpath)
1981
# Files which are not versioned and not ignored
1982
# should be treated as unknown.
1983
unknown_nested_files.add((relpath, None, kind))
1985
for filename in files:
1986
# Get file name into canonical form.
1987
abspath = self.abspath(filename)
1988
filename = self.relpath(abspath)
1989
if len(filename) > 0:
1990
new_files.add(filename)
1991
recurse_directory_to_add_files(filename)
1993
files = list(new_files)
1996
return # nothing to do
1998
# Sort needed to first handle directory content before the directory
1999
files.sort(reverse=True)
2001
# Bail out if we are going to delete files we shouldn't
2002
if not keep_files and not force:
2003
has_changed_files = len(unknown_nested_files) > 0
2004
if not has_changed_files:
2005
for (file_id, path, content_change, versioned, parent_id, name,
2006
kind, executable) in self.iter_changes(self.basis_tree(),
2007
include_unchanged=True, require_versioned=False,
2008
want_unversioned=True, specific_files=files):
2009
if versioned == (False, False):
2010
# The record is unknown ...
2011
if not self.is_ignored(path[1]):
2012
# ... but not ignored
2013
has_changed_files = True
2015
elif (content_change and (kind[1] is not None) and
2016
osutils.is_inside_any(files, path[1])):
2017
# Versioned and changed, but not deleted, and still
2018
# in one of the dirs to be deleted.
2019
has_changed_files = True
2022
if has_changed_files:
2023
# Make delta show ALL applicable changes in error message.
2024
tree_delta = self.changes_from(self.basis_tree(),
2025
require_versioned=False, want_unversioned=True,
2026
specific_files=files)
2027
for unknown_file in unknown_nested_files:
2028
if unknown_file not in tree_delta.unversioned:
2029
tree_delta.unversioned.extend((unknown_file,))
2030
raise errors.BzrRemoveChangedFilesError(tree_delta)
2032
# Build inv_delta and delete files where applicable,
2033
# do this before any modifications to inventory.
1808
inv = self.inventory
1810
# do this before any modifications
2034
1811
for f in files:
2035
fid = self.path2id(f)
1812
fid = inv.path2id(f)
2038
message = "%s is not versioned." % (f,)
1814
note("%s is not versioned."%f)
2041
# having removed it, it must be either ignored or unknown
1817
# having remove it, it must be either ignored or unknown
2042
1818
if self.is_ignored(f):
2043
1819
new_status = 'I'
2045
1821
new_status = '?'
2046
# XXX: Really should be a more abstract reporter interface
2047
kind_ch = osutils.kind_marker(self.kind(fid))
2048
to_file.write(new_status + ' ' + f + kind_ch + '\n')
2050
inv_delta.append((f, None, fid, None))
2051
message = "removed %s" % (f,)
2054
abs_path = self.abspath(f)
2055
if osutils.lexists(abs_path):
2056
if (osutils.isdir(abs_path) and
2057
len(os.listdir(abs_path)) > 0):
2059
osutils.rmtree(abs_path)
2061
message = "%s is not an empty directory "\
2062
"and won't be deleted." % (f,)
2064
osutils.delete_any(abs_path)
2065
message = "deleted %s" % (f,)
2066
elif message is not None:
2067
# Only care if we haven't done anything yet.
2068
message = "%s does not exist." % (f,)
2070
# Print only one message (if any) per file.
2071
if message is not None:
2073
self.apply_inventory_delta(inv_delta)
1822
textui.show_status(new_status, inv[fid].kind, f,
1826
self._write_inventory(inv)
2075
1828
@needs_tree_write_lock
2076
def revert(self, filenames=None, old_tree=None, backups=True,
2077
pb=None, report_changes=False):
1829
def revert(self, filenames, old_tree=None, backups=True,
1830
pb=DummyProgress(), report_changes=False):
2078
1831
from bzrlib.conflicts import resolve
2081
symbol_versioning.warn('Using [] to revert all files is deprecated'
2082
' as of bzr 0.91. Please use None (the default) instead.',
2083
DeprecationWarning, stacklevel=2)
2084
1832
if old_tree is None:
2085
basis_tree = self.basis_tree()
2086
basis_tree.lock_read()
2087
old_tree = basis_tree
1833
old_tree = self.basis_tree()
1834
conflicts = transform.revert(self, old_tree, filenames, backups, pb,
1836
if not len(filenames):
1837
self.set_parent_ids(self.get_parent_ids()[:1])
2091
conflicts = transform.revert(self, old_tree, filenames, backups, pb,
2093
if filenames is None and len(self.get_parent_ids()) > 1:
2095
last_revision = self.last_revision()
2096
if last_revision != _mod_revision.NULL_REVISION:
2097
if basis_tree is None:
2098
basis_tree = self.basis_tree()
2099
basis_tree.lock_read()
2100
parent_trees.append((last_revision, basis_tree))
2101
self.set_parent_trees(parent_trees)
2104
resolve(self, filenames, ignore_misses=True, recursive=True)
2106
if basis_tree is not None:
1840
resolve(self, filenames, ignore_misses=True)
2108
1841
return conflicts
2110
1843
def revision_tree(self, revision_id):
2265
1993
# cant set that until we update the working trees last revision to be
2266
1994
# one from the new branch, because it will just get absorbed by the
2267
1995
# parent de-duplication logic.
2269
1997
# We MUST save it even if an error occurs, because otherwise the users
2270
1998
# local work is unreferenced and will appear to have been lost.
2274
2002
last_rev = self.get_parent_ids()[0]
2275
2003
except IndexError:
2276
last_rev = _mod_revision.NULL_REVISION
2277
if revision is None:
2278
revision = self.branch.last_revision()
2280
old_tip = old_tip or _mod_revision.NULL_REVISION
2282
if not _mod_revision.is_null(old_tip) and old_tip != last_rev:
2283
# the branch we are bound to was updated
2284
# merge those changes in first
2285
base_tree = self.basis_tree()
2286
other_tree = self.branch.repository.revision_tree(old_tip)
2287
nb_conflicts = merge.merge_inner(self.branch, other_tree,
2288
base_tree, this_tree=self,
2289
change_reporter=change_reporter)
2291
self.add_parent_tree((old_tip, other_tree))
2292
trace.note('Rerun update after fixing the conflicts.')
2295
if last_rev != _mod_revision.ensure_null(revision):
2296
# the working tree is up to date with the branch
2297
# we can merge the specified revision from master
2298
to_tree = self.branch.repository.revision_tree(revision)
2299
to_root_id = to_tree.get_root_id()
2005
if last_rev != self.branch.last_revision():
2006
# merge tree state up to new branch tip.
2301
2007
basis = self.basis_tree()
2302
2008
basis.lock_read()
2304
if (basis.inventory.root is None
2305
or basis.inventory.root.file_id != to_root_id):
2306
self.set_root_id(to_root_id)
2010
to_tree = self.branch.basis_tree()
2011
if basis.inventory.root is None:
2012
self.set_root_id(to_tree.inventory.root.file_id)
2014
result += merge.merge_inner(
2311
# determine the branch point
2312
graph = self.branch.repository.get_graph()
2313
base_rev_id = graph.find_unique_lca(self.branch.last_revision(),
2315
base_tree = self.branch.repository.revision_tree(base_rev_id)
2317
nb_conflicts = merge.merge_inner(self.branch, to_tree, base_tree,
2319
change_reporter=change_reporter)
2320
self.set_last_revision(revision)
2321
2021
# TODO - dedup parents list with things merged by pull ?
2322
2022
# reuse the tree we've updated to to set the basis:
2323
parent_trees = [(revision, to_tree)]
2023
parent_trees = [(self.branch.last_revision(), to_tree)]
2324
2024
merges = self.get_parent_ids()[1:]
2325
2025
# Ideally we ask the tree for the trees here, that way the working
2326
# tree can decide whether to give us the entire tree or give us a
2026
# tree can decide whether to give us teh entire tree or give us a
2327
2027
# lazy initialised tree. dirstate for instance will have the trees
2328
2028
# in ram already, whereas a last-revision + basis-inventory tree
2329
2029
# will not, but also does not need them when setting parents.
2330
2030
for parent in merges:
2331
2031
parent_trees.append(
2332
2032
(parent, self.branch.repository.revision_tree(parent)))
2333
if not _mod_revision.is_null(old_tip):
2033
if old_tip is not None:
2334
2034
parent_trees.append(
2335
2035
(old_tip, self.branch.repository.revision_tree(old_tip)))
2336
2036
self.set_parent_trees(parent_trees)
2337
2037
last_rev = parent_trees[0][0]
2039
# the working tree had the same last-revision as the master
2040
# branch did. We may still have pivot local work from the local
2041
# branch into old_tip:
2042
if old_tip is not None:
2043
self.add_parent_tree_id(old_tip)
2044
if old_tip and old_tip != last_rev:
2045
# our last revision was not the prior branch last revision
2046
# and we have converted that last revision to a pending merge.
2047
# base is somewhere between the branch tip now
2048
# and the now pending merge
2050
# Since we just modified the working tree and inventory, flush out
2051
# the current state, before we modify it again.
2052
# TODO: jam 20070214 WorkingTree3 doesn't require this, dirstate
2053
# requires it only because TreeTransform directly munges the
2054
# inventory and calls tree._write_inventory(). Ultimately we
2055
# should be able to remove this extra flush.
2057
from bzrlib.revision import common_ancestor
2059
base_rev_id = common_ancestor(self.branch.last_revision(),
2061
self.branch.repository)
2062
except errors.NoCommonAncestor:
2064
base_tree = self.branch.repository.revision_tree(base_rev_id)
2065
other_tree = self.branch.repository.revision_tree(old_tip)
2066
result += merge.merge_inner(
2340
2073
def _write_hashcache_if_dirty(self):
2341
2074
"""Write out the hashcache if it is dirty."""
2581
2287
self.set_conflicts(un_resolved)
2582
2288
return un_resolved, resolved
2585
def _check(self, references):
2586
"""Check the tree for consistency.
2588
:param references: A dict with keys matching the items returned by
2589
self._get_check_refs(), and values from looking those keys up in
2592
tree_basis = self.basis_tree()
2593
tree_basis.lock_read()
2595
repo_basis = references[('trees', self.last_revision())]
2596
if len(list(repo_basis.iter_changes(tree_basis))) > 0:
2597
raise errors.BzrCheckError(
2598
"Mismatched basis inventory content.")
2603
def _validate(self):
2604
"""Validate internal structures.
2606
This is meant mostly for the test suite. To give it a chance to detect
2607
corruption after actions have occurred. The default implementation is a
2610
:return: None. An exception should be raised if there is an error.
2614
def _get_rules_searcher(self, default_searcher):
2615
"""See Tree._get_rules_searcher."""
2616
if self._rules_searcher is None:
2617
self._rules_searcher = super(WorkingTree,
2618
self)._get_rules_searcher(default_searcher)
2619
return self._rules_searcher
2621
def get_shelf_manager(self):
2622
"""Return the ShelfManager for this WorkingTree."""
2623
from bzrlib.shelf import ShelfManager
2624
return ShelfManager(self, self._transport)
2627
2291
class WorkingTree2(WorkingTree):
2628
2292
"""This is the Format 2 working tree.
2630
This was the first weave based working tree.
2294
This was the first weave based working tree.
2631
2295
- uses os locks for locking.
2632
2296
- uses the branch last-revision.
2635
def __init__(self, *args, **kwargs):
2636
super(WorkingTree2, self).__init__(*args, **kwargs)
2637
# WorkingTree2 has more of a constraint that self._inventory must
2638
# exist. Because this is an older format, we don't mind the overhead
2639
# caused by the extra computation here.
2641
# Newer WorkingTree's should only have self._inventory set when they
2643
if self._inventory is None:
2644
self.read_working_inventory()
2646
def _get_check_refs(self):
2647
"""Return the references needed to perform a check of this tree."""
2648
return [('trees', self.last_revision())]
2650
2299
def lock_tree_write(self):
2651
2300
"""See WorkingTree.lock_tree_write().
2653
2302
In Format2 WorkingTrees we have a single lock for the branch and tree
2654
2303
so lock_tree_write() degrades to lock_write().
2656
:return: An object with an unlock method which will release the lock
2659
2305
self.branch.lock_write()
2661
self._control_files.lock_write()
2307
return self._control_files.lock_write()
2664
2309
self.branch.unlock()
2667
2312
def unlock(self):
2668
# do non-implementation specific cleanup
2671
2313
# we share control files:
2672
2314
if self._control_files._lock_count == 3:
2673
2315
# _inventory_is_modified is always False during a read lock.
2674
2316
if self._inventory_is_modified:
2676
2318
self._write_hashcache_if_dirty()
2678
2320
# reverse order of locking.
2680
2322
return self._control_files.unlock()
2855
2493
def unregister_format(klass, format):
2494
assert klass._formats[format.get_format_string()] is format
2856
2495
del klass._formats[format.get_format_string()]
2859
2499
class WorkingTreeFormat2(WorkingTreeFormat):
2860
"""The second working tree format.
2500
"""The second working tree format.
2862
2502
This format modified the hash cache from the format 1 hash cache.
2865
upgrade_recommended = True
2867
2505
def get_format_description(self):
2868
2506
"""See WorkingTreeFormat.get_format_description()."""
2869
2507
return "Working tree format 2"
2871
def _stub_initialize_on_transport(self, transport, file_mode):
2872
"""Workaround: create control files for a remote working tree.
2509
def stub_initialize_remote(self, control_files):
2510
"""As a special workaround create critical control files for a remote working tree
2874
2512
This ensures that it can later be updated and dealt with locally,
2875
since BzrDirFormat6 and BzrDirFormat5 cannot represent dirs with
2513
since BzrDirFormat6 and BzrDirFormat5 cannot represent dirs with
2876
2514
no working tree. (See bug #43064).
2878
2516
sio = StringIO()
2879
inv = inventory.Inventory()
2880
xml5.serializer_v5.write_inventory(inv, sio, working=True)
2518
xml5.serializer_v5.write_inventory(inv, sio)
2882
transport.put_file('inventory', sio, file_mode)
2883
transport.put_bytes('pending-merges', '', file_mode)
2885
def initialize(self, a_bzrdir, revision_id=None, from_branch=None,
2886
accelerator_tree=None, hardlink=False):
2520
control_files.put('inventory', sio)
2522
control_files.put_bytes('pending-merges', '')
2525
def initialize(self, a_bzrdir, revision_id=None):
2887
2526
"""See WorkingTreeFormat.initialize()."""
2888
2527
if not isinstance(a_bzrdir.transport, LocalTransport):
2889
2528
raise errors.NotLocalUrl(a_bzrdir.transport.base)
2890
if from_branch is not None:
2891
branch = from_branch
2893
branch = a_bzrdir.open_branch()
2894
if revision_id is None:
2895
revision_id = _mod_revision.ensure_null(branch.last_revision())
2898
branch.generate_revision_history(revision_id)
2901
inv = inventory.Inventory()
2529
branch = a_bzrdir.open_branch()
2530
if revision_id is not None:
2531
revision_id = osutils.safe_revision_id(revision_id)
2534
revision_history = branch.revision_history()
2536
position = revision_history.index(revision_id)
2538
raise errors.NoSuchRevision(branch, revision_id)
2539
branch.set_revision_history(revision_history[:position + 1])
2542
revision = branch.last_revision()
2902
2544
wt = WorkingTree2(a_bzrdir.root_transport.local_abspath('.'),
2905
2547
_internal=True,
2907
2549
_bzrdir=a_bzrdir)
2908
basis_tree = branch.repository.revision_tree(revision_id)
2550
basis_tree = branch.repository.revision_tree(revision)
2909
2551
if basis_tree.inventory.root is not None:
2910
wt.set_root_id(basis_tree.get_root_id())
2552
wt.set_root_id(basis_tree.inventory.root.file_id)
2911
2553
# set the parent list and cache the basis tree.
2912
if _mod_revision.is_null(revision_id):
2915
parent_trees = [(revision_id, basis_tree)]
2916
wt.set_parent_trees(parent_trees)
2554
wt.set_parent_trees([(revision, basis_tree)])
2917
2555
transform.build_tree(basis_tree, wt)
3069
2695
return self.get_format_string()
3072
__default_format = WorkingTreeFormat6()
2698
__default_format = WorkingTreeFormat4()
3073
2699
WorkingTreeFormat.register_format(__default_format)
3074
WorkingTreeFormat.register_format(WorkingTreeFormat5())
3075
WorkingTreeFormat.register_format(WorkingTreeFormat4())
3076
2700
WorkingTreeFormat.register_format(WorkingTreeFormat3())
3077
2701
WorkingTreeFormat.set_default_format(__default_format)
3078
2702
# formats which have no format string are not discoverable
3079
2703
# and not independently creatable, so are not registered.
3080
2704
_legacy_formats = [WorkingTreeFormat2(),
2708
class WorkingTreeTestProviderAdapter(object):
2709
"""A tool to generate a suite testing multiple workingtree formats at once.
2711
This is done by copying the test once for each transport and injecting
2712
the transport_server, transport_readonly_server, and workingtree_format
2713
classes into each copy. Each copy is also given a new id() to make it
2717
def __init__(self, transport_server, transport_readonly_server, formats):
2718
self._transport_server = transport_server
2719
self._transport_readonly_server = transport_readonly_server
2720
self._formats = formats
2722
def _clone_test(self, test, bzrdir_format, workingtree_format, variation):
2723
"""Clone test for adaption."""
2724
new_test = deepcopy(test)
2725
new_test.transport_server = self._transport_server
2726
new_test.transport_readonly_server = self._transport_readonly_server
2727
new_test.bzrdir_format = bzrdir_format
2728
new_test.workingtree_format = workingtree_format
2729
def make_new_test_id():
2730
new_id = "%s(%s)" % (test.id(), variation)
2731
return lambda: new_id
2732
new_test.id = make_new_test_id()
2735
def adapt(self, test):
2736
from bzrlib.tests import TestSuite
2737
result = TestSuite()
2738
for workingtree_format, bzrdir_format in self._formats:
2739
new_test = self._clone_test(
2742
workingtree_format, workingtree_format.__class__.__name__)
2743
result.addTest(new_test)
added
removed
bzrlib/workingtree.py
