36
39
# At the moment they may alias the inventory and have old copies of it in
37
40
# memory. (Now done? -- mbp 20060309)
42
from binascii import hexlify
44
from copy import deepcopy
39
45
from cStringIO import StringIO
43
from bzrlib.lazy_import import lazy_import
44
lazy_import(globals(), """
45
from bisect import bisect_left
51
51
from time import time
59
conflicts as _mod_conflicts,
68
revision as _mod_revision,
55
from bzrlib import bzrdir, errors, ignores, osutils, urlutils
56
from bzrlib.atomicfile import AtomicFile
80
57
import bzrlib.branch
81
from bzrlib.transport import get_transport
83
from bzrlib.workingtree_4 import WorkingTreeFormat4
86
from bzrlib import symbol_versioning
58
from bzrlib.conflicts import Conflict, ConflictList, CONFLICT_SUFFIXES
87
59
from bzrlib.decorators import needs_read_lock, needs_write_lock
88
from bzrlib.inventory import InventoryEntry, Inventory, ROOT_ID, TreeReference
60
from bzrlib.errors import (BzrCheckError,
63
WeaveRevisionNotPresent,
67
MergeModifiedFormatError,
70
from bzrlib.inventory import InventoryEntry, Inventory
89
71
from bzrlib.lockable_files import LockableFiles, TransportLock
90
72
from bzrlib.lockdir import LockDir
91
import bzrlib.mutabletree
92
from bzrlib.mutabletree import needs_tree_write_lock
73
from bzrlib.merge import merge_inner, transform_tree
93
74
from bzrlib.osutils import (
105
from bzrlib.trace import mutter, note
106
from bzrlib.transport.local import LocalTransport
107
91
from bzrlib.progress import DummyProgress, ProgressPhase
108
from bzrlib.revision import NULL_REVISION, CURRENT_REVISION
92
from bzrlib.revision import NULL_REVISION
109
93
from bzrlib.rio import RioReader, rio_file, Stanza
110
94
from bzrlib.symbol_versioning import (deprecated_passed,
111
95
deprecated_method,
112
96
deprecated_function,
113
97
DEPRECATED_PARAMETER,
120
MERGE_MODIFIED_HEADER_1 = "BZR merge-modified list format 1"
121
CONFLICT_HEADER_1 = "BZR conflict list format 1"
123
ERROR_PATH_NOT_FOUND = 3 # WindowsError errno code, equivalent to ENOENT
126
@deprecated_function(zero_thirteen)
100
from bzrlib.trace import mutter, note
101
from bzrlib.transform import build_tree
102
from bzrlib.transport import get_transport
103
from bzrlib.transport.local import LocalTransport
104
from bzrlib.textui import show_status
110
# the regex removes any weird characters; we don't escape them
111
# but rather just pull them out
112
_gen_file_id_re = re.compile(r'[^\w.]')
113
_gen_id_suffix = None
117
def _next_id_suffix():
118
"""Create a new file id suffix that is reasonably unique.
120
On the first call we combine the current time with 64 bits of randomness
121
to give a highly probably globally unique number. Then each call in the same
122
process adds 1 to a serial number we append to that unique value.
124
# XXX TODO: change bzrlib.add.smart_add to call workingtree.add() rather
125
# than having to move the id randomness out of the inner loop like this.
126
# XXX TODO: for the global randomness this uses we should add the thread-id
127
# before the serial #.
128
global _gen_id_suffix, _gen_id_serial
129
if _gen_id_suffix is None:
130
_gen_id_suffix = "-%s-%s-" % (compact_date(time()), rand_chars(16))
132
return _gen_id_suffix + str(_gen_id_serial)
127
135
def gen_file_id(name):
128
136
"""Return new file id for the basename 'name'.
130
Use bzrlib.generate_ids.gen_file_id() instead
138
The uniqueness is supplied from _next_id_suffix.
132
return generate_ids.gen_file_id(name)
135
@deprecated_function(zero_thirteen)
140
# The real randomness is in the _next_id_suffix, the
141
# rest of the identifier is just to be nice.
143
# 1) Remove non-ascii word characters to keep the ids portable
144
# 2) squash to lowercase, so the file id doesn't have to
145
# be escaped (case insensitive filesystems would bork for ids
146
# that only differred in case without escaping).
147
# 3) truncate the filename to 20 chars. Long filenames also bork on some
149
# 4) Removing starting '.' characters to prevent the file ids from
150
# being considered hidden.
151
ascii_word_only = _gen_file_id_re.sub('', name.lower())
152
short_no_dots = ascii_word_only.lstrip('.')[:20]
153
return short_no_dots + _next_id_suffix()
136
156
def gen_root_id():
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()
157
"""Return a new tree-root file id."""
158
return gen_file_id('TREE_ROOT')
144
161
class TreeEntry(object):
589
562
return os.path.getsize(self.id2abspath(file_id))
592
def get_file_sha1(self, file_id, path=None, stat_value=None):
565
def get_file_sha1(self, file_id, path=None):
594
567
path = self._inventory.id2path(file_id)
595
return self._hashcache.get_sha1(path, stat_value)
568
return self._hashcache.get_sha1(path)
597
570
def get_file_mtime(self, file_id, path=None):
599
path = self.inventory.id2path(file_id)
572
path = self._inventory.id2path(file_id)
600
573
return os.lstat(self.abspath(path)).st_mtime
602
def _is_executable_from_path_and_stat_from_basis(self, path, stat_result):
603
file_id = self.path2id(path)
604
return self._inventory[file_id].executable
606
def _is_executable_from_path_and_stat_from_stat(self, path, stat_result):
607
mode = stat_result.st_mode
608
return bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode)
610
575
if not supports_executable():
611
576
def is_executable(self, file_id, path=None):
612
577
return self._inventory[file_id].executable
614
_is_executable_from_path_and_stat = \
615
_is_executable_from_path_and_stat_from_basis
617
579
def is_executable(self, file_id, path=None):
619
path = self.id2path(file_id)
581
path = self._inventory.id2path(file_id)
620
582
mode = os.lstat(self.abspath(path)).st_mode
621
583
return bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode)
623
_is_executable_from_path_and_stat = \
624
_is_executable_from_path_and_stat_from_stat
626
@needs_tree_write_lock
627
def _add(self, files, ids, kinds):
628
"""See MutableTree._add."""
586
def add(self, files, ids=None):
587
"""Make files versioned.
589
Note that the command line normally calls smart_add instead,
590
which can automatically recurse.
592
This adds the files to the inventory, so that they will be
593
recorded by the next commit.
596
List of paths to add, relative to the base of the tree.
599
If set, use these instead of automatically generated ids.
600
Must be the same length as the list of files, but may
601
contain None for ids that are to be autogenerated.
603
TODO: Perhaps have an option to add the ids even if the files do
606
TODO: Perhaps callback with the ids and paths as they're added.
629
608
# TODO: Re-adding a file that is removed in the working copy
630
609
# should probably put it back with the previous ID.
631
# the read and write working inventory should not occur in this
632
# function - they should be part of lock_write and unlock.
634
for f, file_id, kind in zip(files, ids, kinds):
635
assert kind is not None
610
if isinstance(files, basestring):
611
assert(ids is None or isinstance(ids, basestring))
617
ids = [None] * len(files)
619
assert(len(ids) == len(files))
621
inv = self.read_working_inventory()
622
for f,file_id in zip(files, ids):
623
if self.is_control_filename(f):
624
raise errors.ForbiddenControlFileError(filename=f)
629
raise BzrError("cannot add top-level %r" % f)
631
fullpath = normpath(self.abspath(f))
633
kind = file_kind(fullpath)
635
if e.errno == errno.ENOENT:
636
raise NoSuchFile(fullpath)
637
if not InventoryEntry.versionable_kind(kind):
638
raise errors.BadFileKindError(filename=f, kind=kind)
636
639
if file_id is None:
637
640
inv.add_path(f, kind=kind)
639
642
inv.add_path(f, kind=kind, file_id=file_id)
640
self._inventory_is_modified = True
642
@needs_tree_write_lock
643
def _gather_kinds(self, files, kinds):
644
"""See MutableTree._gather_kinds."""
645
for pos, f in enumerate(files):
646
if kinds[pos] is None:
647
fullpath = normpath(self.abspath(f))
649
kinds[pos] = file_kind(fullpath)
651
if e.errno == errno.ENOENT:
652
raise errors.NoSuchFile(fullpath)
644
self._write_inventory(inv)
654
646
@needs_write_lock
655
def add_parent_tree_id(self, revision_id, allow_leftmost_as_ghost=False):
656
"""Add revision_id as a parent.
658
This is equivalent to retrieving the current list of parent ids
659
and setting the list to its value plus revision_id.
661
:param revision_id: The revision id to add to the parent list. It may
662
be a ghost revision as long as its not the first parent to be added,
663
or the allow_leftmost_as_ghost parameter is set True.
664
:param allow_leftmost_as_ghost: Allow the first parent to be a ghost.
666
parents = self.get_parent_ids() + [revision_id]
667
self.set_parent_ids(parents, allow_leftmost_as_ghost=len(parents) > 1
668
or allow_leftmost_as_ghost)
670
@needs_tree_write_lock
671
def add_parent_tree(self, parent_tuple, allow_leftmost_as_ghost=False):
672
"""Add revision_id, tree tuple as a parent.
674
This is equivalent to retrieving the current list of parent trees
675
and setting the list to its value plus parent_tuple. See also
676
add_parent_tree_id - if you only have a parent id available it will be
677
simpler to use that api. If you have the parent already available, using
678
this api is preferred.
680
:param parent_tuple: The (revision id, tree) to add to the parent list.
681
If the revision_id is a ghost, pass None for the tree.
682
:param allow_leftmost_as_ghost: Allow the first parent to be a ghost.
684
parent_ids = self.get_parent_ids() + [parent_tuple[0]]
685
if len(parent_ids) > 1:
686
# the leftmost may have already been a ghost, preserve that if it
688
allow_leftmost_as_ghost = True
689
self.set_parent_ids(parent_ids,
690
allow_leftmost_as_ghost=allow_leftmost_as_ghost)
692
@needs_tree_write_lock
693
647
def add_pending_merge(self, *revision_ids):
694
648
# TODO: Perhaps should check at this point that the
695
649
# history of the revision is actually present?
696
parents = self.get_parent_ids()
650
p = self.pending_merges()
698
652
for rev_id in revision_ids:
699
if rev_id in parents:
701
parents.append(rev_id)
704
self.set_parent_ids(parents, allow_leftmost_as_ghost=True)
706
def path_content_summary(self, path, _lstat=osutils.lstat,
707
_mapper=osutils.file_kind_from_stat_mode):
708
"""See Tree.path_content_summary."""
709
abspath = self.abspath(path)
711
stat_result = _lstat(abspath)
713
if getattr(e, 'errno', None) == errno.ENOENT:
715
return ('missing', None, None, None)
716
# propagate other errors
718
kind = _mapper(stat_result.st_mode)
720
size = stat_result.st_size
721
# try for a stat cache lookup
722
executable = self._is_executable_from_path_and_stat(path, stat_result)
723
return (kind, size, executable, self._sha_from_stat(
725
elif kind == 'directory':
726
# perhaps it looks like a plain directory, but it's really a
728
if self._directory_is_tree_reference(path):
729
kind = 'tree-reference'
730
return kind, None, None, None
731
elif kind == 'symlink':
732
return ('symlink', None, None, os.readlink(abspath))
734
return (kind, None, None, None)
736
@deprecated_method(zero_eleven)
658
self.set_pending_merges(p)
738
661
def pending_merges(self):
739
662
"""Return a list of pending merges.
741
664
These are revisions that have been merged into the working
742
665
directory but not yet committed.
744
As of 0.11 this is deprecated. Please see WorkingTree.get_parent_ids()
745
instead - which is available on all tree objects.
747
return self.get_parent_ids()[1:]
749
def _check_parents_for_ghosts(self, revision_ids, allow_leftmost_as_ghost):
750
"""Common ghost checking functionality from set_parent_*.
752
This checks that the left hand-parent exists if there are any
755
if len(revision_ids) > 0:
756
leftmost_id = revision_ids[0]
757
if (not allow_leftmost_as_ghost and not
758
self.branch.repository.has_revision(leftmost_id)):
759
raise errors.GhostRevisionUnusableHere(leftmost_id)
761
def _set_merges_from_parent_ids(self, parent_ids):
762
merges = parent_ids[1:]
763
self._control_files.put_bytes('pending-merges', '\n'.join(merges))
765
@needs_tree_write_lock
766
def set_parent_ids(self, revision_ids, allow_leftmost_as_ghost=False):
767
"""Set the parent ids to revision_ids.
769
See also set_parent_trees. This api will try to retrieve the tree data
770
for each element of revision_ids from the trees repository. If you have
771
tree data already available, it is more efficient to use
772
set_parent_trees rather than set_parent_ids. set_parent_ids is however
773
an easier API to use.
775
:param revision_ids: The revision_ids to set as the parent ids of this
776
working tree. Any of these may be ghosts.
778
self._check_parents_for_ghosts(revision_ids,
779
allow_leftmost_as_ghost=allow_leftmost_as_ghost)
780
for revision_id in revision_ids:
781
_mod_revision.check_not_reserved_id(revision_id)
783
if len(revision_ids) > 0:
784
self.set_last_revision(revision_ids[0])
786
self.set_last_revision(_mod_revision.NULL_REVISION)
788
self._set_merges_from_parent_ids(revision_ids)
790
@needs_tree_write_lock
791
def set_parent_trees(self, parents_list, allow_leftmost_as_ghost=False):
792
"""See MutableTree.set_parent_trees."""
793
parent_ids = [rev for (rev, tree) in parents_list]
794
for revision_id in parent_ids:
795
_mod_revision.check_not_reserved_id(revision_id)
797
self._check_parents_for_ghosts(parent_ids,
798
allow_leftmost_as_ghost=allow_leftmost_as_ghost)
800
if len(parent_ids) == 0:
801
leftmost_parent_id = _mod_revision.NULL_REVISION
802
leftmost_parent_tree = None
804
leftmost_parent_id, leftmost_parent_tree = parents_list[0]
806
if self._change_last_revision(leftmost_parent_id):
807
if leftmost_parent_tree is None:
808
# If we don't have a tree, fall back to reading the
809
# parent tree from the repository.
810
self._cache_basis_inventory(leftmost_parent_id)
812
inv = leftmost_parent_tree.inventory
813
xml = self._create_basis_xml_from_inventory(
814
leftmost_parent_id, inv)
815
self._write_basis_inventory(xml)
816
self._set_merges_from_parent_ids(parent_ids)
818
@needs_tree_write_lock
668
merges_file = self._control_files.get_utf8('pending-merges')
672
for l in merges_file.readlines():
673
p.append(l.rstrip('\n'))
819
677
def set_pending_merges(self, rev_list):
820
parents = self.get_parent_ids()
821
leftmost = parents[:1]
822
new_parents = leftmost + rev_list
823
self.set_parent_ids(new_parents)
678
self._control_files.put_utf8('pending-merges', '\n'.join(rev_list))
825
@needs_tree_write_lock
826
681
def set_merge_modified(self, modified_hashes):
827
682
def iter_stanzas():
828
683
for file_id, hash in modified_hashes.iteritems():
829
yield Stanza(file_id=file_id.decode('utf8'), hash=hash)
684
yield Stanza(file_id=file_id, hash=hash)
830
685
self._put_rio('merge-hashes', iter_stanzas(), MERGE_MODIFIED_HEADER_1)
832
def _sha_from_stat(self, path, stat_result):
833
"""Get a sha digest from the tree's stat cache.
835
The default implementation assumes no stat cache is present.
837
:param path: The path.
838
:param stat_result: The stat result being looked up.
842
688
def _put_rio(self, filename, stanzas, header):
843
self._must_be_locked()
844
689
my_file = rio_file(stanzas, header)
845
690
self._control_files.put(filename, my_file)
847
@needs_write_lock # because merge pulls data into the branch.
848
def merge_from_branch(self, branch, to_revision=None, from_revision=None,
850
"""Merge from a branch into this working tree.
852
:param branch: The branch to merge from.
853
:param to_revision: If non-None, the merge will merge to to_revision,
854
but not beyond it. to_revision does not need to be in the history
855
of the branch when it is supplied. If None, to_revision defaults to
856
branch.last_revision().
858
from bzrlib.merge import Merger, Merge3Merger
859
pb = bzrlib.ui.ui_factory.nested_progress_bar()
861
merger = Merger(self.branch, this_tree=self, pb=pb)
862
merger.pp = ProgressPhase("Merge phase", 5, pb)
863
merger.pp.next_phase()
864
# check that there are no
866
merger.check_basis(check_clean=True, require_commits=False)
867
if to_revision is None:
868
to_revision = _mod_revision.ensure_null(branch.last_revision())
869
merger.other_rev_id = to_revision
870
if _mod_revision.is_null(merger.other_rev_id):
871
raise errors.NoCommits(branch)
872
self.branch.fetch(branch, last_revision=merger.other_rev_id)
873
merger.other_basis = merger.other_rev_id
874
merger.other_tree = self.branch.repository.revision_tree(
876
merger.other_branch = branch
877
merger.pp.next_phase()
878
if from_revision is None:
881
merger.set_base_revision(from_revision, branch)
882
if merger.base_rev_id == merger.other_rev_id:
883
raise errors.PointlessMerge
884
merger.backup_files = False
885
if merge_type is None:
886
merger.merge_type = Merge3Merger
888
merger.merge_type = merge_type
889
merger.set_interesting_files(None)
890
merger.show_base = False
891
merger.reprocess = False
892
conflicts = merger.do_merge()
899
693
def merge_modified(self):
900
"""Return a dictionary of files modified by a merge.
902
The list is initialized by WorkingTree.set_merge_modified, which is
903
typically called after we make some automatic updates to the tree
906
This returns a map of file_id->sha1, containing only files which are
907
still in the working inventory and have that text hash.
910
695
hashfile = self._control_files.get('merge-hashes')
911
except errors.NoSuchFile:
913
698
merge_hashes = {}
915
700
if hashfile.next() != MERGE_MODIFIED_HEADER_1 + '\n':
916
raise errors.MergeModifiedFormatError()
701
raise MergeModifiedFormatError()
917
702
except StopIteration:
918
raise errors.MergeModifiedFormatError()
703
raise MergeModifiedFormatError()
919
704
for s in RioReader(hashfile):
920
# RioReader reads in Unicode, so convert file_ids back to utf8
921
file_id = osutils.safe_file_id(s.get("file_id"), warn=False)
705
file_id = s.get("file_id")
922
706
if file_id not in self.inventory:
924
text_hash = s.get("hash")
925
if text_hash == self.get_file_sha1(file_id):
926
merge_hashes[file_id] = text_hash
709
if hash == self.get_file_sha1(file_id):
710
merge_hashes[file_id] = hash
927
711
return merge_hashes
930
def mkdir(self, path, file_id=None):
931
"""See MutableTree.mkdir()."""
933
file_id = generate_ids.gen_file_id(os.path.basename(path))
934
os.mkdir(self.abspath(path))
935
self.add(path, file_id, 'directory')
938
713
def get_symlink_target(self, file_id):
939
714
return os.readlink(self.id2abspath(file_id))
942
def subsume(self, other_tree):
943
def add_children(inventory, entry):
944
for child_entry in entry.children.values():
945
inventory._byid[child_entry.file_id] = child_entry
946
if child_entry.kind == 'directory':
947
add_children(inventory, child_entry)
948
if other_tree.get_root_id() == self.get_root_id():
949
raise errors.BadSubsumeSource(self, other_tree,
950
'Trees have the same root')
952
other_tree_path = self.relpath(other_tree.basedir)
953
except errors.PathNotChild:
954
raise errors.BadSubsumeSource(self, other_tree,
955
'Tree is not contained by the other')
956
new_root_parent = self.path2id(osutils.dirname(other_tree_path))
957
if new_root_parent is None:
958
raise errors.BadSubsumeSource(self, other_tree,
959
'Parent directory is not versioned.')
960
# We need to ensure that the result of a fetch will have a
961
# versionedfile for the other_tree root, and only fetching into
962
# RepositoryKnit2 guarantees that.
963
if not self.branch.repository.supports_rich_root():
964
raise errors.SubsumeTargetNeedsUpgrade(other_tree)
965
other_tree.lock_tree_write()
967
new_parents = other_tree.get_parent_ids()
968
other_root = other_tree.inventory.root
969
other_root.parent_id = new_root_parent
970
other_root.name = osutils.basename(other_tree_path)
971
self.inventory.add(other_root)
972
add_children(self.inventory, other_root)
973
self._write_inventory(self.inventory)
974
# normally we don't want to fetch whole repositories, but i think
975
# here we really do want to consolidate the whole thing.
976
for parent_id in other_tree.get_parent_ids():
977
self.branch.fetch(other_tree.branch, parent_id)
978
self.add_parent_tree_id(parent_id)
981
other_tree.bzrdir.retire_bzrdir()
983
def _directory_is_tree_reference(self, relpath):
984
# as a special case, if a directory contains control files then
985
# it's a tree reference, except that the root of the tree is not
986
return relpath and osutils.isdir(self.abspath(relpath) + u"/.bzr")
987
# TODO: We could ask all the control formats whether they
988
# recognize this directory, but at the moment there's no cheap api
989
# to do that. Since we probably can only nest bzr checkouts and
990
# they always use this name it's ok for now. -- mbp 20060306
992
# FIXME: There is an unhandled case here of a subdirectory
993
# containing .bzr but not a branch; that will probably blow up
994
# when you try to commit it. It might happen if there is a
995
# checkout in a subdirectory. This can be avoided by not adding
998
@needs_tree_write_lock
999
def extract(self, file_id, format=None):
1000
"""Extract a subtree from this tree.
1002
A new branch will be created, relative to the path for this tree.
1006
segments = osutils.splitpath(path)
1007
transport = self.branch.bzrdir.root_transport
1008
for name in segments:
1009
transport = transport.clone(name)
1010
transport.ensure_base()
1013
sub_path = self.id2path(file_id)
1014
branch_transport = mkdirs(sub_path)
1016
format = bzrdir.format_registry.make_bzrdir('dirstate-with-subtree')
1017
branch_transport.ensure_base()
1018
branch_bzrdir = format.initialize_on_transport(branch_transport)
1020
repo = branch_bzrdir.find_repository()
1021
except errors.NoRepositoryPresent:
1022
repo = branch_bzrdir.create_repository()
1023
assert repo.supports_rich_root()
1025
if not repo.supports_rich_root():
1026
raise errors.RootNotRich()
1027
new_branch = branch_bzrdir.create_branch()
1028
new_branch.pull(self.branch)
1029
for parent_id in self.get_parent_ids():
1030
new_branch.fetch(self.branch, parent_id)
1031
tree_transport = self.bzrdir.root_transport.clone(sub_path)
1032
if tree_transport.base != branch_transport.base:
1033
tree_bzrdir = format.initialize_on_transport(tree_transport)
1034
branch.BranchReferenceFormat().initialize(tree_bzrdir, new_branch)
1036
tree_bzrdir = branch_bzrdir
1037
wt = tree_bzrdir.create_workingtree(NULL_REVISION)
1038
wt.set_parent_ids(self.get_parent_ids())
1039
my_inv = self.inventory
1040
child_inv = Inventory(root_id=None)
1041
new_root = my_inv[file_id]
1042
my_inv.remove_recursive_id(file_id)
1043
new_root.parent_id = None
1044
child_inv.add(new_root)
1045
self._write_inventory(my_inv)
1046
wt._write_inventory(child_inv)
1049
def _serialize(self, inventory, out_file):
1050
xml5.serializer_v5.write_inventory(self._inventory, out_file,
1053
def _deserialize(selt, in_file):
1054
return xml5.serializer_v5.read_inventory(in_file)
1057
"""Write the in memory inventory to disk."""
1058
# TODO: Maybe this should only write on dirty ?
1059
if self._control_files._lock_mode != 'w':
1060
raise errors.NotWriteLocked(self)
1062
self._serialize(self._inventory, sio)
1064
self._control_files.put('inventory', sio)
1065
self._inventory_is_modified = False
1067
def _kind(self, relpath):
1068
return osutils.file_kind(self.abspath(relpath))
1070
def list_files(self, include_root=False):
716
def file_class(self, filename):
717
if self.path2id(filename):
719
elif self.is_ignored(filename):
724
def list_files(self):
1071
725
"""Recursively list all files as (path, class, kind, id, entry).
1073
727
Lists, but does not descend into unversioned directories.
1171
824
new_children.sort()
1172
825
new_children = collections.deque(new_children)
1173
826
stack.append((f_ie.file_id, fp, fap, new_children))
1174
# Break out of inner loop,
1175
# so that we start outer loop with child
827
# Break out of inner loop, so that we start outer loop with child
1178
830
# if we finished all children, pop it off the stack
1181
@needs_tree_write_lock
1182
def move(self, from_paths, to_dir=None, after=False, **kwargs):
835
def move(self, from_paths, to_name):
1183
836
"""Rename files.
1185
to_dir must exist in the inventory.
838
to_name must exist in the inventory.
1187
If to_dir exists and is a directory, the files are moved into
840
If to_name exists and is a directory, the files are moved into
1188
841
it, keeping their old names.
1190
Note that to_dir is only the last component of the new name;
843
Note that to_name is only the last component of the new name;
1191
844
this doesn't change the directory.
1193
For each entry in from_paths the move mode will be determined
1196
The first mode moves the file in the filesystem and updates the
1197
inventory. The second mode only updates the inventory without
1198
touching the file on the filesystem. This is the new mode introduced
1201
move uses the second mode if 'after == True' and the target is not
1202
versioned but present in the working tree.
1204
move uses the second mode if 'after == False' and the source is
1205
versioned but no longer in the working tree, and the target is not
1206
versioned but present in the working tree.
1208
move uses the first mode if 'after == False' and the source is
1209
versioned and present in the working tree, and the target is not
1210
versioned and not present in the working tree.
1212
Everything else results in an error.
1214
846
This returns a list of (from_path, to_path) pairs for each
1215
847
entry that is moved.
1220
# check for deprecated use of signature
1222
to_dir = kwargs.get('to_name', None)
1224
raise TypeError('You must supply a target directory')
1226
symbol_versioning.warn('The parameter to_name was deprecated'
1227
' in version 0.13. Use to_dir instead',
1230
# check destination directory
850
## TODO: Option to move IDs only
1231
851
assert not isinstance(from_paths, basestring)
1232
852
inv = self.inventory
1233
to_abs = self.abspath(to_dir)
853
to_abs = self.abspath(to_name)
1234
854
if not isdir(to_abs):
1235
raise errors.BzrMoveFailedError('',to_dir,
1236
errors.NotADirectory(to_abs))
1237
if not self.has_filename(to_dir):
1238
raise errors.BzrMoveFailedError('',to_dir,
1239
errors.NotInWorkingDirectory(to_dir))
1240
to_dir_id = inv.path2id(to_dir)
1241
if to_dir_id is None:
1242
raise errors.BzrMoveFailedError('',to_dir,
1243
errors.NotVersionedError(path=str(to_dir)))
855
raise BzrError("destination %r is not a directory" % to_abs)
856
if not self.has_filename(to_name):
857
raise BzrError("destination %r not in working directory" % to_abs)
858
to_dir_id = inv.path2id(to_name)
859
if to_dir_id == None and to_name != '':
860
raise BzrError("destination %r is not a versioned directory" % to_name)
1245
861
to_dir_ie = inv[to_dir_id]
1246
862
if to_dir_ie.kind != 'directory':
1247
raise errors.BzrMoveFailedError('',to_dir,
1248
errors.NotADirectory(to_abs))
1250
# create rename entries and tuples
1251
for from_rel in from_paths:
1252
from_tail = splitpath(from_rel)[-1]
1253
from_id = inv.path2id(from_rel)
1255
raise errors.BzrMoveFailedError(from_rel,to_dir,
1256
errors.NotVersionedError(path=str(from_rel)))
1258
from_entry = inv[from_id]
1259
from_parent_id = from_entry.parent_id
1260
to_rel = pathjoin(to_dir, from_tail)
1261
rename_entry = WorkingTree._RenameEntry(from_rel=from_rel,
1263
from_tail=from_tail,
1264
from_parent_id=from_parent_id,
1265
to_rel=to_rel, to_tail=from_tail,
1266
to_parent_id=to_dir_id)
1267
rename_entries.append(rename_entry)
1268
rename_tuples.append((from_rel, to_rel))
1270
# determine which move mode to use. checks also for movability
1271
rename_entries = self._determine_mv_mode(rename_entries, after)
1273
original_modified = self._inventory_is_modified
863
raise BzrError("destination %r is not a directory" % to_abs)
865
to_idpath = inv.get_idpath(to_dir_id)
868
if not self.has_filename(f):
869
raise BzrError("%r does not exist in working tree" % f)
870
f_id = inv.path2id(f)
872
raise BzrError("%r is not versioned" % f)
873
name_tail = splitpath(f)[-1]
874
dest_path = pathjoin(to_name, name_tail)
875
if self.has_filename(dest_path):
876
raise BzrError("destination %r already exists" % dest_path)
877
if f_id in to_idpath:
878
raise BzrError("can't move %r to a subdirectory of itself" % f)
880
# OK, so there's a race here, it's possible that someone will
881
# create a file in this interval and then the rename might be
882
# left half-done. But we should have caught most problems.
883
orig_inv = deepcopy(self.inventory)
1276
self._inventory_is_modified = True
1277
self._move(rename_entries)
886
name_tail = splitpath(f)[-1]
887
dest_path = pathjoin(to_name, name_tail)
888
result.append((f, dest_path))
889
inv.rename(inv.path2id(f), to_dir_id, name_tail)
891
rename(self.abspath(f), self.abspath(dest_path))
893
raise BzrError("failed to rename %r to %r: %s" %
894
(f, dest_path, e[1]),
895
["rename rolled back"])
1279
897
# restore the inventory on error
1280
self._inventory_is_modified = original_modified
898
self._set_inventory(orig_inv)
1282
900
self._write_inventory(inv)
1283
return rename_tuples
1285
def _determine_mv_mode(self, rename_entries, after=False):
1286
"""Determines for each from-to pair if both inventory and working tree
1287
or only the inventory has to be changed.
1289
Also does basic plausability tests.
1291
inv = self.inventory
1293
for rename_entry in rename_entries:
1294
# store to local variables for easier reference
1295
from_rel = rename_entry.from_rel
1296
from_id = rename_entry.from_id
1297
to_rel = rename_entry.to_rel
1298
to_id = inv.path2id(to_rel)
1299
only_change_inv = False
1301
# check the inventory for source and destination
1303
raise errors.BzrMoveFailedError(from_rel,to_rel,
1304
errors.NotVersionedError(path=str(from_rel)))
1305
if to_id is not None:
1306
raise errors.BzrMoveFailedError(from_rel,to_rel,
1307
errors.AlreadyVersionedError(path=str(to_rel)))
1309
# try to determine the mode for rename (only change inv or change
1310
# inv and file system)
1312
if not self.has_filename(to_rel):
1313
raise errors.BzrMoveFailedError(from_id,to_rel,
1314
errors.NoSuchFile(path=str(to_rel),
1315
extra="New file has not been created yet"))
1316
only_change_inv = True
1317
elif not self.has_filename(from_rel) and self.has_filename(to_rel):
1318
only_change_inv = True
1319
elif self.has_filename(from_rel) and not self.has_filename(to_rel):
1320
only_change_inv = False
1322
# something is wrong, so lets determine what exactly
1323
if not self.has_filename(from_rel) and \
1324
not self.has_filename(to_rel):
1325
raise errors.BzrRenameFailedError(from_rel,to_rel,
1326
errors.PathsDoNotExist(paths=(str(from_rel),
1329
raise errors.RenameFailedFilesExist(from_rel, to_rel,
1330
extra="(Use --after to update the Bazaar id)")
1331
rename_entry.only_change_inv = only_change_inv
1332
return rename_entries
1334
def _move(self, rename_entries):
1335
"""Moves a list of files.
1337
Depending on the value of the flag 'only_change_inv', the
1338
file will be moved on the file system or not.
1340
inv = self.inventory
1343
for entry in rename_entries:
1345
self._move_entry(entry)
1347
self._rollback_move(moved)
1351
def _rollback_move(self, moved):
1352
"""Try to rollback a previous move in case of an filesystem error."""
1353
inv = self.inventory
1356
self._move_entry(_RenameEntry(entry.to_rel, entry.from_id,
1357
entry.to_tail, entry.to_parent_id, entry.from_rel,
1358
entry.from_tail, entry.from_parent_id,
1359
entry.only_change_inv))
1360
except errors.BzrMoveFailedError, e:
1361
raise errors.BzrMoveFailedError( '', '', "Rollback failed."
1362
" The working tree is in an inconsistent state."
1363
" Please consider doing a 'bzr revert'."
1364
" Error message is: %s" % e)
1366
def _move_entry(self, entry):
1367
inv = self.inventory
1368
from_rel_abs = self.abspath(entry.from_rel)
1369
to_rel_abs = self.abspath(entry.to_rel)
1370
if from_rel_abs == to_rel_abs:
1371
raise errors.BzrMoveFailedError(entry.from_rel, entry.to_rel,
1372
"Source and target are identical.")
1374
if not entry.only_change_inv:
1376
osutils.rename(from_rel_abs, to_rel_abs)
1378
raise errors.BzrMoveFailedError(entry.from_rel,
1380
inv.rename(entry.from_id, entry.to_parent_id, entry.to_tail)
1382
@needs_tree_write_lock
1383
def rename_one(self, from_rel, to_rel, after=False):
904
def rename_one(self, from_rel, to_rel):
1384
905
"""Rename one file.
1386
907
This can change the directory or the filename or both.
1388
rename_one has several 'modes' to work. First, it can rename a physical
1389
file and change the file_id. That is the normal mode. Second, it can
1390
only change the file_id without touching any physical file. This is
1391
the new mode introduced in version 0.15.
1393
rename_one uses the second mode if 'after == True' and 'to_rel' is not
1394
versioned but present in the working tree.
1396
rename_one uses the second mode if 'after == False' and 'from_rel' is
1397
versioned but no longer in the working tree, and 'to_rel' is not
1398
versioned but present in the working tree.
1400
rename_one uses the first mode if 'after == False' and 'from_rel' is
1401
versioned and present in the working tree, and 'to_rel' is not
1402
versioned and not present in the working tree.
1404
Everything else results in an error.
1406
909
inv = self.inventory
1409
# create rename entries and tuples
1410
from_tail = splitpath(from_rel)[-1]
1411
from_id = inv.path2id(from_rel)
1413
raise errors.BzrRenameFailedError(from_rel,to_rel,
1414
errors.NotVersionedError(path=str(from_rel)))
1415
from_entry = inv[from_id]
1416
from_parent_id = from_entry.parent_id
910
if not self.has_filename(from_rel):
911
raise BzrError("can't rename: old working file %r does not exist" % from_rel)
912
if self.has_filename(to_rel):
913
raise BzrError("can't rename: new working file %r already exists" % to_rel)
915
file_id = inv.path2id(from_rel)
917
raise BzrError("can't rename: old name %r is not versioned" % from_rel)
920
from_parent = entry.parent_id
921
from_name = entry.name
923
if inv.path2id(to_rel):
924
raise BzrError("can't rename: new name %r is already versioned" % to_rel)
1417
926
to_dir, to_tail = os.path.split(to_rel)
1418
927
to_dir_id = inv.path2id(to_dir)
1419
rename_entry = WorkingTree._RenameEntry(from_rel=from_rel,
1421
from_tail=from_tail,
1422
from_parent_id=from_parent_id,
1423
to_rel=to_rel, to_tail=to_tail,
1424
to_parent_id=to_dir_id)
1425
rename_entries.append(rename_entry)
1427
# determine which move mode to use. checks also for movability
1428
rename_entries = self._determine_mv_mode(rename_entries, after)
1430
# check if the target changed directory and if the target directory is
1432
if to_dir_id is None:
1433
raise errors.BzrMoveFailedError(from_rel,to_rel,
1434
errors.NotVersionedError(path=str(to_dir)))
1436
# all checks done. now we can continue with our actual work
1437
mutter('rename_one:\n'
1442
' to_dir_id {%s}\n',
1443
from_id, from_rel, to_rel, to_dir, to_dir_id)
1445
self._move(rename_entries)
928
if to_dir_id == None and to_dir != '':
929
raise BzrError("can't determine destination directory id for %r" % to_dir)
931
mutter("rename_one:")
932
mutter(" file_id {%s}" % file_id)
933
mutter(" from_rel %r" % from_rel)
934
mutter(" to_rel %r" % to_rel)
935
mutter(" to_dir %r" % to_dir)
936
mutter(" to_dir_id {%s}" % to_dir_id)
938
inv.rename(file_id, to_dir_id, to_tail)
940
from_abs = self.abspath(from_rel)
941
to_abs = self.abspath(to_rel)
943
rename(from_abs, to_abs)
945
inv.rename(file_id, from_parent, from_name)
946
raise BzrError("failed to rename %r to %r: %s"
947
% (from_abs, to_abs, e[1]),
948
["rename rolled back"])
1446
949
self._write_inventory(inv)
1448
class _RenameEntry(object):
1449
def __init__(self, from_rel, from_id, from_tail, from_parent_id,
1450
to_rel, to_tail, to_parent_id, only_change_inv=False):
1451
self.from_rel = from_rel
1452
self.from_id = from_id
1453
self.from_tail = from_tail
1454
self.from_parent_id = from_parent_id
1455
self.to_rel = to_rel
1456
self.to_tail = to_tail
1457
self.to_parent_id = to_parent_id
1458
self.only_change_inv = only_change_inv
1460
951
@needs_read_lock
1461
952
def unknowns(self):
1462
953
"""Return all unknown files.
1817
1270
@needs_read_lock
1818
1271
def read_working_inventory(self):
1819
"""Read the working inventory.
1821
:raises errors.InventoryModified: read_working_inventory will fail
1822
when the current in memory inventory has been modified.
1824
# conceptually this should be an implementation detail of the tree.
1825
# XXX: Deprecate this.
1272
"""Read the working inventory."""
1826
1273
# ElementTree does its own conversion from UTF-8, so open in
1828
if self._inventory_is_modified:
1829
raise errors.InventoryModified(self)
1830
result = self._deserialize(self._control_files.get('inventory'))
1831
self._set_inventory(result, dirty=False)
1275
result = bzrlib.xml5.serializer_v5.read_inventory(
1276
self._control_files.get('inventory'))
1277
self._set_inventory(result)
1834
@needs_tree_write_lock
1835
def remove(self, files, verbose=False, to_file=None, keep_files=True,
1837
"""Remove nominated files from the working inventory.
1839
:files: File paths relative to the basedir.
1840
:keep_files: If true, the files will also be kept.
1841
:force: Delete files and directories, even if they are changed and
1842
even if the directories are not empty.
1281
def remove(self, files, verbose=False, to_file=None):
1282
"""Remove nominated files from the working inventory..
1284
This does not remove their text. This does not run on XXX on what? RBC
1286
TODO: Refuse to remove modified files unless --force is given?
1288
TODO: Do something useful with directories.
1290
TODO: Should this remove the text or not? Tough call; not
1291
removing may be useful and the user can just use use rm, and
1292
is the opposite of add. Removing it is consistent with most
1293
other tools. Maybe an option.
1295
## TODO: Normalize names
1296
## TODO: Remove nested loops; better scalability
1844
1297
if isinstance(files, basestring):
1845
1298
files = [files]
1850
unknown_nested_files=set()
1852
def recurse_directory_to_add_files(directory):
1853
# Recurse directory and add all files
1854
# so we can check if they have changed.
1855
for parent_info, file_infos in\
1856
osutils.walkdirs(self.abspath(directory),
1858
for relpath, basename, kind, lstat, abspath in file_infos:
1859
# Is it versioned or ignored?
1860
if self.path2id(relpath) or self.is_ignored(relpath):
1861
# Add nested content for deletion.
1862
new_files.add(relpath)
1864
# Files which are not versioned and not ignored
1865
# should be treated as unknown.
1866
unknown_nested_files.add((relpath, None, kind))
1868
for filename in files:
1869
# Get file name into canonical form.
1870
abspath = self.abspath(filename)
1871
filename = self.relpath(abspath)
1872
if len(filename) > 0:
1873
new_files.add(filename)
1874
if osutils.isdir(abspath):
1875
recurse_directory_to_add_files(filename)
1877
files = list(new_files)
1880
return # nothing to do
1882
# Sort needed to first handle directory content before the directory
1883
files.sort(reverse=True)
1885
# Bail out if we are going to delete files we shouldn't
1886
if not keep_files and not force:
1887
has_changed_files = len(unknown_nested_files) > 0
1888
if not has_changed_files:
1889
for (file_id, path, content_change, versioned, parent_id, name,
1890
kind, executable) in self._iter_changes(self.basis_tree(),
1891
include_unchanged=True, require_versioned=False,
1892
want_unversioned=True, specific_files=files):
1893
# Check if it's an unknown (but not ignored) OR
1894
# changed (but not deleted) :
1895
if not self.is_ignored(path[1]) and (
1896
versioned == (False, False) or
1897
content_change and kind[1] != None):
1898
has_changed_files = True
1901
if has_changed_files:
1902
# Make delta show ALL applicable changes in error message.
1903
tree_delta = self.changes_from(self.basis_tree(),
1904
require_versioned=False, want_unversioned=True,
1905
specific_files=files)
1906
for unknown_file in unknown_nested_files:
1907
if unknown_file not in tree_delta.unversioned:
1908
tree_delta.unversioned.extend((unknown_file,))
1909
raise errors.BzrRemoveChangedFilesError(tree_delta)
1911
# Build inv_delta and delete files where applicaple,
1912
# do this before any modifications to inventory.
1300
inv = self.inventory
1302
# do this before any modifications
1913
1303
for f in files:
1914
fid = self.path2id(f)
1304
fid = inv.path2id(f)
1917
message = "%s is not versioned." % (f,)
1920
# having removed it, it must be either ignored or unknown
1921
if self.is_ignored(f):
1925
textui.show_status(new_status, self.kind(fid), f,
1928
inv_delta.append((f, None, fid, None))
1929
message = "removed %s" % (f,)
1932
abs_path = self.abspath(f)
1933
if osutils.lexists(abs_path):
1934
if (osutils.isdir(abs_path) and
1935
len(os.listdir(abs_path)) > 0):
1937
osutils.rmtree(abs_path)
1939
message = "%s is not an empty directory "\
1940
"and won't be deleted." % (f,)
1942
osutils.delete_any(abs_path)
1943
message = "deleted %s" % (f,)
1944
elif message is not None:
1945
# Only care if we haven't done anything yet.
1946
message = "%s does not exist." % (f,)
1948
# Print only one message (if any) per file.
1949
if message is not None:
1951
self.apply_inventory_delta(inv_delta)
1953
@needs_tree_write_lock
1954
def revert(self, filenames=None, old_tree=None, backups=True,
1955
pb=DummyProgress(), report_changes=False):
1956
from bzrlib.conflicts import resolve
1959
symbol_versioning.warn('Using [] to revert all files is deprecated'
1960
' as of bzr 0.91. Please use None (the default) instead.',
1961
DeprecationWarning, stacklevel=2)
1306
# TODO: Perhaps make this just a warning, and continue?
1307
# This tends to happen when
1308
raise NotVersionedError(path=f)
1310
# having remove it, it must be either ignored or unknown
1311
if self.is_ignored(f):
1315
show_status(new_status, inv[fid].kind, f, to_file=to_file)
1318
self._write_inventory(inv)
1321
def revert(self, filenames, old_tree=None, backups=True,
1322
pb=DummyProgress()):
1323
from transform import revert
1324
from conflicts import resolve
1962
1325
if old_tree is None:
1963
1326
old_tree = self.basis_tree()
1964
conflicts = transform.revert(self, old_tree, filenames, backups, pb,
1966
if filenames is None:
1967
self.set_parent_ids(self.get_parent_ids()[:1])
1327
conflicts = revert(self, old_tree, filenames, backups, pb)
1328
if not len(filenames):
1329
self.set_pending_merges([])
1970
1332
resolve(self, filenames, ignore_misses=True)
1971
1333
return conflicts
1973
def revision_tree(self, revision_id):
1974
"""See Tree.revision_tree.
1976
WorkingTree can supply revision_trees for the basis revision only
1977
because there is only one cached inventory in the bzr directory.
1979
if revision_id == self.last_revision():
1981
xml = self.read_basis_inventory()
1982
except errors.NoSuchFile:
1986
inv = xml7.serializer_v7.read_inventory_from_string(xml)
1987
# dont use the repository revision_tree api because we want
1988
# to supply the inventory.
1989
if inv.revision_id == revision_id:
1990
return revisiontree.RevisionTree(self.branch.repository,
1992
except errors.BadInventoryFormat:
1994
# raise if there was no inventory, or if we read the wrong inventory.
1995
raise errors.NoSuchRevisionInTree(self, revision_id)
1997
1335
# XXX: This method should be deprecated in favour of taking in a proper
1998
1336
# new Inventory object.
1999
@needs_tree_write_lock
2000
1338
def set_inventory(self, new_inventory_list):
2001
1339
from bzrlib.inventory import (Inventory,
2002
1340
InventoryDirectory,
2071
1383
raise NotImplementedError(self.unlock)
2073
def update(self, change_reporter=None, possible_transports=None):
2074
1387
"""Update a working tree along its branch.
2076
This will update the branch if its bound too, which means we have
2077
multiple trees involved:
2079
- The new basis tree of the master.
2080
- The old basis tree of the branch.
2081
- The old basis tree of the working tree.
2082
- The current working tree state.
2084
Pathologically, all three may be different, and non-ancestors of each
2085
other. Conceptually we want to:
2087
- Preserve the wt.basis->wt.state changes
2088
- Transform the wt.basis to the new master basis.
2089
- Apply a merge of the old branch basis to get any 'local' changes from
2091
- Restore the wt.basis->wt.state changes.
1389
This will update the branch if its bound too, which means we have multiple trees involved:
1390
The new basis tree of the master.
1391
The old basis tree of the branch.
1392
The old basis tree of the working tree.
1393
The current working tree state.
1394
pathologically all three may be different, and non ancestors of each other.
1395
Conceptually we want to:
1396
Preserve the wt.basis->wt.state changes
1397
Transform the wt.basis to the new master basis.
1398
Apply a merge of the old branch basis to get any 'local' changes from it into the tree.
1399
Restore the wt.basis->wt.state changes.
2093
1401
There isn't a single operation at the moment to do that, so we:
2094
- Merge current state -> basis tree of the master w.r.t. the old tree
2096
- Do a 'normal' merge of the old branch basis if it is relevant.
2098
if self.branch.get_master_branch(possible_transports) is not None:
2100
update_branch = True
2102
self.lock_tree_write()
2103
update_branch = False
2106
old_tip = self.branch.update(possible_transports)
2109
return self._update_tree(old_tip, change_reporter)
2113
@needs_tree_write_lock
2114
def _update_tree(self, old_tip=None, change_reporter=None):
2115
"""Update a tree to the master branch.
2117
:param old_tip: if supplied, the previous tip revision the branch,
2118
before it was changed to the master branch's tip.
2120
# here if old_tip is not None, it is the old tip of the branch before
2121
# it was updated from the master branch. This should become a pending
2122
# merge in the working tree to preserve the user existing work. we
2123
# cant set that until we update the working trees last revision to be
2124
# one from the new branch, because it will just get absorbed by the
2125
# parent de-duplication logic.
2127
# We MUST save it even if an error occurs, because otherwise the users
2128
# local work is unreferenced and will appear to have been lost.
2132
last_rev = self.get_parent_ids()[0]
2134
last_rev = _mod_revision.NULL_REVISION
2135
if last_rev != _mod_revision.ensure_null(self.branch.last_revision()):
2136
# merge tree state up to new branch tip.
2137
basis = self.basis_tree()
1402
Merge current state -> basis tree of the master w.r.t. the old tree basis.
1403
Do a 'normal' merge of the old branch basis if it is relevant.
1405
old_tip = self.branch.update()
1406
if old_tip is not None:
1407
self.add_pending_merge(old_tip)
1408
self.branch.lock_read()
1411
if self.last_revision() != self.branch.last_revision():
1412
# merge tree state up to new branch tip.
1413
basis = self.basis_tree()
2140
1414
to_tree = self.branch.basis_tree()
2141
if basis.inventory.root is None:
2142
self.set_root_id(to_tree.inventory.root.file_id)
2144
result += merge.merge_inner(
1415
result += merge_inner(self.branch,
2149
change_reporter=change_reporter)
2152
# TODO - dedup parents list with things merged by pull ?
2153
# reuse the tree we've updated to to set the basis:
2154
parent_trees = [(self.branch.last_revision(), to_tree)]
2155
merges = self.get_parent_ids()[1:]
2156
# Ideally we ask the tree for the trees here, that way the working
2157
# tree can decide whether to give us teh entire tree or give us a
2158
# lazy initialised tree. dirstate for instance will have the trees
2159
# in ram already, whereas a last-revision + basis-inventory tree
2160
# will not, but also does not need them when setting parents.
2161
for parent in merges:
2162
parent_trees.append(
2163
(parent, self.branch.repository.revision_tree(parent)))
2164
if (old_tip is not None and not _mod_revision.is_null(old_tip)):
2165
parent_trees.append(
2166
(old_tip, self.branch.repository.revision_tree(old_tip)))
2167
self.set_parent_trees(parent_trees)
2168
last_rev = parent_trees[0][0]
2170
# the working tree had the same last-revision as the master
2171
# branch did. We may still have pivot local work from the local
2172
# branch into old_tip:
2173
if (old_tip is not None and not _mod_revision.is_null(old_tip)):
2174
self.add_parent_tree_id(old_tip)
2175
if (old_tip is not None and not _mod_revision.is_null(old_tip)
2176
and old_tip != last_rev):
2177
# our last revision was not the prior branch last revision
2178
# and we have converted that last revision to a pending merge.
2179
# base is somewhere between the branch tip now
2180
# and the now pending merge
2182
# Since we just modified the working tree and inventory, flush out
2183
# the current state, before we modify it again.
2184
# TODO: jam 20070214 WorkingTree3 doesn't require this, dirstate
2185
# requires it only because TreeTransform directly munges the
2186
# inventory and calls tree._write_inventory(). Ultimately we
2187
# should be able to remove this extra flush.
2189
graph = self.branch.repository.get_graph()
2190
base_rev_id = graph.find_unique_lca(self.branch.last_revision(),
2192
base_tree = self.branch.repository.revision_tree(base_rev_id)
2193
other_tree = self.branch.repository.revision_tree(old_tip)
2194
result += merge.merge_inner(
2199
change_reporter=change_reporter)
2202
def _write_hashcache_if_dirty(self):
2203
"""Write out the hashcache if it is dirty."""
2204
if self._hashcache.needs_write:
2206
self._hashcache.write()
2208
if e.errno not in (errno.EPERM, errno.EACCES):
2210
# TODO: jam 20061219 Should this be a warning? A single line
2211
# warning might be sufficient to let the user know what
2213
mutter('Could not write hashcache for %s\nError: %s',
2214
self._hashcache.cache_file_name(), e)
2216
@needs_tree_write_lock
1419
self.set_last_revision(self.branch.last_revision())
1420
if old_tip and old_tip != self.last_revision():
1421
# our last revision was not the prior branch last revision
1422
# and we have converted that last revision to a pending merge.
1423
# base is somewhere between the branch tip now
1424
# and the now pending merge
1425
from bzrlib.revision import common_ancestor
1427
base_rev_id = common_ancestor(self.branch.last_revision(),
1429
self.branch.repository)
1430
except errors.NoCommonAncestor:
1432
base_tree = self.branch.repository.revision_tree(base_rev_id)
1433
other_tree = self.branch.repository.revision_tree(old_tip)
1434
result += merge_inner(self.branch,
1440
self.branch.unlock()
2217
1443
def _write_inventory(self, inv):
2218
1444
"""Write inventory as the current inventory."""
2219
self._set_inventory(inv, dirty=True)
1446
bzrlib.xml5.serializer_v5.write_inventory(inv, sio)
1448
self._control_files.put('inventory', sio)
1449
self._set_inventory(inv)
1450
mutter('wrote working inventory')
2222
1452
def set_conflicts(self, arg):
2223
raise errors.UnsupportedOperation(self.set_conflicts, self)
1453
raise UnsupportedOperation(self.set_conflicts, self)
2225
1455
def add_conflicts(self, arg):
2226
raise errors.UnsupportedOperation(self.add_conflicts, self)
1456
raise UnsupportedOperation(self.add_conflicts, self)
2228
1458
@needs_read_lock
2229
1459
def conflicts(self):
2230
conflicts = _mod_conflicts.ConflictList()
1460
conflicts = ConflictList()
2231
1461
for conflicted in self._iter_conflicts():
2246
1476
if text == False:
2248
1478
ctype = {True: 'text conflict', False: 'contents conflict'}[text]
2249
conflicts.append(_mod_conflicts.Conflict.factory(ctype,
1479
conflicts.append(Conflict.factory(ctype, path=conflicted,
2251
1480
file_id=self.path2id(conflicted)))
2252
1481
return conflicts
2254
def walkdirs(self, prefix=""):
2255
"""Walk the directories of this tree.
2257
returns a generator which yields items in the form:
2258
((curren_directory_path, fileid),
2259
[(file1_path, file1_name, file1_kind, (lstat), file1_id,
2262
This API returns a generator, which is only valid during the current
2263
tree transaction - within a single lock_read or lock_write duration.
2265
If the tree is not locked, it may cause an error to be raised,
2266
depending on the tree implementation.
2268
disk_top = self.abspath(prefix)
2269
if disk_top.endswith('/'):
2270
disk_top = disk_top[:-1]
2271
top_strip_len = len(disk_top) + 1
2272
inventory_iterator = self._walkdirs(prefix)
2273
disk_iterator = osutils.walkdirs(disk_top, prefix)
2275
current_disk = disk_iterator.next()
2276
disk_finished = False
2278
if not (e.errno == errno.ENOENT or
2279
(sys.platform == 'win32' and e.errno == ERROR_PATH_NOT_FOUND)):
2282
disk_finished = True
2284
current_inv = inventory_iterator.next()
2285
inv_finished = False
2286
except StopIteration:
2289
while not inv_finished or not disk_finished:
2290
if not disk_finished:
2291
# strip out .bzr dirs
2292
if current_disk[0][1][top_strip_len:] == '':
2293
# osutils.walkdirs can be made nicer -
2294
# yield the path-from-prefix rather than the pathjoined
2296
bzrdir_loc = bisect_left(current_disk[1], ('.bzr', '.bzr'))
2297
if current_disk[1][bzrdir_loc][0] == '.bzr':
2298
# we dont yield the contents of, or, .bzr itself.
2299
del current_disk[1][bzrdir_loc]
2301
# everything is unknown
2304
# everything is missing
2307
direction = cmp(current_inv[0][0], current_disk[0][0])
2309
# disk is before inventory - unknown
2310
dirblock = [(relpath, basename, kind, stat, None, None) for
2311
relpath, basename, kind, stat, top_path in current_disk[1]]
2312
yield (current_disk[0][0], None), dirblock
2314
current_disk = disk_iterator.next()
2315
except StopIteration:
2316
disk_finished = True
2318
# inventory is before disk - missing.
2319
dirblock = [(relpath, basename, 'unknown', None, fileid, kind)
2320
for relpath, basename, dkind, stat, fileid, kind in
2322
yield (current_inv[0][0], current_inv[0][1]), dirblock
2324
current_inv = inventory_iterator.next()
2325
except StopIteration:
2328
# versioned present directory
2329
# merge the inventory and disk data together
2331
for relpath, subiterator in itertools.groupby(sorted(
2332
current_inv[1] + current_disk[1], key=operator.itemgetter(0)), operator.itemgetter(1)):
2333
path_elements = list(subiterator)
2334
if len(path_elements) == 2:
2335
inv_row, disk_row = path_elements
2336
# versioned, present file
2337
dirblock.append((inv_row[0],
2338
inv_row[1], disk_row[2],
2339
disk_row[3], inv_row[4],
2341
elif len(path_elements[0]) == 5:
2343
dirblock.append((path_elements[0][0],
2344
path_elements[0][1], path_elements[0][2],
2345
path_elements[0][3], None, None))
2346
elif len(path_elements[0]) == 6:
2347
# versioned, absent file.
2348
dirblock.append((path_elements[0][0],
2349
path_elements[0][1], 'unknown', None,
2350
path_elements[0][4], path_elements[0][5]))
2352
raise NotImplementedError('unreachable code')
2353
yield current_inv[0], dirblock
2355
current_inv = inventory_iterator.next()
2356
except StopIteration:
2359
current_disk = disk_iterator.next()
2360
except StopIteration:
2361
disk_finished = True
2363
def _walkdirs(self, prefix=""):
2364
"""Walk the directories of this tree.
2366
:prefix: is used as the directrory to start with.
2367
returns a generator which yields items in the form:
2368
((curren_directory_path, fileid),
2369
[(file1_path, file1_name, file1_kind, None, file1_id,
2372
_directory = 'directory'
2373
# get the root in the inventory
2374
inv = self.inventory
2375
top_id = inv.path2id(prefix)
2379
pending = [(prefix, '', _directory, None, top_id, None)]
2382
currentdir = pending.pop()
2383
# 0 - relpath, 1- basename, 2- kind, 3- stat, 4-id, 5-kind
2384
top_id = currentdir[4]
2386
relroot = currentdir[0] + '/'
2389
# FIXME: stash the node in pending
2391
for name, child in entry.sorted_children():
2392
dirblock.append((relroot + name, name, child.kind, None,
2393
child.file_id, child.kind
2395
yield (currentdir[0], entry.file_id), dirblock
2396
# push the user specified dirs from dirblock
2397
for dir in reversed(dirblock):
2398
if dir[2] == _directory:
2401
@needs_tree_write_lock
2402
def auto_resolve(self):
2403
"""Automatically resolve text conflicts according to contents.
2405
Only text conflicts are auto_resolvable. Files with no conflict markers
2406
are considered 'resolved', because bzr always puts conflict markers
2407
into files that have text conflicts. The corresponding .THIS .BASE and
2408
.OTHER files are deleted, as per 'resolve'.
2409
:return: a tuple of ConflictLists: (un_resolved, resolved).
2411
un_resolved = _mod_conflicts.ConflictList()
2412
resolved = _mod_conflicts.ConflictList()
2413
conflict_re = re.compile('^(<{7}|={7}|>{7})')
2414
for conflict in self.conflicts():
2415
if (conflict.typestring != 'text conflict' or
2416
self.kind(conflict.file_id) != 'file'):
2417
un_resolved.append(conflict)
2419
my_file = open(self.id2abspath(conflict.file_id), 'rb')
2421
for line in my_file:
2422
if conflict_re.search(line):
2423
un_resolved.append(conflict)
2426
resolved.append(conflict)
2429
resolved.remove_files(self)
2430
self.set_conflicts(un_resolved)
2431
return un_resolved, resolved
2433
def _validate(self):
2434
"""Validate internal structures.
2436
This is meant mostly for the test suite. To give it a chance to detect
2437
corruption after actions have occurred. The default implementation is a
2440
:return: None. An exception should be raised if there is an error.
2445
1484
class WorkingTree2(WorkingTree):
2446
1485
"""This is the Format 2 working tree.
added
removed
bzrlib/workingtree.py
