13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
17
17
"""WorkingTree object and friends.
19
19
A WorkingTree represents the editable working copy of a branch.
20
Operations which represent the WorkingTree are also done here,
21
such as renaming or adding files. The WorkingTree has an inventory
22
which is updated by these operations. A commit produces a
20
Operations which represent the WorkingTree are also done here,
21
such as renaming or adding files. The WorkingTree has an inventory
22
which is updated by these operations. A commit produces a
23
23
new revision based on the workingtree and its inventory.
25
25
At the moment every WorkingTree has its own branch. Remote
51
59
conflicts as _mod_conflicts,
60
68
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.lock import LogicalLockResult
81
from bzrlib.lockable_files import LockableFiles
88
from bzrlib.inventory import InventoryEntry, Inventory, ROOT_ID, TreeReference
89
from bzrlib.lockable_files import LockableFiles, TransportLock
82
90
from bzrlib.lockdir import LockDir
83
91
import bzrlib.mutabletree
84
92
from bzrlib.mutabletree import needs_tree_write_lock
85
from bzrlib import osutils
86
93
from bzrlib.osutils import (
94
103
supports_executable,
96
from bzrlib.filters import filtered_input_file
97
105
from bzrlib.trace import mutter, note
98
106
from bzrlib.transport.local import LocalTransport
99
from bzrlib.revision import CURRENT_REVISION
107
from bzrlib.progress import DummyProgress, ProgressPhase
108
from bzrlib.revision import NULL_REVISION, CURRENT_REVISION
100
109
from bzrlib.rio import RioReader, rio_file, Stanza
101
from bzrlib.symbol_versioning import (
103
DEPRECATED_PARAMETER,
110
from bzrlib.symbol_versioning import (deprecated_passed,
113
DEPRECATED_PARAMETER,
107
120
MERGE_MODIFIED_HEADER_1 = "BZR merge-modified list format 1"
108
# TODO: Modifying the conflict objects or their type is currently nearly
109
# impossible as there is no clear relationship between the working tree format
110
# and the conflict list file format.
111
121
CONFLICT_HEADER_1 = "BZR conflict list format 1"
113
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()
116
144
class TreeEntry(object):
117
145
"""An entry that implements the minimum interface used by commands.
119
This needs further inspection, it may be better to have
147
This needs further inspection, it may be better to have
120
148
InventoryEntries without ids - though that seems wrong. For now,
121
149
this is a parallel hierarchy to InventoryEntry, and needs to become
122
150
one of several things: decorates to that hierarchy, children of, or
286
290
self._control_files.break_lock()
287
291
self.branch.break_lock()
289
def _get_check_refs(self):
290
"""Return the references needed to perform a check of this tree.
292
The default implementation returns no refs, and is only suitable for
293
trees that have no local caching and can commit on ghosts at any time.
295
:seealso: bzrlib.check for details about check_refs.
299
293
def requires_rich_root(self):
300
294
return self._format.requires_rich_root
302
296
def supports_tree_reference(self):
305
def supports_content_filtering(self):
306
return self._format.supports_content_filtering()
308
def supports_views(self):
309
return self.views.supports_views()
311
299
def _set_inventory(self, inv, dirty):
312
300
"""Set the internal cached inventory.
423
390
# at this point ?
425
392
return self.branch.repository.revision_tree(revision_id)
426
except (errors.RevisionNotPresent, errors.NoSuchRevision):
393
except errors.RevisionNotPresent:
427
394
# the basis tree *may* be a ghost or a low level error may have
428
# occurred. If the revision is present, its a problem, if its not
395
# occured. If the revision is present, its a problem, if its not
430
397
if self.branch.repository.has_revision(revision_id):
432
399
# the basis tree is a ghost so return an empty tree.
433
return self.branch.repository.revision_tree(
434
_mod_revision.NULL_REVISION)
437
self._flush_ignore_list_cache()
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)
439
440
def relpath(self, path):
440
441
"""Return the local path portion from a given path.
442
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
443
444
interpreted relative to the python current working directory.
445
446
return osutils.relpath(self.basedir, path)
447
448
def has_filename(self, filename):
448
449
return osutils.lexists(self.abspath(filename))
450
def get_file(self, file_id, path=None, filtered=True):
451
return self.get_file_with_stat(file_id, path, filtered=filtered)[0]
453
def get_file_with_stat(self, file_id, path=None, filtered=True,
455
"""See Tree.get_file_with_stat."""
457
path = self.id2path(file_id)
458
file_obj = self.get_file_byname(path, filtered=False)
459
stat_value = _fstat(file_obj.fileno())
460
if filtered and self.supports_content_filtering():
461
filters = self._content_filter_stack(path)
462
file_obj = filtered_input_file(file_obj, filters)
463
return (file_obj, stat_value)
465
def get_file_text(self, file_id, path=None, filtered=True):
466
return self.get_file(file_id, path=path, filtered=filtered).read()
468
def get_file_byname(self, filename, filtered=True):
469
path = self.abspath(filename)
471
if filtered and self.supports_content_filtering():
472
filters = self._content_filter_stack(filename)
473
return filtered_input_file(f, filters)
477
def get_file_lines(self, file_id, path=None, filtered=True):
478
"""See Tree.get_file_lines()"""
479
file = self.get_file(file_id, path, filtered=filtered)
481
return file.readlines()
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')
486
463
def annotate_iter(self, file_id, default_revision=CURRENT_REVISION):
493
470
incorrectly attributed to CURRENT_REVISION (but after committing, the
494
471
attribution will be correct).
496
maybe_file_parent_keys = []
497
for parent_id in self.get_parent_ids():
499
parent_tree = self.revision_tree(parent_id)
500
except errors.NoSuchRevisionInTree:
501
parent_tree = self.branch.repository.revision_tree(parent_id)
502
parent_tree.lock_read()
504
if file_id not in parent_tree:
506
ie = parent_tree.inventory[file_id]
507
if ie.kind != 'file':
508
# Note: this is slightly unnecessary, because symlinks and
509
# directories have a "text" which is the empty text, and we
510
# know that won't mess up annotations. But it seems cleaner
512
parent_text_key = (file_id, ie.revision)
513
if parent_text_key not in maybe_file_parent_keys:
514
maybe_file_parent_keys.append(parent_text_key)
517
graph = _mod_graph.Graph(self.branch.repository.texts)
518
heads = graph.heads(maybe_file_parent_keys)
519
file_parent_keys = []
520
for key in maybe_file_parent_keys:
522
file_parent_keys.append(key)
524
# Now we have the parents of this content
525
annotator = self.branch.repository.texts.get_annotator()
526
text = self.get_file(file_id).read()
527
this_key =(file_id, default_revision)
528
annotator.add_special_text(this_key, file_parent_keys, text)
529
annotations = [(key[-1], line)
530
for key, line in annotator.annotate_flat(this_key)]
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(),
533
500
def _get_ancestors(self, default_revision):
534
501
ancestors = set([default_revision])
562
529
def get_root_id(self):
563
530
"""Return the id of this trees root"""
564
531
return self._inventory.root.file_id
566
533
def _get_store_filename(self, file_id):
567
534
## XXX: badly named; this is not in the store at all
535
file_id = osutils.safe_file_id(file_id)
568
536
return self.abspath(self.id2path(file_id))
571
539
def clone(self, to_bzrdir, revision_id=None):
572
540
"""Duplicate this working tree into to_bzr, including all state.
574
542
Specifically modified files are kept as modified, but
575
543
ignored and unknown files are discarded.
577
545
If you want to make a new line of development, see bzrdir.sprout()
580
If not None, the cloned tree will have its last revision set to
581
revision, and difference between the source trees last revision
548
If not None, the cloned tree will have its last revision set to
549
revision, and and difference between the source trees last revision
582
550
and this one merged in.
584
552
# assumes the target bzr dir format is compatible.
585
result = to_bzrdir.create_workingtree()
553
result = self._format.initialize(to_bzrdir)
586
554
self.copy_content_into(result, revision_id)
617
588
__contains__ = has_id
619
590
def get_file_size(self, file_id):
620
"""See Tree.get_file_size"""
621
# XXX: this returns the on-disk size; it should probably return the
624
return os.path.getsize(self.id2abspath(file_id))
626
if e.errno != errno.ENOENT:
591
file_id = osutils.safe_file_id(file_id)
592
return os.path.getsize(self.id2abspath(file_id))
632
595
def get_file_sha1(self, file_id, path=None, stat_value=None):
596
file_id = osutils.safe_file_id(file_id)
634
598
path = self._inventory.id2path(file_id)
635
599
return self._hashcache.get_sha1(path, stat_value)
637
601
def get_file_mtime(self, file_id, path=None):
602
file_id = osutils.safe_file_id(file_id)
639
604
path = self.inventory.id2path(file_id)
640
605
return os.lstat(self.abspath(path)).st_mtime
642
def _is_executable_from_path_and_stat_from_basis(self, path, stat_result):
643
file_id = self.path2id(path)
645
# For unversioned files on win32, we just assume they are not
648
return self._inventory[file_id].executable
650
def _is_executable_from_path_and_stat_from_stat(self, path, stat_result):
651
mode = stat_result.st_mode
652
return bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode)
654
607
if not supports_executable():
655
608
def is_executable(self, file_id, path=None):
609
file_id = osutils.safe_file_id(file_id)
656
610
return self._inventory[file_id].executable
658
_is_executable_from_path_and_stat = \
659
_is_executable_from_path_and_stat_from_basis
661
612
def is_executable(self, file_id, path=None):
614
file_id = osutils.safe_file_id(file_id)
663
615
path = self.id2path(file_id)
664
616
mode = os.lstat(self.abspath(path)).st_mode
665
617
return bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode)
667
_is_executable_from_path_and_stat = \
668
_is_executable_from_path_and_stat_from_stat
670
619
@needs_tree_write_lock
671
620
def _add(self, files, ids, kinds):
672
621
"""See MutableTree._add."""
673
622
# TODO: Re-adding a file that is removed in the working copy
674
623
# should probably put it back with the previous ID.
675
# the read and write working inventory should not occur in this
624
# the read and write working inventory should not occur in this
676
625
# function - they should be part of lock_write and unlock.
677
626
inv = self.inventory
678
627
for f, file_id, kind in zip(files, ids, kinds):
628
assert kind is not None
679
629
if file_id is None:
680
630
inv.add_path(f, kind=kind)
632
file_id = osutils.safe_file_id(file_id)
682
633
inv.add_path(f, kind=kind, file_id=file_id)
683
634
self._inventory_is_modified = True
747
698
self.set_parent_ids(parents, allow_leftmost_as_ghost=True)
749
def path_content_summary(self, path, _lstat=os.lstat,
750
_mapper=osutils.file_kind_from_stat_mode):
751
"""See Tree.path_content_summary."""
752
abspath = self.abspath(path)
754
stat_result = _lstat(abspath)
756
if getattr(e, 'errno', None) == errno.ENOENT:
758
return ('missing', None, None, None)
759
# propagate other errors
761
kind = _mapper(stat_result.st_mode)
763
return self._file_content_summary(path, stat_result)
764
elif kind == 'directory':
765
# perhaps it looks like a plain directory, but it's really a
767
if self._directory_is_tree_reference(path):
768
kind = 'tree-reference'
769
return kind, None, None, None
770
elif kind == 'symlink':
771
target = osutils.readlink(abspath)
772
return ('symlink', None, None, target)
774
return (kind, None, None, None)
776
def _file_content_summary(self, path, stat_result):
777
size = stat_result.st_size
778
executable = self._is_executable_from_path_and_stat(path, stat_result)
779
# try for a stat cache lookup
780
return ('file', size, executable, self._sha_from_stat(
700
@deprecated_method(zero_eleven)
702
def pending_merges(self):
703
"""Return a list of pending merges.
705
These are revisions that have been merged into the working
706
directory but not yet committed.
708
As of 0.11 this is deprecated. Please see WorkingTree.get_parent_ids()
709
instead - which is available on all tree objects.
711
return self.get_parent_ids()[1:]
783
713
def _check_parents_for_ghosts(self, revision_ids, allow_leftmost_as_ghost):
784
714
"""Common ghost checking functionality from set_parent_*.
795
725
def _set_merges_from_parent_ids(self, parent_ids):
796
726
merges = parent_ids[1:]
797
self._transport.put_bytes('pending-merges', '\n'.join(merges),
798
mode=self.bzrdir._get_file_mode())
800
def _filter_parent_ids_by_ancestry(self, revision_ids):
801
"""Check that all merged revisions are proper 'heads'.
803
This will always return the first revision_id, and any merged revisions
806
if len(revision_ids) == 0:
808
graph = self.branch.repository.get_graph()
809
heads = graph.heads(revision_ids)
810
new_revision_ids = revision_ids[:1]
811
for revision_id in revision_ids[1:]:
812
if revision_id in heads and revision_id not in new_revision_ids:
813
new_revision_ids.append(revision_id)
814
if new_revision_ids != revision_ids:
815
trace.mutter('requested to set revision_ids = %s,'
816
' but filtered to %s', revision_ids, new_revision_ids)
817
return new_revision_ids
727
self._control_files.put_bytes('pending-merges', '\n'.join(merges))
819
729
@needs_tree_write_lock
820
730
def set_parent_ids(self, revision_ids, allow_leftmost_as_ghost=False):
821
731
"""Set the parent ids to revision_ids.
823
733
See also set_parent_trees. This api will try to retrieve the tree data
824
734
for each element of revision_ids from the trees repository. If you have
825
735
tree data already available, it is more efficient to use
887
794
yield Stanza(file_id=file_id.decode('utf8'), hash=hash)
888
795
self._put_rio('merge-hashes', iter_stanzas(), MERGE_MODIFIED_HEADER_1)
890
def _sha_from_stat(self, path, stat_result):
891
"""Get a sha digest from the tree's stat cache.
893
The default implementation assumes no stat cache is present.
895
:param path: The path.
896
:param stat_result: The stat result being looked up.
900
797
def _put_rio(self, filename, stanzas, header):
901
798
self._must_be_locked()
902
799
my_file = rio_file(stanzas, header)
903
self._transport.put_file(filename, my_file,
904
mode=self.bzrdir._get_file_mode())
800
self._control_files.put(filename, my_file)
906
802
@needs_write_lock # because merge pulls data into the branch.
907
803
def merge_from_branch(self, branch, to_revision=None, from_revision=None,
908
merge_type=None, force=False):
909
805
"""Merge from a branch into this working tree.
911
807
:param branch: The branch to merge from.
915
811
branch.last_revision().
917
813
from bzrlib.merge import Merger, Merge3Merger
918
merger = Merger(self.branch, this_tree=self)
919
# check that there are no local alterations
920
if not force and self.has_changes():
921
raise errors.UncommittedChanges(self)
922
if to_revision is None:
923
to_revision = _mod_revision.ensure_null(branch.last_revision())
924
merger.other_rev_id = to_revision
925
if _mod_revision.is_null(merger.other_rev_id):
926
raise errors.NoCommits(branch)
927
self.branch.fetch(branch, last_revision=merger.other_rev_id)
928
merger.other_basis = merger.other_rev_id
929
merger.other_tree = self.branch.repository.revision_tree(
931
merger.other_branch = branch
932
if from_revision is None:
935
merger.set_base_revision(from_revision, branch)
936
if merger.base_rev_id == merger.other_rev_id:
937
raise errors.PointlessMerge
938
merger.backup_files = False
939
if merge_type is None:
940
merger.merge_type = Merge3Merger
942
merger.merge_type = merge_type
943
merger.set_interesting_files(None)
944
merger.show_base = False
945
merger.reprocess = False
946
conflicts = merger.do_merge()
814
pb = bzrlib.ui.ui_factory.nested_progress_bar()
816
merger = Merger(self.branch, this_tree=self, pb=pb)
817
merger.pp = ProgressPhase("Merge phase", 5, pb)
818
merger.pp.next_phase()
819
# check that there are no
821
merger.check_basis(check_clean=True, require_commits=False)
822
if to_revision is None:
823
to_revision = _mod_revision.ensure_null(branch.last_revision())
825
to_revision = osutils.safe_revision_id(to_revision)
826
merger.other_rev_id = to_revision
827
if _mod_revision.is_null(merger.other_rev_id):
828
raise errors.NoCommits(branch)
829
self.branch.fetch(branch, last_revision=merger.other_rev_id)
830
merger.other_basis = merger.other_rev_id
831
merger.other_tree = self.branch.repository.revision_tree(
833
merger.other_branch = branch
834
merger.pp.next_phase()
835
if from_revision is None:
838
merger.set_base_revision(from_revision, branch)
839
if merger.base_rev_id == merger.other_rev_id:
840
raise errors.PointlessMerge
841
merger.backup_files = False
842
if merge_type is None:
843
merger.merge_type = Merge3Merger
845
merger.merge_type = merge_type
846
merger.set_interesting_files(None)
847
merger.show_base = False
848
merger.reprocess = False
849
conflicts = merger.do_merge()
951
856
def merge_modified(self):
952
857
"""Return a dictionary of files modified by a merge.
954
The list is initialized by WorkingTree.set_merge_modified, which is
859
The list is initialized by WorkingTree.set_merge_modified, which is
955
860
typically called after we make some automatic updates to the tree
956
861
because of a merge.
959
864
still in the working inventory and have that text hash.
962
hashfile = self._transport.get('merge-hashes')
867
hashfile = self._control_files.get('merge-hashes')
963
868
except errors.NoSuchFile:
968
if hashfile.next() != MERGE_MODIFIED_HEADER_1 + '\n':
969
raise errors.MergeModifiedFormatError()
970
except StopIteration:
872
if hashfile.next() != MERGE_MODIFIED_HEADER_1 + '\n':
971
873
raise errors.MergeModifiedFormatError()
972
for s in RioReader(hashfile):
973
# RioReader reads in Unicode, so convert file_ids back to utf8
974
file_id = osutils.safe_file_id(s.get("file_id"), warn=False)
975
if file_id not in self.inventory:
977
text_hash = s.get("hash")
978
if text_hash == self.get_file_sha1(file_id):
979
merge_hashes[file_id] = text_hash
874
except StopIteration:
875
raise errors.MergeModifiedFormatError()
876
for s in RioReader(hashfile):
877
# RioReader reads in Unicode, so convert file_ids back to utf8
878
file_id = osutils.safe_file_id(s.get("file_id"), warn=False)
879
if file_id not in self.inventory:
881
text_hash = s.get("hash")
882
if text_hash == self.get_file_sha1(file_id):
883
merge_hashes[file_id] = text_hash
984
886
@needs_write_lock
985
887
def mkdir(self, path, file_id=None):
1037
938
other_tree.unlock()
1038
939
other_tree.bzrdir.retire_bzrdir()
1040
def _setup_directory_is_tree_reference(self):
1041
if self._branch.repository._format.supports_tree_reference:
1042
self._directory_is_tree_reference = \
1043
self._directory_may_be_tree_reference
1045
self._directory_is_tree_reference = \
1046
self._directory_is_never_tree_reference
1048
def _directory_is_never_tree_reference(self, relpath):
1051
def _directory_may_be_tree_reference(self, relpath):
1052
# as a special case, if a directory contains control files then
1053
# it's a tree reference, except that the root of the tree is not
1054
return relpath and osutils.isdir(self.abspath(relpath) + u"/.bzr")
1055
# TODO: We could ask all the control formats whether they
1056
# recognize this directory, but at the moment there's no cheap api
1057
# to do that. Since we probably can only nest bzr checkouts and
1058
# they always use this name it's ok for now. -- mbp 20060306
1060
# FIXME: There is an unhandled case here of a subdirectory
1061
# containing .bzr but not a branch; that will probably blow up
1062
# when you try to commit it. It might happen if there is a
1063
# checkout in a subdirectory. This can be avoided by not adding
1066
941
@needs_tree_write_lock
1067
942
def extract(self, file_id, format=None):
1068
943
"""Extract a subtree from this tree.
1070
945
A new branch will be created, relative to the path for this tree.
1077
952
transport = transport.clone(name)
1078
953
transport.ensure_base()
1079
954
return transport
1081
956
sub_path = self.id2path(file_id)
1082
957
branch_transport = mkdirs(sub_path)
1083
958
if format is None:
1084
format = self.bzrdir.cloning_metadir()
959
format = bzrdir.format_registry.make_bzrdir('dirstate-with-subtree')
1085
960
branch_transport.ensure_base()
1086
961
branch_bzrdir = format.initialize_on_transport(branch_transport)
1088
963
repo = branch_bzrdir.find_repository()
1089
964
except errors.NoRepositoryPresent:
1090
965
repo = branch_bzrdir.create_repository()
1091
if not repo.supports_rich_root():
1092
raise errors.RootNotRich()
966
assert repo.supports_rich_root()
968
if not repo.supports_rich_root():
969
raise errors.RootNotRich()
1093
970
new_branch = branch_bzrdir.create_branch()
1094
971
new_branch.pull(self.branch)
1095
972
for parent_id in self.get_parent_ids():
1097
974
tree_transport = self.bzrdir.root_transport.clone(sub_path)
1098
975
if tree_transport.base != branch_transport.base:
1099
976
tree_bzrdir = format.initialize_on_transport(tree_transport)
1100
branch.BranchReferenceFormat().initialize(tree_bzrdir,
1101
target_branch=new_branch)
977
branch.BranchReferenceFormat().initialize(tree_bzrdir, new_branch)
1103
979
tree_bzrdir = branch_bzrdir
1104
wt = tree_bzrdir.create_workingtree(_mod_revision.NULL_REVISION)
980
wt = tree_bzrdir.create_workingtree(NULL_REVISION)
1105
981
wt.set_parent_ids(self.get_parent_ids())
1106
982
my_inv = self.inventory
1107
child_inv = inventory.Inventory(root_id=None)
983
child_inv = Inventory(root_id=None)
1108
984
new_root = my_inv[file_id]
1109
985
my_inv.remove_recursive_id(file_id)
1110
986
new_root.parent_id = None
1128
1003
sio = StringIO()
1129
1004
self._serialize(self._inventory, sio)
1131
self._transport.put_file('inventory', sio,
1132
mode=self.bzrdir._get_file_mode())
1006
self._control_files.put('inventory', sio)
1133
1007
self._inventory_is_modified = False
1135
1009
def _kind(self, relpath):
1136
1010
return osutils.file_kind(self.abspath(relpath))
1138
def list_files(self, include_root=False, from_dir=None, recursive=True):
1139
"""List all files as (path, class, kind, id, entry).
1012
def list_files(self, include_root=False):
1013
"""Recursively list all files as (path, class, kind, id, entry).
1141
1015
Lists, but does not descend into unversioned directories.
1142
1017
This does not include files that have been deleted in this
1143
tree. Skips the control directory.
1145
:param include_root: if True, return an entry for the root
1146
:param from_dir: start from this directory or None for the root
1147
:param recursive: whether to recurse into subdirectories or not
1020
Skips the control directory.
1149
1022
# list_files is an iterator, so @needs_read_lock doesn't work properly
1150
1023
# with it. So callers should be careful to always read_lock the tree.
1165
1038
fk_entries = {'directory':TreeDirectory, 'file':TreeFile, 'symlink':TreeLink}
1167
1040
# directory file_id, relative path, absolute path, reverse sorted children
1168
if from_dir is not None:
1169
from_dir_id = inv.path2id(from_dir)
1170
if from_dir_id is None:
1171
# Directory not versioned
1173
from_dir_abspath = pathjoin(self.basedir, from_dir)
1175
from_dir_id = inv.root.file_id
1176
from_dir_abspath = self.basedir
1177
children = os.listdir(from_dir_abspath)
1041
children = os.listdir(self.basedir)
1178
1042
children.sort()
1179
# jam 20060527 The kernel sized tree seems equivalent whether we
1043
# jam 20060527 The kernel sized tree seems equivalent whether we
1180
1044
# use a deque and popleft to keep them sorted, or if we use a plain
1181
1045
# list and just reverse() them.
1182
1046
children = collections.deque(children)
1183
stack = [(from_dir_id, u'', from_dir_abspath, children)]
1047
stack = [(inv.root.file_id, u'', self.basedir, children)]
1185
1049
from_dir_id, from_dir_relpath, from_dir_abspath, children = stack[-1]
1240
1104
except KeyError:
1241
1105
yield fp[1:], c, fk, None, TreeEntry()
1244
1108
if fk != 'directory':
1247
# But do this child first if recursing down
1249
new_children = os.listdir(fap)
1251
new_children = collections.deque(new_children)
1252
stack.append((f_ie.file_id, fp, fap, new_children))
1253
# Break out of inner loop,
1254
# so that we start outer loop with child
1111
# But do this child first
1112
new_children = os.listdir(fap)
1114
new_children = collections.deque(new_children)
1115
stack.append((f_ie.file_id, fp, fap, new_children))
1116
# Break out of inner loop,
1117
# so that we start outer loop with child
1257
1120
# if we finished all children, pop it off the stack
1494
1352
from_tail = splitpath(from_rel)[-1]
1495
1353
from_id = inv.path2id(from_rel)
1496
1354
if from_id is None:
1497
# if file is missing in the inventory maybe it's in the basis_tree
1498
basis_tree = self.branch.basis_tree()
1499
from_id = basis_tree.path2id(from_rel)
1501
raise errors.BzrRenameFailedError(from_rel,to_rel,
1502
errors.NotVersionedError(path=str(from_rel)))
1503
# put entry back in the inventory so we can rename it
1504
from_entry = basis_tree.inventory[from_id].copy()
1507
from_entry = inv[from_id]
1355
raise errors.BzrRenameFailedError(from_rel,to_rel,
1356
errors.NotVersionedError(path=str(from_rel)))
1357
from_entry = inv[from_id]
1508
1358
from_parent_id = from_entry.parent_id
1509
1359
to_dir, to_tail = os.path.split(to_rel)
1510
1360
to_dir_id = inv.path2id(to_dir)
1572
1422
:raises: NoSuchId if any fileid is not currently versioned.
1574
1424
for file_id in file_ids:
1575
if file_id not in self._inventory:
1576
raise errors.NoSuchId(self, file_id)
1577
for file_id in file_ids:
1425
file_id = osutils.safe_file_id(file_id)
1578
1426
if self._inventory.has_id(file_id):
1579
1427
self._inventory.remove_recursive_id(file_id)
1429
raise errors.NoSuchId(self, file_id)
1580
1430
if len(file_ids):
1581
# in the future this should just set a dirty bit to wait for the
1431
# in the future this should just set a dirty bit to wait for the
1582
1432
# final unlock. However, until all methods of workingtree start
1583
# with the current in -memory inventory rather than triggering
1433
# with the current in -memory inventory rather than triggering
1584
1434
# a read, it is more complex - we need to teach read_inventory
1585
1435
# to know when to read, and when to not read first... and possibly
1586
1436
# to save first when the in memory one may be corrupted.
1587
1437
# so for now, we just only write it if it is indeed dirty.
1588
1438
# - RBC 20060907
1589
1439
self._write_inventory(self._inventory)
1441
@deprecated_method(zero_eight)
1442
def iter_conflicts(self):
1443
"""List all files in the tree that have text or content conflicts.
1444
DEPRECATED. Use conflicts instead."""
1445
return self._iter_conflicts()
1591
1447
def _iter_conflicts(self):
1592
1448
conflicted = set()
1602
1458
@needs_write_lock
1603
1459
def pull(self, source, overwrite=False, stop_revision=None,
1604
change_reporter=None, possible_transports=None, local=False):
1460
change_reporter=None):
1461
top_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1605
1462
source.lock_read()
1464
pp = ProgressPhase("Pull phase", 2, top_pb)
1607
1466
old_revision_info = self.branch.last_revision_info()
1608
1467
basis_tree = self.basis_tree()
1609
count = self.branch.pull(source, overwrite, stop_revision,
1610
possible_transports=possible_transports,
1468
count = self.branch.pull(source, overwrite, stop_revision)
1612
1469
new_revision_info = self.branch.last_revision_info()
1613
1470
if new_revision_info != old_revision_info:
1614
1472
repository = self.branch.repository
1473
pb = bzrlib.ui.ui_factory.nested_progress_bar()
1615
1474
basis_tree.lock_read()
1617
1476
new_basis_tree = self.branch.basis_tree()
1620
1479
new_basis_tree,
1622
1481
this_tree=self,
1624
1483
change_reporter=change_reporter)
1625
basis_root_id = basis_tree.get_root_id()
1626
new_root_id = new_basis_tree.get_root_id()
1627
if basis_root_id != new_root_id:
1628
self.set_root_id(new_root_id)
1484
if (basis_tree.inventory.root is None and
1485
new_basis_tree.inventory.root is not None):
1486
self.set_root_id(new_basis_tree.inventory.root.file_id)
1630
1489
basis_tree.unlock()
1631
1490
# TODO - dedup parents list with things merged by pull ?
1632
1491
# reuse the revisiontree we merged against to set the new
1634
1493
parent_trees = [(self.branch.last_revision(), new_basis_tree)]
1635
# we have to pull the merge trees out again, because
1636
# merge_inner has set the ids. - this corner is not yet
1494
# we have to pull the merge trees out again, because
1495
# merge_inner has set the ids. - this corner is not yet
1637
1496
# layered well enough to prevent double handling.
1638
1497
# XXX TODO: Fix the double handling: telling the tree about
1639
1498
# the already known parent data is wasteful.
1735
1589
r"""Check whether the filename matches an ignore pattern.
1737
1591
Patterns containing '/' or '\' need to match the whole path;
1738
others match against only the last component. Patterns starting
1739
with '!' are ignore exceptions. Exceptions take precedence
1740
over regular patterns and cause the filename to not be ignored.
1592
others match against only the last component.
1742
1594
If the file is ignored, returns the pattern which caused it to
1743
1595
be ignored, otherwise None. So this can simply be used as a
1744
1596
boolean if desired."""
1745
1597
if getattr(self, '_ignoreglobster', None) is None:
1746
self._ignoreglobster = globbing.ExceptionGlobster(self.get_ignore_list())
1598
self._ignoreglobster = globbing.Globster(self.get_ignore_list())
1747
1599
return self._ignoreglobster.match(filename)
1749
1601
def kind(self, file_id):
1750
1602
return file_kind(self.id2abspath(file_id))
1752
def stored_kind(self, file_id):
1753
"""See Tree.stored_kind"""
1754
return self.inventory[file_id].kind
1756
1604
def _comparison_data(self, entry, path):
1757
1605
abspath = self.abspath(path)
1799
1647
raise errors.ObjectNotLocked(self)
1801
1649
def lock_read(self):
1802
"""Lock the tree for reading.
1804
This also locks the branch, and can be unlocked via self.unlock().
1806
:return: A bzrlib.lock.LogicalLockResult.
1650
"""See Branch.lock_read, and WorkingTree.unlock."""
1808
1651
if not self.is_locked():
1809
1652
self._reset_data()
1810
1653
self.branch.lock_read()
1812
self._control_files.lock_read()
1813
return LogicalLockResult(self.unlock)
1655
return self._control_files.lock_read()
1815
1657
self.branch.unlock()
1818
1660
def lock_tree_write(self):
1819
"""See MutableTree.lock_tree_write, and WorkingTree.unlock.
1821
:return: A bzrlib.lock.LogicalLockResult.
1661
"""See MutableTree.lock_tree_write, and WorkingTree.unlock."""
1823
1662
if not self.is_locked():
1824
1663
self._reset_data()
1825
1664
self.branch.lock_read()
1827
self._control_files.lock_write()
1828
return LogicalLockResult(self.unlock)
1666
return self._control_files.lock_write()
1830
1668
self.branch.unlock()
1833
1671
def lock_write(self):
1834
"""See MutableTree.lock_write, and WorkingTree.unlock.
1836
:return: A bzrlib.lock.LogicalLockResult.
1672
"""See MutableTree.lock_write, and WorkingTree.unlock."""
1838
1673
if not self.is_locked():
1839
1674
self._reset_data()
1840
1675
self.branch.lock_write()
1842
self._control_files.lock_write()
1843
return LogicalLockResult(self.unlock)
1677
return self._control_files.lock_write()
1845
1679
self.branch.unlock()
1854
1688
def _reset_data(self):
1855
1689
"""Reset transient data that cannot be revalidated."""
1856
1690
self._inventory_is_modified = False
1857
f = self._transport.get('inventory')
1859
result = self._deserialize(f)
1691
result = self._deserialize(self._control_files.get('inventory'))
1862
1692
self._set_inventory(result, dirty=False)
1864
1694
@needs_tree_write_lock
1865
1695
def set_last_revision(self, new_revision):
1866
1696
"""Change the last revision in the working tree."""
1697
new_revision = osutils.safe_revision_id(new_revision)
1867
1698
if self._change_last_revision(new_revision):
1868
1699
self._cache_basis_inventory(new_revision)
1870
1701
def _change_last_revision(self, new_revision):
1871
1702
"""Template method part of set_last_revision to perform the change.
1873
1704
This is used to allow WorkingTree3 instances to not affect branch
1874
1705
when their last revision is set.
1886
1717
def _write_basis_inventory(self, xml):
1887
1718
"""Write the basis inventory XML to the basis-inventory file"""
1719
assert isinstance(xml, str), 'serialised xml must be bytestring.'
1888
1720
path = self._basis_inventory_name()
1889
1721
sio = StringIO(xml)
1890
self._transport.put_file(path, sio,
1891
mode=self.bzrdir._get_file_mode())
1722
self._control_files.put(path, sio)
1893
1724
def _create_basis_xml_from_inventory(self, revision_id, inventory):
1894
1725
"""Create the text that will be saved in basis-inventory"""
1895
inventory.revision_id = revision_id
1726
# TODO: jam 20070209 This should be redundant, as the revision_id
1727
# as all callers should have already converted the revision_id to
1729
inventory.revision_id = osutils.safe_revision_id(revision_id)
1896
1730
return xml7.serializer_v7.write_inventory_to_string(inventory)
1898
1732
def _cache_basis_inventory(self, new_revision):
1901
1735
# as commit already has that ready-to-use [while the format is the
1902
1736
# same, that is].
1904
# this double handles the inventory - unpack and repack -
1738
# this double handles the inventory - unpack and repack -
1905
1739
# but is easier to understand. We can/should put a conditional
1906
1740
# in here based on whether the inventory is in the latest format
1907
1741
# - perhaps we should repack all inventories on a repository
1909
1743
# the fast path is to copy the raw xml from the repository. If the
1910
# xml contains 'revision_id="', then we assume the right
1744
# xml contains 'revision_id="', then we assume the right
1911
1745
# revision_id is set. We must check for this full string, because a
1912
1746
# root node id can legitimately look like 'revision_id' but cannot
1913
1747
# contain a '"'.
1914
xml = self.branch.repository._get_inventory_xml(new_revision)
1748
xml = self.branch.repository.get_inventory_xml(new_revision)
1915
1749
firstline = xml.split('\n', 1)[0]
1916
if (not 'revision_id="' in firstline or
1750
if (not 'revision_id="' in firstline or
1917
1751
'format="7"' not in firstline):
1918
inv = self.branch.repository._serializer.read_inventory_from_string(
1752
inv = self.branch.repository.deserialise_inventory(
1920
1754
xml = self._create_basis_xml_from_inventory(new_revision, inv)
1921
1755
self._write_basis_inventory(xml)
1922
1756
except (errors.NoSuchRevision, errors.RevisionNotPresent):
1925
1759
def read_basis_inventory(self):
1926
1760
"""Read the cached basis inventory."""
1927
1761
path = self._basis_inventory_name()
1928
return self._transport.get_bytes(path)
1762
return self._control_files.get(path).read()
1930
1764
@needs_read_lock
1931
1765
def read_working_inventory(self):
1932
1766
"""Read the working inventory.
1934
1768
:raises errors.InventoryModified: read_working_inventory will fail
1935
1769
when the current in memory inventory has been modified.
1937
# conceptually this should be an implementation detail of the tree.
1771
# conceptually this should be an implementation detail of the tree.
1938
1772
# XXX: Deprecate this.
1939
1773
# ElementTree does its own conversion from UTF-8, so open in
1941
1775
if self._inventory_is_modified:
1942
1776
raise errors.InventoryModified(self)
1943
f = self._transport.get('inventory')
1945
result = self._deserialize(f)
1777
result = self._deserialize(self._control_files.get('inventory'))
1948
1778
self._set_inventory(result, dirty=False)
1958
1788
:force: Delete files and directories, even if they are changed and
1959
1789
even if the directories are not empty.
1791
## TODO: Normalize names
1961
1793
if isinstance(files, basestring):
1962
1794
files = [files]
1966
1798
new_files=set()
1967
unknown_nested_files=set()
1969
to_file = sys.stdout
1799
unknown_files_in_directory=set()
1971
1801
def recurse_directory_to_add_files(directory):
1972
# Recurse directory and add all files
1802
# recurse directory and add all files
1973
1803
# so we can check if they have changed.
1974
for parent_info, file_infos in self.walkdirs(directory):
1975
for relpath, basename, kind, lstat, fileid, kind in file_infos:
1976
# Is it versioned or ignored?
1977
if self.path2id(relpath) or self.is_ignored(relpath):
1978
# Add nested content for deletion.
1979
new_files.add(relpath)
1981
# Files which are not versioned and not ignored
1982
# should be treated as unknown.
1983
unknown_nested_files.add((relpath, None, kind))
1804
for parent_info, file_infos in\
1805
osutils.walkdirs(self.abspath(directory),
1807
for relpath, basename, kind, lstat, abspath in file_infos:
1809
if self.path2id(relpath): #is it versioned?
1810
new_files.add(relpath)
1812
unknown_files_in_directory.add(
1813
(relpath, None, kind))
1985
1815
for filename in files:
1986
1816
# Get file name into canonical form.
1988
1818
filename = self.relpath(abspath)
1989
1819
if len(filename) > 0:
1990
1820
new_files.add(filename)
1991
recurse_directory_to_add_files(filename)
1993
files = list(new_files)
1821
if osutils.isdir(abspath):
1822
recurse_directory_to_add_files(filename)
1823
files = [f for f in new_files]
1995
1825
if len(files) == 0:
1996
1826
return # nothing to do
1998
1828
# Sort needed to first handle directory content before the directory
1999
1829
files.sort(reverse=True)
2001
# Bail out if we are going to delete files we shouldn't
2002
1830
if not keep_files and not force:
2003
has_changed_files = len(unknown_nested_files) > 0
1831
has_changed_files = len(unknown_files_in_directory) > 0
2004
1832
if not has_changed_files:
2005
1833
for (file_id, path, content_change, versioned, parent_id, name,
2006
kind, executable) in self.iter_changes(self.basis_tree(),
1834
kind, executable) in self._iter_changes(self.basis_tree(),
2007
1835
include_unchanged=True, require_versioned=False,
2008
1836
want_unversioned=True, specific_files=files):
2009
if versioned == (False, False):
2010
# The record is unknown ...
2011
if not self.is_ignored(path[1]):
2012
# ... but not ignored
2013
has_changed_files = True
2015
elif (content_change and (kind[1] is not None) and
2016
osutils.is_inside_any(files, path[1])):
2017
# Versioned and changed, but not deleted, and still
2018
# in one of the dirs to be deleted.
1837
# check if it's unknown OR changed but not deleted:
1838
if (versioned == (False, False)
1839
or (content_change and kind[1] != None)):
2019
1840
has_changed_files = True
2022
1843
if has_changed_files:
2023
# Make delta show ALL applicable changes in error message.
1844
# make delta to show ALL applicable changes in error message.
2024
1845
tree_delta = self.changes_from(self.basis_tree(),
2025
require_versioned=False, want_unversioned=True,
2026
1846
specific_files=files)
2027
for unknown_file in unknown_nested_files:
2028
if unknown_file not in tree_delta.unversioned:
2029
tree_delta.unversioned.extend((unknown_file,))
1847
for unknown_file in unknown_files_in_directory:
1848
tree_delta.unversioned.extend((unknown_file,))
2030
1849
raise errors.BzrRemoveChangedFilesError(tree_delta)
2032
# Build inv_delta and delete files where applicable,
2033
# do this before any modifications to inventory.
1851
# do this before any modifications
2034
1852
for f in files:
2035
1853
fid = self.path2id(f)
2038
message = "%s is not versioned." % (f,)
1856
message="%s is not versioned." % (f,)
2041
1859
# having removed it, it must be either ignored or unknown
2043
1861
new_status = 'I'
2045
1863
new_status = '?'
2046
# XXX: Really should be a more abstract reporter interface
2047
kind_ch = osutils.kind_marker(self.kind(fid))
2048
to_file.write(new_status + ' ' + f + kind_ch + '\n')
1864
textui.show_status(new_status, self.kind(fid), f,
2050
1867
inv_delta.append((f, None, fid, None))
2051
message = "removed %s" % (f,)
1868
message="removed %s" % (f,)
2053
1870
if not keep_files:
2054
1871
abs_path = self.abspath(f)
2055
1872
if osutils.lexists(abs_path):
2056
1873
if (osutils.isdir(abs_path) and
2057
1874
len(os.listdir(abs_path)) > 0):
2059
osutils.rmtree(abs_path)
2061
message = "%s is not an empty directory "\
2062
"and won't be deleted." % (f,)
1875
message="%s is not empty directory "\
1876
"and won't be deleted." % (f,)
2064
1878
osutils.delete_any(abs_path)
2065
message = "deleted %s" % (f,)
1879
message="deleted %s" % (f,)
2066
1880
elif message is not None:
2067
# Only care if we haven't done anything yet.
2068
message = "%s does not exist." % (f,)
1881
# only care if we haven't done anything yet.
1882
message="%s does not exist." % (f,)
2070
# Print only one message (if any) per file.
1884
# print only one message (if any) per file.
2071
1885
if message is not None:
2073
1887
self.apply_inventory_delta(inv_delta)
2075
1889
@needs_tree_write_lock
2076
def revert(self, filenames=None, old_tree=None, backups=True,
2077
pb=None, report_changes=False):
1890
def revert(self, filenames, old_tree=None, backups=True,
1891
pb=DummyProgress(), report_changes=False):
2078
1892
from bzrlib.conflicts import resolve
2081
symbol_versioning.warn('Using [] to revert all files is deprecated'
2082
' as of bzr 0.91. Please use None (the default) instead.',
2083
DeprecationWarning, stacklevel=2)
2084
1893
if old_tree is None:
2085
basis_tree = self.basis_tree()
2086
basis_tree.lock_read()
2087
old_tree = basis_tree
1894
old_tree = self.basis_tree()
1895
conflicts = transform.revert(self, old_tree, filenames, backups, pb,
1897
if not len(filenames):
1898
self.set_parent_ids(self.get_parent_ids()[:1])
2091
conflicts = transform.revert(self, old_tree, filenames, backups, pb,
2093
if filenames is None and len(self.get_parent_ids()) > 1:
2095
last_revision = self.last_revision()
2096
if last_revision != _mod_revision.NULL_REVISION:
2097
if basis_tree is None:
2098
basis_tree = self.basis_tree()
2099
basis_tree.lock_read()
2100
parent_trees.append((last_revision, basis_tree))
2101
self.set_parent_trees(parent_trees)
2104
resolve(self, filenames, ignore_misses=True, recursive=True)
2106
if basis_tree is not None:
1901
resolve(self, filenames, ignore_misses=True)
2108
1902
return conflicts
2110
1904
def revision_tree(self, revision_id):
2158
1953
@needs_tree_write_lock
2159
1954
def set_root_id(self, file_id):
2160
1955
"""Set the root id for this tree."""
2162
1957
if file_id is None:
2164
'WorkingTree.set_root_id with fileid=None')
2165
file_id = osutils.safe_file_id(file_id)
1958
symbol_versioning.warn(symbol_versioning.zero_twelve
1959
% 'WorkingTree.set_root_id with fileid=None',
1964
file_id = osutils.safe_file_id(file_id)
2166
1965
self._set_root_id(file_id)
2168
1967
def _set_root_id(self, file_id):
2169
1968
"""Set the root id for this tree, in a format specific manner.
2171
:param file_id: The file id to assign to the root. It must not be
1970
:param file_id: The file id to assign to the root. It must not be
2172
1971
present in the current inventory or an error will occur. It must
2173
1972
not be None, but rather a valid file id.
2194
1993
def unlock(self):
2195
1994
"""See Branch.unlock.
2197
1996
WorkingTree locking just uses the Branch locking facilities.
2198
1997
This is current because all working trees have an embedded branch
2199
1998
within them. IF in the future, we were to make branch data shareable
2200
between multiple working trees, i.e. via shared storage, then we
1999
between multiple working trees, i.e. via shared storage, then we
2201
2000
would probably want to lock both the local tree, and the branch.
2203
2002
raise NotImplementedError(self.unlock)
2207
def update(self, change_reporter=None, possible_transports=None,
2208
revision=None, old_tip=_marker):
2004
def update(self, change_reporter=None):
2209
2005
"""Update a working tree along its branch.
2211
2007
This will update the branch if its bound too, which means we have
2229
2025
- Merge current state -> basis tree of the master w.r.t. the old tree
2231
2027
- Do a 'normal' merge of the old branch basis if it is relevant.
2233
:param revision: The target revision to update to. Must be in the
2235
:param old_tip: If branch.update() has already been run, the value it
2236
returned (old tip of the branch or None). _marker is used
2239
if self.branch.get_bound_location() is not None:
2029
if self.branch.get_master_branch() is not None:
2240
2030
self.lock_write()
2241
update_branch = (old_tip is self._marker)
2031
update_branch = True
2243
2033
self.lock_tree_write()
2244
2034
update_branch = False
2246
2036
if update_branch:
2247
old_tip = self.branch.update(possible_transports)
2037
old_tip = self.branch.update()
2249
if old_tip is self._marker:
2251
return self._update_tree(old_tip, change_reporter, revision)
2040
return self._update_tree(old_tip, change_reporter)
2255
2044
@needs_tree_write_lock
2256
def _update_tree(self, old_tip=None, change_reporter=None, revision=None):
2045
def _update_tree(self, old_tip=None, change_reporter=None):
2257
2046
"""Update a tree to the master branch.
2259
2048
:param old_tip: if supplied, the previous tip revision the branch,
2265
2054
# cant set that until we update the working trees last revision to be
2266
2055
# one from the new branch, because it will just get absorbed by the
2267
2056
# parent de-duplication logic.
2269
2058
# We MUST save it even if an error occurs, because otherwise the users
2270
2059
# local work is unreferenced and will appear to have been lost.
2274
2063
last_rev = self.get_parent_ids()[0]
2275
2064
except IndexError:
2276
2065
last_rev = _mod_revision.NULL_REVISION
2277
if revision is None:
2278
revision = self.branch.last_revision()
2280
old_tip = old_tip or _mod_revision.NULL_REVISION
2282
if not _mod_revision.is_null(old_tip) and old_tip != last_rev:
2283
# the branch we are bound to was updated
2284
# merge those changes in first
2285
base_tree = self.basis_tree()
2286
other_tree = self.branch.repository.revision_tree(old_tip)
2287
nb_conflicts = merge.merge_inner(self.branch, other_tree,
2288
base_tree, this_tree=self,
2289
change_reporter=change_reporter)
2291
self.add_parent_tree((old_tip, other_tree))
2292
trace.note('Rerun update after fixing the conflicts.')
2295
if last_rev != _mod_revision.ensure_null(revision):
2296
# the working tree is up to date with the branch
2297
# we can merge the specified revision from master
2298
to_tree = self.branch.repository.revision_tree(revision)
2299
to_root_id = to_tree.get_root_id()
2066
if last_rev != _mod_revision.ensure_null(self.branch.last_revision()):
2067
# merge tree state up to new branch tip.
2301
2068
basis = self.basis_tree()
2302
2069
basis.lock_read()
2304
if (basis.inventory.root is None
2305
or basis.inventory.root.file_id != to_root_id):
2306
self.set_root_id(to_root_id)
2071
to_tree = self.branch.basis_tree()
2072
if basis.inventory.root is None:
2073
self.set_root_id(to_tree.inventory.root.file_id)
2075
result += merge.merge_inner(
2080
change_reporter=change_reporter)
2311
# determine the branch point
2312
graph = self.branch.repository.get_graph()
2313
base_rev_id = graph.find_unique_lca(self.branch.last_revision(),
2315
base_tree = self.branch.repository.revision_tree(base_rev_id)
2317
nb_conflicts = merge.merge_inner(self.branch, to_tree, base_tree,
2319
change_reporter=change_reporter)
2320
self.set_last_revision(revision)
2321
2083
# TODO - dedup parents list with things merged by pull ?
2322
2084
# reuse the tree we've updated to to set the basis:
2323
parent_trees = [(revision, to_tree)]
2085
parent_trees = [(self.branch.last_revision(), to_tree)]
2324
2086
merges = self.get_parent_ids()[1:]
2325
2087
# Ideally we ask the tree for the trees here, that way the working
2326
# tree can decide whether to give us the entire tree or give us a
2088
# tree can decide whether to give us teh entire tree or give us a
2327
2089
# lazy initialised tree. dirstate for instance will have the trees
2328
2090
# in ram already, whereas a last-revision + basis-inventory tree
2329
2091
# will not, but also does not need them when setting parents.
2330
2092
for parent in merges:
2331
2093
parent_trees.append(
2332
2094
(parent, self.branch.repository.revision_tree(parent)))
2333
if not _mod_revision.is_null(old_tip):
2095
if (old_tip is not None and not _mod_revision.is_null(old_tip)):
2334
2096
parent_trees.append(
2335
2097
(old_tip, self.branch.repository.revision_tree(old_tip)))
2336
2098
self.set_parent_trees(parent_trees)
2337
2099
last_rev = parent_trees[0][0]
2101
# the working tree had the same last-revision as the master
2102
# branch did. We may still have pivot local work from the local
2103
# branch into old_tip:
2104
if (old_tip is not None and not _mod_revision.is_null(old_tip)):
2105
self.add_parent_tree_id(old_tip)
2106
if (old_tip is not None and not _mod_revision.is_null(old_tip)
2107
and old_tip != last_rev):
2108
# our last revision was not the prior branch last revision
2109
# and we have converted that last revision to a pending merge.
2110
# base is somewhere between the branch tip now
2111
# and the now pending merge
2113
# Since we just modified the working tree and inventory, flush out
2114
# the current state, before we modify it again.
2115
# TODO: jam 20070214 WorkingTree3 doesn't require this, dirstate
2116
# requires it only because TreeTransform directly munges the
2117
# inventory and calls tree._write_inventory(). Ultimately we
2118
# should be able to remove this extra flush.
2120
graph = self.branch.repository.get_graph()
2121
base_rev_id = graph.find_unique_lca(self.branch.last_revision(),
2123
base_tree = self.branch.repository.revision_tree(base_rev_id)
2124
other_tree = self.branch.repository.revision_tree(old_tip)
2125
result += merge.merge_inner(
2130
change_reporter=change_reporter)
2340
2133
def _write_hashcache_if_dirty(self):
2341
2134
"""Write out the hashcache if it is dirty."""
2425
2218
current_inv = None
2426
2219
inv_finished = True
2427
2220
while not inv_finished or not disk_finished:
2429
((cur_disk_dir_relpath, cur_disk_dir_path_from_top),
2430
cur_disk_dir_content) = current_disk
2432
((cur_disk_dir_relpath, cur_disk_dir_path_from_top),
2433
cur_disk_dir_content) = ((None, None), None)
2434
2221
if not disk_finished:
2435
2222
# strip out .bzr dirs
2436
if (cur_disk_dir_path_from_top[top_strip_len:] == '' and
2437
len(cur_disk_dir_content) > 0):
2438
# osutils.walkdirs can be made nicer -
2223
if current_disk[0][1][top_strip_len:] == '':
2224
# osutils.walkdirs can be made nicer -
2439
2225
# yield the path-from-prefix rather than the pathjoined
2441
bzrdir_loc = bisect_left(cur_disk_dir_content,
2443
if (bzrdir_loc < len(cur_disk_dir_content)
2444
and self.bzrdir.is_control_filename(
2445
cur_disk_dir_content[bzrdir_loc][0])):
2227
bzrdir_loc = bisect_left(current_disk[1], ('.bzr', '.bzr'))
2228
if current_disk[1][bzrdir_loc][0] == '.bzr':
2446
2229
# we dont yield the contents of, or, .bzr itself.
2447
del cur_disk_dir_content[bzrdir_loc]
2230
del current_disk[1][bzrdir_loc]
2448
2231
if inv_finished:
2449
2232
# everything is unknown
2452
2235
# everything is missing
2455
direction = cmp(current_inv[0][0], cur_disk_dir_relpath)
2238
direction = cmp(current_inv[0][0], current_disk[0][0])
2456
2239
if direction > 0:
2457
2240
# disk is before inventory - unknown
2458
2241
dirblock = [(relpath, basename, kind, stat, None, None) for
2459
relpath, basename, kind, stat, top_path in
2460
cur_disk_dir_content]
2461
yield (cur_disk_dir_relpath, None), dirblock
2242
relpath, basename, kind, stat, top_path in current_disk[1]]
2243
yield (current_disk[0][0], None), dirblock
2463
2245
current_disk = disk_iterator.next()
2464
2246
except StopIteration:
2539
2320
# FIXME: stash the node in pending
2540
2321
entry = inv[top_id]
2541
if entry.kind == 'directory':
2542
for name, child in entry.sorted_children():
2543
dirblock.append((relroot + name, name, child.kind, None,
2544
child.file_id, child.kind
2322
for name, child in entry.sorted_children():
2323
dirblock.append((relroot + name, name, child.kind, None,
2324
child.file_id, child.kind
2546
2326
yield (currentdir[0], entry.file_id), dirblock
2547
2327
# push the user specified dirs from dirblock
2548
2328
for dir in reversed(dirblock):
2614
def _get_rules_searcher(self, default_searcher):
2615
"""See Tree._get_rules_searcher."""
2616
if self._rules_searcher is None:
2617
self._rules_searcher = super(WorkingTree,
2618
self)._get_rules_searcher(default_searcher)
2619
return self._rules_searcher
2621
def get_shelf_manager(self):
2622
"""Return the ShelfManager for this WorkingTree."""
2623
from bzrlib.shelf import ShelfManager
2624
return ShelfManager(self, self._transport)
2627
2376
class WorkingTree2(WorkingTree):
2628
2377
"""This is the Format 2 working tree.
2630
This was the first weave based working tree.
2379
This was the first weave based working tree.
2631
2380
- uses os locks for locking.
2632
2381
- uses the branch last-revision.
2643
2392
if self._inventory is None:
2644
2393
self.read_working_inventory()
2646
def _get_check_refs(self):
2647
"""Return the references needed to perform a check of this tree."""
2648
return [('trees', self.last_revision())]
2650
2395
def lock_tree_write(self):
2651
2396
"""See WorkingTree.lock_tree_write().
2653
2398
In Format2 WorkingTrees we have a single lock for the branch and tree
2654
2399
so lock_tree_write() degrades to lock_write().
2656
:return: An object with an unlock method which will release the lock
2659
2401
self.branch.lock_write()
2661
self._control_files.lock_write()
2403
return self._control_files.lock_write()
2664
2405
self.branch.unlock()
2667
2408
def unlock(self):
2668
# do non-implementation specific cleanup
2671
2409
# we share control files:
2672
2410
if self._control_files._lock_count == 3:
2673
2411
# _inventory_is_modified is always False during a read lock.
2674
2412
if self._inventory_is_modified:
2676
2414
self._write_hashcache_if_dirty()
2678
2416
# reverse order of locking.
2680
2418
return self._control_files.unlock()
2696
2434
def _last_revision(self):
2697
2435
"""See Mutable.last_revision."""
2699
return self._transport.get_bytes('last-revision')
2437
return osutils.safe_revision_id(
2438
self._control_files.get('last-revision').read())
2700
2439
except errors.NoSuchFile:
2701
return _mod_revision.NULL_REVISION
2703
2442
def _change_last_revision(self, revision_id):
2704
2443
"""See WorkingTree._change_last_revision."""
2705
if revision_id is None or revision_id == _mod_revision.NULL_REVISION:
2444
if revision_id is None or revision_id == NULL_REVISION:
2707
self._transport.delete('last-revision')
2446
self._control_files._transport.delete('last-revision')
2708
2447
except errors.NoSuchFile:
2712
self._transport.put_bytes('last-revision', revision_id,
2713
mode=self.bzrdir._get_file_mode())
2451
self._control_files.put_bytes('last-revision', revision_id)
2716
def _get_check_refs(self):
2717
"""Return the references needed to perform a check of this tree."""
2718
return [('trees', self.last_revision())]
2720
2454
@needs_tree_write_lock
2721
2455
def set_conflicts(self, conflicts):
2722
self._put_rio('conflicts', conflicts.to_stanzas(),
2456
self._put_rio('conflicts', conflicts.to_stanzas(),
2723
2457
CONFLICT_HEADER_1)
2725
2459
@needs_tree_write_lock
2868
2605
"""See WorkingTreeFormat.get_format_description()."""
2869
2606
return "Working tree format 2"
2871
def _stub_initialize_on_transport(self, transport, file_mode):
2872
"""Workaround: create control files for a remote working tree.
2608
def stub_initialize_remote(self, control_files):
2609
"""As a special workaround create critical control files for a remote working tree
2874
2611
This ensures that it can later be updated and dealt with locally,
2875
since BzrDirFormat6 and BzrDirFormat5 cannot represent dirs with
2612
since BzrDirFormat6 and BzrDirFormat5 cannot represent dirs with
2876
2613
no working tree. (See bug #43064).
2878
2615
sio = StringIO()
2879
inv = inventory.Inventory()
2880
xml5.serializer_v5.write_inventory(inv, sio, working=True)
2617
xml5.serializer_v5.write_inventory(inv, sio)
2882
transport.put_file('inventory', sio, file_mode)
2883
transport.put_bytes('pending-merges', '', file_mode)
2885
def initialize(self, a_bzrdir, revision_id=None, from_branch=None,
2886
accelerator_tree=None, hardlink=False):
2619
control_files.put('inventory', sio)
2621
control_files.put_bytes('pending-merges', '')
2624
def initialize(self, a_bzrdir, revision_id=None):
2887
2625
"""See WorkingTreeFormat.initialize()."""
2888
2626
if not isinstance(a_bzrdir.transport, LocalTransport):
2889
2627
raise errors.NotLocalUrl(a_bzrdir.transport.base)
2890
if from_branch is not None:
2891
branch = from_branch
2893
branch = a_bzrdir.open_branch()
2628
branch = a_bzrdir.open_branch()
2894
2629
if revision_id is None:
2895
2630
revision_id = _mod_revision.ensure_null(branch.last_revision())
2632
revision_id = osutils.safe_revision_id(revision_id)
2896
2633
branch.lock_write()
2898
2635
branch.generate_revision_history(revision_id)
2900
2637
branch.unlock()
2901
inv = inventory.Inventory()
2902
2639
wt = WorkingTree2(a_bzrdir.root_transport.local_abspath('.'),
2973
2710
def _open_control_files(self, a_bzrdir):
2974
2711
transport = a_bzrdir.get_workingtree_transport(None)
2975
return LockableFiles(transport, self._lock_file_name,
2712
return LockableFiles(transport, self._lock_file_name,
2976
2713
self._lock_class)
2978
def initialize(self, a_bzrdir, revision_id=None, from_branch=None,
2979
accelerator_tree=None, hardlink=False):
2715
def initialize(self, a_bzrdir, revision_id=None):
2980
2716
"""See WorkingTreeFormat.initialize().
2982
:param revision_id: if supplied, create a working tree at a different
2983
revision than the branch is at.
2984
:param accelerator_tree: A tree which can be used for retrieving file
2985
contents more quickly than the revision tree, i.e. a workingtree.
2986
The revision tree will be used for cases where accelerator_tree's
2987
content is different.
2988
:param hardlink: If true, hard-link files from accelerator_tree,
2718
revision_id allows creating a working tree at a different
2719
revision than the branch is at.
2991
2721
if not isinstance(a_bzrdir.transport, LocalTransport):
2992
2722
raise errors.NotLocalUrl(a_bzrdir.transport.base)
2994
2724
control_files = self._open_control_files(a_bzrdir)
2995
2725
control_files.create_lock()
2996
2726
control_files.lock_write()
2997
transport.put_bytes('format', self.get_format_string(),
2998
mode=a_bzrdir._get_file_mode())
2999
if from_branch is not None:
3000
branch = from_branch
3002
branch = a_bzrdir.open_branch()
2727
control_files.put_utf8('format', self.get_format_string())
2728
branch = a_bzrdir.open_branch()
3003
2729
if revision_id is None:
3004
2730
revision_id = _mod_revision.ensure_null(branch.last_revision())
2732
revision_id = osutils.safe_revision_id(revision_id)
3005
2733
# WorkingTree3 can handle an inventory which has a unique root id.
3006
2734
# as of bzr 0.12. However, bzr 0.11 and earlier fail to handle
3007
2735
# those trees. And because there isn't a format bump inbetween, we
added
removed
bzrlib/workingtree.py
