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
60
conflicts as _mod_conflicts,
60
revision as _mod_revision,
69
80
import bzrlib.branch
70
81
from bzrlib.transport import get_transport
71
from bzrlib.workingtree_4 import (
83
from bzrlib.workingtree_4 import WorkingTreeFormat4
78
86
from bzrlib import symbol_versioning
79
87
from bzrlib.decorators import needs_read_lock, needs_write_lock
80
from bzrlib.lockable_files import LockableFiles
88
from bzrlib.inventory import InventoryEntry, Inventory, ROOT_ID, TreeReference
89
from bzrlib.lockable_files import LockableFiles, TransportLock
81
90
from bzrlib.lockdir import LockDir
82
91
import bzrlib.mutabletree
83
92
from bzrlib.mutabletree import needs_tree_write_lock
84
from bzrlib import osutils
85
93
from bzrlib.osutils import (
93
103
supports_executable,
95
from bzrlib.filters import filtered_input_file
96
105
from bzrlib.trace import mutter, note
97
106
from bzrlib.transport.local import LocalTransport
98
from bzrlib.revision import CURRENT_REVISION
107
from bzrlib.progress import DummyProgress, ProgressPhase
108
from bzrlib.revision import NULL_REVISION, CURRENT_REVISION
99
109
from bzrlib.rio import RioReader, rio_file, Stanza
100
from bzrlib.symbol_versioning import (
102
DEPRECATED_PARAMETER,
110
from bzrlib.symbol_versioning import (deprecated_passed,
113
DEPRECATED_PARAMETER,
106
120
MERGE_MODIFIED_HEADER_1 = "BZR merge-modified list format 1"
107
# TODO: Modifying the conflict objects or their type is currently nearly
108
# impossible as there is no clear relationship between the working tree format
109
# and the conflict list file format.
110
121
CONFLICT_HEADER_1 = "BZR conflict list format 1"
112
123
ERROR_PATH_NOT_FOUND = 3 # WindowsError errno code, equivalent to ENOENT
126
@deprecated_function(zero_thirteen)
127
def gen_file_id(name):
128
"""Return new file id for the basename 'name'.
130
Use bzrlib.generate_ids.gen_file_id() instead
132
return generate_ids.gen_file_id(name)
135
@deprecated_function(zero_thirteen)
137
"""Return a new tree-root file id.
139
This has been deprecated in favor of bzrlib.generate_ids.gen_root_id()
141
return generate_ids.gen_root_id()
115
144
class TreeEntry(object):
116
145
"""An entry that implements the minimum interface used by commands.
118
This needs further inspection, it may be better to have
147
This needs further inspection, it may be better to have
119
148
InventoryEntries without ids - though that seems wrong. For now,
120
149
this is a parallel hierarchy to InventoryEntry, and needs to become
121
150
one of several things: decorates to that hierarchy, children of, or
422
390
# at this point ?
424
392
return self.branch.repository.revision_tree(revision_id)
425
except (errors.RevisionNotPresent, errors.NoSuchRevision):
393
except errors.RevisionNotPresent:
426
394
# the basis tree *may* be a ghost or a low level error may have
427
# occurred. If the revision is present, its a problem, if its not
395
# occured. If the revision is present, its a problem, if its not
429
397
if self.branch.repository.has_revision(revision_id):
431
399
# the basis tree is a ghost so return an empty tree.
432
return self.branch.repository.revision_tree(
433
_mod_revision.NULL_REVISION)
436
self._flush_ignore_list_cache()
400
return self.branch.repository.revision_tree(None)
403
@deprecated_method(zero_eight)
404
def create(branch, directory):
405
"""Create a workingtree for branch at directory.
407
If existing_directory already exists it must have a .bzr directory.
408
If it does not exist, it will be created.
410
This returns a new WorkingTree object for the new checkout.
412
TODO FIXME RBC 20060124 when we have checkout formats in place this
413
should accept an optional revisionid to checkout [and reject this if
414
checking out into the same dir as a pre-checkout-aware branch format.]
416
XXX: When BzrDir is present, these should be created through that
419
warnings.warn('delete WorkingTree.create', stacklevel=3)
420
transport = get_transport(directory)
421
if branch.bzrdir.root_transport.base == transport.base:
423
return branch.bzrdir.create_workingtree()
424
# different directory,
425
# create a branch reference
426
# and now a working tree.
427
raise NotImplementedError
430
@deprecated_method(zero_eight)
431
def create_standalone(directory):
432
"""Create a checkout and a branch and a repo at directory.
434
Directory must exist and be empty.
436
please use BzrDir.create_standalone_workingtree
438
return bzrdir.BzrDir.create_standalone_workingtree(directory)
438
440
def relpath(self, path):
439
441
"""Return the local path portion from a given path.
441
The path may be absolute or relative. If its a relative path it is
443
The path may be absolute or relative. If its a relative path it is
442
444
interpreted relative to the python current working directory.
444
446
return osutils.relpath(self.basedir, path)
446
448
def has_filename(self, filename):
447
449
return osutils.lexists(self.abspath(filename))
449
def get_file(self, file_id, path=None, filtered=True):
450
return self.get_file_with_stat(file_id, path, filtered=filtered)[0]
452
def get_file_with_stat(self, file_id, path=None, filtered=True,
454
"""See Tree.get_file_with_stat."""
456
path = self.id2path(file_id)
457
file_obj = self.get_file_byname(path, filtered=False)
458
stat_value = _fstat(file_obj.fileno())
459
if filtered and self.supports_content_filtering():
460
filters = self._content_filter_stack(path)
461
file_obj = filtered_input_file(file_obj, filters)
462
return (file_obj, stat_value)
464
def get_file_text(self, file_id, path=None, filtered=True):
465
return self.get_file(file_id, path=path, filtered=filtered).read()
467
def get_file_byname(self, filename, filtered=True):
468
path = self.abspath(filename)
470
if filtered and self.supports_content_filtering():
471
filters = self._content_filter_stack(filename)
472
return filtered_input_file(f, filters)
476
def get_file_lines(self, file_id, path=None, filtered=True):
477
"""See Tree.get_file_lines()"""
478
file = self.get_file(file_id, path, filtered=filtered)
480
return file.readlines()
451
def get_file(self, file_id):
452
file_id = osutils.safe_file_id(file_id)
453
return self.get_file_byname(self.id2path(file_id))
455
def get_file_text(self, file_id):
456
file_id = osutils.safe_file_id(file_id)
457
return self.get_file(file_id).read()
459
def get_file_byname(self, filename):
460
return file(self.abspath(filename), 'rb')
485
def annotate_iter(self, file_id, default_revision=CURRENT_REVISION):
463
def annotate_iter(self, file_id):
486
464
"""See Tree.annotate_iter
488
466
This implementation will use the basis tree implementation if possible.
492
470
incorrectly attributed to CURRENT_REVISION (but after committing, the
493
471
attribution will be correct).
495
maybe_file_parent_keys = []
496
for parent_id in self.get_parent_ids():
498
parent_tree = self.revision_tree(parent_id)
499
except errors.NoSuchRevisionInTree:
500
parent_tree = self.branch.repository.revision_tree(parent_id)
501
parent_tree.lock_read()
503
if file_id not in parent_tree:
505
ie = parent_tree.inventory[file_id]
506
if ie.kind != 'file':
507
# Note: this is slightly unnecessary, because symlinks and
508
# directories have a "text" which is the empty text, and we
509
# know that won't mess up annotations. But it seems cleaner
511
parent_text_key = (file_id, ie.revision)
512
if parent_text_key not in maybe_file_parent_keys:
513
maybe_file_parent_keys.append(parent_text_key)
516
graph = _mod_graph.Graph(self.branch.repository.texts)
517
heads = graph.heads(maybe_file_parent_keys)
518
file_parent_keys = []
519
for key in maybe_file_parent_keys:
521
file_parent_keys.append(key)
523
# Now we have the parents of this content
524
annotator = self.branch.repository.texts.get_annotator()
525
text = self.get_file(file_id).read()
526
this_key =(file_id, default_revision)
527
annotator.add_special_text(this_key, file_parent_keys, text)
528
annotations = [(key[-1], line)
529
for key, line in annotator.annotate_flat(this_key)]
532
def _get_ancestors(self, default_revision):
533
ancestors = set([default_revision])
534
for parent_id in self.get_parent_ids():
535
ancestors.update(self.branch.repository.get_ancestry(
536
parent_id, topo_sorted=False))
473
file_id = osutils.safe_file_id(file_id)
474
basis = self.basis_tree()
477
changes = self._iter_changes(basis, True, [self.id2path(file_id)],
478
require_versioned=True).next()
479
changed_content, kind = changes[2], changes[6]
480
if not changed_content:
481
return basis.annotate_iter(file_id)
485
if kind[0] != 'file':
488
old_lines = list(basis.annotate_iter(file_id))
490
for tree in self.branch.repository.revision_trees(
491
self.get_parent_ids()[1:]):
492
if file_id not in tree:
494
old.append(list(tree.annotate_iter(file_id)))
495
return annotate.reannotate(old, self.get_file(file_id).readlines(),
539
500
def get_parent_ids(self):
540
501
"""See Tree.get_parent_ids.
542
503
This implementation reads the pending merges list and last_revision
543
504
value and uses that to decide what the parents list should be.
545
last_rev = _mod_revision.ensure_null(self._last_revision())
546
if _mod_revision.NULL_REVISION == last_rev:
506
last_rev = self._last_revision()
549
510
parents = [last_rev]
551
merges_bytes = self._transport.get_bytes('pending-merges')
512
merges_file = self._control_files.get('pending-merges')
552
513
except errors.NoSuchFile:
555
for l in osutils.split_lines(merges_bytes):
556
revision_id = l.rstrip('\n')
516
for l in merges_file.readlines():
517
revision_id = osutils.safe_revision_id(l.rstrip('\n'))
557
518
parents.append(revision_id)
561
522
def get_root_id(self):
562
523
"""Return the id of this trees root"""
563
524
return self._inventory.root.file_id
565
526
def _get_store_filename(self, file_id):
566
527
## XXX: badly named; this is not in the store at all
528
file_id = osutils.safe_file_id(file_id)
567
529
return self.abspath(self.id2path(file_id))
570
532
def clone(self, to_bzrdir, revision_id=None):
571
533
"""Duplicate this working tree into to_bzr, including all state.
573
535
Specifically modified files are kept as modified, but
574
536
ignored and unknown files are discarded.
576
538
If you want to make a new line of development, see bzrdir.sprout()
579
If not None, the cloned tree will have its last revision set to
580
revision, and difference between the source trees last revision
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
581
543
and this one merged in.
583
545
# assumes the target bzr dir format is compatible.
584
result = to_bzrdir.create_workingtree()
546
result = self._format.initialize(to_bzrdir)
585
547
self.copy_content_into(result, revision_id)
616
581
__contains__ = has_id
618
583
def get_file_size(self, file_id):
619
"""See Tree.get_file_size"""
620
# XXX: this returns the on-disk size; it should probably return the
623
return os.path.getsize(self.id2abspath(file_id))
625
if e.errno != errno.ENOENT:
584
file_id = osutils.safe_file_id(file_id)
585
return os.path.getsize(self.id2abspath(file_id))
631
588
def get_file_sha1(self, file_id, path=None, stat_value=None):
589
file_id = osutils.safe_file_id(file_id)
633
591
path = self._inventory.id2path(file_id)
634
592
return self._hashcache.get_sha1(path, stat_value)
636
594
def get_file_mtime(self, file_id, path=None):
595
file_id = osutils.safe_file_id(file_id)
638
597
path = self.inventory.id2path(file_id)
639
598
return os.lstat(self.abspath(path)).st_mtime
641
def _is_executable_from_path_and_stat_from_basis(self, path, stat_result):
642
file_id = self.path2id(path)
644
# For unversioned files on win32, we just assume they are not
647
return self._inventory[file_id].executable
649
def _is_executable_from_path_and_stat_from_stat(self, path, stat_result):
650
mode = stat_result.st_mode
651
return bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode)
653
600
if not supports_executable():
654
601
def is_executable(self, file_id, path=None):
602
file_id = osutils.safe_file_id(file_id)
655
603
return self._inventory[file_id].executable
657
_is_executable_from_path_and_stat = \
658
_is_executable_from_path_and_stat_from_basis
660
605
def is_executable(self, file_id, path=None):
607
file_id = osutils.safe_file_id(file_id)
662
608
path = self.id2path(file_id)
663
609
mode = os.lstat(self.abspath(path)).st_mode
664
610
return bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode)
666
_is_executable_from_path_and_stat = \
667
_is_executable_from_path_and_stat_from_stat
669
612
@needs_tree_write_lock
670
613
def _add(self, files, ids, kinds):
671
614
"""See MutableTree._add."""
672
615
# TODO: Re-adding a file that is removed in the working copy
673
616
# should probably put it back with the previous ID.
674
# the read and write working inventory should not occur in this
617
# the read and write working inventory should not occur in this
675
618
# function - they should be part of lock_write and unlock.
619
inv = self.read_working_inventory()
677
620
for f, file_id, kind in zip(files, ids, kinds):
621
assert kind is not None
678
622
if file_id is None:
679
623
inv.add_path(f, kind=kind)
625
file_id = osutils.safe_file_id(file_id)
681
626
inv.add_path(f, kind=kind, file_id=file_id)
682
self._inventory_is_modified = True
627
self._write_inventory(inv)
684
629
@needs_tree_write_lock
685
630
def _gather_kinds(self, files, kinds):
746
691
self.set_parent_ids(parents, allow_leftmost_as_ghost=True)
748
def path_content_summary(self, path, _lstat=os.lstat,
749
_mapper=osutils.file_kind_from_stat_mode):
750
"""See Tree.path_content_summary."""
751
abspath = self.abspath(path)
753
stat_result = _lstat(abspath)
755
if getattr(e, 'errno', None) == errno.ENOENT:
757
return ('missing', None, None, None)
758
# propagate other errors
760
kind = _mapper(stat_result.st_mode)
762
return self._file_content_summary(path, stat_result)
763
elif kind == 'directory':
764
# perhaps it looks like a plain directory, but it's really a
766
if self._directory_is_tree_reference(path):
767
kind = 'tree-reference'
768
return kind, None, None, None
769
elif kind == 'symlink':
770
target = osutils.readlink(abspath)
771
return ('symlink', None, None, target)
773
return (kind, None, None, None)
775
def _file_content_summary(self, path, stat_result):
776
size = stat_result.st_size
777
executable = self._is_executable_from_path_and_stat(path, stat_result)
778
# try for a stat cache lookup
779
return ('file', size, executable, self._sha_from_stat(
693
@deprecated_method(zero_eleven)
695
def pending_merges(self):
696
"""Return a list of pending merges.
698
These are revisions that have been merged into the working
699
directory but not yet committed.
701
As of 0.11 this is deprecated. Please see WorkingTree.get_parent_ids()
702
instead - which is available on all tree objects.
704
return self.get_parent_ids()[1:]
782
706
def _check_parents_for_ghosts(self, revision_ids, allow_leftmost_as_ghost):
783
707
"""Common ghost checking functionality from set_parent_*.
794
718
def _set_merges_from_parent_ids(self, parent_ids):
795
719
merges = parent_ids[1:]
796
self._transport.put_bytes('pending-merges', '\n'.join(merges),
797
mode=self.bzrdir._get_file_mode())
799
def _filter_parent_ids_by_ancestry(self, revision_ids):
800
"""Check that all merged revisions are proper 'heads'.
802
This will always return the first revision_id, and any merged revisions
805
if len(revision_ids) == 0:
807
graph = self.branch.repository.get_graph()
808
heads = graph.heads(revision_ids)
809
new_revision_ids = revision_ids[:1]
810
for revision_id in revision_ids[1:]:
811
if revision_id in heads and revision_id not in new_revision_ids:
812
new_revision_ids.append(revision_id)
813
if new_revision_ids != revision_ids:
814
trace.mutter('requested to set revision_ids = %s,'
815
' but filtered to %s', revision_ids, new_revision_ids)
816
return new_revision_ids
720
self._control_files.put_bytes('pending-merges', '\n'.join(merges))
818
722
@needs_tree_write_lock
819
723
def set_parent_ids(self, revision_ids, allow_leftmost_as_ghost=False):
820
724
"""Set the parent ids to revision_ids.
822
726
See also set_parent_trees. This api will try to retrieve the tree data
823
727
for each element of revision_ids from the trees repository. If you have
824
728
tree data already available, it is more efficient to use
828
732
:param revision_ids: The revision_ids to set as the parent ids of this
829
733
working tree. Any of these may be ghosts.
735
revision_ids = [osutils.safe_revision_id(r) for r in revision_ids]
831
736
self._check_parents_for_ghosts(revision_ids,
832
737
allow_leftmost_as_ghost=allow_leftmost_as_ghost)
833
for revision_id in revision_ids:
834
_mod_revision.check_not_reserved_id(revision_id)
836
revision_ids = self._filter_parent_ids_by_ancestry(revision_ids)
838
739
if len(revision_ids) > 0:
839
740
self.set_last_revision(revision_ids[0])
841
self.set_last_revision(_mod_revision.NULL_REVISION)
742
self.set_last_revision(None)
843
744
self._set_merges_from_parent_ids(revision_ids)
845
746
@needs_tree_write_lock
846
747
def set_parent_trees(self, parents_list, allow_leftmost_as_ghost=False):
847
748
"""See MutableTree.set_parent_trees."""
848
parent_ids = [rev for (rev, tree) in parents_list]
849
for revision_id in parent_ids:
850
_mod_revision.check_not_reserved_id(revision_id)
749
parent_ids = [osutils.safe_revision_id(rev) for (rev, tree) in parents_list]
852
751
self._check_parents_for_ghosts(parent_ids,
853
752
allow_leftmost_as_ghost=allow_leftmost_as_ghost)
855
parent_ids = self._filter_parent_ids_by_ancestry(parent_ids)
857
754
if len(parent_ids) == 0:
858
leftmost_parent_id = _mod_revision.NULL_REVISION
755
leftmost_parent_id = None
859
756
leftmost_parent_tree = None
861
758
leftmost_parent_id, leftmost_parent_tree = parents_list[0]
886
783
yield Stanza(file_id=file_id.decode('utf8'), hash=hash)
887
784
self._put_rio('merge-hashes', iter_stanzas(), MERGE_MODIFIED_HEADER_1)
889
def _sha_from_stat(self, path, stat_result):
890
"""Get a sha digest from the tree's stat cache.
892
The default implementation assumes no stat cache is present.
894
:param path: The path.
895
:param stat_result: The stat result being looked up.
899
786
def _put_rio(self, filename, stanzas, header):
900
787
self._must_be_locked()
901
788
my_file = rio_file(stanzas, header)
902
self._transport.put_file(filename, my_file,
903
mode=self.bzrdir._get_file_mode())
789
self._control_files.put(filename, my_file)
905
791
@needs_write_lock # because merge pulls data into the branch.
906
def merge_from_branch(self, branch, to_revision=None, from_revision=None,
907
merge_type=None, force=False):
792
def merge_from_branch(self, branch, to_revision=None):
908
793
"""Merge from a branch into this working tree.
910
795
:param branch: The branch to merge from.
914
799
branch.last_revision().
916
801
from bzrlib.merge import Merger, Merge3Merger
917
merger = Merger(self.branch, this_tree=self)
918
# check that there are no local alterations
919
if not force and self.has_changes():
920
raise errors.UncommittedChanges(self)
921
if to_revision is None:
922
to_revision = _mod_revision.ensure_null(branch.last_revision())
923
merger.other_rev_id = to_revision
924
if _mod_revision.is_null(merger.other_rev_id):
925
raise errors.NoCommits(branch)
926
self.branch.fetch(branch, last_revision=merger.other_rev_id)
927
merger.other_basis = merger.other_rev_id
928
merger.other_tree = self.branch.repository.revision_tree(
930
merger.other_branch = branch
931
if from_revision is None:
802
pb = bzrlib.ui.ui_factory.nested_progress_bar()
804
merger = Merger(self.branch, this_tree=self, pb=pb)
805
merger.pp = ProgressPhase("Merge phase", 5, pb)
806
merger.pp.next_phase()
807
# check that there are no
809
merger.check_basis(check_clean=True, require_commits=False)
810
if to_revision is None:
811
to_revision = branch.last_revision()
813
to_revision = osutils.safe_revision_id(to_revision)
814
merger.other_rev_id = to_revision
815
if merger.other_rev_id is None:
816
raise error.NoCommits(branch)
817
self.branch.fetch(branch, last_revision=merger.other_rev_id)
818
merger.other_basis = merger.other_rev_id
819
merger.other_tree = self.branch.repository.revision_tree(
821
merger.other_branch = branch
822
merger.pp.next_phase()
932
823
merger.find_base()
934
merger.set_base_revision(from_revision, branch)
935
if merger.base_rev_id == merger.other_rev_id:
936
raise errors.PointlessMerge
937
merger.backup_files = False
938
if merge_type is None:
824
if merger.base_rev_id == merger.other_rev_id:
825
raise errors.PointlessMerge
826
merger.backup_files = False
939
827
merger.merge_type = Merge3Merger
941
merger.merge_type = merge_type
942
merger.set_interesting_files(None)
943
merger.show_base = False
944
merger.reprocess = False
945
conflicts = merger.do_merge()
828
merger.set_interesting_files(None)
829
merger.show_base = False
830
merger.reprocess = False
831
conflicts = merger.do_merge()
950
838
def merge_modified(self):
951
839
"""Return a dictionary of files modified by a merge.
953
The list is initialized by WorkingTree.set_merge_modified, which is
841
The list is initialized by WorkingTree.set_merge_modified, which is
954
842
typically called after we make some automatic updates to the tree
955
843
because of a merge.
958
846
still in the working inventory and have that text hash.
961
hashfile = self._transport.get('merge-hashes')
849
hashfile = self._control_files.get('merge-hashes')
962
850
except errors.NoSuchFile:
967
if hashfile.next() != MERGE_MODIFIED_HEADER_1 + '\n':
968
raise errors.MergeModifiedFormatError()
969
except StopIteration:
854
if hashfile.next() != MERGE_MODIFIED_HEADER_1 + '\n':
970
855
raise errors.MergeModifiedFormatError()
971
for s in RioReader(hashfile):
972
# RioReader reads in Unicode, so convert file_ids back to utf8
973
file_id = osutils.safe_file_id(s.get("file_id"), warn=False)
974
if file_id not in self.inventory:
976
text_hash = s.get("hash")
977
if text_hash == self.get_file_sha1(file_id):
978
merge_hashes[file_id] = text_hash
856
except StopIteration:
857
raise errors.MergeModifiedFormatError()
858
for s in RioReader(hashfile):
859
# RioReader reads in Unicode, so convert file_ids back to utf8
860
file_id = osutils.safe_file_id(s.get("file_id"), warn=False)
861
if file_id not in self.inventory:
863
text_hash = s.get("hash")
864
if text_hash == self.get_file_sha1(file_id):
865
merge_hashes[file_id] = text_hash
983
868
@needs_write_lock
984
869
def mkdir(self, path, file_id=None):
1036
920
other_tree.unlock()
1037
921
other_tree.bzrdir.retire_bzrdir()
1039
def _setup_directory_is_tree_reference(self):
1040
if self._branch.repository._format.supports_tree_reference:
1041
self._directory_is_tree_reference = \
1042
self._directory_may_be_tree_reference
1044
self._directory_is_tree_reference = \
1045
self._directory_is_never_tree_reference
1047
def _directory_is_never_tree_reference(self, relpath):
1050
def _directory_may_be_tree_reference(self, relpath):
1051
# as a special case, if a directory contains control files then
1052
# it's a tree reference, except that the root of the tree is not
1053
return relpath and osutils.isdir(self.abspath(relpath) + u"/.bzr")
1054
# TODO: We could ask all the control formats whether they
1055
# recognize this directory, but at the moment there's no cheap api
1056
# to do that. Since we probably can only nest bzr checkouts and
1057
# they always use this name it's ok for now. -- mbp 20060306
1059
# FIXME: There is an unhandled case here of a subdirectory
1060
# containing .bzr but not a branch; that will probably blow up
1061
# when you try to commit it. It might happen if there is a
1062
# checkout in a subdirectory. This can be avoided by not adding
1065
923
@needs_tree_write_lock
1066
924
def extract(self, file_id, format=None):
1067
925
"""Extract a subtree from this tree.
1069
927
A new branch will be created, relative to the path for this tree.
1074
932
transport = self.branch.bzrdir.root_transport
1075
933
for name in segments:
1076
934
transport = transport.clone(name)
1077
transport.ensure_base()
937
except errors.FileExists:
1078
939
return transport
1080
941
sub_path = self.id2path(file_id)
1081
942
branch_transport = mkdirs(sub_path)
1082
943
if format is None:
1083
format = self.bzrdir.cloning_metadir()
1084
branch_transport.ensure_base()
944
format = bzrdir.format_registry.make_bzrdir('dirstate-with-subtree')
946
branch_transport.mkdir('.')
947
except errors.FileExists:
1085
949
branch_bzrdir = format.initialize_on_transport(branch_transport)
1087
951
repo = branch_bzrdir.find_repository()
1088
952
except errors.NoRepositoryPresent:
1089
953
repo = branch_bzrdir.create_repository()
1090
if not repo.supports_rich_root():
1091
raise errors.RootNotRich()
954
assert repo.supports_rich_root()
956
if not repo.supports_rich_root():
957
raise errors.RootNotRich()
1092
958
new_branch = branch_bzrdir.create_branch()
1093
959
new_branch.pull(self.branch)
1094
960
for parent_id in self.get_parent_ids():
1127
991
sio = StringIO()
1128
992
self._serialize(self._inventory, sio)
1130
self._transport.put_file('inventory', sio,
1131
mode=self.bzrdir._get_file_mode())
994
self._control_files.put('inventory', sio)
1132
995
self._inventory_is_modified = False
1134
997
def _kind(self, relpath):
1135
998
return osutils.file_kind(self.abspath(relpath))
1137
def list_files(self, include_root=False, from_dir=None, recursive=True):
1138
"""List all files as (path, class, kind, id, entry).
1000
def list_files(self, include_root=False):
1001
"""Recursively list all files as (path, class, kind, id, entry).
1140
1003
Lists, but does not descend into unversioned directories.
1141
1005
This does not include files that have been deleted in this
1142
tree. Skips the control directory.
1144
:param include_root: if True, return an entry for the root
1145
:param from_dir: start from this directory or None for the root
1146
:param recursive: whether to recurse into subdirectories or not
1008
Skips the control directory.
1148
1010
# list_files is an iterator, so @needs_read_lock doesn't work properly
1149
1011
# with it. So callers should be careful to always read_lock the tree.
1164
1026
fk_entries = {'directory':TreeDirectory, 'file':TreeFile, 'symlink':TreeLink}
1166
1028
# directory file_id, relative path, absolute path, reverse sorted children
1167
if from_dir is not None:
1168
from_dir_id = inv.path2id(from_dir)
1169
if from_dir_id is None:
1170
# Directory not versioned
1172
from_dir_abspath = pathjoin(self.basedir, from_dir)
1174
from_dir_id = inv.root.file_id
1175
from_dir_abspath = self.basedir
1176
children = os.listdir(from_dir_abspath)
1029
children = os.listdir(self.basedir)
1177
1030
children.sort()
1178
# jam 20060527 The kernel sized tree seems equivalent whether we
1031
# jam 20060527 The kernel sized tree seems equivalent whether we
1179
1032
# use a deque and popleft to keep them sorted, or if we use a plain
1180
1033
# list and just reverse() them.
1181
1034
children = collections.deque(children)
1182
stack = [(from_dir_id, u'', from_dir_abspath, children)]
1035
stack = [(inv.root.file_id, u'', self.basedir, children)]
1184
1037
from_dir_id, from_dir_relpath, from_dir_abspath, children = stack[-1]
1239
1092
except KeyError:
1240
1093
yield fp[1:], c, fk, None, TreeEntry()
1243
1096
if fk != 'directory':
1246
# But do this child first if recursing down
1248
new_children = os.listdir(fap)
1250
new_children = collections.deque(new_children)
1251
stack.append((f_ie.file_id, fp, fap, new_children))
1252
# Break out of inner loop,
1253
# so that we start outer loop with child
1099
# But do this child first
1100
new_children = os.listdir(fap)
1102
new_children = collections.deque(new_children)
1103
stack.append((f_ie.file_id, fp, fap, new_children))
1104
# Break out of inner loop,
1105
# so that we start outer loop with child
1256
1108
# if we finished all children, pop it off the stack
1571
1410
:raises: NoSuchId if any fileid is not currently versioned.
1573
1412
for file_id in file_ids:
1574
if file_id not in self._inventory:
1575
raise errors.NoSuchId(self, file_id)
1576
for file_id in file_ids:
1413
file_id = osutils.safe_file_id(file_id)
1577
1414
if self._inventory.has_id(file_id):
1578
1415
self._inventory.remove_recursive_id(file_id)
1417
raise errors.NoSuchId(self, file_id)
1579
1418
if len(file_ids):
1580
# in the future this should just set a dirty bit to wait for the
1419
# in the future this should just set a dirty bit to wait for the
1581
1420
# final unlock. However, until all methods of workingtree start
1582
# with the current in -memory inventory rather than triggering
1421
# with the current in -memory inventory rather than triggering
1583
1422
# a read, it is more complex - we need to teach read_inventory
1584
1423
# to know when to read, and when to not read first... and possibly
1585
1424
# to save first when the in memory one may be corrupted.
1586
1425
# so for now, we just only write it if it is indeed dirty.
1587
1426
# - RBC 20060907
1588
1427
self._write_inventory(self._inventory)
1429
@deprecated_method(zero_eight)
1430
def iter_conflicts(self):
1431
"""List all files in the tree that have text or content conflicts.
1432
DEPRECATED. Use conflicts instead."""
1433
return self._iter_conflicts()
1590
1435
def _iter_conflicts(self):
1591
1436
conflicted = set()
1601
1446
@needs_write_lock
1602
1447
def pull(self, source, overwrite=False, stop_revision=None,
1603
change_reporter=None, possible_transports=None, local=False):
1448
change_reporter=None):
1449
top_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1604
1450
source.lock_read()
1452
pp = ProgressPhase("Pull phase", 2, top_pb)
1606
1454
old_revision_info = self.branch.last_revision_info()
1607
1455
basis_tree = self.basis_tree()
1608
count = self.branch.pull(source, overwrite, stop_revision,
1609
possible_transports=possible_transports,
1456
count = self.branch.pull(source, overwrite, stop_revision)
1611
1457
new_revision_info = self.branch.last_revision_info()
1612
1458
if new_revision_info != old_revision_info:
1613
1460
repository = self.branch.repository
1461
pb = bzrlib.ui.ui_factory.nested_progress_bar()
1614
1462
basis_tree.lock_read()
1616
1464
new_basis_tree = self.branch.basis_tree()
1619
1467
new_basis_tree,
1621
1469
this_tree=self,
1623
1471
change_reporter=change_reporter)
1624
basis_root_id = basis_tree.get_root_id()
1625
new_root_id = new_basis_tree.get_root_id()
1626
if basis_root_id != new_root_id:
1627
self.set_root_id(new_root_id)
1472
if (basis_tree.inventory.root is None and
1473
new_basis_tree.inventory.root is not None):
1474
self.set_root_id(new_basis_tree.inventory.root.file_id)
1629
1477
basis_tree.unlock()
1630
1478
# TODO - dedup parents list with things merged by pull ?
1631
1479
# reuse the revisiontree we merged against to set the new
1633
1481
parent_trees = [(self.branch.last_revision(), new_basis_tree)]
1634
# we have to pull the merge trees out again, because
1635
# merge_inner has set the ids. - this corner is not yet
1482
# we have to pull the merge trees out again, because
1483
# merge_inner has set the ids. - this corner is not yet
1636
1484
# layered well enough to prevent double handling.
1637
1485
# XXX TODO: Fix the double handling: telling the tree about
1638
1486
# the already known parent data is wasteful.
1734
1577
r"""Check whether the filename matches an ignore pattern.
1736
1579
Patterns containing '/' or '\' need to match the whole path;
1737
others match against only the last component. Patterns starting
1738
with '!' are ignore exceptions. Exceptions take precedence
1739
over regular patterns and cause the filename to not be ignored.
1580
others match against only the last component.
1741
1582
If the file is ignored, returns the pattern which caused it to
1742
1583
be ignored, otherwise None. So this can simply be used as a
1743
1584
boolean if desired."""
1744
1585
if getattr(self, '_ignoreglobster', None) is None:
1745
self._ignoreglobster = globbing.ExceptionGlobster(self.get_ignore_list())
1586
self._ignoreglobster = globbing.Globster(self.get_ignore_list())
1746
1587
return self._ignoreglobster.match(filename)
1748
1589
def kind(self, file_id):
1749
1590
return file_kind(self.id2abspath(file_id))
1751
def stored_kind(self, file_id):
1752
"""See Tree.stored_kind"""
1753
return self.inventory[file_id].kind
1755
1592
def _comparison_data(self, entry, path):
1756
1593
abspath = self.abspath(path)
1798
1635
raise errors.ObjectNotLocked(self)
1800
1637
def lock_read(self):
1801
"""Lock the tree for reading.
1803
This also locks the branch, and can be unlocked via self.unlock().
1805
:return: An object with an unlock method which will release the lock
1638
"""See Branch.lock_read, and WorkingTree.unlock."""
1808
1639
if not self.is_locked():
1809
1640
self._reset_data()
1810
1641
self.branch.lock_read()
1812
self._control_files.lock_read()
1643
return self._control_files.lock_read()
1815
1645
self.branch.unlock()
1818
1648
def lock_tree_write(self):
1819
"""See MutableTree.lock_tree_write, and WorkingTree.unlock.
1821
:return: An object with an unlock method which will release the lock
1649
"""See MutableTree.lock_tree_write, and WorkingTree.unlock."""
1824
1650
if not self.is_locked():
1825
1651
self._reset_data()
1826
1652
self.branch.lock_read()
1828
self._control_files.lock_write()
1654
return self._control_files.lock_write()
1831
1656
self.branch.unlock()
1834
1659
def lock_write(self):
1835
"""See MutableTree.lock_write, and WorkingTree.unlock.
1837
:return: An object with an unlock method which will release the lock
1660
"""See MutableTree.lock_write, and WorkingTree.unlock."""
1840
1661
if not self.is_locked():
1841
1662
self._reset_data()
1842
1663
self.branch.lock_write()
1844
self._control_files.lock_write()
1665
return self._control_files.lock_write()
1847
1667
self.branch.unlock()
1856
1676
def _reset_data(self):
1857
1677
"""Reset transient data that cannot be revalidated."""
1858
1678
self._inventory_is_modified = False
1859
f = self._transport.get('inventory')
1861
result = self._deserialize(f)
1679
result = self._deserialize(self._control_files.get('inventory'))
1864
1680
self._set_inventory(result, dirty=False)
1866
1682
@needs_tree_write_lock
1867
1683
def set_last_revision(self, new_revision):
1868
1684
"""Change the last revision in the working tree."""
1685
new_revision = osutils.safe_revision_id(new_revision)
1869
1686
if self._change_last_revision(new_revision):
1870
1687
self._cache_basis_inventory(new_revision)
1872
1689
def _change_last_revision(self, new_revision):
1873
1690
"""Template method part of set_last_revision to perform the change.
1875
1692
This is used to allow WorkingTree3 instances to not affect branch
1876
1693
when their last revision is set.
1878
if _mod_revision.is_null(new_revision):
1695
if new_revision is None:
1879
1696
self.branch.set_revision_history([])
1888
1705
def _write_basis_inventory(self, xml):
1889
1706
"""Write the basis inventory XML to the basis-inventory file"""
1707
assert isinstance(xml, str), 'serialised xml must be bytestring.'
1890
1708
path = self._basis_inventory_name()
1891
1709
sio = StringIO(xml)
1892
self._transport.put_file(path, sio,
1893
mode=self.bzrdir._get_file_mode())
1710
self._control_files.put(path, sio)
1895
1712
def _create_basis_xml_from_inventory(self, revision_id, inventory):
1896
1713
"""Create the text that will be saved in basis-inventory"""
1897
inventory.revision_id = revision_id
1714
# TODO: jam 20070209 This should be redundant, as the revision_id
1715
# as all callers should have already converted the revision_id to
1717
inventory.revision_id = osutils.safe_revision_id(revision_id)
1898
1718
return xml7.serializer_v7.write_inventory_to_string(inventory)
1900
1720
def _cache_basis_inventory(self, new_revision):
1903
1723
# as commit already has that ready-to-use [while the format is the
1904
1724
# same, that is].
1906
# this double handles the inventory - unpack and repack -
1726
# this double handles the inventory - unpack and repack -
1907
1727
# but is easier to understand. We can/should put a conditional
1908
1728
# in here based on whether the inventory is in the latest format
1909
1729
# - perhaps we should repack all inventories on a repository
1911
1731
# the fast path is to copy the raw xml from the repository. If the
1912
# xml contains 'revision_id="', then we assume the right
1732
# xml contains 'revision_id="', then we assume the right
1913
1733
# revision_id is set. We must check for this full string, because a
1914
1734
# root node id can legitimately look like 'revision_id' but cannot
1915
1735
# contain a '"'.
1916
xml = self.branch.repository._get_inventory_xml(new_revision)
1736
xml = self.branch.repository.get_inventory_xml(new_revision)
1917
1737
firstline = xml.split('\n', 1)[0]
1918
if (not 'revision_id="' in firstline or
1738
if (not 'revision_id="' in firstline or
1919
1739
'format="7"' not in firstline):
1920
inv = self.branch.repository._serializer.read_inventory_from_string(
1740
inv = self.branch.repository.deserialise_inventory(
1922
1742
xml = self._create_basis_xml_from_inventory(new_revision, inv)
1923
1743
self._write_basis_inventory(xml)
1924
1744
except (errors.NoSuchRevision, errors.RevisionNotPresent):
1927
1747
def read_basis_inventory(self):
1928
1748
"""Read the cached basis inventory."""
1929
1749
path = self._basis_inventory_name()
1930
return self._transport.get_bytes(path)
1750
return self._control_files.get(path).read()
1932
1752
@needs_read_lock
1933
1753
def read_working_inventory(self):
1934
1754
"""Read the working inventory.
1936
1756
:raises errors.InventoryModified: read_working_inventory will fail
1937
1757
when the current in memory inventory has been modified.
1939
# conceptually this should be an implementation detail of the tree.
1759
# conceptually this should be an implementation detail of the tree.
1940
1760
# XXX: Deprecate this.
1941
1761
# ElementTree does its own conversion from UTF-8, so open in
1943
1763
if self._inventory_is_modified:
1944
1764
raise errors.InventoryModified(self)
1945
f = self._transport.get('inventory')
1947
result = self._deserialize(f)
1765
result = self._deserialize(self._control_files.get('inventory'))
1950
1766
self._set_inventory(result, dirty=False)
1953
1769
@needs_tree_write_lock
1954
1770
def remove(self, files, verbose=False, to_file=None, keep_files=True,
1956
"""Remove nominated files from the working inventory.
1772
"""Remove nominated files from the working inventor.
1958
1774
:files: File paths relative to the basedir.
1959
1775
:keep_files: If true, the files will also be kept.
1960
1776
:force: Delete files and directories, even if they are changed and
1961
1777
even if the directories are not empty.
1779
## TODO: Normalize names
1963
1781
if isinstance(files, basestring):
1964
1782
files = [files]
1784
inv = self.inventory
1968
1786
new_files=set()
1969
unknown_nested_files=set()
1971
to_file = sys.stdout
1787
unknown_files_in_directory=set()
1973
1789
def recurse_directory_to_add_files(directory):
1974
# Recurse directory and add all files
1790
# recurse directory and add all files
1975
1791
# so we can check if they have changed.
1976
for parent_info, file_infos in\
1977
self.walkdirs(directory):
1978
for relpath, basename, kind, lstat, fileid, kind in file_infos:
1979
# Is it versioned or ignored?
1980
if self.path2id(relpath) or self.is_ignored(relpath):
1981
# Add nested content for deletion.
1982
new_files.add(relpath)
1984
# Files which are not versioned and not ignored
1985
# should be treated as unknown.
1986
unknown_nested_files.add((relpath, None, kind))
1792
for contained_dir_info in self.walkdirs(directory):
1793
for file_info in contained_dir_info[1]:
1794
if file_info[2] == 'file':
1795
relpath = self.relpath(file_info[0])
1796
if file_info[4]: #is it versioned?
1797
new_files.add(relpath)
1799
unknown_files_in_directory.add(
1800
(relpath, None, file_info[2]))
1988
1802
for filename in files:
1989
1803
# Get file name into canonical form.
1990
abspath = self.abspath(filename)
1991
filename = self.relpath(abspath)
1804
filename = self.relpath(self.abspath(filename))
1992
1805
if len(filename) > 0:
1993
1806
new_files.add(filename)
1994
recurse_directory_to_add_files(filename)
1996
files = list(new_files)
1999
return # nothing to do
1807
if osutils.isdir(filename) and len(os.listdir(filename)) > 0:
1808
recurse_directory_to_add_files(filename)
1809
files = [f for f in new_files]
2001
1811
# Sort needed to first handle directory content before the directory
2002
1812
files.sort(reverse=True)
2004
# Bail out if we are going to delete files we shouldn't
2005
1813
if not keep_files and not force:
2006
has_changed_files = len(unknown_nested_files) > 0
2007
if not has_changed_files:
2008
for (file_id, path, content_change, versioned, parent_id, name,
2009
kind, executable) in self.iter_changes(self.basis_tree(),
2010
include_unchanged=True, require_versioned=False,
2011
want_unversioned=True, specific_files=files):
2012
if versioned == (False, False):
2013
# The record is unknown ...
2014
if not self.is_ignored(path[1]):
2015
# ... but not ignored
2016
has_changed_files = True
2018
elif content_change and (kind[1] is not None):
2019
# Versioned and changed, but not deleted
2020
has_changed_files = True
2023
if has_changed_files:
2024
# Make delta show ALL applicable changes in error message.
2025
tree_delta = self.changes_from(self.basis_tree(),
2026
require_versioned=False, want_unversioned=True,
2027
specific_files=files)
2028
for unknown_file in unknown_nested_files:
2029
if unknown_file not in tree_delta.unversioned:
2030
tree_delta.unversioned.extend((unknown_file,))
1814
tree_delta = self.changes_from(self.basis_tree(),
1815
specific_files=files)
1816
for unknown_file in unknown_files_in_directory:
1817
tree_delta.unversioned.extend((unknown_file,))
1818
if bool(tree_delta.modified
1820
or tree_delta.renamed
1821
or tree_delta.kind_changed
1822
or tree_delta.unversioned):
2031
1823
raise errors.BzrRemoveChangedFilesError(tree_delta)
2033
# Build inv_delta and delete files where applicable,
2034
# do this before any modifications to inventory.
1825
# do this before any modifications
2035
1826
for f in files:
2036
fid = self.path2id(f)
1827
fid = inv.path2id(f)
2039
message = "%s is not versioned." % (f,)
1830
message="%s is not versioned." % (f,)
2042
1833
# having removed it, it must be either ignored or unknown
2044
1835
new_status = 'I'
2046
1837
new_status = '?'
2047
# XXX: Really should be a more abstract reporter interface
2048
kind_ch = osutils.kind_marker(self.kind(fid))
2049
to_file.write(new_status + ' ' + f + kind_ch + '\n')
2051
inv_delta.append((f, None, fid, None))
2052
message = "removed %s" % (f,)
1838
textui.show_status(new_status, inv[fid].kind, f,
1842
message="removed %s" % (f,)
2054
1844
if not keep_files:
2055
1845
abs_path = self.abspath(f)
2056
1846
if osutils.lexists(abs_path):
2057
1847
if (osutils.isdir(abs_path) and
2058
1848
len(os.listdir(abs_path)) > 0):
2060
osutils.rmtree(abs_path)
2062
message = "%s is not an empty directory "\
2063
"and won't be deleted." % (f,)
1849
message="%s is not empty directory "\
1850
"and won't be deleted." % (f,)
2065
1852
osutils.delete_any(abs_path)
2066
message = "deleted %s" % (f,)
1853
message="deleted %s" % (f,)
2067
1854
elif message is not None:
2068
# Only care if we haven't done anything yet.
2069
message = "%s does not exist." % (f,)
1855
# only care if we haven't done anything yet.
1856
message="%s does not exist." % (f,)
2071
# Print only one message (if any) per file.
1858
# print only one message (if any) per file.
2072
1859
if message is not None:
2074
self.apply_inventory_delta(inv_delta)
1861
self._write_inventory(inv)
2076
1863
@needs_tree_write_lock
2077
def revert(self, filenames=None, old_tree=None, backups=True,
2078
pb=None, report_changes=False):
1864
def revert(self, filenames, old_tree=None, backups=True,
1865
pb=DummyProgress(), report_changes=False):
2079
1866
from bzrlib.conflicts import resolve
2082
symbol_versioning.warn('Using [] to revert all files is deprecated'
2083
' as of bzr 0.91. Please use None (the default) instead.',
2084
DeprecationWarning, stacklevel=2)
2085
1867
if old_tree is None:
2086
basis_tree = self.basis_tree()
2087
basis_tree.lock_read()
2088
old_tree = basis_tree
1868
old_tree = self.basis_tree()
1869
conflicts = transform.revert(self, old_tree, filenames, backups, pb,
1871
if not len(filenames):
1872
self.set_parent_ids(self.get_parent_ids()[:1])
2092
conflicts = transform.revert(self, old_tree, filenames, backups, pb,
2094
if filenames is None and len(self.get_parent_ids()) > 1:
2096
last_revision = self.last_revision()
2097
if last_revision != _mod_revision.NULL_REVISION:
2098
if basis_tree is None:
2099
basis_tree = self.basis_tree()
2100
basis_tree.lock_read()
2101
parent_trees.append((last_revision, basis_tree))
2102
self.set_parent_trees(parent_trees)
2105
resolve(self, filenames, ignore_misses=True, recursive=True)
2107
if basis_tree is not None:
1875
resolve(self, filenames, ignore_misses=True)
2109
1876
return conflicts
2111
1878
def revision_tree(self, revision_id):
2230
1999
- Merge current state -> basis tree of the master w.r.t. the old tree
2232
2001
- Do a 'normal' merge of the old branch basis if it is relevant.
2234
:param revision: The target revision to update to. Must be in the
2236
:param old_tip: If branch.update() has already been run, the value it
2237
returned (old tip of the branch or None). _marker is used
2240
if self.branch.get_bound_location() is not None:
2003
if self.branch.get_master_branch() is not None:
2241
2004
self.lock_write()
2242
update_branch = (old_tip is self._marker)
2005
update_branch = True
2244
2007
self.lock_tree_write()
2245
2008
update_branch = False
2247
2010
if update_branch:
2248
old_tip = self.branch.update(possible_transports)
2011
old_tip = self.branch.update()
2250
if old_tip is self._marker:
2252
return self._update_tree(old_tip, change_reporter, revision)
2014
return self._update_tree(old_tip)
2256
2018
@needs_tree_write_lock
2257
def _update_tree(self, old_tip=None, change_reporter=None, revision=None):
2019
def _update_tree(self, old_tip=None):
2258
2020
"""Update a tree to the master branch.
2260
2022
:param old_tip: if supplied, the previous tip revision the branch,
2266
2028
# cant set that until we update the working trees last revision to be
2267
2029
# one from the new branch, because it will just get absorbed by the
2268
2030
# parent de-duplication logic.
2270
2032
# We MUST save it even if an error occurs, because otherwise the users
2271
2033
# local work is unreferenced and will appear to have been lost.
2275
2037
last_rev = self.get_parent_ids()[0]
2276
2038
except IndexError:
2277
last_rev = _mod_revision.NULL_REVISION
2278
if revision is None:
2279
revision = self.branch.last_revision()
2281
old_tip = old_tip or _mod_revision.NULL_REVISION
2283
if not _mod_revision.is_null(old_tip) and old_tip != last_rev:
2284
# the branch we are bound to was updated
2285
# merge those changes in first
2286
base_tree = self.basis_tree()
2287
other_tree = self.branch.repository.revision_tree(old_tip)
2288
nb_conflicts = merge.merge_inner(self.branch, other_tree,
2289
base_tree, this_tree=self,
2290
change_reporter=change_reporter)
2292
self.add_parent_tree((old_tip, other_tree))
2293
trace.note('Rerun update after fixing the conflicts.')
2296
if last_rev != _mod_revision.ensure_null(revision):
2297
# the working tree is up to date with the branch
2298
# we can merge the specified revision from master
2299
to_tree = self.branch.repository.revision_tree(revision)
2300
to_root_id = to_tree.get_root_id()
2040
if last_rev != self.branch.last_revision():
2041
# merge tree state up to new branch tip.
2302
2042
basis = self.basis_tree()
2303
2043
basis.lock_read()
2305
if (basis.inventory.root is None
2306
or basis.inventory.root.file_id != to_root_id):
2307
self.set_root_id(to_root_id)
2045
to_tree = self.branch.basis_tree()
2046
if basis.inventory.root is None:
2047
self.set_root_id(to_tree.inventory.root.file_id)
2049
result += merge.merge_inner(
2312
# determine the branch point
2313
graph = self.branch.repository.get_graph()
2314
base_rev_id = graph.find_unique_lca(self.branch.last_revision(),
2316
base_tree = self.branch.repository.revision_tree(base_rev_id)
2318
nb_conflicts = merge.merge_inner(self.branch, to_tree, base_tree,
2320
change_reporter=change_reporter)
2321
self.set_last_revision(revision)
2322
2056
# TODO - dedup parents list with things merged by pull ?
2323
2057
# reuse the tree we've updated to to set the basis:
2324
parent_trees = [(revision, to_tree)]
2058
parent_trees = [(self.branch.last_revision(), to_tree)]
2325
2059
merges = self.get_parent_ids()[1:]
2326
2060
# Ideally we ask the tree for the trees here, that way the working
2327
# tree can decide whether to give us the entire tree or give us a
2061
# tree can decide whether to give us teh entire tree or give us a
2328
2062
# lazy initialised tree. dirstate for instance will have the trees
2329
2063
# in ram already, whereas a last-revision + basis-inventory tree
2330
2064
# will not, but also does not need them when setting parents.
2331
2065
for parent in merges:
2332
2066
parent_trees.append(
2333
2067
(parent, self.branch.repository.revision_tree(parent)))
2334
if not _mod_revision.is_null(old_tip):
2068
if old_tip is not None:
2335
2069
parent_trees.append(
2336
2070
(old_tip, self.branch.repository.revision_tree(old_tip)))
2337
2071
self.set_parent_trees(parent_trees)
2338
2072
last_rev = parent_trees[0][0]
2074
# the working tree had the same last-revision as the master
2075
# branch did. We may still have pivot local work from the local
2076
# branch into old_tip:
2077
if old_tip is not None:
2078
self.add_parent_tree_id(old_tip)
2079
if old_tip and old_tip != last_rev:
2080
# our last revision was not the prior branch last revision
2081
# and we have converted that last revision to a pending merge.
2082
# base is somewhere between the branch tip now
2083
# and the now pending merge
2085
# Since we just modified the working tree and inventory, flush out
2086
# the current state, before we modify it again.
2087
# TODO: jam 20070214 WorkingTree3 doesn't require this, dirstate
2088
# requires it only because TreeTransform directly munges the
2089
# inventory and calls tree._write_inventory(). Ultimately we
2090
# should be able to remove this extra flush.
2092
from bzrlib.revision import common_ancestor
2094
base_rev_id = common_ancestor(self.branch.last_revision(),
2096
self.branch.repository)
2097
except errors.NoCommonAncestor:
2099
base_tree = self.branch.repository.revision_tree(base_rev_id)
2100
other_tree = self.branch.repository.revision_tree(old_tip)
2101
result += merge.merge_inner(
2341
2108
def _write_hashcache_if_dirty(self):
2342
2109
"""Write out the hashcache if it is dirty."""
2426
2193
current_inv = None
2427
2194
inv_finished = True
2428
2195
while not inv_finished or not disk_finished:
2430
((cur_disk_dir_relpath, cur_disk_dir_path_from_top),
2431
cur_disk_dir_content) = current_disk
2433
((cur_disk_dir_relpath, cur_disk_dir_path_from_top),
2434
cur_disk_dir_content) = ((None, None), None)
2435
2196
if not disk_finished:
2436
2197
# strip out .bzr dirs
2437
if (cur_disk_dir_path_from_top[top_strip_len:] == '' and
2438
len(cur_disk_dir_content) > 0):
2439
# osutils.walkdirs can be made nicer -
2198
if current_disk[0][1][top_strip_len:] == '':
2199
# osutils.walkdirs can be made nicer -
2440
2200
# yield the path-from-prefix rather than the pathjoined
2442
bzrdir_loc = bisect_left(cur_disk_dir_content,
2444
if (bzrdir_loc < len(cur_disk_dir_content)
2445
and self.bzrdir.is_control_filename(
2446
cur_disk_dir_content[bzrdir_loc][0])):
2202
bzrdir_loc = bisect_left(current_disk[1], ('.bzr', '.bzr'))
2203
if current_disk[1][bzrdir_loc][0] == '.bzr':
2447
2204
# we dont yield the contents of, or, .bzr itself.
2448
del cur_disk_dir_content[bzrdir_loc]
2205
del current_disk[1][bzrdir_loc]
2449
2206
if inv_finished:
2450
2207
# everything is unknown
2644
2367
if self._inventory is None:
2645
2368
self.read_working_inventory()
2647
def _get_check_refs(self):
2648
"""Return the references needed to perform a check of this tree."""
2649
return [('trees', self.last_revision())]
2651
2370
def lock_tree_write(self):
2652
2371
"""See WorkingTree.lock_tree_write().
2654
2373
In Format2 WorkingTrees we have a single lock for the branch and tree
2655
2374
so lock_tree_write() degrades to lock_write().
2657
:return: An object with an unlock method which will release the lock
2660
2376
self.branch.lock_write()
2662
self._control_files.lock_write()
2378
return self._control_files.lock_write()
2665
2380
self.branch.unlock()
2668
2383
def unlock(self):
2669
# do non-implementation specific cleanup
2672
2384
# we share control files:
2673
2385
if self._control_files._lock_count == 3:
2674
2386
# _inventory_is_modified is always False during a read lock.
2675
2387
if self._inventory_is_modified:
2677
2389
self._write_hashcache_if_dirty()
2679
2391
# reverse order of locking.
2681
2393
return self._control_files.unlock()
2697
2409
def _last_revision(self):
2698
2410
"""See Mutable.last_revision."""
2700
return self._transport.get_bytes('last-revision')
2412
return osutils.safe_revision_id(
2413
self._control_files.get('last-revision').read())
2701
2414
except errors.NoSuchFile:
2702
return _mod_revision.NULL_REVISION
2704
2417
def _change_last_revision(self, revision_id):
2705
2418
"""See WorkingTree._change_last_revision."""
2706
if revision_id is None or revision_id == _mod_revision.NULL_REVISION:
2419
if revision_id is None or revision_id == NULL_REVISION:
2708
self._transport.delete('last-revision')
2421
self._control_files._transport.delete('last-revision')
2709
2422
except errors.NoSuchFile:
2713
self._transport.put_bytes('last-revision', revision_id,
2714
mode=self.bzrdir._get_file_mode())
2426
self._control_files.put_bytes('last-revision', revision_id)
2717
def _get_check_refs(self):
2718
"""Return the references needed to perform a check of this tree."""
2719
return [('trees', self.last_revision())]
2721
2429
@needs_tree_write_lock
2722
2430
def set_conflicts(self, conflicts):
2723
self._put_rio('conflicts', conflicts.to_stanzas(),
2431
self._put_rio('conflicts', conflicts.to_stanzas(),
2724
2432
CONFLICT_HEADER_1)
2726
2434
@needs_tree_write_lock
2869
2580
"""See WorkingTreeFormat.get_format_description()."""
2870
2581
return "Working tree format 2"
2872
def _stub_initialize_on_transport(self, transport, file_mode):
2873
"""Workaround: create control files for a remote working tree.
2583
def stub_initialize_remote(self, control_files):
2584
"""As a special workaround create critical control files for a remote working tree
2875
2586
This ensures that it can later be updated and dealt with locally,
2876
since BzrDirFormat6 and BzrDirFormat5 cannot represent dirs with
2587
since BzrDirFormat6 and BzrDirFormat5 cannot represent dirs with
2877
2588
no working tree. (See bug #43064).
2879
2590
sio = StringIO()
2880
inv = inventory.Inventory()
2881
xml5.serializer_v5.write_inventory(inv, sio, working=True)
2592
xml5.serializer_v5.write_inventory(inv, sio)
2883
transport.put_file('inventory', sio, file_mode)
2884
transport.put_bytes('pending-merges', '', file_mode)
2886
def initialize(self, a_bzrdir, revision_id=None, from_branch=None,
2887
accelerator_tree=None, hardlink=False):
2594
control_files.put('inventory', sio)
2596
control_files.put_bytes('pending-merges', '')
2599
def initialize(self, a_bzrdir, revision_id=None):
2888
2600
"""See WorkingTreeFormat.initialize()."""
2889
2601
if not isinstance(a_bzrdir.transport, LocalTransport):
2890
2602
raise errors.NotLocalUrl(a_bzrdir.transport.base)
2891
if from_branch is not None:
2892
branch = from_branch
2894
branch = a_bzrdir.open_branch()
2895
if revision_id is None:
2896
revision_id = _mod_revision.ensure_null(branch.last_revision())
2899
branch.generate_revision_history(revision_id)
2902
inv = inventory.Inventory()
2603
branch = a_bzrdir.open_branch()
2604
if revision_id is not None:
2605
revision_id = osutils.safe_revision_id(revision_id)
2608
revision_history = branch.revision_history()
2610
position = revision_history.index(revision_id)
2612
raise errors.NoSuchRevision(branch, revision_id)
2613
branch.set_revision_history(revision_history[:position + 1])
2616
revision = branch.last_revision()
2903
2618
wt = WorkingTree2(a_bzrdir.root_transport.local_abspath('.'),
2906
2621
_internal=True,
2908
2623
_bzrdir=a_bzrdir)
2909
basis_tree = branch.repository.revision_tree(revision_id)
2624
basis_tree = branch.repository.revision_tree(revision)
2910
2625
if basis_tree.inventory.root is not None:
2911
wt.set_root_id(basis_tree.get_root_id())
2626
wt.set_root_id(basis_tree.inventory.root.file_id)
2912
2627
# set the parent list and cache the basis tree.
2913
if _mod_revision.is_null(revision_id):
2916
parent_trees = [(revision_id, basis_tree)]
2917
wt.set_parent_trees(parent_trees)
2628
wt.set_parent_trees([(revision, basis_tree)])
2918
2629
transform.build_tree(basis_tree, wt)
2974
2685
def _open_control_files(self, a_bzrdir):
2975
2686
transport = a_bzrdir.get_workingtree_transport(None)
2976
return LockableFiles(transport, self._lock_file_name,
2687
return LockableFiles(transport, self._lock_file_name,
2977
2688
self._lock_class)
2979
def initialize(self, a_bzrdir, revision_id=None, from_branch=None,
2980
accelerator_tree=None, hardlink=False):
2690
def initialize(self, a_bzrdir, revision_id=None):
2981
2691
"""See WorkingTreeFormat.initialize().
2983
:param revision_id: if supplied, create a working tree at a different
2984
revision than the branch is at.
2985
:param accelerator_tree: A tree which can be used for retrieving file
2986
contents more quickly than the revision tree, i.e. a workingtree.
2987
The revision tree will be used for cases where accelerator_tree's
2988
content is different.
2989
:param hardlink: If true, hard-link files from accelerator_tree,
2693
revision_id allows creating a working tree at a different
2694
revision than the branch is at.
2992
2696
if not isinstance(a_bzrdir.transport, LocalTransport):
2993
2697
raise errors.NotLocalUrl(a_bzrdir.transport.base)
3070
2772
return self.get_format_string()
3073
__default_format = WorkingTreeFormat6()
2775
__default_format = WorkingTreeFormat4()
3074
2776
WorkingTreeFormat.register_format(__default_format)
3075
WorkingTreeFormat.register_format(WorkingTreeFormat5())
3076
WorkingTreeFormat.register_format(WorkingTreeFormat4())
3077
2777
WorkingTreeFormat.register_format(WorkingTreeFormat3())
3078
2778
WorkingTreeFormat.set_default_format(__default_format)
3079
2779
# formats which have no format string are not discoverable
3080
2780
# and not independently creatable, so are not registered.
3081
2781
_legacy_formats = [WorkingTreeFormat2(),
2785
class WorkingTreeTestProviderAdapter(object):
2786
"""A tool to generate a suite testing multiple workingtree formats at once.
2788
This is done by copying the test once for each transport and injecting
2789
the transport_server, transport_readonly_server, and workingtree_format
2790
classes into each copy. Each copy is also given a new id() to make it
2794
def __init__(self, transport_server, transport_readonly_server, formats):
2795
self._transport_server = transport_server
2796
self._transport_readonly_server = transport_readonly_server
2797
self._formats = formats
2799
def _clone_test(self, test, bzrdir_format, workingtree_format, variation):
2800
"""Clone test for adaption."""
2801
new_test = deepcopy(test)
2802
new_test.transport_server = self._transport_server
2803
new_test.transport_readonly_server = self._transport_readonly_server
2804
new_test.bzrdir_format = bzrdir_format
2805
new_test.workingtree_format = workingtree_format
2806
def make_new_test_id():
2807
new_id = "%s(%s)" % (test.id(), variation)
2808
return lambda: new_id
2809
new_test.id = make_new_test_id()
2812
def adapt(self, test):
2813
from bzrlib.tests import TestSuite
2814
result = TestSuite()
2815
for workingtree_format, bzrdir_format in self._formats:
2816
new_test = self._clone_test(
2819
workingtree_format, workingtree_format.__class__.__name__)
2820
result.addTest(new_test)
added
removed
bzrlib/workingtree.py
