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.lockable_files import LockableFiles
85
from bzrlib.inventory import InventoryEntry, Inventory, ROOT_ID, TreeReference
86
from bzrlib.lockable_files import LockableFiles, TransportLock
81
87
from bzrlib.lockdir import LockDir
82
88
import bzrlib.mutabletree
83
89
from bzrlib.mutabletree import needs_tree_write_lock
84
from bzrlib import osutils
85
90
from bzrlib.osutils import (
93
100
supports_executable,
95
from bzrlib.filters import filtered_input_file
96
102
from bzrlib.trace import mutter, note
97
103
from bzrlib.transport.local import LocalTransport
98
from bzrlib.revision import CURRENT_REVISION
104
from bzrlib.progress import DummyProgress, ProgressPhase
105
from bzrlib.revision import NULL_REVISION, CURRENT_REVISION
99
106
from bzrlib.rio import RioReader, rio_file, Stanza
100
from bzrlib.symbol_versioning import (
102
DEPRECATED_PARAMETER,
107
from bzrlib.symbol_versioning import (deprecated_passed,
110
DEPRECATED_PARAMETER,
106
117
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
118
CONFLICT_HEADER_1 = "BZR conflict list format 1"
112
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()
115
139
class TreeEntry(object):
116
140
"""An entry that implements the minimum interface used by commands.
118
This needs further inspection, it may be better to have
142
This needs further inspection, it may be better to have
119
143
InventoryEntries without ids - though that seems wrong. For now,
120
144
this is a parallel hierarchy to InventoryEntry, and needs to become
121
145
one of several things: decorates to that hierarchy, children of, or
422
384
# at this point ?
424
386
return self.branch.repository.revision_tree(revision_id)
425
except (errors.RevisionNotPresent, errors.NoSuchRevision):
387
except errors.RevisionNotPresent:
426
388
# 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
389
# occured. If the revision is present, its a problem, if its not
429
391
if self.branch.repository.has_revision(revision_id):
431
393
# 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()
394
return self.branch.repository.revision_tree(None)
397
@deprecated_method(zero_eight)
398
def create(branch, directory):
399
"""Create a workingtree for branch at directory.
401
If existing_directory already exists it must have a .bzr directory.
402
If it does not exist, it will be created.
404
This returns a new WorkingTree object for the new checkout.
406
TODO FIXME RBC 20060124 when we have checkout formats in place this
407
should accept an optional revisionid to checkout [and reject this if
408
checking out into the same dir as a pre-checkout-aware branch format.]
410
XXX: When BzrDir is present, these should be created through that
413
warnings.warn('delete WorkingTree.create', stacklevel=3)
414
transport = get_transport(directory)
415
if branch.bzrdir.root_transport.base == transport.base:
417
return branch.bzrdir.create_workingtree()
418
# different directory,
419
# create a branch reference
420
# and now a working tree.
421
raise NotImplementedError
424
@deprecated_method(zero_eight)
425
def create_standalone(directory):
426
"""Create a checkout and a branch and a repo at directory.
428
Directory must exist and be empty.
430
please use BzrDir.create_standalone_workingtree
432
return bzrdir.BzrDir.create_standalone_workingtree(directory)
438
434
def relpath(self, path):
439
435
"""Return the local path portion from a given path.
441
The path may be absolute or relative. If its a relative path it is
437
The path may be absolute or relative. If its a relative path it is
442
438
interpreted relative to the python current working directory.
444
440
return osutils.relpath(self.basedir, path)
446
442
def has_filename(self, filename):
447
443
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()
445
def get_file(self, file_id):
446
file_id = osutils.safe_file_id(file_id)
447
return self.get_file_byname(self.id2path(file_id))
449
def get_file_text(self, file_id):
450
file_id = osutils.safe_file_id(file_id)
451
return self.get_file(file_id).read()
453
def get_file_byname(self, filename):
454
return file(self.abspath(filename), 'rb')
485
def annotate_iter(self, file_id, default_revision=CURRENT_REVISION):
457
def annotate_iter(self, file_id):
486
458
"""See Tree.annotate_iter
488
460
This implementation will use the basis tree implementation if possible.
492
464
incorrectly attributed to CURRENT_REVISION (but after committing, the
493
465
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))
467
file_id = osutils.safe_file_id(file_id)
468
basis = self.basis_tree()
471
changes = self._iter_changes(basis, True, [self.id2path(file_id)],
472
require_versioned=True).next()
473
changed_content, kind = changes[2], changes[6]
474
if not changed_content:
475
return basis.annotate_iter(file_id)
479
if kind[0] != 'file':
482
old_lines = list(basis.annotate_iter(file_id))
484
for tree in self.branch.repository.revision_trees(
485
self.get_parent_ids()[1:]):
486
if file_id not in tree:
488
old.append(list(tree.annotate_iter(file_id)))
489
return annotate.reannotate(old, self.get_file(file_id).readlines(),
539
494
def get_parent_ids(self):
540
495
"""See Tree.get_parent_ids.
542
497
This implementation reads the pending merges list and last_revision
543
498
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:
500
last_rev = self._last_revision()
549
504
parents = [last_rev]
551
merges_bytes = self._transport.get_bytes('pending-merges')
506
merges_file = self._control_files.get('pending-merges')
552
507
except errors.NoSuchFile:
555
for l in osutils.split_lines(merges_bytes):
556
revision_id = l.rstrip('\n')
510
for l in merges_file.readlines():
511
revision_id = osutils.safe_revision_id(l.rstrip('\n'))
557
512
parents.append(revision_id)
561
516
def get_root_id(self):
562
517
"""Return the id of this trees root"""
563
518
return self._inventory.root.file_id
565
520
def _get_store_filename(self, file_id):
566
521
## XXX: badly named; this is not in the store at all
522
file_id = osutils.safe_file_id(file_id)
567
523
return self.abspath(self.id2path(file_id))
570
def clone(self, to_bzrdir, revision_id=None):
526
def clone(self, to_bzrdir, revision_id=None, basis=None):
571
527
"""Duplicate this working tree into to_bzr, including all state.
573
529
Specifically modified files are kept as modified, but
574
530
ignored and unknown files are discarded.
576
532
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
535
If not None, the cloned tree will have its last revision set to
536
revision, and and difference between the source trees last revision
581
537
and this one merged in.
540
If not None, a closer copy of a tree which may have some files in
541
common, and which file content should be preferentially copied from.
583
543
# assumes the target bzr dir format is compatible.
584
result = to_bzrdir.create_workingtree()
544
result = self._format.initialize(to_bzrdir)
585
545
self.copy_content_into(result, revision_id)
616
579
__contains__ = has_id
618
581
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:
582
file_id = osutils.safe_file_id(file_id)
583
return os.path.getsize(self.id2abspath(file_id))
631
586
def get_file_sha1(self, file_id, path=None, stat_value=None):
587
file_id = osutils.safe_file_id(file_id)
633
589
path = self._inventory.id2path(file_id)
634
590
return self._hashcache.get_sha1(path, stat_value)
636
592
def get_file_mtime(self, file_id, path=None):
593
file_id = osutils.safe_file_id(file_id)
638
595
path = self.inventory.id2path(file_id)
639
596
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
598
if not supports_executable():
654
599
def is_executable(self, file_id, path=None):
600
file_id = osutils.safe_file_id(file_id)
655
601
return self._inventory[file_id].executable
657
_is_executable_from_path_and_stat = \
658
_is_executable_from_path_and_stat_from_basis
660
603
def is_executable(self, file_id, path=None):
605
file_id = osutils.safe_file_id(file_id)
662
606
path = self.id2path(file_id)
663
607
mode = os.lstat(self.abspath(path)).st_mode
664
608
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
610
@needs_tree_write_lock
670
611
def _add(self, files, ids, kinds):
671
612
"""See MutableTree._add."""
672
613
# TODO: Re-adding a file that is removed in the working copy
673
614
# should probably put it back with the previous ID.
674
# the read and write working inventory should not occur in this
615
# the read and write working inventory should not occur in this
675
616
# function - they should be part of lock_write and unlock.
617
inv = self.read_working_inventory()
677
618
for f, file_id, kind in zip(files, ids, kinds):
619
assert kind is not None
678
620
if file_id is None:
679
621
inv.add_path(f, kind=kind)
623
file_id = osutils.safe_file_id(file_id)
681
624
inv.add_path(f, kind=kind, file_id=file_id)
682
self._inventory_is_modified = True
625
self._write_inventory(inv)
684
627
@needs_tree_write_lock
685
628
def _gather_kinds(self, files, kinds):
746
689
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(
691
@deprecated_method(zero_eleven)
693
def pending_merges(self):
694
"""Return a list of pending merges.
696
These are revisions that have been merged into the working
697
directory but not yet committed.
699
As of 0.11 this is deprecated. Please see WorkingTree.get_parent_ids()
700
instead - which is available on all tree objects.
702
return self.get_parent_ids()[1:]
782
704
def _check_parents_for_ghosts(self, revision_ids, allow_leftmost_as_ghost):
783
705
"""Common ghost checking functionality from set_parent_*.
828
730
:param revision_ids: The revision_ids to set as the parent ids of this
829
731
working tree. Any of these may be ghosts.
733
revision_ids = [osutils.safe_revision_id(r) for r in revision_ids]
831
734
self._check_parents_for_ghosts(revision_ids,
832
735
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
737
if len(revision_ids) > 0:
839
738
self.set_last_revision(revision_ids[0])
841
self.set_last_revision(_mod_revision.NULL_REVISION)
740
self.set_last_revision(None)
843
742
self._set_merges_from_parent_ids(revision_ids)
845
744
@needs_tree_write_lock
846
745
def set_parent_trees(self, parents_list, allow_leftmost_as_ghost=False):
847
746
"""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)
747
parent_ids = [osutils.safe_revision_id(rev) for (rev, tree) in parents_list]
852
749
self._check_parents_for_ghosts(parent_ids,
853
750
allow_leftmost_as_ghost=allow_leftmost_as_ghost)
855
parent_ids = self._filter_parent_ids_by_ancestry(parent_ids)
857
752
if len(parent_ids) == 0:
858
leftmost_parent_id = _mod_revision.NULL_REVISION
753
leftmost_parent_id = None
859
754
leftmost_parent_tree = None
861
756
leftmost_parent_id, leftmost_parent_tree = parents_list[0]
914
797
branch.last_revision().
916
799
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:
800
pb = bzrlib.ui.ui_factory.nested_progress_bar()
802
merger = Merger(self.branch, this_tree=self, pb=pb)
803
merger.pp = ProgressPhase("Merge phase", 5, pb)
804
merger.pp.next_phase()
805
# check that there are no
807
merger.check_basis(check_clean=True, require_commits=False)
808
if to_revision is None:
809
to_revision = branch.last_revision()
811
to_revision = osutils.safe_revision_id(to_revision)
812
merger.other_rev_id = to_revision
813
if merger.other_rev_id is None:
814
raise error.NoCommits(branch)
815
self.branch.fetch(branch, last_revision=merger.other_rev_id)
816
merger.other_basis = merger.other_rev_id
817
merger.other_tree = self.branch.repository.revision_tree(
819
merger.other_branch = branch
820
merger.pp.next_phase()
932
821
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:
822
if merger.base_rev_id == merger.other_rev_id:
823
raise errors.PointlessMerge
824
merger.backup_files = False
939
825
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()
826
merger.set_interesting_files(None)
827
merger.show_base = False
828
merger.reprocess = False
829
conflicts = merger.do_merge()
950
836
def merge_modified(self):
951
837
"""Return a dictionary of files modified by a merge.
953
The list is initialized by WorkingTree.set_merge_modified, which is
839
The list is initialized by WorkingTree.set_merge_modified, which is
954
840
typically called after we make some automatic updates to the tree
955
841
because of a merge.
1127
989
sio = StringIO()
1128
990
self._serialize(self._inventory, sio)
1130
self._transport.put_file('inventory', sio,
1131
mode=self.bzrdir._get_file_mode())
992
self._control_files.put('inventory', sio)
1132
993
self._inventory_is_modified = False
1134
995
def _kind(self, relpath):
1135
996
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).
998
def list_files(self, include_root=False):
999
"""Recursively list all files as (path, class, kind, id, entry).
1140
1001
Lists, but does not descend into unversioned directories.
1141
1003
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
1006
Skips the control directory.
1148
1008
# list_files is an iterator, so @needs_read_lock doesn't work properly
1149
1009
# with it. So callers should be careful to always read_lock the tree.
1910
1745
def read_basis_inventory(self):
1911
1746
"""Read the cached basis inventory."""
1912
1747
path = self._basis_inventory_name()
1913
return self._transport.get_bytes(path)
1748
return self._control_files.get(path).read()
1915
1750
@needs_read_lock
1916
1751
def read_working_inventory(self):
1917
1752
"""Read the working inventory.
1919
1754
:raises errors.InventoryModified: read_working_inventory will fail
1920
1755
when the current in memory inventory has been modified.
1922
# conceptually this should be an implementation detail of the tree.
1757
# conceptually this should be an implementation detail of the tree.
1923
1758
# XXX: Deprecate this.
1924
1759
# ElementTree does its own conversion from UTF-8, so open in
1926
1761
if self._inventory_is_modified:
1927
1762
raise errors.InventoryModified(self)
1928
f = self._transport.get('inventory')
1930
result = self._deserialize(f)
1763
result = self._deserialize(self._control_files.get('inventory'))
1933
1764
self._set_inventory(result, dirty=False)
1936
1767
@needs_tree_write_lock
1937
def remove(self, files, verbose=False, to_file=None, keep_files=True,
1939
"""Remove nominated files from the working inventory.
1941
:files: File paths relative to the basedir.
1942
:keep_files: If true, the files will also be kept.
1943
:force: Delete files and directories, even if they are changed and
1944
even if the directories are not empty.
1768
def remove(self, files, verbose=False, to_file=None):
1769
"""Remove nominated files from the working inventory..
1771
This does not remove their text. This does not run on XXX on what? RBC
1773
TODO: Refuse to remove modified files unless --force is given?
1775
TODO: Do something useful with directories.
1777
TODO: Should this remove the text or not? Tough call; not
1778
removing may be useful and the user can just use use rm, and
1779
is the opposite of add. Removing it is consistent with most
1780
other tools. Maybe an option.
1782
## TODO: Normalize names
1783
## TODO: Remove nested loops; better scalability
1946
1784
if isinstance(files, basestring):
1947
1785
files = [files]
1952
unknown_nested_files=set()
1954
to_file = sys.stdout
1956
def recurse_directory_to_add_files(directory):
1957
# Recurse directory and add all files
1958
# so we can check if they have changed.
1959
for parent_info, file_infos in\
1960
self.walkdirs(directory):
1961
for relpath, basename, kind, lstat, fileid, kind in file_infos:
1962
# Is it versioned or ignored?
1963
if self.path2id(relpath) or self.is_ignored(relpath):
1964
# Add nested content for deletion.
1965
new_files.add(relpath)
1967
# Files which are not versioned and not ignored
1968
# should be treated as unknown.
1969
unknown_nested_files.add((relpath, None, kind))
1971
for filename in files:
1972
# Get file name into canonical form.
1973
abspath = self.abspath(filename)
1974
filename = self.relpath(abspath)
1975
if len(filename) > 0:
1976
new_files.add(filename)
1977
recurse_directory_to_add_files(filename)
1979
files = list(new_files)
1982
return # nothing to do
1984
# Sort needed to first handle directory content before the directory
1985
files.sort(reverse=True)
1987
# Bail out if we are going to delete files we shouldn't
1988
if not keep_files and not force:
1989
has_changed_files = len(unknown_nested_files) > 0
1990
if not has_changed_files:
1991
for (file_id, path, content_change, versioned, parent_id, name,
1992
kind, executable) in self.iter_changes(self.basis_tree(),
1993
include_unchanged=True, require_versioned=False,
1994
want_unversioned=True, specific_files=files):
1995
if versioned == (False, False):
1996
# The record is unknown ...
1997
if not self.is_ignored(path[1]):
1998
# ... but not ignored
1999
has_changed_files = True
2001
elif content_change and (kind[1] is not None):
2002
# Versioned and changed, but not deleted
2003
has_changed_files = True
2006
if has_changed_files:
2007
# Make delta show ALL applicable changes in error message.
2008
tree_delta = self.changes_from(self.basis_tree(),
2009
require_versioned=False, want_unversioned=True,
2010
specific_files=files)
2011
for unknown_file in unknown_nested_files:
2012
if unknown_file not in tree_delta.unversioned:
2013
tree_delta.unversioned.extend((unknown_file,))
2014
raise errors.BzrRemoveChangedFilesError(tree_delta)
2016
# Build inv_delta and delete files where applicable,
2017
# do this before any modifications to inventory.
1787
inv = self.inventory
1789
# do this before any modifications
2018
1790
for f in files:
2019
fid = self.path2id(f)
1791
fid = inv.path2id(f)
2022
message = "%s is not versioned." % (f,)
1793
note("%s is not versioned."%f)
2025
# having removed it, it must be either ignored or unknown
1796
# having remove it, it must be either ignored or unknown
2026
1797
if self.is_ignored(f):
2027
1798
new_status = 'I'
2029
1800
new_status = '?'
2030
# XXX: Really should be a more abstract reporter interface
2031
kind_ch = osutils.kind_marker(self.kind(fid))
2032
to_file.write(new_status + ' ' + f + kind_ch + '\n')
2034
inv_delta.append((f, None, fid, None))
2035
message = "removed %s" % (f,)
2038
abs_path = self.abspath(f)
2039
if osutils.lexists(abs_path):
2040
if (osutils.isdir(abs_path) and
2041
len(os.listdir(abs_path)) > 0):
2043
osutils.rmtree(abs_path)
2045
message = "%s is not an empty directory "\
2046
"and won't be deleted." % (f,)
2048
osutils.delete_any(abs_path)
2049
message = "deleted %s" % (f,)
2050
elif message is not None:
2051
# Only care if we haven't done anything yet.
2052
message = "%s does not exist." % (f,)
2054
# Print only one message (if any) per file.
2055
if message is not None:
2057
self.apply_inventory_delta(inv_delta)
1801
textui.show_status(new_status, inv[fid].kind, f,
1805
self._write_inventory(inv)
2059
1807
@needs_tree_write_lock
2060
def revert(self, filenames=None, old_tree=None, backups=True,
2061
pb=None, report_changes=False):
1808
def revert(self, filenames, old_tree=None, backups=True,
1809
pb=DummyProgress(), report_changes=False):
2062
1810
from bzrlib.conflicts import resolve
2065
symbol_versioning.warn('Using [] to revert all files is deprecated'
2066
' as of bzr 0.91. Please use None (the default) instead.',
2067
DeprecationWarning, stacklevel=2)
2068
1811
if old_tree is None:
2069
basis_tree = self.basis_tree()
2070
basis_tree.lock_read()
2071
old_tree = basis_tree
1812
old_tree = self.basis_tree()
1813
conflicts = transform.revert(self, old_tree, filenames, backups, pb,
1815
if not len(filenames):
1816
self.set_parent_ids(self.get_parent_ids()[:1])
2075
conflicts = transform.revert(self, old_tree, filenames, backups, pb,
2077
if filenames is None and len(self.get_parent_ids()) > 1:
2079
last_revision = self.last_revision()
2080
if last_revision != _mod_revision.NULL_REVISION:
2081
if basis_tree is None:
2082
basis_tree = self.basis_tree()
2083
basis_tree.lock_read()
2084
parent_trees.append((last_revision, basis_tree))
2085
self.set_parent_trees(parent_trees)
2088
resolve(self, filenames, ignore_misses=True, recursive=True)
2090
if basis_tree is not None:
1819
resolve(self, filenames, ignore_misses=True)
2092
1820
return conflicts
2094
1822
def revision_tree(self, revision_id):
2249
1972
# cant set that until we update the working trees last revision to be
2250
1973
# one from the new branch, because it will just get absorbed by the
2251
1974
# parent de-duplication logic.
2253
1976
# We MUST save it even if an error occurs, because otherwise the users
2254
1977
# local work is unreferenced and will appear to have been lost.
2258
1981
last_rev = self.get_parent_ids()[0]
2259
1982
except IndexError:
2260
last_rev = _mod_revision.NULL_REVISION
2261
if revision is None:
2262
revision = self.branch.last_revision()
2264
old_tip = old_tip or _mod_revision.NULL_REVISION
2266
if not _mod_revision.is_null(old_tip) and old_tip != last_rev:
2267
# the branch we are bound to was updated
2268
# merge those changes in first
2269
base_tree = self.basis_tree()
2270
other_tree = self.branch.repository.revision_tree(old_tip)
2271
nb_conflicts = merge.merge_inner(self.branch, other_tree,
2272
base_tree, this_tree=self,
2273
change_reporter=change_reporter)
2275
self.add_parent_tree((old_tip, other_tree))
2276
trace.note('Rerun update after fixing the conflicts.')
2279
if last_rev != _mod_revision.ensure_null(revision):
2280
# the working tree is up to date with the branch
2281
# we can merge the specified revision from master
2282
to_tree = self.branch.repository.revision_tree(revision)
2283
to_root_id = to_tree.get_root_id()
1984
if last_rev != self.branch.last_revision():
1985
# merge tree state up to new branch tip.
2285
1986
basis = self.basis_tree()
2286
1987
basis.lock_read()
2288
if (basis.inventory.root is None
2289
or basis.inventory.root.file_id != to_root_id):
2290
self.set_root_id(to_root_id)
1989
to_tree = self.branch.basis_tree()
1990
if basis.inventory.root is None:
1991
self.set_root_id(to_tree.inventory.root.file_id)
1993
result += merge.merge_inner(
2295
# determine the branch point
2296
graph = self.branch.repository.get_graph()
2297
base_rev_id = graph.find_unique_lca(self.branch.last_revision(),
2299
base_tree = self.branch.repository.revision_tree(base_rev_id)
2301
nb_conflicts = merge.merge_inner(self.branch, to_tree, base_tree,
2303
change_reporter=change_reporter)
2304
self.set_last_revision(revision)
2305
2000
# TODO - dedup parents list with things merged by pull ?
2306
2001
# reuse the tree we've updated to to set the basis:
2307
parent_trees = [(revision, to_tree)]
2002
parent_trees = [(self.branch.last_revision(), to_tree)]
2308
2003
merges = self.get_parent_ids()[1:]
2309
2004
# Ideally we ask the tree for the trees here, that way the working
2310
# tree can decide whether to give us the entire tree or give us a
2005
# tree can decide whether to give us teh entire tree or give us a
2311
2006
# lazy initialised tree. dirstate for instance will have the trees
2312
2007
# in ram already, whereas a last-revision + basis-inventory tree
2313
2008
# will not, but also does not need them when setting parents.
2314
2009
for parent in merges:
2315
2010
parent_trees.append(
2316
2011
(parent, self.branch.repository.revision_tree(parent)))
2317
if not _mod_revision.is_null(old_tip):
2012
if old_tip is not None:
2318
2013
parent_trees.append(
2319
2014
(old_tip, self.branch.repository.revision_tree(old_tip)))
2320
2015
self.set_parent_trees(parent_trees)
2321
2016
last_rev = parent_trees[0][0]
2018
# the working tree had the same last-revision as the master
2019
# branch did. We may still have pivot local work from the local
2020
# branch into old_tip:
2021
if old_tip is not None:
2022
self.add_parent_tree_id(old_tip)
2023
if old_tip and old_tip != last_rev:
2024
# our last revision was not the prior branch last revision
2025
# and we have converted that last revision to a pending merge.
2026
# base is somewhere between the branch tip now
2027
# and the now pending merge
2029
# Since we just modified the working tree and inventory, flush out
2030
# the current state, before we modify it again.
2031
# TODO: jam 20070214 WorkingTree3 doesn't require this, dirstate
2032
# requires it only because TreeTransform directly munges the
2033
# inventory and calls tree._write_inventory(). Ultimately we
2034
# should be able to remove this extra flush.
2036
from bzrlib.revision import common_ancestor
2038
base_rev_id = common_ancestor(self.branch.last_revision(),
2040
self.branch.repository)
2041
except errors.NoCommonAncestor:
2043
base_tree = self.branch.repository.revision_tree(base_rev_id)
2044
other_tree = self.branch.repository.revision_tree(old_tip)
2045
result += merge.merge_inner(
2324
2052
def _write_hashcache_if_dirty(self):
2325
2053
"""Write out the hashcache if it is dirty."""
2565
2266
self.set_conflicts(un_resolved)
2566
2267
return un_resolved, resolved
2569
def _check(self, references):
2570
"""Check the tree for consistency.
2572
:param references: A dict with keys matching the items returned by
2573
self._get_check_refs(), and values from looking those keys up in
2576
tree_basis = self.basis_tree()
2577
tree_basis.lock_read()
2579
repo_basis = references[('trees', self.last_revision())]
2580
if len(list(repo_basis.iter_changes(tree_basis))) > 0:
2581
raise errors.BzrCheckError(
2582
"Mismatched basis inventory content.")
2587
def _validate(self):
2588
"""Validate internal structures.
2590
This is meant mostly for the test suite. To give it a chance to detect
2591
corruption after actions have occurred. The default implementation is a
2594
:return: None. An exception should be raised if there is an error.
2598
def _get_rules_searcher(self, default_searcher):
2599
"""See Tree._get_rules_searcher."""
2600
if self._rules_searcher is None:
2601
self._rules_searcher = super(WorkingTree,
2602
self)._get_rules_searcher(default_searcher)
2603
return self._rules_searcher
2605
def get_shelf_manager(self):
2606
"""Return the ShelfManager for this WorkingTree."""
2607
from bzrlib.shelf import ShelfManager
2608
return ShelfManager(self, self._transport)
2611
2270
class WorkingTree2(WorkingTree):
2612
2271
"""This is the Format 2 working tree.
2614
This was the first weave based working tree.
2273
This was the first weave based working tree.
2615
2274
- uses os locks for locking.
2616
2275
- uses the branch last-revision.
2619
def __init__(self, *args, **kwargs):
2620
super(WorkingTree2, self).__init__(*args, **kwargs)
2621
# WorkingTree2 has more of a constraint that self._inventory must
2622
# exist. Because this is an older format, we don't mind the overhead
2623
# caused by the extra computation here.
2625
# Newer WorkingTree's should only have self._inventory set when they
2627
if self._inventory is None:
2628
self.read_working_inventory()
2630
def _get_check_refs(self):
2631
"""Return the references needed to perform a check of this tree."""
2632
return [('trees', self.last_revision())]
2634
2278
def lock_tree_write(self):
2635
2279
"""See WorkingTree.lock_tree_write().
2835
2472
def unregister_format(klass, format):
2473
assert klass._formats[format.get_format_string()] is format
2836
2474
del klass._formats[format.get_format_string()]
2839
2478
class WorkingTreeFormat2(WorkingTreeFormat):
2840
"""The second working tree format.
2479
"""The second working tree format.
2842
2481
This format modified the hash cache from the format 1 hash cache.
2845
upgrade_recommended = True
2847
2484
def get_format_description(self):
2848
2485
"""See WorkingTreeFormat.get_format_description()."""
2849
2486
return "Working tree format 2"
2851
def _stub_initialize_on_transport(self, transport, file_mode):
2852
"""Workaround: create control files for a remote working tree.
2488
def stub_initialize_remote(self, control_files):
2489
"""As a special workaround create critical control files for a remote working tree
2854
2491
This ensures that it can later be updated and dealt with locally,
2855
since BzrDirFormat6 and BzrDirFormat5 cannot represent dirs with
2492
since BzrDirFormat6 and BzrDirFormat5 cannot represent dirs with
2856
2493
no working tree. (See bug #43064).
2858
2495
sio = StringIO()
2859
inv = inventory.Inventory()
2860
xml5.serializer_v5.write_inventory(inv, sio, working=True)
2497
xml5.serializer_v5.write_inventory(inv, sio)
2862
transport.put_file('inventory', sio, file_mode)
2863
transport.put_bytes('pending-merges', '', file_mode)
2865
def initialize(self, a_bzrdir, revision_id=None, from_branch=None,
2866
accelerator_tree=None, hardlink=False):
2499
control_files.put('inventory', sio)
2501
control_files.put_bytes('pending-merges', '')
2504
def initialize(self, a_bzrdir, revision_id=None):
2867
2505
"""See WorkingTreeFormat.initialize()."""
2868
2506
if not isinstance(a_bzrdir.transport, LocalTransport):
2869
2507
raise errors.NotLocalUrl(a_bzrdir.transport.base)
2870
if from_branch is not None:
2871
branch = from_branch
2873
branch = a_bzrdir.open_branch()
2874
if revision_id is None:
2875
revision_id = _mod_revision.ensure_null(branch.last_revision())
2878
branch.generate_revision_history(revision_id)
2881
inv = inventory.Inventory()
2508
branch = a_bzrdir.open_branch()
2509
if revision_id is not None:
2510
revision_id = osutils.safe_revision_id(revision_id)
2513
revision_history = branch.revision_history()
2515
position = revision_history.index(revision_id)
2517
raise errors.NoSuchRevision(branch, revision_id)
2518
branch.set_revision_history(revision_history[:position + 1])
2521
revision = branch.last_revision()
2882
2523
wt = WorkingTree2(a_bzrdir.root_transport.local_abspath('.'),
2885
2526
_internal=True,
2887
2528
_bzrdir=a_bzrdir)
2888
basis_tree = branch.repository.revision_tree(revision_id)
2529
basis_tree = branch.repository.revision_tree(revision)
2889
2530
if basis_tree.inventory.root is not None:
2890
wt.set_root_id(basis_tree.get_root_id())
2531
wt.set_root_id(basis_tree.inventory.root.file_id)
2891
2532
# set the parent list and cache the basis tree.
2892
if _mod_revision.is_null(revision_id):
2895
parent_trees = [(revision_id, basis_tree)]
2896
wt.set_parent_trees(parent_trees)
2533
wt.set_parent_trees([(revision, basis_tree)])
2897
2534
transform.build_tree(basis_tree, wt)
3049
2674
return self.get_format_string()
3052
__default_format = WorkingTreeFormat6()
2677
__default_format = WorkingTreeFormat4()
3053
2678
WorkingTreeFormat.register_format(__default_format)
3054
WorkingTreeFormat.register_format(WorkingTreeFormat5())
3055
WorkingTreeFormat.register_format(WorkingTreeFormat4())
3056
2679
WorkingTreeFormat.register_format(WorkingTreeFormat3())
3057
2680
WorkingTreeFormat.set_default_format(__default_format)
3058
2681
# formats which have no format string are not discoverable
3059
2682
# and not independently creatable, so are not registered.
3060
2683
_legacy_formats = [WorkingTreeFormat2(),
2687
class WorkingTreeTestProviderAdapter(object):
2688
"""A tool to generate a suite testing multiple workingtree formats at once.
2690
This is done by copying the test once for each transport and injecting
2691
the transport_server, transport_readonly_server, and workingtree_format
2692
classes into each copy. Each copy is also given a new id() to make it
2696
def __init__(self, transport_server, transport_readonly_server, formats):
2697
self._transport_server = transport_server
2698
self._transport_readonly_server = transport_readonly_server
2699
self._formats = formats
2701
def _clone_test(self, test, bzrdir_format, workingtree_format, variation):
2702
"""Clone test for adaption."""
2703
new_test = deepcopy(test)
2704
new_test.transport_server = self._transport_server
2705
new_test.transport_readonly_server = self._transport_readonly_server
2706
new_test.bzrdir_format = bzrdir_format
2707
new_test.workingtree_format = workingtree_format
2708
def make_new_test_id():
2709
new_id = "%s(%s)" % (test.id(), variation)
2710
return lambda: new_id
2711
new_test.id = make_new_test_id()
2714
def adapt(self, test):
2715
from bzrlib.tests import TestSuite
2716
result = TestSuite()
2717
for workingtree_format, bzrdir_format in self._formats:
2718
new_test = self._clone_test(
2721
workingtree_format, workingtree_format.__class__.__name__)
2722
result.addTest(new_test)
added
removed
bzrlib/workingtree.py
