51
60
conflicts as _mod_conflicts,
60
revision as _mod_revision,
69
80
import bzrlib.branch
70
81
from bzrlib.transport import get_transport
71
from bzrlib.workingtree_4 import (
83
from bzrlib.workingtree_4 import WorkingTreeFormat4
78
86
from bzrlib import symbol_versioning
79
87
from bzrlib.decorators import needs_read_lock, needs_write_lock
80
from bzrlib.lockable_files import LockableFiles
88
from bzrlib.inventory import InventoryEntry, Inventory, ROOT_ID, TreeReference
89
from bzrlib.lockable_files import LockableFiles, TransportLock
81
90
from bzrlib.lockdir import LockDir
82
91
import bzrlib.mutabletree
83
92
from bzrlib.mutabletree import needs_tree_write_lock
84
from bzrlib import osutils
85
93
from bzrlib.osutils import (
93
103
supports_executable,
95
from bzrlib.filters import filtered_input_file
96
105
from bzrlib.trace import mutter, note
97
106
from bzrlib.transport.local import LocalTransport
98
from bzrlib.revision import CURRENT_REVISION
107
from bzrlib.progress import DummyProgress, ProgressPhase
108
from bzrlib.revision import NULL_REVISION, CURRENT_REVISION
99
109
from bzrlib.rio import RioReader, rio_file, Stanza
100
from bzrlib.symbol_versioning import (
102
DEPRECATED_PARAMETER,
110
from bzrlib.symbol_versioning import (deprecated_passed,
113
DEPRECATED_PARAMETER,
106
120
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
121
CONFLICT_HEADER_1 = "BZR conflict list format 1"
112
123
ERROR_PATH_NOT_FOUND = 3 # WindowsError errno code, equivalent to ENOENT
126
@deprecated_function(zero_thirteen)
127
def gen_file_id(name):
128
"""Return new file id for the basename 'name'.
130
Use bzrlib.generate_ids.gen_file_id() instead
132
return generate_ids.gen_file_id(name)
135
@deprecated_function(zero_thirteen)
137
"""Return a new tree-root file id.
139
This has been deprecated in favor of bzrlib.generate_ids.gen_root_id()
141
return generate_ids.gen_root_id()
115
144
class TreeEntry(object):
116
145
"""An entry that implements the minimum interface used by commands.
118
This needs further inspection, it may be better to have
147
This needs further inspection, it may be better to have
119
148
InventoryEntries without ids - though that seems wrong. For now,
120
149
this is a parallel hierarchy to InventoryEntry, and needs to become
121
150
one of several things: decorates to that hierarchy, children of, or
422
390
# at this point ?
424
392
return self.branch.repository.revision_tree(revision_id)
425
except (errors.RevisionNotPresent, errors.NoSuchRevision):
393
except errors.RevisionNotPresent:
426
394
# 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
395
# occured. If the revision is present, its a problem, if its not
429
397
if self.branch.repository.has_revision(revision_id):
431
399
# 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()
400
return self.branch.repository.revision_tree(None)
403
@deprecated_method(zero_eight)
404
def create(branch, directory):
405
"""Create a workingtree for branch at directory.
407
If existing_directory already exists it must have a .bzr directory.
408
If it does not exist, it will be created.
410
This returns a new WorkingTree object for the new checkout.
412
TODO FIXME RBC 20060124 when we have checkout formats in place this
413
should accept an optional revisionid to checkout [and reject this if
414
checking out into the same dir as a pre-checkout-aware branch format.]
416
XXX: When BzrDir is present, these should be created through that
419
warnings.warn('delete WorkingTree.create', stacklevel=3)
420
transport = get_transport(directory)
421
if branch.bzrdir.root_transport.base == transport.base:
423
return branch.bzrdir.create_workingtree()
424
# different directory,
425
# create a branch reference
426
# and now a working tree.
427
raise NotImplementedError
430
@deprecated_method(zero_eight)
431
def create_standalone(directory):
432
"""Create a checkout and a branch and a repo at directory.
434
Directory must exist and be empty.
436
please use BzrDir.create_standalone_workingtree
438
return bzrdir.BzrDir.create_standalone_workingtree(directory)
438
440
def relpath(self, path):
439
441
"""Return the local path portion from a given path.
441
The path may be absolute or relative. If its a relative path it is
443
The path may be absolute or relative. If its a relative path it is
442
444
interpreted relative to the python current working directory.
444
446
return osutils.relpath(self.basedir, path)
446
448
def has_filename(self, filename):
447
449
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()
451
def get_file(self, file_id):
452
file_id = osutils.safe_file_id(file_id)
453
return self.get_file_byname(self.id2path(file_id))
455
def get_file_text(self, file_id):
456
file_id = osutils.safe_file_id(file_id)
457
return self.get_file(file_id).read()
459
def get_file_byname(self, filename):
460
return file(self.abspath(filename), 'rb')
485
def annotate_iter(self, file_id, default_revision=CURRENT_REVISION):
463
def annotate_iter(self, file_id):
486
464
"""See Tree.annotate_iter
488
466
This implementation will use the basis tree implementation if possible.
492
470
incorrectly attributed to CURRENT_REVISION (but after committing, the
493
471
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))
473
file_id = osutils.safe_file_id(file_id)
474
basis = self.basis_tree()
477
changes = self._iter_changes(basis, True, [self.id2path(file_id)],
478
require_versioned=True).next()
479
changed_content, kind = changes[2], changes[6]
480
if not changed_content:
481
return basis.annotate_iter(file_id)
485
if kind[0] != 'file':
488
old_lines = list(basis.annotate_iter(file_id))
490
for tree in self.branch.repository.revision_trees(
491
self.get_parent_ids()[1:]):
492
if file_id not in tree:
494
old.append(list(tree.annotate_iter(file_id)))
495
return annotate.reannotate(old, self.get_file(file_id).readlines(),
539
500
def get_parent_ids(self):
540
501
"""See Tree.get_parent_ids.
542
503
This implementation reads the pending merges list and last_revision
543
504
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:
506
last_rev = self._last_revision()
549
510
parents = [last_rev]
551
merges_bytes = self._transport.get_bytes('pending-merges')
512
merges_file = self._control_files.get('pending-merges')
552
513
except errors.NoSuchFile:
555
for l in osutils.split_lines(merges_bytes):
556
revision_id = l.rstrip('\n')
516
for l in merges_file.readlines():
517
revision_id = osutils.safe_revision_id(l.rstrip('\n'))
557
518
parents.append(revision_id)
616
581
__contains__ = has_id
618
583
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:
584
file_id = osutils.safe_file_id(file_id)
585
return os.path.getsize(self.id2abspath(file_id))
631
588
def get_file_sha1(self, file_id, path=None, stat_value=None):
589
file_id = osutils.safe_file_id(file_id)
633
591
path = self._inventory.id2path(file_id)
634
592
return self._hashcache.get_sha1(path, stat_value)
636
594
def get_file_mtime(self, file_id, path=None):
595
file_id = osutils.safe_file_id(file_id)
638
597
path = self.inventory.id2path(file_id)
639
598
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
600
if not supports_executable():
654
601
def is_executable(self, file_id, path=None):
602
file_id = osutils.safe_file_id(file_id)
655
603
return self._inventory[file_id].executable
657
_is_executable_from_path_and_stat = \
658
_is_executable_from_path_and_stat_from_basis
660
605
def is_executable(self, file_id, path=None):
607
file_id = osutils.safe_file_id(file_id)
662
608
path = self.id2path(file_id)
663
609
mode = os.lstat(self.abspath(path)).st_mode
664
610
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
612
@needs_tree_write_lock
670
613
def _add(self, files, ids, kinds):
671
614
"""See MutableTree._add."""
672
615
# TODO: Re-adding a file that is removed in the working copy
673
616
# should probably put it back with the previous ID.
674
# the read and write working inventory should not occur in this
617
# the read and write working inventory should not occur in this
675
618
# function - they should be part of lock_write and unlock.
619
inv = self.read_working_inventory()
677
620
for f, file_id, kind in zip(files, ids, kinds):
621
assert kind is not None
678
622
if file_id is None:
679
623
inv.add_path(f, kind=kind)
625
file_id = osutils.safe_file_id(file_id)
681
626
inv.add_path(f, kind=kind, file_id=file_id)
682
self._inventory_is_modified = True
627
self._write_inventory(inv)
684
629
@needs_tree_write_lock
685
630
def _gather_kinds(self, files, kinds):
746
691
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(
693
@deprecated_method(zero_eleven)
695
def pending_merges(self):
696
"""Return a list of pending merges.
698
These are revisions that have been merged into the working
699
directory but not yet committed.
701
As of 0.11 this is deprecated. Please see WorkingTree.get_parent_ids()
702
instead - which is available on all tree objects.
704
return self.get_parent_ids()[1:]
782
706
def _check_parents_for_ghosts(self, revision_ids, allow_leftmost_as_ghost):
783
707
"""Common ghost checking functionality from set_parent_*.
828
732
:param revision_ids: The revision_ids to set as the parent ids of this
829
733
working tree. Any of these may be ghosts.
735
revision_ids = [osutils.safe_revision_id(r) for r in revision_ids]
831
736
self._check_parents_for_ghosts(revision_ids,
832
737
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
739
if len(revision_ids) > 0:
839
740
self.set_last_revision(revision_ids[0])
841
self.set_last_revision(_mod_revision.NULL_REVISION)
742
self.set_last_revision(None)
843
744
self._set_merges_from_parent_ids(revision_ids)
845
746
@needs_tree_write_lock
846
747
def set_parent_trees(self, parents_list, allow_leftmost_as_ghost=False):
847
748
"""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)
749
parent_ids = [osutils.safe_revision_id(rev) for (rev, tree) in parents_list]
852
751
self._check_parents_for_ghosts(parent_ids,
853
752
allow_leftmost_as_ghost=allow_leftmost_as_ghost)
855
parent_ids = self._filter_parent_ids_by_ancestry(parent_ids)
857
754
if len(parent_ids) == 0:
858
leftmost_parent_id = _mod_revision.NULL_REVISION
755
leftmost_parent_id = None
859
756
leftmost_parent_tree = None
861
758
leftmost_parent_id, leftmost_parent_tree = parents_list[0]
914
799
branch.last_revision().
916
801
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:
802
pb = bzrlib.ui.ui_factory.nested_progress_bar()
804
merger = Merger(self.branch, this_tree=self, pb=pb)
805
merger.pp = ProgressPhase("Merge phase", 5, pb)
806
merger.pp.next_phase()
807
# check that there are no
809
merger.check_basis(check_clean=True, require_commits=False)
810
if to_revision is None:
811
to_revision = branch.last_revision()
813
to_revision = osutils.safe_revision_id(to_revision)
814
merger.other_rev_id = to_revision
815
if merger.other_rev_id is None:
816
raise error.NoCommits(branch)
817
self.branch.fetch(branch, last_revision=merger.other_rev_id)
818
merger.other_basis = merger.other_rev_id
819
merger.other_tree = self.branch.repository.revision_tree(
821
merger.other_branch = branch
822
merger.pp.next_phase()
932
823
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:
824
if merger.base_rev_id == merger.other_rev_id:
825
raise errors.PointlessMerge
826
merger.backup_files = False
939
827
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()
828
merger.set_interesting_files(None)
829
merger.show_base = False
830
merger.reprocess = False
831
conflicts = merger.do_merge()
950
838
def merge_modified(self):
951
839
"""Return a dictionary of files modified by a merge.
953
The list is initialized by WorkingTree.set_merge_modified, which is
841
The list is initialized by WorkingTree.set_merge_modified, which is
954
842
typically called after we make some automatic updates to the tree
955
843
because of a merge.
1127
991
sio = StringIO()
1128
992
self._serialize(self._inventory, sio)
1130
self._transport.put_file('inventory', sio,
1131
mode=self.bzrdir._get_file_mode())
994
self._control_files.put('inventory', sio)
1132
995
self._inventory_is_modified = False
1134
997
def _kind(self, relpath):
1135
998
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).
1000
def list_files(self, include_root=False):
1001
"""Recursively list all files as (path, class, kind, id, entry).
1140
1003
Lists, but does not descend into unversioned directories.
1141
1005
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
1008
Skips the control directory.
1148
1010
# list_files is an iterator, so @needs_read_lock doesn't work properly
1149
1011
# with it. So callers should be careful to always read_lock the tree.
1910
1747
def read_basis_inventory(self):
1911
1748
"""Read the cached basis inventory."""
1912
1749
path = self._basis_inventory_name()
1913
return self._transport.get_bytes(path)
1750
return self._control_files.get(path).read()
1915
1752
@needs_read_lock
1916
1753
def read_working_inventory(self):
1917
1754
"""Read the working inventory.
1919
1756
:raises errors.InventoryModified: read_working_inventory will fail
1920
1757
when the current in memory inventory has been modified.
1922
# conceptually this should be an implementation detail of the tree.
1759
# conceptually this should be an implementation detail of the tree.
1923
1760
# XXX: Deprecate this.
1924
1761
# ElementTree does its own conversion from UTF-8, so open in
1926
1763
if self._inventory_is_modified:
1927
1764
raise errors.InventoryModified(self)
1928
f = self._transport.get('inventory')
1930
result = self._deserialize(f)
1765
result = self._deserialize(self._control_files.get('inventory'))
1933
1766
self._set_inventory(result, dirty=False)
1936
1769
@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.
1770
def remove(self, files, verbose=False, to_file=None):
1771
"""Remove nominated files from the working inventory..
1773
This does not remove their text. This does not run on XXX on what? RBC
1775
TODO: Refuse to remove modified files unless --force is given?
1777
TODO: Do something useful with directories.
1779
TODO: Should this remove the text or not? Tough call; not
1780
removing may be useful and the user can just use use rm, and
1781
is the opposite of add. Removing it is consistent with most
1782
other tools. Maybe an option.
1784
## TODO: Normalize names
1785
## TODO: Remove nested loops; better scalability
1946
1786
if isinstance(files, basestring):
1947
1787
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.
1789
inv = self.inventory
1791
# do this before any modifications
2018
1792
for f in files:
2019
fid = self.path2id(f)
1793
fid = inv.path2id(f)
2022
message = "%s is not versioned." % (f,)
1795
note("%s is not versioned."%f)
2025
# having removed it, it must be either ignored or unknown
1798
# having remove it, it must be either ignored or unknown
2026
1799
if self.is_ignored(f):
2027
1800
new_status = 'I'
2029
1802
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)
1803
textui.show_status(new_status, inv[fid].kind, f,
1807
self._write_inventory(inv)
2059
1809
@needs_tree_write_lock
2060
def revert(self, filenames=None, old_tree=None, backups=True,
2061
pb=None, report_changes=False):
1810
def revert(self, filenames, old_tree=None, backups=True,
1811
pb=DummyProgress(), report_changes=False):
2062
1812
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
1813
if old_tree is None:
2069
basis_tree = self.basis_tree()
2070
basis_tree.lock_read()
2071
old_tree = basis_tree
1814
old_tree = self.basis_tree()
1815
conflicts = transform.revert(self, old_tree, filenames, backups, pb,
1817
if not len(filenames):
1818
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:
1821
resolve(self, filenames, ignore_misses=True)
2092
1822
return conflicts
2094
1824
def revision_tree(self, revision_id):
2249
1974
# cant set that until we update the working trees last revision to be
2250
1975
# one from the new branch, because it will just get absorbed by the
2251
1976
# parent de-duplication logic.
2253
1978
# We MUST save it even if an error occurs, because otherwise the users
2254
1979
# local work is unreferenced and will appear to have been lost.
2258
1983
last_rev = self.get_parent_ids()[0]
2259
1984
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()
1986
if last_rev != self.branch.last_revision():
1987
# merge tree state up to new branch tip.
2285
1988
basis = self.basis_tree()
2286
1989
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)
1991
to_tree = self.branch.basis_tree()
1992
if basis.inventory.root is None:
1993
self.set_root_id(to_tree.inventory.root.file_id)
1995
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
2002
# TODO - dedup parents list with things merged by pull ?
2306
2003
# reuse the tree we've updated to to set the basis:
2307
parent_trees = [(revision, to_tree)]
2004
parent_trees = [(self.branch.last_revision(), to_tree)]
2308
2005
merges = self.get_parent_ids()[1:]
2309
2006
# 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
2007
# tree can decide whether to give us teh entire tree or give us a
2311
2008
# lazy initialised tree. dirstate for instance will have the trees
2312
2009
# in ram already, whereas a last-revision + basis-inventory tree
2313
2010
# will not, but also does not need them when setting parents.
2314
2011
for parent in merges:
2315
2012
parent_trees.append(
2316
2013
(parent, self.branch.repository.revision_tree(parent)))
2317
if not _mod_revision.is_null(old_tip):
2014
if old_tip is not None:
2318
2015
parent_trees.append(
2319
2016
(old_tip, self.branch.repository.revision_tree(old_tip)))
2320
2017
self.set_parent_trees(parent_trees)
2321
2018
last_rev = parent_trees[0][0]
2020
# the working tree had the same last-revision as the master
2021
# branch did. We may still have pivot local work from the local
2022
# branch into old_tip:
2023
if old_tip is not None:
2024
self.add_parent_tree_id(old_tip)
2025
if old_tip and old_tip != last_rev:
2026
# our last revision was not the prior branch last revision
2027
# and we have converted that last revision to a pending merge.
2028
# base is somewhere between the branch tip now
2029
# and the now pending merge
2031
# Since we just modified the working tree and inventory, flush out
2032
# the current state, before we modify it again.
2033
# TODO: jam 20070214 WorkingTree3 doesn't require this, dirstate
2034
# requires it only because TreeTransform directly munges the
2035
# inventory and calls tree._write_inventory(). Ultimately we
2036
# should be able to remove this extra flush.
2038
from bzrlib.revision import common_ancestor
2040
base_rev_id = common_ancestor(self.branch.last_revision(),
2042
self.branch.repository)
2043
except errors.NoCommonAncestor:
2045
base_tree = self.branch.repository.revision_tree(base_rev_id)
2046
other_tree = self.branch.repository.revision_tree(old_tip)
2047
result += merge.merge_inner(
2324
2054
def _write_hashcache_if_dirty(self):
2325
2055
"""Write out the hashcache if it is dirty."""
2848
2513
"""See WorkingTreeFormat.get_format_description()."""
2849
2514
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.
2516
def stub_initialize_remote(self, control_files):
2517
"""As a special workaround create critical control files for a remote working tree
2854
2519
This ensures that it can later be updated and dealt with locally,
2855
since BzrDirFormat6 and BzrDirFormat5 cannot represent dirs with
2520
since BzrDirFormat6 and BzrDirFormat5 cannot represent dirs with
2856
2521
no working tree. (See bug #43064).
2858
2523
sio = StringIO()
2859
inv = inventory.Inventory()
2860
xml5.serializer_v5.write_inventory(inv, sio, working=True)
2525
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):
2527
control_files.put('inventory', sio)
2529
control_files.put_bytes('pending-merges', '')
2532
def initialize(self, a_bzrdir, revision_id=None):
2867
2533
"""See WorkingTreeFormat.initialize()."""
2868
2534
if not isinstance(a_bzrdir.transport, LocalTransport):
2869
2535
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()
2536
branch = a_bzrdir.open_branch()
2537
if revision_id is not None:
2538
revision_id = osutils.safe_revision_id(revision_id)
2541
revision_history = branch.revision_history()
2543
position = revision_history.index(revision_id)
2545
raise errors.NoSuchRevision(branch, revision_id)
2546
branch.set_revision_history(revision_history[:position + 1])
2549
revision = branch.last_revision()
2882
2551
wt = WorkingTree2(a_bzrdir.root_transport.local_abspath('.'),
2885
2554
_internal=True,
2887
2556
_bzrdir=a_bzrdir)
2888
basis_tree = branch.repository.revision_tree(revision_id)
2557
basis_tree = branch.repository.revision_tree(revision)
2889
2558
if basis_tree.inventory.root is not None:
2890
wt.set_root_id(basis_tree.get_root_id())
2559
wt.set_root_id(basis_tree.inventory.root.file_id)
2891
2560
# 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)
2561
wt.set_parent_trees([(revision, basis_tree)])
2897
2562
transform.build_tree(basis_tree, wt)
3049
2705
return self.get_format_string()
3052
__default_format = WorkingTreeFormat6()
2708
__default_format = WorkingTreeFormat4()
3053
2709
WorkingTreeFormat.register_format(__default_format)
3054
WorkingTreeFormat.register_format(WorkingTreeFormat5())
3055
WorkingTreeFormat.register_format(WorkingTreeFormat4())
3056
2710
WorkingTreeFormat.register_format(WorkingTreeFormat3())
3057
2711
WorkingTreeFormat.set_default_format(__default_format)
3058
2712
# formats which have no format string are not discoverable
3059
2713
# and not independently creatable, so are not registered.
3060
2714
_legacy_formats = [WorkingTreeFormat2(),
2718
class WorkingTreeTestProviderAdapter(object):
2719
"""A tool to generate a suite testing multiple workingtree formats at once.
2721
This is done by copying the test once for each transport and injecting
2722
the transport_server, transport_readonly_server, and workingtree_format
2723
classes into each copy. Each copy is also given a new id() to make it
2727
def __init__(self, transport_server, transport_readonly_server, formats):
2728
self._transport_server = transport_server
2729
self._transport_readonly_server = transport_readonly_server
2730
self._formats = formats
2732
def _clone_test(self, test, bzrdir_format, workingtree_format, variation):
2733
"""Clone test for adaption."""
2734
new_test = deepcopy(test)
2735
new_test.transport_server = self._transport_server
2736
new_test.transport_readonly_server = self._transport_readonly_server
2737
new_test.bzrdir_format = bzrdir_format
2738
new_test.workingtree_format = workingtree_format
2739
def make_new_test_id():
2740
new_id = "%s(%s)" % (test.id(), variation)
2741
return lambda: new_id
2742
new_test.id = make_new_test_id()
2745
def adapt(self, test):
2746
from bzrlib.tests import TestSuite
2747
result = TestSuite()
2748
for workingtree_format, bzrdir_format in self._formats:
2749
new_test = self._clone_test(
2752
workingtree_format, workingtree_format.__class__.__name__)
2753
result.addTest(new_test)
added
removed
bzrlib/workingtree.py
