51
59
conflicts as _mod_conflicts,
60
revision as _mod_revision,
69
79
import bzrlib.branch
70
80
from bzrlib.transport import get_transport
71
from bzrlib.workingtree_4 import (
82
from bzrlib.workingtree_4 import WorkingTreeFormat4
78
85
from bzrlib import symbol_versioning
79
86
from bzrlib.decorators import needs_read_lock, needs_write_lock
80
from bzrlib.lockable_files import LockableFiles
87
from bzrlib.inventory import InventoryEntry, Inventory, ROOT_ID, TreeReference
88
from bzrlib.lockable_files import LockableFiles, TransportLock
81
89
from bzrlib.lockdir import LockDir
82
90
import bzrlib.mutabletree
83
91
from bzrlib.mutabletree import needs_tree_write_lock
84
from bzrlib import osutils
85
92
from bzrlib.osutils import (
93
102
supports_executable,
95
from bzrlib.filters import filtered_input_file
96
104
from bzrlib.trace import mutter, note
97
105
from bzrlib.transport.local import LocalTransport
98
from bzrlib.revision import CURRENT_REVISION
106
from bzrlib.progress import DummyProgress, ProgressPhase
107
from bzrlib.revision import NULL_REVISION, CURRENT_REVISION
99
108
from bzrlib.rio import RioReader, rio_file, Stanza
100
from bzrlib.symbol_versioning import (
102
DEPRECATED_PARAMETER,
109
from bzrlib.symbol_versioning import (deprecated_passed,
112
DEPRECATED_PARAMETER,
106
119
MERGE_MODIFIED_HEADER_1 = "BZR merge-modified list format 1"
107
# TODO: Modifying the conflict objects or their type is currently nearly
108
# impossible as there is no clear relationship between the working tree format
109
# and the conflict list file format.
110
120
CONFLICT_HEADER_1 = "BZR conflict list format 1"
112
ERROR_PATH_NOT_FOUND = 3 # WindowsError errno code, equivalent to ENOENT
123
@deprecated_function(zero_thirteen)
124
def gen_file_id(name):
125
"""Return new file id for the basename 'name'.
127
Use bzrlib.generate_ids.gen_file_id() instead
129
return generate_ids.gen_file_id(name)
132
@deprecated_function(zero_thirteen)
134
"""Return a new tree-root file id.
136
This has been deprecated in favor of bzrlib.generate_ids.gen_root_id()
138
return generate_ids.gen_root_id()
115
141
class TreeEntry(object):
116
142
"""An entry that implements the minimum interface used by commands.
118
This needs further inspection, it may be better to have
144
This needs further inspection, it may be better to have
119
145
InventoryEntries without ids - though that seems wrong. For now,
120
146
this is a parallel hierarchy to InventoryEntry, and needs to become
121
147
one of several things: decorates to that hierarchy, children of, or
192
"""Construct a WorkingTree instance. This is not a public API.
213
"""Construct a WorkingTree for basedir.
194
:param branch: A branch to override probing for the branch.
215
If the branch is not supplied, it is opened automatically.
216
If the branch is supplied, it must be the branch for this basedir.
217
(branch.base is not cross checked, because for remote branches that
218
would be meaningless).
196
220
self._format = _format
197
221
self.bzrdir = _bzrdir
198
222
if not _internal:
199
raise errors.BzrError("Please use bzrdir.open_workingtree or "
200
"WorkingTree.open() to obtain a WorkingTree.")
223
# not created via open etc.
224
warnings.warn("WorkingTree() is deprecated as of bzr version 0.8. "
225
"Please use bzrdir.open_workingtree or WorkingTree.open().",
228
wt = WorkingTree.open(basedir)
229
self._branch = wt.branch
230
self.basedir = wt.basedir
231
self._control_files = wt._control_files
232
self._hashcache = wt._hashcache
233
self._set_inventory(wt._inventory, dirty=False)
234
self._format = wt._format
235
self.bzrdir = wt.bzrdir
236
assert isinstance(basedir, basestring), \
237
"base directory %r is not a string" % basedir
201
238
basedir = safe_unicode(basedir)
202
239
mutter("opening working tree %r", basedir)
203
240
if deprecated_passed(branch):
242
warnings.warn("WorkingTree(..., branch=XXX) is deprecated"
243
" as of bzr 0.8. Please use bzrdir.open_workingtree() or"
244
" WorkingTree.open().",
204
248
self._branch = branch
206
250
self._branch = self.bzrdir.open_branch()
422
408
# at this point ?
424
410
return self.branch.repository.revision_tree(revision_id)
425
except (errors.RevisionNotPresent, errors.NoSuchRevision):
411
except errors.RevisionNotPresent:
426
412
# the basis tree *may* be a ghost or a low level error may have
427
# occurred. If the revision is present, its a problem, if its not
413
# occured. If the revision is present, its a problem, if its not
429
415
if self.branch.repository.has_revision(revision_id):
431
417
# the basis tree is a ghost so return an empty tree.
432
return self.branch.repository.revision_tree(
433
_mod_revision.NULL_REVISION)
436
self._flush_ignore_list_cache()
418
return self.branch.repository.revision_tree(None)
421
@deprecated_method(zero_eight)
422
def create(branch, directory):
423
"""Create a workingtree for branch at directory.
425
If existing_directory already exists it must have a .bzr directory.
426
If it does not exist, it will be created.
428
This returns a new WorkingTree object for the new checkout.
430
TODO FIXME RBC 20060124 when we have checkout formats in place this
431
should accept an optional revisionid to checkout [and reject this if
432
checking out into the same dir as a pre-checkout-aware branch format.]
434
XXX: When BzrDir is present, these should be created through that
437
warnings.warn('delete WorkingTree.create', stacklevel=3)
438
transport = get_transport(directory)
439
if branch.bzrdir.root_transport.base == transport.base:
441
return branch.bzrdir.create_workingtree()
442
# different directory,
443
# create a branch reference
444
# and now a working tree.
445
raise NotImplementedError
448
@deprecated_method(zero_eight)
449
def create_standalone(directory):
450
"""Create a checkout and a branch and a repo at directory.
452
Directory must exist and be empty.
454
please use BzrDir.create_standalone_workingtree
456
return bzrdir.BzrDir.create_standalone_workingtree(directory)
438
458
def relpath(self, path):
439
459
"""Return the local path portion from a given path.
441
The path may be absolute or relative. If its a relative path it is
461
The path may be absolute or relative. If its a relative path it is
442
462
interpreted relative to the python current working directory.
444
464
return osutils.relpath(self.basedir, path)
446
466
def has_filename(self, filename):
447
467
return osutils.lexists(self.abspath(filename))
449
def get_file(self, file_id, path=None, filtered=True):
450
return self.get_file_with_stat(file_id, path, filtered=filtered)[0]
452
def get_file_with_stat(self, file_id, path=None, filtered=True,
454
"""See Tree.get_file_with_stat."""
456
path = self.id2path(file_id)
457
file_obj = self.get_file_byname(path, filtered=False)
458
stat_value = _fstat(file_obj.fileno())
459
if filtered and self.supports_content_filtering():
460
filters = self._content_filter_stack(path)
461
file_obj = filtered_input_file(file_obj, filters)
462
return (file_obj, stat_value)
464
def get_file_text(self, file_id, path=None, filtered=True):
465
return self.get_file(file_id, path=path, filtered=filtered).read()
467
def get_file_byname(self, filename, filtered=True):
468
path = self.abspath(filename)
470
if filtered and self.supports_content_filtering():
471
filters = self._content_filter_stack(filename)
472
return filtered_input_file(f, filters)
476
def get_file_lines(self, file_id, path=None, filtered=True):
477
"""See Tree.get_file_lines()"""
478
file = self.get_file(file_id, path, filtered=filtered)
480
return file.readlines()
469
def get_file(self, file_id):
470
file_id = osutils.safe_file_id(file_id)
471
return self.get_file_byname(self.id2path(file_id))
473
def get_file_text(self, file_id):
474
file_id = osutils.safe_file_id(file_id)
475
return self.get_file(file_id).read()
477
def get_file_byname(self, filename):
478
return file(self.abspath(filename), 'rb')
485
def annotate_iter(self, file_id, default_revision=CURRENT_REVISION):
481
def annotate_iter(self, file_id):
486
482
"""See Tree.annotate_iter
488
484
This implementation will use the basis tree implementation if possible.
492
488
incorrectly attributed to CURRENT_REVISION (but after committing, the
493
489
attribution will be correct).
495
maybe_file_parent_keys = []
496
for parent_id in self.get_parent_ids():
498
parent_tree = self.revision_tree(parent_id)
499
except errors.NoSuchRevisionInTree:
500
parent_tree = self.branch.repository.revision_tree(parent_id)
501
parent_tree.lock_read()
503
if file_id not in parent_tree:
505
ie = parent_tree.inventory[file_id]
506
if ie.kind != 'file':
507
# Note: this is slightly unnecessary, because symlinks and
508
# directories have a "text" which is the empty text, and we
509
# know that won't mess up annotations. But it seems cleaner
511
parent_text_key = (file_id, ie.revision)
512
if parent_text_key not in maybe_file_parent_keys:
513
maybe_file_parent_keys.append(parent_text_key)
516
graph = _mod_graph.Graph(self.branch.repository.texts)
517
heads = graph.heads(maybe_file_parent_keys)
518
file_parent_keys = []
519
for key in maybe_file_parent_keys:
521
file_parent_keys.append(key)
523
# Now we have the parents of this content
524
annotator = self.branch.repository.texts.get_annotator()
525
text = self.get_file(file_id).read()
526
this_key =(file_id, default_revision)
527
annotator.add_special_text(this_key, file_parent_keys, text)
528
annotations = [(key[-1], line)
529
for key, line in annotator.annotate_flat(this_key)]
532
def _get_ancestors(self, default_revision):
533
ancestors = set([default_revision])
534
for parent_id in self.get_parent_ids():
535
ancestors.update(self.branch.repository.get_ancestry(
536
parent_id, topo_sorted=False))
491
file_id = osutils.safe_file_id(file_id)
492
basis = self.basis_tree()
495
changes = self._iter_changes(basis, True, [self.id2path(file_id)],
496
require_versioned=True).next()
497
changed_content, kind = changes[2], changes[6]
498
if not changed_content:
499
return basis.annotate_iter(file_id)
503
if kind[0] != 'file':
506
old_lines = list(basis.annotate_iter(file_id))
508
for tree in self.branch.repository.revision_trees(
509
self.get_parent_ids()[1:]):
510
if file_id not in tree:
512
old.append(list(tree.annotate_iter(file_id)))
513
return annotate.reannotate(old, self.get_file(file_id).readlines(),
539
518
def get_parent_ids(self):
540
519
"""See Tree.get_parent_ids.
542
521
This implementation reads the pending merges list and last_revision
543
522
value and uses that to decide what the parents list should be.
545
last_rev = _mod_revision.ensure_null(self._last_revision())
546
if _mod_revision.NULL_REVISION == last_rev:
524
last_rev = self._last_revision()
549
528
parents = [last_rev]
551
merges_bytes = self._transport.get_bytes('pending-merges')
530
merges_file = self._control_files.get('pending-merges')
552
531
except errors.NoSuchFile:
555
for l in osutils.split_lines(merges_bytes):
556
revision_id = l.rstrip('\n')
534
for l in merges_file.readlines():
535
revision_id = osutils.safe_revision_id(l.rstrip('\n'))
557
536
parents.append(revision_id)
561
540
def get_root_id(self):
562
541
"""Return the id of this trees root"""
563
542
return self._inventory.root.file_id
565
544
def _get_store_filename(self, file_id):
566
545
## XXX: badly named; this is not in the store at all
546
file_id = osutils.safe_file_id(file_id)
567
547
return self.abspath(self.id2path(file_id))
570
def clone(self, to_bzrdir, revision_id=None):
550
def clone(self, to_bzrdir, revision_id=None, basis=None):
571
551
"""Duplicate this working tree into to_bzr, including all state.
573
553
Specifically modified files are kept as modified, but
574
554
ignored and unknown files are discarded.
576
556
If you want to make a new line of development, see bzrdir.sprout()
579
If not None, the cloned tree will have its last revision set to
580
revision, and difference between the source trees last revision
559
If not None, the cloned tree will have its last revision set to
560
revision, and and difference between the source trees last revision
581
561
and this one merged in.
564
If not None, a closer copy of a tree which may have some files in
565
common, and which file content should be preferentially copied from.
583
567
# assumes the target bzr dir format is compatible.
584
result = to_bzrdir.create_workingtree()
568
result = self._format.initialize(to_bzrdir)
585
569
self.copy_content_into(result, revision_id)
616
603
__contains__ = has_id
618
605
def get_file_size(self, file_id):
619
"""See Tree.get_file_size"""
620
# XXX: this returns the on-disk size; it should probably return the
623
return os.path.getsize(self.id2abspath(file_id))
625
if e.errno != errno.ENOENT:
606
file_id = osutils.safe_file_id(file_id)
607
return os.path.getsize(self.id2abspath(file_id))
631
610
def get_file_sha1(self, file_id, path=None, stat_value=None):
611
file_id = osutils.safe_file_id(file_id)
633
613
path = self._inventory.id2path(file_id)
634
614
return self._hashcache.get_sha1(path, stat_value)
636
616
def get_file_mtime(self, file_id, path=None):
617
file_id = osutils.safe_file_id(file_id)
638
619
path = self.inventory.id2path(file_id)
639
620
return os.lstat(self.abspath(path)).st_mtime
641
def _is_executable_from_path_and_stat_from_basis(self, path, stat_result):
642
file_id = self.path2id(path)
644
# For unversioned files on win32, we just assume they are not
647
return self._inventory[file_id].executable
649
def _is_executable_from_path_and_stat_from_stat(self, path, stat_result):
650
mode = stat_result.st_mode
651
return bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode)
653
622
if not supports_executable():
654
623
def is_executable(self, file_id, path=None):
624
file_id = osutils.safe_file_id(file_id)
655
625
return self._inventory[file_id].executable
657
_is_executable_from_path_and_stat = \
658
_is_executable_from_path_and_stat_from_basis
660
627
def is_executable(self, file_id, path=None):
629
file_id = osutils.safe_file_id(file_id)
662
630
path = self.id2path(file_id)
663
631
mode = os.lstat(self.abspath(path)).st_mode
664
632
return bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode)
666
_is_executable_from_path_and_stat = \
667
_is_executable_from_path_and_stat_from_stat
669
634
@needs_tree_write_lock
670
635
def _add(self, files, ids, kinds):
671
636
"""See MutableTree._add."""
672
637
# TODO: Re-adding a file that is removed in the working copy
673
638
# should probably put it back with the previous ID.
674
# the read and write working inventory should not occur in this
639
# the read and write working inventory should not occur in this
675
640
# function - they should be part of lock_write and unlock.
641
inv = self.read_working_inventory()
677
642
for f, file_id, kind in zip(files, ids, kinds):
643
assert kind is not None
678
644
if file_id is None:
679
645
inv.add_path(f, kind=kind)
647
file_id = osutils.safe_file_id(file_id)
681
648
inv.add_path(f, kind=kind, file_id=file_id)
682
self._inventory_is_modified = True
649
self._write_inventory(inv)
684
651
@needs_tree_write_lock
685
652
def _gather_kinds(self, files, kinds):
746
713
self.set_parent_ids(parents, allow_leftmost_as_ghost=True)
748
def path_content_summary(self, path, _lstat=os.lstat,
749
_mapper=osutils.file_kind_from_stat_mode):
750
"""See Tree.path_content_summary."""
751
abspath = self.abspath(path)
753
stat_result = _lstat(abspath)
755
if getattr(e, 'errno', None) == errno.ENOENT:
757
return ('missing', None, None, None)
758
# propagate other errors
760
kind = _mapper(stat_result.st_mode)
762
return self._file_content_summary(path, stat_result)
763
elif kind == 'directory':
764
# perhaps it looks like a plain directory, but it's really a
766
if self._directory_is_tree_reference(path):
767
kind = 'tree-reference'
768
return kind, None, None, None
769
elif kind == 'symlink':
770
target = osutils.readlink(abspath)
771
return ('symlink', None, None, target)
773
return (kind, None, None, None)
775
def _file_content_summary(self, path, stat_result):
776
size = stat_result.st_size
777
executable = self._is_executable_from_path_and_stat(path, stat_result)
778
# try for a stat cache lookup
779
return ('file', size, executable, self._sha_from_stat(
715
@deprecated_method(zero_eleven)
717
def pending_merges(self):
718
"""Return a list of pending merges.
720
These are revisions that have been merged into the working
721
directory but not yet committed.
723
As of 0.11 this is deprecated. Please see WorkingTree.get_parent_ids()
724
instead - which is available on all tree objects.
726
return self.get_parent_ids()[1:]
782
728
def _check_parents_for_ghosts(self, revision_ids, allow_leftmost_as_ghost):
783
729
"""Common ghost checking functionality from set_parent_*.
828
754
:param revision_ids: The revision_ids to set as the parent ids of this
829
755
working tree. Any of these may be ghosts.
757
revision_ids = [osutils.safe_revision_id(r) for r in revision_ids]
831
758
self._check_parents_for_ghosts(revision_ids,
832
759
allow_leftmost_as_ghost=allow_leftmost_as_ghost)
833
for revision_id in revision_ids:
834
_mod_revision.check_not_reserved_id(revision_id)
836
revision_ids = self._filter_parent_ids_by_ancestry(revision_ids)
838
761
if len(revision_ids) > 0:
839
762
self.set_last_revision(revision_ids[0])
841
self.set_last_revision(_mod_revision.NULL_REVISION)
764
self.set_last_revision(None)
843
766
self._set_merges_from_parent_ids(revision_ids)
845
768
@needs_tree_write_lock
846
769
def set_parent_trees(self, parents_list, allow_leftmost_as_ghost=False):
847
770
"""See MutableTree.set_parent_trees."""
848
parent_ids = [rev for (rev, tree) in parents_list]
849
for revision_id in parent_ids:
850
_mod_revision.check_not_reserved_id(revision_id)
771
parent_ids = [osutils.safe_revision_id(rev) for (rev, tree) in parents_list]
852
773
self._check_parents_for_ghosts(parent_ids,
853
774
allow_leftmost_as_ghost=allow_leftmost_as_ghost)
855
parent_ids = self._filter_parent_ids_by_ancestry(parent_ids)
857
776
if len(parent_ids) == 0:
858
leftmost_parent_id = _mod_revision.NULL_REVISION
777
leftmost_parent_id = None
859
778
leftmost_parent_tree = None
861
780
leftmost_parent_id, leftmost_parent_tree = parents_list[0]
914
821
branch.last_revision().
916
823
from bzrlib.merge import Merger, Merge3Merger
917
merger = Merger(self.branch, this_tree=self)
918
# check that there are no local alterations
919
if not force and self.has_changes():
920
raise errors.UncommittedChanges(self)
921
if to_revision is None:
922
to_revision = _mod_revision.ensure_null(branch.last_revision())
923
merger.other_rev_id = to_revision
924
if _mod_revision.is_null(merger.other_rev_id):
925
raise errors.NoCommits(branch)
926
self.branch.fetch(branch, last_revision=merger.other_rev_id)
927
merger.other_basis = merger.other_rev_id
928
merger.other_tree = self.branch.repository.revision_tree(
930
merger.other_branch = branch
931
if from_revision is None:
824
pb = bzrlib.ui.ui_factory.nested_progress_bar()
826
merger = Merger(self.branch, this_tree=self, pb=pb)
827
merger.pp = ProgressPhase("Merge phase", 5, pb)
828
merger.pp.next_phase()
829
# check that there are no
831
merger.check_basis(check_clean=True, require_commits=False)
832
if to_revision is None:
833
to_revision = branch.last_revision()
835
to_revision = osutils.safe_revision_id(to_revision)
836
merger.other_rev_id = to_revision
837
if merger.other_rev_id is None:
838
raise error.NoCommits(branch)
839
self.branch.fetch(branch, last_revision=merger.other_rev_id)
840
merger.other_basis = merger.other_rev_id
841
merger.other_tree = self.branch.repository.revision_tree(
843
merger.other_branch = branch
844
merger.pp.next_phase()
932
845
merger.find_base()
934
merger.set_base_revision(from_revision, branch)
935
if merger.base_rev_id == merger.other_rev_id:
936
raise errors.PointlessMerge
937
merger.backup_files = False
938
if merge_type is None:
846
if merger.base_rev_id == merger.other_rev_id:
847
raise errors.PointlessMerge
848
merger.backup_files = False
939
849
merger.merge_type = Merge3Merger
941
merger.merge_type = merge_type
942
merger.set_interesting_files(None)
943
merger.show_base = False
944
merger.reprocess = False
945
conflicts = merger.do_merge()
850
merger.set_interesting_files(None)
851
merger.show_base = False
852
merger.reprocess = False
853
conflicts = merger.do_merge()
950
860
def merge_modified(self):
951
861
"""Return a dictionary of files modified by a merge.
953
The list is initialized by WorkingTree.set_merge_modified, which is
863
The list is initialized by WorkingTree.set_merge_modified, which is
954
864
typically called after we make some automatic updates to the tree
955
865
because of a merge.
1127
1013
sio = StringIO()
1128
1014
self._serialize(self._inventory, sio)
1130
self._transport.put_file('inventory', sio,
1131
mode=self.bzrdir._get_file_mode())
1016
self._control_files.put('inventory', sio)
1132
1017
self._inventory_is_modified = False
1134
1019
def _kind(self, relpath):
1135
1020
return osutils.file_kind(self.abspath(relpath))
1137
def list_files(self, include_root=False, from_dir=None, recursive=True):
1138
"""List all files as (path, class, kind, id, entry).
1022
def list_files(self, include_root=False):
1023
"""Recursively list all files as (path, class, kind, id, entry).
1140
1025
Lists, but does not descend into unversioned directories.
1141
1027
This does not include files that have been deleted in this
1142
tree. Skips the control directory.
1144
:param include_root: if True, return an entry for the root
1145
:param from_dir: start from this directory or None for the root
1146
:param recursive: whether to recurse into subdirectories or not
1030
Skips the control directory.
1148
1032
# list_files is an iterator, so @needs_read_lock doesn't work properly
1149
1033
# with it. So callers should be careful to always read_lock the tree.
1927
1769
def read_basis_inventory(self):
1928
1770
"""Read the cached basis inventory."""
1929
1771
path = self._basis_inventory_name()
1930
return self._transport.get_bytes(path)
1772
return self._control_files.get(path).read()
1932
1774
@needs_read_lock
1933
1775
def read_working_inventory(self):
1934
1776
"""Read the working inventory.
1936
1778
:raises errors.InventoryModified: read_working_inventory will fail
1937
1779
when the current in memory inventory has been modified.
1939
# conceptually this should be an implementation detail of the tree.
1781
# conceptually this should be an implementation detail of the tree.
1940
1782
# XXX: Deprecate this.
1941
1783
# ElementTree does its own conversion from UTF-8, so open in
1943
1785
if self._inventory_is_modified:
1944
1786
raise errors.InventoryModified(self)
1945
f = self._transport.get('inventory')
1947
result = self._deserialize(f)
1787
result = self._deserialize(self._control_files.get('inventory'))
1950
1788
self._set_inventory(result, dirty=False)
1953
1791
@needs_tree_write_lock
1954
def remove(self, files, verbose=False, to_file=None, keep_files=True,
1956
"""Remove nominated files from the working inventory.
1958
:files: File paths relative to the basedir.
1959
:keep_files: If true, the files will also be kept.
1960
:force: Delete files and directories, even if they are changed and
1961
even if the directories are not empty.
1792
def remove(self, files, verbose=False, to_file=None):
1793
"""Remove nominated files from the working inventory..
1795
This does not remove their text. This does not run on XXX on what? RBC
1797
TODO: Refuse to remove modified files unless --force is given?
1799
TODO: Do something useful with directories.
1801
TODO: Should this remove the text or not? Tough call; not
1802
removing may be useful and the user can just use use rm, and
1803
is the opposite of add. Removing it is consistent with most
1804
other tools. Maybe an option.
1806
## TODO: Normalize names
1807
## TODO: Remove nested loops; better scalability
1963
1808
if isinstance(files, basestring):
1964
1809
files = [files]
1969
unknown_nested_files=set()
1971
to_file = sys.stdout
1973
def recurse_directory_to_add_files(directory):
1974
# Recurse directory and add all files
1975
# so we can check if they have changed.
1976
for parent_info, file_infos in\
1977
self.walkdirs(directory):
1978
for relpath, basename, kind, lstat, fileid, kind in file_infos:
1979
# Is it versioned or ignored?
1980
if self.path2id(relpath) or self.is_ignored(relpath):
1981
# Add nested content for deletion.
1982
new_files.add(relpath)
1984
# Files which are not versioned and not ignored
1985
# should be treated as unknown.
1986
unknown_nested_files.add((relpath, None, kind))
1988
for filename in files:
1989
# Get file name into canonical form.
1990
abspath = self.abspath(filename)
1991
filename = self.relpath(abspath)
1992
if len(filename) > 0:
1993
new_files.add(filename)
1994
recurse_directory_to_add_files(filename)
1996
files = list(new_files)
1999
return # nothing to do
2001
# Sort needed to first handle directory content before the directory
2002
files.sort(reverse=True)
2004
# Bail out if we are going to delete files we shouldn't
2005
if not keep_files and not force:
2006
has_changed_files = len(unknown_nested_files) > 0
2007
if not has_changed_files:
2008
for (file_id, path, content_change, versioned, parent_id, name,
2009
kind, executable) in self.iter_changes(self.basis_tree(),
2010
include_unchanged=True, require_versioned=False,
2011
want_unversioned=True, specific_files=files):
2012
if versioned == (False, False):
2013
# The record is unknown ...
2014
if not self.is_ignored(path[1]):
2015
# ... but not ignored
2016
has_changed_files = True
2018
elif content_change and (kind[1] is not None):
2019
# Versioned and changed, but not deleted
2020
has_changed_files = True
2023
if has_changed_files:
2024
# Make delta show ALL applicable changes in error message.
2025
tree_delta = self.changes_from(self.basis_tree(),
2026
require_versioned=False, want_unversioned=True,
2027
specific_files=files)
2028
for unknown_file in unknown_nested_files:
2029
if unknown_file not in tree_delta.unversioned:
2030
tree_delta.unversioned.extend((unknown_file,))
2031
raise errors.BzrRemoveChangedFilesError(tree_delta)
2033
# Build inv_delta and delete files where applicable,
2034
# do this before any modifications to inventory.
1811
inv = self.inventory
1813
# do this before any modifications
2035
1814
for f in files:
2036
fid = self.path2id(f)
1815
fid = inv.path2id(f)
2039
message = "%s is not versioned." % (f,)
1817
note("%s is not versioned."%f)
2042
# having removed it, it must be either ignored or unknown
1820
# having remove it, it must be either ignored or unknown
2043
1821
if self.is_ignored(f):
2044
1822
new_status = 'I'
2046
1824
new_status = '?'
2047
# XXX: Really should be a more abstract reporter interface
2048
kind_ch = osutils.kind_marker(self.kind(fid))
2049
to_file.write(new_status + ' ' + f + kind_ch + '\n')
2051
inv_delta.append((f, None, fid, None))
2052
message = "removed %s" % (f,)
2055
abs_path = self.abspath(f)
2056
if osutils.lexists(abs_path):
2057
if (osutils.isdir(abs_path) and
2058
len(os.listdir(abs_path)) > 0):
2060
osutils.rmtree(abs_path)
2062
message = "%s is not an empty directory "\
2063
"and won't be deleted." % (f,)
2065
osutils.delete_any(abs_path)
2066
message = "deleted %s" % (f,)
2067
elif message is not None:
2068
# Only care if we haven't done anything yet.
2069
message = "%s does not exist." % (f,)
2071
# Print only one message (if any) per file.
2072
if message is not None:
2074
self.apply_inventory_delta(inv_delta)
1825
textui.show_status(new_status, inv[fid].kind, f,
1829
self._write_inventory(inv)
2076
1831
@needs_tree_write_lock
2077
def revert(self, filenames=None, old_tree=None, backups=True,
2078
pb=None, report_changes=False):
1832
def revert(self, filenames, old_tree=None, backups=True,
1833
pb=DummyProgress(), report_changes=False):
2079
1834
from bzrlib.conflicts import resolve
2082
symbol_versioning.warn('Using [] to revert all files is deprecated'
2083
' as of bzr 0.91. Please use None (the default) instead.',
2084
DeprecationWarning, stacklevel=2)
2085
1835
if old_tree is None:
2086
basis_tree = self.basis_tree()
2087
basis_tree.lock_read()
2088
old_tree = basis_tree
1836
old_tree = self.basis_tree()
1837
conflicts = transform.revert(self, old_tree, filenames, backups, pb,
1839
if not len(filenames):
1840
self.set_parent_ids(self.get_parent_ids()[:1])
2092
conflicts = transform.revert(self, old_tree, filenames, backups, pb,
2094
if filenames is None and len(self.get_parent_ids()) > 1:
2096
last_revision = self.last_revision()
2097
if last_revision != _mod_revision.NULL_REVISION:
2098
if basis_tree is None:
2099
basis_tree = self.basis_tree()
2100
basis_tree.lock_read()
2101
parent_trees.append((last_revision, basis_tree))
2102
self.set_parent_trees(parent_trees)
2105
resolve(self, filenames, ignore_misses=True, recursive=True)
2107
if basis_tree is not None:
1843
resolve(self, filenames, ignore_misses=True)
2109
1844
return conflicts
2111
1846
def revision_tree(self, revision_id):
2266
1996
# cant set that until we update the working trees last revision to be
2267
1997
# one from the new branch, because it will just get absorbed by the
2268
1998
# parent de-duplication logic.
2270
2000
# We MUST save it even if an error occurs, because otherwise the users
2271
2001
# local work is unreferenced and will appear to have been lost.
2275
2005
last_rev = self.get_parent_ids()[0]
2276
2006
except IndexError:
2277
last_rev = _mod_revision.NULL_REVISION
2278
if revision is None:
2279
revision = self.branch.last_revision()
2281
old_tip = old_tip or _mod_revision.NULL_REVISION
2283
if not _mod_revision.is_null(old_tip) and old_tip != last_rev:
2284
# the branch we are bound to was updated
2285
# merge those changes in first
2286
base_tree = self.basis_tree()
2287
other_tree = self.branch.repository.revision_tree(old_tip)
2288
nb_conflicts = merge.merge_inner(self.branch, other_tree,
2289
base_tree, this_tree=self,
2290
change_reporter=change_reporter)
2292
self.add_parent_tree((old_tip, other_tree))
2293
trace.note('Rerun update after fixing the conflicts.')
2296
if last_rev != _mod_revision.ensure_null(revision):
2297
# the working tree is up to date with the branch
2298
# we can merge the specified revision from master
2299
to_tree = self.branch.repository.revision_tree(revision)
2300
to_root_id = to_tree.get_root_id()
2008
if last_rev != self.branch.last_revision():
2009
# merge tree state up to new branch tip.
2302
2010
basis = self.basis_tree()
2303
2011
basis.lock_read()
2305
if (basis.inventory.root is None
2306
or basis.inventory.root.file_id != to_root_id):
2307
self.set_root_id(to_root_id)
2013
to_tree = self.branch.basis_tree()
2014
if basis.inventory.root is None:
2015
self.set_root_id(to_tree.inventory.root.file_id)
2017
result += merge.merge_inner(
2312
# determine the branch point
2313
graph = self.branch.repository.get_graph()
2314
base_rev_id = graph.find_unique_lca(self.branch.last_revision(),
2316
base_tree = self.branch.repository.revision_tree(base_rev_id)
2318
nb_conflicts = merge.merge_inner(self.branch, to_tree, base_tree,
2320
change_reporter=change_reporter)
2321
self.set_last_revision(revision)
2322
2024
# TODO - dedup parents list with things merged by pull ?
2323
2025
# reuse the tree we've updated to to set the basis:
2324
parent_trees = [(revision, to_tree)]
2026
parent_trees = [(self.branch.last_revision(), to_tree)]
2325
2027
merges = self.get_parent_ids()[1:]
2326
2028
# Ideally we ask the tree for the trees here, that way the working
2327
# tree can decide whether to give us the entire tree or give us a
2029
# tree can decide whether to give us teh entire tree or give us a
2328
2030
# lazy initialised tree. dirstate for instance will have the trees
2329
2031
# in ram already, whereas a last-revision + basis-inventory tree
2330
2032
# will not, but also does not need them when setting parents.
2331
2033
for parent in merges:
2332
2034
parent_trees.append(
2333
2035
(parent, self.branch.repository.revision_tree(parent)))
2334
if not _mod_revision.is_null(old_tip):
2036
if old_tip is not None:
2335
2037
parent_trees.append(
2336
2038
(old_tip, self.branch.repository.revision_tree(old_tip)))
2337
2039
self.set_parent_trees(parent_trees)
2338
2040
last_rev = parent_trees[0][0]
2042
# the working tree had the same last-revision as the master
2043
# branch did. We may still have pivot local work from the local
2044
# branch into old_tip:
2045
if old_tip is not None:
2046
self.add_parent_tree_id(old_tip)
2047
if old_tip and old_tip != last_rev:
2048
# our last revision was not the prior branch last revision
2049
# and we have converted that last revision to a pending merge.
2050
# base is somewhere between the branch tip now
2051
# and the now pending merge
2053
# Since we just modified the working tree and inventory, flush out
2054
# the current state, before we modify it again.
2055
# TODO: jam 20070214 WorkingTree3 doesn't require this, dirstate
2056
# requires it only because TreeTransform directly munges the
2057
# inventory and calls tree._write_inventory(). Ultimately we
2058
# should be able to remove this extra flush.
2060
from bzrlib.revision import common_ancestor
2062
base_rev_id = common_ancestor(self.branch.last_revision(),
2064
self.branch.repository)
2065
except errors.NoCommonAncestor:
2067
base_tree = self.branch.repository.revision_tree(base_rev_id)
2068
other_tree = self.branch.repository.revision_tree(old_tip)
2069
result += merge.merge_inner(
2341
2076
def _write_hashcache_if_dirty(self):
2342
2077
"""Write out the hashcache if it is dirty."""
2869
2534
"""See WorkingTreeFormat.get_format_description()."""
2870
2535
return "Working tree format 2"
2872
def _stub_initialize_on_transport(self, transport, file_mode):
2873
"""Workaround: create control files for a remote working tree.
2537
def stub_initialize_remote(self, control_files):
2538
"""As a special workaround create critical control files for a remote working tree
2875
2540
This ensures that it can later be updated and dealt with locally,
2876
since BzrDirFormat6 and BzrDirFormat5 cannot represent dirs with
2541
since BzrDirFormat6 and BzrDirFormat5 cannot represent dirs with
2877
2542
no working tree. (See bug #43064).
2879
2544
sio = StringIO()
2880
inv = inventory.Inventory()
2881
xml5.serializer_v5.write_inventory(inv, sio, working=True)
2546
xml5.serializer_v5.write_inventory(inv, sio)
2883
transport.put_file('inventory', sio, file_mode)
2884
transport.put_bytes('pending-merges', '', file_mode)
2886
def initialize(self, a_bzrdir, revision_id=None, from_branch=None,
2887
accelerator_tree=None, hardlink=False):
2548
control_files.put('inventory', sio)
2550
control_files.put_bytes('pending-merges', '')
2553
def initialize(self, a_bzrdir, revision_id=None):
2888
2554
"""See WorkingTreeFormat.initialize()."""
2889
2555
if not isinstance(a_bzrdir.transport, LocalTransport):
2890
2556
raise errors.NotLocalUrl(a_bzrdir.transport.base)
2891
if from_branch is not None:
2892
branch = from_branch
2894
branch = a_bzrdir.open_branch()
2895
if revision_id is None:
2896
revision_id = _mod_revision.ensure_null(branch.last_revision())
2899
branch.generate_revision_history(revision_id)
2902
inv = inventory.Inventory()
2557
branch = a_bzrdir.open_branch()
2558
if revision_id is not None:
2559
revision_id = osutils.safe_revision_id(revision_id)
2562
revision_history = branch.revision_history()
2564
position = revision_history.index(revision_id)
2566
raise errors.NoSuchRevision(branch, revision_id)
2567
branch.set_revision_history(revision_history[:position + 1])
2570
revision = branch.last_revision()
2903
2572
wt = WorkingTree2(a_bzrdir.root_transport.local_abspath('.'),
2906
2575
_internal=True,
2908
2577
_bzrdir=a_bzrdir)
2909
basis_tree = branch.repository.revision_tree(revision_id)
2578
basis_tree = branch.repository.revision_tree(revision)
2910
2579
if basis_tree.inventory.root is not None:
2911
wt.set_root_id(basis_tree.get_root_id())
2580
wt.set_root_id(basis_tree.inventory.root.file_id)
2912
2581
# set the parent list and cache the basis tree.
2913
if _mod_revision.is_null(revision_id):
2916
parent_trees = [(revision_id, basis_tree)]
2917
wt.set_parent_trees(parent_trees)
2582
wt.set_parent_trees([(revision, basis_tree)])
2918
2583
transform.build_tree(basis_tree, wt)
3070
2726
return self.get_format_string()
3073
__default_format = WorkingTreeFormat6()
2729
__default_format = WorkingTreeFormat4()
3074
2730
WorkingTreeFormat.register_format(__default_format)
3075
WorkingTreeFormat.register_format(WorkingTreeFormat5())
3076
WorkingTreeFormat.register_format(WorkingTreeFormat4())
3077
2731
WorkingTreeFormat.register_format(WorkingTreeFormat3())
3078
2732
WorkingTreeFormat.set_default_format(__default_format)
3079
2733
# formats which have no format string are not discoverable
3080
2734
# and not independently creatable, so are not registered.
3081
2735
_legacy_formats = [WorkingTreeFormat2(),
2739
class WorkingTreeTestProviderAdapter(object):
2740
"""A tool to generate a suite testing multiple workingtree formats at once.
2742
This is done by copying the test once for each transport and injecting
2743
the transport_server, transport_readonly_server, and workingtree_format
2744
classes into each copy. Each copy is also given a new id() to make it
2748
def __init__(self, transport_server, transport_readonly_server, formats):
2749
self._transport_server = transport_server
2750
self._transport_readonly_server = transport_readonly_server
2751
self._formats = formats
2753
def _clone_test(self, test, bzrdir_format, workingtree_format, variation):
2754
"""Clone test for adaption."""
2755
new_test = deepcopy(test)
2756
new_test.transport_server = self._transport_server
2757
new_test.transport_readonly_server = self._transport_readonly_server
2758
new_test.bzrdir_format = bzrdir_format
2759
new_test.workingtree_format = workingtree_format
2760
def make_new_test_id():
2761
new_id = "%s(%s)" % (test.id(), variation)
2762
return lambda: new_id
2763
new_test.id = make_new_test_id()
2766
def adapt(self, test):
2767
from bzrlib.tests import TestSuite
2768
result = TestSuite()
2769
for workingtree_format, bzrdir_format in self._formats:
2770
new_test = self._clone_test(
2773
workingtree_format, workingtree_format.__class__.__name__)
2774
result.addTest(new_test)
added
removed
bzrlib/workingtree.py
