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
def annotate_iter(self, file_id, default_revision=CURRENT_REVISION):
463
def annotate_iter(self, file_id):
487
464
"""See Tree.annotate_iter
489
466
This implementation will use the basis tree implementation if possible.
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)]
533
def _get_ancestors(self, default_revision):
534
ancestors = set([default_revision])
535
for parent_id in self.get_parent_ids():
536
ancestors.update(self.branch.repository.get_ancestry(
537
parent_id, topo_sorted=False))
473
file_id = osutils.safe_file_id(file_id)
474
basis = self.basis_tree()
477
changes = self._iter_changes(basis, True, [self.id2path(file_id)],
478
require_versioned=True).next()
479
changed_content, kind = changes[2], changes[6]
480
if not changed_content:
481
return basis.annotate_iter(file_id)
485
if kind[0] != 'file':
488
old_lines = list(basis.annotate_iter(file_id))
490
for tree in self.branch.repository.revision_trees(
491
self.get_parent_ids()[1:]):
492
if file_id not in tree:
494
old.append(list(tree.annotate_iter(file_id)))
495
return annotate.reannotate(old, self.get_file(file_id).readlines(),
540
500
def get_parent_ids(self):
541
501
"""See Tree.get_parent_ids.
543
503
This implementation reads the pending merges list and last_revision
544
504
value and uses that to decide what the parents list should be.
562
522
def get_root_id(self):
563
523
"""Return the id of this trees root"""
564
524
return self._inventory.root.file_id
566
526
def _get_store_filename(self, file_id):
567
527
## XXX: badly named; this is not in the store at all
528
file_id = osutils.safe_file_id(file_id)
568
529
return self.abspath(self.id2path(file_id))
571
532
def clone(self, to_bzrdir, revision_id=None):
572
533
"""Duplicate this working tree into to_bzr, including all state.
574
535
Specifically modified files are kept as modified, but
575
536
ignored and unknown files are discarded.
577
538
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
541
If not None, the cloned tree will have its last revision set to
542
revision, and and difference between the source trees last revision
582
543
and this one merged in.
584
545
# assumes the target bzr dir format is compatible.
585
result = to_bzrdir.create_workingtree()
546
result = self._format.initialize(to_bzrdir)
586
547
self.copy_content_into(result, revision_id)
617
581
__contains__ = has_id
619
583
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:
584
file_id = osutils.safe_file_id(file_id)
585
return os.path.getsize(self.id2abspath(file_id))
632
588
def get_file_sha1(self, file_id, path=None, stat_value=None):
589
file_id = osutils.safe_file_id(file_id)
634
591
path = self._inventory.id2path(file_id)
635
592
return self._hashcache.get_sha1(path, stat_value)
637
594
def get_file_mtime(self, file_id, path=None):
595
file_id = osutils.safe_file_id(file_id)
639
597
path = self.inventory.id2path(file_id)
640
598
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
600
if not supports_executable():
655
601
def is_executable(self, file_id, path=None):
602
file_id = osutils.safe_file_id(file_id)
656
603
return self._inventory[file_id].executable
658
_is_executable_from_path_and_stat = \
659
_is_executable_from_path_and_stat_from_basis
661
605
def is_executable(self, file_id, path=None):
607
file_id = osutils.safe_file_id(file_id)
663
608
path = self.id2path(file_id)
664
609
mode = os.lstat(self.abspath(path)).st_mode
665
610
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
612
@needs_tree_write_lock
671
613
def _add(self, files, ids, kinds):
672
614
"""See MutableTree._add."""
673
615
# TODO: Re-adding a file that is removed in the working copy
674
616
# should probably put it back with the previous ID.
675
# the read and write working inventory should not occur in this
617
# the read and write working inventory should not occur in this
676
618
# function - they should be part of lock_write and unlock.
677
619
inv = self.inventory
678
620
for f, file_id, kind in zip(files, ids, kinds):
621
assert kind is not None
679
622
if file_id is None:
680
623
inv.add_path(f, kind=kind)
625
file_id = osutils.safe_file_id(file_id)
682
626
inv.add_path(f, kind=kind, file_id=file_id)
683
627
self._inventory_is_modified = True
747
691
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(
693
@deprecated_method(zero_eleven)
695
def pending_merges(self):
696
"""Return a list of pending merges.
698
These are revisions that have been merged into the working
699
directory but not yet committed.
701
As of 0.11 this is deprecated. Please see WorkingTree.get_parent_ids()
702
instead - which is available on all tree objects.
704
return self.get_parent_ids()[1:]
783
706
def _check_parents_for_ghosts(self, revision_ids, allow_leftmost_as_ghost):
784
707
"""Common ghost checking functionality from set_parent_*.
795
718
def _set_merges_from_parent_ids(self, parent_ids):
796
719
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
720
self._control_files.put_bytes('pending-merges', '\n'.join(merges))
819
722
@needs_tree_write_lock
820
723
def set_parent_ids(self, revision_ids, allow_leftmost_as_ghost=False):
821
724
"""Set the parent ids to revision_ids.
823
726
See also set_parent_trees. This api will try to retrieve the tree data
824
727
for each element of revision_ids from the trees repository. If you have
825
728
tree data already available, it is more efficient to use
887
787
yield Stanza(file_id=file_id.decode('utf8'), hash=hash)
888
788
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
790
def _put_rio(self, filename, stanzas, header):
901
791
self._must_be_locked()
902
792
my_file = rio_file(stanzas, header)
903
self._transport.put_file(filename, my_file,
904
mode=self.bzrdir._get_file_mode())
793
self._control_files.put(filename, my_file)
906
795
@needs_write_lock # because merge pulls data into the branch.
907
def merge_from_branch(self, branch, to_revision=None, from_revision=None,
908
merge_type=None, force=False):
796
def merge_from_branch(self, branch, to_revision=None):
909
797
"""Merge from a branch into this working tree.
911
799
:param branch: The branch to merge from.
915
803
branch.last_revision().
917
805
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:
806
pb = bzrlib.ui.ui_factory.nested_progress_bar()
808
merger = Merger(self.branch, this_tree=self, pb=pb)
809
merger.pp = ProgressPhase("Merge phase", 5, pb)
810
merger.pp.next_phase()
811
# check that there are no
813
merger.check_basis(check_clean=True, require_commits=False)
814
if to_revision is None:
815
to_revision = _mod_revision.ensure_null(branch.last_revision())
817
to_revision = osutils.safe_revision_id(to_revision)
818
merger.other_rev_id = to_revision
819
if _mod_revision.is_null(merger.other_rev_id):
820
raise errors.NoCommits(branch)
821
self.branch.fetch(branch, last_revision=merger.other_rev_id)
822
merger.other_basis = merger.other_rev_id
823
merger.other_tree = self.branch.repository.revision_tree(
825
merger.other_branch = branch
826
merger.pp.next_phase()
933
827
merger.find_base()
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:
828
if merger.base_rev_id == merger.other_rev_id:
829
raise errors.PointlessMerge
830
merger.backup_files = False
940
831
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()
832
merger.set_interesting_files(None)
833
merger.show_base = False
834
merger.reprocess = False
835
conflicts = merger.do_merge()
951
842
def merge_modified(self):
952
843
"""Return a dictionary of files modified by a merge.
954
The list is initialized by WorkingTree.set_merge_modified, which is
845
The list is initialized by WorkingTree.set_merge_modified, which is
955
846
typically called after we make some automatic updates to the tree
956
847
because of a merge.
959
850
still in the working inventory and have that text hash.
962
hashfile = self._transport.get('merge-hashes')
853
hashfile = self._control_files.get('merge-hashes')
963
854
except errors.NoSuchFile:
968
if hashfile.next() != MERGE_MODIFIED_HEADER_1 + '\n':
969
raise errors.MergeModifiedFormatError()
970
except StopIteration:
858
if hashfile.next() != MERGE_MODIFIED_HEADER_1 + '\n':
971
859
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
860
except StopIteration:
861
raise errors.MergeModifiedFormatError()
862
for s in RioReader(hashfile):
863
# RioReader reads in Unicode, so convert file_ids back to utf8
864
file_id = osutils.safe_file_id(s.get("file_id"), warn=False)
865
if file_id not in self.inventory:
867
text_hash = s.get("hash")
868
if text_hash == self.get_file_sha1(file_id):
869
merge_hashes[file_id] = text_hash
984
872
@needs_write_lock
985
873
def mkdir(self, path, file_id=None):
1037
924
other_tree.unlock()
1038
925
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
927
@needs_tree_write_lock
1067
928
def extract(self, file_id, format=None):
1068
929
"""Extract a subtree from this tree.
1070
931
A new branch will be created, relative to the path for this tree.
1077
938
transport = transport.clone(name)
1078
939
transport.ensure_base()
1079
940
return transport
1081
942
sub_path = self.id2path(file_id)
1082
943
branch_transport = mkdirs(sub_path)
1083
944
if format is None:
1084
format = self.bzrdir.cloning_metadir()
945
format = bzrdir.format_registry.make_bzrdir('dirstate-with-subtree')
1085
946
branch_transport.ensure_base()
1086
947
branch_bzrdir = format.initialize_on_transport(branch_transport)
1088
949
repo = branch_bzrdir.find_repository()
1089
950
except errors.NoRepositoryPresent:
1090
951
repo = branch_bzrdir.create_repository()
1091
if not repo.supports_rich_root():
1092
raise errors.RootNotRich()
952
assert repo.supports_rich_root()
954
if not repo.supports_rich_root():
955
raise errors.RootNotRich()
1093
956
new_branch = branch_bzrdir.create_branch()
1094
957
new_branch.pull(self.branch)
1095
958
for parent_id in self.get_parent_ids():
1097
960
tree_transport = self.bzrdir.root_transport.clone(sub_path)
1098
961
if tree_transport.base != branch_transport.base:
1099
962
tree_bzrdir = format.initialize_on_transport(tree_transport)
1100
branch.BranchReferenceFormat().initialize(tree_bzrdir,
1101
target_branch=new_branch)
963
branch.BranchReferenceFormat().initialize(tree_bzrdir, new_branch)
1103
965
tree_bzrdir = branch_bzrdir
1104
wt = tree_bzrdir.create_workingtree(_mod_revision.NULL_REVISION)
966
wt = tree_bzrdir.create_workingtree(NULL_REVISION)
1105
967
wt.set_parent_ids(self.get_parent_ids())
1106
968
my_inv = self.inventory
1107
child_inv = inventory.Inventory(root_id=None)
969
child_inv = Inventory(root_id=None)
1108
970
new_root = my_inv[file_id]
1109
971
my_inv.remove_recursive_id(file_id)
1110
972
new_root.parent_id = None
1128
989
sio = StringIO()
1129
990
self._serialize(self._inventory, sio)
1131
self._transport.put_file('inventory', sio,
1132
mode=self.bzrdir._get_file_mode())
992
self._control_files.put('inventory', sio)
1133
993
self._inventory_is_modified = False
1135
995
def _kind(self, relpath):
1136
996
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).
998
def list_files(self, include_root=False):
999
"""Recursively list all files as (path, class, kind, id, entry).
1141
1001
Lists, but does not descend into unversioned directories.
1142
1003
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
1006
Skips the control directory.
1149
1008
# list_files is an iterator, so @needs_read_lock doesn't work properly
1150
1009
# with it. So callers should be careful to always read_lock the tree.
1165
1024
fk_entries = {'directory':TreeDirectory, 'file':TreeFile, 'symlink':TreeLink}
1167
1026
# 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)
1027
children = os.listdir(self.basedir)
1178
1028
children.sort()
1179
# jam 20060527 The kernel sized tree seems equivalent whether we
1029
# jam 20060527 The kernel sized tree seems equivalent whether we
1180
1030
# use a deque and popleft to keep them sorted, or if we use a plain
1181
1031
# list and just reverse() them.
1182
1032
children = collections.deque(children)
1183
stack = [(from_dir_id, u'', from_dir_abspath, children)]
1033
stack = [(inv.root.file_id, u'', self.basedir, children)]
1185
1035
from_dir_id, from_dir_relpath, from_dir_abspath, children = stack[-1]
1240
1090
except KeyError:
1241
1091
yield fp[1:], c, fk, None, TreeEntry()
1244
1094
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
1097
# But do this child first
1098
new_children = os.listdir(fap)
1100
new_children = collections.deque(new_children)
1101
stack.append((f_ie.file_id, fp, fap, new_children))
1102
# Break out of inner loop,
1103
# so that we start outer loop with child
1257
1106
# if we finished all children, pop it off the stack
1494
1338
from_tail = splitpath(from_rel)[-1]
1495
1339
from_id = inv.path2id(from_rel)
1496
1340
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]
1341
raise errors.BzrRenameFailedError(from_rel,to_rel,
1342
errors.NotVersionedError(path=str(from_rel)))
1343
from_entry = inv[from_id]
1508
1344
from_parent_id = from_entry.parent_id
1509
1345
to_dir, to_tail = os.path.split(to_rel)
1510
1346
to_dir_id = inv.path2id(to_dir)
1572
1408
:raises: NoSuchId if any fileid is not currently versioned.
1574
1410
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:
1411
file_id = osutils.safe_file_id(file_id)
1578
1412
if self._inventory.has_id(file_id):
1579
1413
self._inventory.remove_recursive_id(file_id)
1415
raise errors.NoSuchId(self, file_id)
1580
1416
if len(file_ids):
1581
# in the future this should just set a dirty bit to wait for the
1417
# in the future this should just set a dirty bit to wait for the
1582
1418
# final unlock. However, until all methods of workingtree start
1583
# with the current in -memory inventory rather than triggering
1419
# with the current in -memory inventory rather than triggering
1584
1420
# a read, it is more complex - we need to teach read_inventory
1585
1421
# to know when to read, and when to not read first... and possibly
1586
1422
# to save first when the in memory one may be corrupted.
1587
1423
# so for now, we just only write it if it is indeed dirty.
1588
1424
# - RBC 20060907
1589
1425
self._write_inventory(self._inventory)
1427
@deprecated_method(zero_eight)
1428
def iter_conflicts(self):
1429
"""List all files in the tree that have text or content conflicts.
1430
DEPRECATED. Use conflicts instead."""
1431
return self._iter_conflicts()
1591
1433
def _iter_conflicts(self):
1592
1434
conflicted = set()
1602
1444
@needs_write_lock
1603
1445
def pull(self, source, overwrite=False, stop_revision=None,
1604
change_reporter=None, possible_transports=None, local=False):
1446
change_reporter=None):
1447
top_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1605
1448
source.lock_read()
1450
pp = ProgressPhase("Pull phase", 2, top_pb)
1607
1452
old_revision_info = self.branch.last_revision_info()
1608
1453
basis_tree = self.basis_tree()
1609
count = self.branch.pull(source, overwrite, stop_revision,
1610
possible_transports=possible_transports,
1454
count = self.branch.pull(source, overwrite, stop_revision)
1612
1455
new_revision_info = self.branch.last_revision_info()
1613
1456
if new_revision_info != old_revision_info:
1614
1458
repository = self.branch.repository
1459
pb = bzrlib.ui.ui_factory.nested_progress_bar()
1615
1460
basis_tree.lock_read()
1617
1462
new_basis_tree = self.branch.basis_tree()
1620
1465
new_basis_tree,
1622
1467
this_tree=self,
1624
1469
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)
1470
if (basis_tree.inventory.root is None and
1471
new_basis_tree.inventory.root is not None):
1472
self.set_root_id(new_basis_tree.inventory.root.file_id)
1630
1475
basis_tree.unlock()
1631
1476
# TODO - dedup parents list with things merged by pull ?
1632
1477
# reuse the revisiontree we merged against to set the new
1634
1479
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
1480
# we have to pull the merge trees out again, because
1481
# merge_inner has set the ids. - this corner is not yet
1637
1482
# layered well enough to prevent double handling.
1638
1483
# XXX TODO: Fix the double handling: telling the tree about
1639
1484
# the already known parent data is wasteful.
1735
1575
r"""Check whether the filename matches an ignore pattern.
1737
1577
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.
1578
others match against only the last component.
1742
1580
If the file is ignored, returns the pattern which caused it to
1743
1581
be ignored, otherwise None. So this can simply be used as a
1744
1582
boolean if desired."""
1745
1583
if getattr(self, '_ignoreglobster', None) is None:
1746
self._ignoreglobster = globbing.ExceptionGlobster(self.get_ignore_list())
1584
self._ignoreglobster = globbing.Globster(self.get_ignore_list())
1747
1585
return self._ignoreglobster.match(filename)
1749
1587
def kind(self, file_id):
1750
1588
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
1590
def _comparison_data(self, entry, path):
1757
1591
abspath = self.abspath(path)
1799
1633
raise errors.ObjectNotLocked(self)
1801
1635
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.
1636
"""See Branch.lock_read, and WorkingTree.unlock."""
1808
1637
if not self.is_locked():
1809
1638
self._reset_data()
1810
1639
self.branch.lock_read()
1812
self._control_files.lock_read()
1813
return LogicalLockResult(self.unlock)
1641
return self._control_files.lock_read()
1815
1643
self.branch.unlock()
1818
1646
def lock_tree_write(self):
1819
"""See MutableTree.lock_tree_write, and WorkingTree.unlock.
1821
:return: A bzrlib.lock.LogicalLockResult.
1647
"""See MutableTree.lock_tree_write, and WorkingTree.unlock."""
1823
1648
if not self.is_locked():
1824
1649
self._reset_data()
1825
1650
self.branch.lock_read()
1827
self._control_files.lock_write()
1828
return LogicalLockResult(self.unlock)
1652
return self._control_files.lock_write()
1830
1654
self.branch.unlock()
1833
1657
def lock_write(self):
1834
"""See MutableTree.lock_write, and WorkingTree.unlock.
1836
:return: A bzrlib.lock.LogicalLockResult.
1658
"""See MutableTree.lock_write, and WorkingTree.unlock."""
1838
1659
if not self.is_locked():
1839
1660
self._reset_data()
1840
1661
self.branch.lock_write()
1842
self._control_files.lock_write()
1843
return LogicalLockResult(self.unlock)
1663
return self._control_files.lock_write()
1845
1665
self.branch.unlock()
1854
1674
def _reset_data(self):
1855
1675
"""Reset transient data that cannot be revalidated."""
1856
1676
self._inventory_is_modified = False
1857
f = self._transport.get('inventory')
1859
result = self._deserialize(f)
1677
result = self._deserialize(self._control_files.get('inventory'))
1862
1678
self._set_inventory(result, dirty=False)
1864
1680
@needs_tree_write_lock
1865
1681
def set_last_revision(self, new_revision):
1866
1682
"""Change the last revision in the working tree."""
1683
new_revision = osutils.safe_revision_id(new_revision)
1867
1684
if self._change_last_revision(new_revision):
1868
1685
self._cache_basis_inventory(new_revision)
1870
1687
def _change_last_revision(self, new_revision):
1871
1688
"""Template method part of set_last_revision to perform the change.
1873
1690
This is used to allow WorkingTree3 instances to not affect branch
1874
1691
when their last revision is set.
1886
1703
def _write_basis_inventory(self, xml):
1887
1704
"""Write the basis inventory XML to the basis-inventory file"""
1705
assert isinstance(xml, str), 'serialised xml must be bytestring.'
1888
1706
path = self._basis_inventory_name()
1889
1707
sio = StringIO(xml)
1890
self._transport.put_file(path, sio,
1891
mode=self.bzrdir._get_file_mode())
1708
self._control_files.put(path, sio)
1893
1710
def _create_basis_xml_from_inventory(self, revision_id, inventory):
1894
1711
"""Create the text that will be saved in basis-inventory"""
1895
inventory.revision_id = revision_id
1712
# TODO: jam 20070209 This should be redundant, as the revision_id
1713
# as all callers should have already converted the revision_id to
1715
inventory.revision_id = osutils.safe_revision_id(revision_id)
1896
1716
return xml7.serializer_v7.write_inventory_to_string(inventory)
1898
1718
def _cache_basis_inventory(self, new_revision):
1901
1721
# as commit already has that ready-to-use [while the format is the
1902
1722
# same, that is].
1904
# this double handles the inventory - unpack and repack -
1724
# this double handles the inventory - unpack and repack -
1905
1725
# but is easier to understand. We can/should put a conditional
1906
1726
# in here based on whether the inventory is in the latest format
1907
1727
# - perhaps we should repack all inventories on a repository
1909
1729
# the fast path is to copy the raw xml from the repository. If the
1910
# xml contains 'revision_id="', then we assume the right
1730
# xml contains 'revision_id="', then we assume the right
1911
1731
# revision_id is set. We must check for this full string, because a
1912
1732
# root node id can legitimately look like 'revision_id' but cannot
1913
1733
# contain a '"'.
1914
xml = self.branch.repository._get_inventory_xml(new_revision)
1734
xml = self.branch.repository.get_inventory_xml(new_revision)
1915
1735
firstline = xml.split('\n', 1)[0]
1916
if (not 'revision_id="' in firstline or
1736
if (not 'revision_id="' in firstline or
1917
1737
'format="7"' not in firstline):
1918
inv = self.branch.repository._serializer.read_inventory_from_string(
1738
inv = self.branch.repository.deserialise_inventory(
1920
1740
xml = self._create_basis_xml_from_inventory(new_revision, inv)
1921
1741
self._write_basis_inventory(xml)
1922
1742
except (errors.NoSuchRevision, errors.RevisionNotPresent):
1925
1745
def read_basis_inventory(self):
1926
1746
"""Read the cached basis inventory."""
1927
1747
path = self._basis_inventory_name()
1928
return self._transport.get_bytes(path)
1748
return self._control_files.get(path).read()
1930
1750
@needs_read_lock
1931
1751
def read_working_inventory(self):
1932
1752
"""Read the working inventory.
1934
1754
:raises errors.InventoryModified: read_working_inventory will fail
1935
1755
when the current in memory inventory has been modified.
1937
# conceptually this should be an implementation detail of the tree.
1757
# conceptually this should be an implementation detail of the tree.
1938
1758
# XXX: Deprecate this.
1939
1759
# ElementTree does its own conversion from UTF-8, so open in
1941
1761
if self._inventory_is_modified:
1942
1762
raise errors.InventoryModified(self)
1943
f = self._transport.get('inventory')
1945
result = self._deserialize(f)
1763
result = self._deserialize(self._control_files.get('inventory'))
1948
1764
self._set_inventory(result, dirty=False)
1958
1774
:force: Delete files and directories, even if they are changed and
1959
1775
even if the directories are not empty.
1777
## TODO: Normalize names
1961
1779
if isinstance(files, basestring):
1962
1780
files = [files]
1966
1784
new_files=set()
1967
unknown_nested_files=set()
1969
to_file = sys.stdout
1785
unknown_files_in_directory=set()
1971
1787
def recurse_directory_to_add_files(directory):
1972
# Recurse directory and add all files
1788
# recurse directory and add all files
1973
1789
# 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))
1790
for parent_info, file_infos in\
1791
osutils.walkdirs(self.abspath(directory),
1793
for relpath, basename, kind, lstat, abspath in file_infos:
1795
if self.path2id(relpath): #is it versioned?
1796
new_files.add(relpath)
1798
unknown_files_in_directory.add(
1799
(relpath, None, kind))
1985
1801
for filename in files:
1986
1802
# Get file name into canonical form.
1988
1804
filename = self.relpath(abspath)
1989
1805
if len(filename) > 0:
1990
1806
new_files.add(filename)
1991
recurse_directory_to_add_files(filename)
1993
files = list(new_files)
1807
if osutils.isdir(abspath):
1808
recurse_directory_to_add_files(filename)
1809
files = [f for f in new_files]
1995
1811
if len(files) == 0:
1996
1812
return # nothing to do
1998
1814
# Sort needed to first handle directory content before the directory
1999
1815
files.sort(reverse=True)
2001
# Bail out if we are going to delete files we shouldn't
2002
1816
if not keep_files and not force:
2003
has_changed_files = len(unknown_nested_files) > 0
1817
has_changed_files = len(unknown_files_in_directory) > 0
2004
1818
if not has_changed_files:
2005
1819
for (file_id, path, content_change, versioned, parent_id, name,
2006
kind, executable) in self.iter_changes(self.basis_tree(),
1820
kind, executable) in self._iter_changes(self.basis_tree(),
2007
1821
include_unchanged=True, require_versioned=False,
2008
1822
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.
1823
# check if it's unknown OR changed but not deleted:
1824
if (versioned == (False, False)
1825
or (content_change and kind[1] != None)):
2019
1826
has_changed_files = True
2022
1829
if has_changed_files:
2023
# Make delta show ALL applicable changes in error message.
1830
# make delta to show ALL applicable changes in error message.
2024
1831
tree_delta = self.changes_from(self.basis_tree(),
2025
require_versioned=False, want_unversioned=True,
2026
1832
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,))
1833
for unknown_file in unknown_files_in_directory:
1834
tree_delta.unversioned.extend((unknown_file,))
2030
1835
raise errors.BzrRemoveChangedFilesError(tree_delta)
2032
# Build inv_delta and delete files where applicable,
2033
# do this before any modifications to inventory.
1837
# do this before any modifications
2034
1838
for f in files:
2035
1839
fid = self.path2id(f)
2038
message = "%s is not versioned." % (f,)
1842
message="%s is not versioned." % (f,)
2041
1845
# having removed it, it must be either ignored or unknown
2043
1847
new_status = 'I'
2045
1849
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')
1850
textui.show_status(new_status, self.kind(fid), f,
2050
1853
inv_delta.append((f, None, fid, None))
2051
message = "removed %s" % (f,)
1854
message="removed %s" % (f,)
2053
1856
if not keep_files:
2054
1857
abs_path = self.abspath(f)
2055
1858
if osutils.lexists(abs_path):
2056
1859
if (osutils.isdir(abs_path) and
2057
1860
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,)
1861
message="%s is not empty directory "\
1862
"and won't be deleted." % (f,)
2064
1864
osutils.delete_any(abs_path)
2065
message = "deleted %s" % (f,)
1865
message="deleted %s" % (f,)
2066
1866
elif message is not None:
2067
# Only care if we haven't done anything yet.
2068
message = "%s does not exist." % (f,)
1867
# only care if we haven't done anything yet.
1868
message="%s does not exist." % (f,)
2070
# Print only one message (if any) per file.
1870
# print only one message (if any) per file.
2071
1871
if message is not None:
2073
1873
self.apply_inventory_delta(inv_delta)
2075
1875
@needs_tree_write_lock
2076
def revert(self, filenames=None, old_tree=None, backups=True,
2077
pb=None, report_changes=False):
1876
def revert(self, filenames, old_tree=None, backups=True,
1877
pb=DummyProgress(), report_changes=False):
2078
1878
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
1879
if old_tree is None:
2085
basis_tree = self.basis_tree()
2086
basis_tree.lock_read()
2087
old_tree = basis_tree
1880
old_tree = self.basis_tree()
1881
conflicts = transform.revert(self, old_tree, filenames, backups, pb,
1883
if not len(filenames):
1884
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:
1887
resolve(self, filenames, ignore_misses=True)
2108
1888
return conflicts
2110
1890
def revision_tree(self, revision_id):
2158
1939
@needs_tree_write_lock
2159
1940
def set_root_id(self, file_id):
2160
1941
"""Set the root id for this tree."""
2162
1943
if file_id is None:
2164
'WorkingTree.set_root_id with fileid=None')
2165
file_id = osutils.safe_file_id(file_id)
1944
symbol_versioning.warn(symbol_versioning.zero_twelve
1945
% 'WorkingTree.set_root_id with fileid=None',
1950
file_id = osutils.safe_file_id(file_id)
2166
1951
self._set_root_id(file_id)
2168
1953
def _set_root_id(self, file_id):
2169
1954
"""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
1956
:param file_id: The file id to assign to the root. It must not be
2172
1957
present in the current inventory or an error will occur. It must
2173
1958
not be None, but rather a valid file id.
2194
1979
def unlock(self):
2195
1980
"""See Branch.unlock.
2197
1982
WorkingTree locking just uses the Branch locking facilities.
2198
1983
This is current because all working trees have an embedded branch
2199
1984
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
1985
between multiple working trees, i.e. via shared storage, then we
2201
1986
would probably want to lock both the local tree, and the branch.
2203
1988
raise NotImplementedError(self.unlock)
2207
def update(self, change_reporter=None, possible_transports=None,
2208
revision=None, old_tip=_marker):
1990
def update(self, change_reporter=None):
2209
1991
"""Update a working tree along its branch.
2211
1993
This will update the branch if its bound too, which means we have
2229
2011
- Merge current state -> basis tree of the master w.r.t. the old tree
2231
2013
- 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:
2015
if self.branch.get_master_branch() is not None:
2240
2016
self.lock_write()
2241
update_branch = (old_tip is self._marker)
2017
update_branch = True
2243
2019
self.lock_tree_write()
2244
2020
update_branch = False
2246
2022
if update_branch:
2247
old_tip = self.branch.update(possible_transports)
2023
old_tip = self.branch.update()
2249
if old_tip is self._marker:
2251
return self._update_tree(old_tip, change_reporter, revision)
2026
return self._update_tree(old_tip, change_reporter)
2255
2030
@needs_tree_write_lock
2256
def _update_tree(self, old_tip=None, change_reporter=None, revision=None):
2031
def _update_tree(self, old_tip=None, change_reporter=None):
2257
2032
"""Update a tree to the master branch.
2259
2034
:param old_tip: if supplied, the previous tip revision the branch,
2265
2040
# cant set that until we update the working trees last revision to be
2266
2041
# one from the new branch, because it will just get absorbed by the
2267
2042
# parent de-duplication logic.
2269
2044
# We MUST save it even if an error occurs, because otherwise the users
2270
2045
# local work is unreferenced and will appear to have been lost.
2274
2049
last_rev = self.get_parent_ids()[0]
2275
2050
except IndexError:
2276
2051
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()
2052
if last_rev != _mod_revision.ensure_null(self.branch.last_revision()):
2053
# merge tree state up to new branch tip.
2301
2054
basis = self.basis_tree()
2302
2055
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)
2057
to_tree = self.branch.basis_tree()
2058
if basis.inventory.root is None:
2059
self.set_root_id(to_tree.inventory.root.file_id)
2061
result += merge.merge_inner(
2066
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
2069
# TODO - dedup parents list with things merged by pull ?
2322
2070
# reuse the tree we've updated to to set the basis:
2323
parent_trees = [(revision, to_tree)]
2071
parent_trees = [(self.branch.last_revision(), to_tree)]
2324
2072
merges = self.get_parent_ids()[1:]
2325
2073
# 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
2074
# tree can decide whether to give us teh entire tree or give us a
2327
2075
# lazy initialised tree. dirstate for instance will have the trees
2328
2076
# in ram already, whereas a last-revision + basis-inventory tree
2329
2077
# will not, but also does not need them when setting parents.
2330
2078
for parent in merges:
2331
2079
parent_trees.append(
2332
2080
(parent, self.branch.repository.revision_tree(parent)))
2333
if not _mod_revision.is_null(old_tip):
2081
if (old_tip is not None and not _mod_revision.is_null(old_tip)):
2334
2082
parent_trees.append(
2335
2083
(old_tip, self.branch.repository.revision_tree(old_tip)))
2336
2084
self.set_parent_trees(parent_trees)
2337
2085
last_rev = parent_trees[0][0]
2087
# the working tree had the same last-revision as the master
2088
# branch did. We may still have pivot local work from the local
2089
# branch into old_tip:
2090
if (old_tip is not None and not _mod_revision.is_null(old_tip)):
2091
self.add_parent_tree_id(old_tip)
2092
if (old_tip is not None and not _mod_revision.is_null(old_tip)
2093
and old_tip != last_rev):
2094
# our last revision was not the prior branch last revision
2095
# and we have converted that last revision to a pending merge.
2096
# base is somewhere between the branch tip now
2097
# and the now pending merge
2099
# Since we just modified the working tree and inventory, flush out
2100
# the current state, before we modify it again.
2101
# TODO: jam 20070214 WorkingTree3 doesn't require this, dirstate
2102
# requires it only because TreeTransform directly munges the
2103
# inventory and calls tree._write_inventory(). Ultimately we
2104
# should be able to remove this extra flush.
2106
graph = self.branch.repository.get_graph()
2107
base_rev_id = graph.find_unique_lca(self.branch.last_revision(),
2109
base_tree = self.branch.repository.revision_tree(base_rev_id)
2110
other_tree = self.branch.repository.revision_tree(old_tip)
2111
result += merge.merge_inner(
2116
change_reporter=change_reporter)
2340
2119
def _write_hashcache_if_dirty(self):
2341
2120
"""Write out the hashcache if it is dirty."""
2425
2204
current_inv = None
2426
2205
inv_finished = True
2427
2206
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
2207
if not disk_finished:
2435
2208
# 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 -
2209
if current_disk[0][1][top_strip_len:] == '':
2210
# osutils.walkdirs can be made nicer -
2439
2211
# 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])):
2213
bzrdir_loc = bisect_left(current_disk[1], ('.bzr', '.bzr'))
2214
if current_disk[1][bzrdir_loc][0] == '.bzr':
2446
2215
# we dont yield the contents of, or, .bzr itself.
2447
del cur_disk_dir_content[bzrdir_loc]
2216
del current_disk[1][bzrdir_loc]
2448
2217
if inv_finished:
2449
2218
# everything is unknown
2452
2221
# everything is missing
2455
direction = cmp(current_inv[0][0], cur_disk_dir_relpath)
2224
direction = cmp(current_inv[0][0], current_disk[0][0])
2456
2225
if direction > 0:
2457
2226
# disk is before inventory - unknown
2458
2227
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
2228
relpath, basename, kind, stat, top_path in current_disk[1]]
2229
yield (current_disk[0][0], None), dirblock
2463
2231
current_disk = disk_iterator.next()
2464
2232
except StopIteration:
2539
2306
# FIXME: stash the node in pending
2540
2307
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
2308
for name, child in entry.sorted_children():
2309
dirblock.append((relroot + name, name, child.kind, None,
2310
child.file_id, child.kind
2546
2312
yield (currentdir[0], entry.file_id), dirblock
2547
2313
# push the user specified dirs from dirblock
2548
2314
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
2362
class WorkingTree2(WorkingTree):
2628
2363
"""This is the Format 2 working tree.
2630
This was the first weave based working tree.
2365
This was the first weave based working tree.
2631
2366
- uses os locks for locking.
2632
2367
- uses the branch last-revision.
2643
2378
if self._inventory is None:
2644
2379
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
2381
def lock_tree_write(self):
2651
2382
"""See WorkingTree.lock_tree_write().
2653
2384
In Format2 WorkingTrees we have a single lock for the branch and tree
2654
2385
so lock_tree_write() degrades to lock_write().
2656
:return: An object with an unlock method which will release the lock
2659
2387
self.branch.lock_write()
2661
self._control_files.lock_write()
2389
return self._control_files.lock_write()
2664
2391
self.branch.unlock()
2667
2394
def unlock(self):
2668
# do non-implementation specific cleanup
2671
2395
# we share control files:
2672
2396
if self._control_files._lock_count == 3:
2673
2397
# _inventory_is_modified is always False during a read lock.
2674
2398
if self._inventory_is_modified:
2676
2400
self._write_hashcache_if_dirty()
2678
2402
# reverse order of locking.
2680
2404
return self._control_files.unlock()
2696
2420
def _last_revision(self):
2697
2421
"""See Mutable.last_revision."""
2699
return self._transport.get_bytes('last-revision')
2423
return osutils.safe_revision_id(
2424
self._control_files.get('last-revision').read())
2700
2425
except errors.NoSuchFile:
2701
return _mod_revision.NULL_REVISION
2703
2428
def _change_last_revision(self, revision_id):
2704
2429
"""See WorkingTree._change_last_revision."""
2705
if revision_id is None or revision_id == _mod_revision.NULL_REVISION:
2430
if revision_id is None or revision_id == NULL_REVISION:
2707
self._transport.delete('last-revision')
2432
self._control_files._transport.delete('last-revision')
2708
2433
except errors.NoSuchFile:
2712
self._transport.put_bytes('last-revision', revision_id,
2713
mode=self.bzrdir._get_file_mode())
2437
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
2440
@needs_tree_write_lock
2721
2441
def set_conflicts(self, conflicts):
2722
self._put_rio('conflicts', conflicts.to_stanzas(),
2442
self._put_rio('conflicts', conflicts.to_stanzas(),
2723
2443
CONFLICT_HEADER_1)
2725
2445
@needs_tree_write_lock
2868
2591
"""See WorkingTreeFormat.get_format_description()."""
2869
2592
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.
2594
def stub_initialize_remote(self, control_files):
2595
"""As a special workaround create critical control files for a remote working tree
2874
2597
This ensures that it can later be updated and dealt with locally,
2875
since BzrDirFormat6 and BzrDirFormat5 cannot represent dirs with
2598
since BzrDirFormat6 and BzrDirFormat5 cannot represent dirs with
2876
2599
no working tree. (See bug #43064).
2878
2601
sio = StringIO()
2879
inv = inventory.Inventory()
2880
xml5.serializer_v5.write_inventory(inv, sio, working=True)
2603
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):
2605
control_files.put('inventory', sio)
2607
control_files.put_bytes('pending-merges', '')
2610
def initialize(self, a_bzrdir, revision_id=None):
2887
2611
"""See WorkingTreeFormat.initialize()."""
2888
2612
if not isinstance(a_bzrdir.transport, LocalTransport):
2889
2613
raise errors.NotLocalUrl(a_bzrdir.transport.base)
2890
if from_branch is not None:
2891
branch = from_branch
2893
branch = a_bzrdir.open_branch()
2614
branch = a_bzrdir.open_branch()
2894
2615
if revision_id is None:
2895
2616
revision_id = _mod_revision.ensure_null(branch.last_revision())
2618
revision_id = osutils.safe_revision_id(revision_id)
2896
2619
branch.lock_write()
2898
2621
branch.generate_revision_history(revision_id)
2900
2623
branch.unlock()
2901
inv = inventory.Inventory()
2902
2625
wt = WorkingTree2(a_bzrdir.root_transport.local_abspath('.'),
2973
2696
def _open_control_files(self, a_bzrdir):
2974
2697
transport = a_bzrdir.get_workingtree_transport(None)
2975
return LockableFiles(transport, self._lock_file_name,
2698
return LockableFiles(transport, self._lock_file_name,
2976
2699
self._lock_class)
2978
def initialize(self, a_bzrdir, revision_id=None, from_branch=None,
2979
accelerator_tree=None, hardlink=False):
2701
def initialize(self, a_bzrdir, revision_id=None):
2980
2702
"""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,
2704
revision_id allows creating a working tree at a different
2705
revision than the branch is at.
2991
2707
if not isinstance(a_bzrdir.transport, LocalTransport):
2992
2708
raise errors.NotLocalUrl(a_bzrdir.transport.base)
2994
2710
control_files = self._open_control_files(a_bzrdir)
2995
2711
control_files.create_lock()
2996
2712
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()
2713
control_files.put_utf8('format', self.get_format_string())
2714
branch = a_bzrdir.open_branch()
3003
2715
if revision_id is None:
3004
2716
revision_id = _mod_revision.ensure_null(branch.last_revision())
2718
revision_id = osutils.safe_revision_id(revision_id)
3005
2719
# WorkingTree3 can handle an inventory which has a unique root id.
3006
2720
# as of bzr 0.12. However, bzr 0.11 and earlier fail to handle
3007
2721
# those trees. And because there isn't a format bump inbetween, we
added
removed
bzrlib/workingtree.py
