380
378
inv = self._inventory
381
379
for path, ie in inv.iter_entries():
382
if osutils.lexists(self.abspath(path)):
380
if bzrlib.osutils.lexists(self.abspath(path)):
385
def all_file_ids(self):
386
"""See Tree.iter_all_file_ids"""
387
return set(self.inventory)
389
383
def __repr__(self):
390
384
return "<%s of %s>" % (self.__class__.__name__,
391
385
getattr(self, 'basedir', None))
393
387
def abspath(self, filename):
394
388
return pathjoin(self.basedir, filename)
396
390
def basis_tree(self):
397
"""Return RevisionTree for the current last revision.
399
If the left most parent is a ghost then the returned tree will be an
400
empty tree - one obtained by calling
401
repository.revision_tree(NULL_REVISION).
404
revision_id = self.get_parent_ids()[0]
406
# no parents, return an empty revision tree.
407
# in the future this should return the tree for
408
# 'empty:' - the implicit root empty tree.
409
return self.branch.repository.revision_tree(
410
_mod_revision.NULL_REVISION)
412
return self.revision_tree(revision_id)
413
except errors.NoSuchRevision:
415
# No cached copy available, retrieve from the repository.
416
# FIXME? RBC 20060403 should we cache the inventory locally
419
return self.branch.repository.revision_tree(revision_id)
420
except (errors.RevisionNotPresent, errors.NoSuchRevision):
421
# the basis tree *may* be a ghost or a low level error may have
422
# occurred. If the revision is present, its a problem, if its not
424
if self.branch.repository.has_revision(revision_id):
426
# the basis tree is a ghost so return an empty tree.
427
return self.branch.repository.revision_tree(
428
_mod_revision.NULL_REVISION)
431
self._flush_ignore_list_cache()
391
"""Return RevisionTree for the current last revision."""
392
revision_id = self.last_revision()
393
if revision_id is not None:
395
xml = self.read_basis_inventory()
396
inv = bzrlib.xml5.serializer_v5.read_inventory_from_string(xml)
399
if inv is not None and inv.revision_id == revision_id:
400
return bzrlib.tree.RevisionTree(self.branch.repository, inv,
402
# FIXME? RBC 20060403 should we cache the inventory here ?
403
return self.branch.repository.revision_tree(revision_id)
406
@deprecated_method(zero_eight)
407
def create(branch, directory):
408
"""Create a workingtree for branch at directory.
410
If existing_directory already exists it must have a .bzr directory.
411
If it does not exist, it will be created.
413
This returns a new WorkingTree object for the new checkout.
415
TODO FIXME RBC 20060124 when we have checkout formats in place this
416
should accept an optional revisionid to checkout [and reject this if
417
checking out into the same dir as a pre-checkout-aware branch format.]
419
XXX: When BzrDir is present, these should be created through that
422
warnings.warn('delete WorkingTree.create', stacklevel=3)
423
transport = get_transport(directory)
424
if branch.bzrdir.root_transport.base == transport.base:
426
return branch.bzrdir.create_workingtree()
427
# different directory,
428
# create a branch reference
429
# and now a working tree.
430
raise NotImplementedError
433
@deprecated_method(zero_eight)
434
def create_standalone(directory):
435
"""Create a checkout and a branch and a repo at directory.
437
Directory must exist and be empty.
439
please use BzrDir.create_standalone_workingtree
441
return bzrdir.BzrDir.create_standalone_workingtree(directory)
433
443
def relpath(self, path):
434
444
"""Return the local path portion from a given path.
436
The path may be absolute or relative. If its a relative path it is
446
The path may be absolute or relative. If its a relative path it is
437
447
interpreted relative to the python current working directory.
439
return osutils.relpath(self.basedir, path)
449
return relpath(self.basedir, path)
441
451
def has_filename(self, filename):
442
return osutils.lexists(self.abspath(filename))
444
def get_file(self, file_id, path=None, filtered=True):
445
return self.get_file_with_stat(file_id, path, filtered=filtered)[0]
447
def get_file_with_stat(self, file_id, path=None, filtered=True,
449
"""See Tree.get_file_with_stat."""
451
path = self.id2path(file_id)
452
file_obj = self.get_file_byname(path, filtered=False)
453
stat_value = _fstat(file_obj.fileno())
454
if filtered and self.supports_content_filtering():
455
filters = self._content_filter_stack(path)
456
file_obj = filtered_input_file(file_obj, filters)
457
return (file_obj, stat_value)
459
def get_file_text(self, file_id, path=None, filtered=True):
460
return self.get_file(file_id, path=path, filtered=filtered).read()
462
def get_file_byname(self, filename, filtered=True):
463
path = self.abspath(filename)
465
if filtered and self.supports_content_filtering():
466
filters = self._content_filter_stack(filename)
467
return filtered_input_file(f, filters)
471
def get_file_lines(self, file_id, path=None, filtered=True):
472
"""See Tree.get_file_lines()"""
473
file = self.get_file(file_id, path, filtered=filtered)
475
return file.readlines()
480
def annotate_iter(self, file_id, default_revision=CURRENT_REVISION):
481
"""See Tree.annotate_iter
483
This implementation will use the basis tree implementation if possible.
484
Lines not in the basis are attributed to CURRENT_REVISION
486
If there are pending merges, lines added by those merges will be
487
incorrectly attributed to CURRENT_REVISION (but after committing, the
488
attribution will be correct).
490
maybe_file_parent_keys = []
491
for parent_id in self.get_parent_ids():
493
parent_tree = self.revision_tree(parent_id)
494
except errors.NoSuchRevisionInTree:
495
parent_tree = self.branch.repository.revision_tree(parent_id)
496
parent_tree.lock_read()
498
if file_id not in parent_tree:
500
ie = parent_tree.inventory[file_id]
501
if ie.kind != 'file':
502
# Note: this is slightly unnecessary, because symlinks and
503
# directories have a "text" which is the empty text, and we
504
# know that won't mess up annotations. But it seems cleaner
506
parent_text_key = (file_id, ie.revision)
507
if parent_text_key not in maybe_file_parent_keys:
508
maybe_file_parent_keys.append(parent_text_key)
511
graph = _mod_graph.Graph(self.branch.repository.texts)
512
heads = graph.heads(maybe_file_parent_keys)
513
file_parent_keys = []
514
for key in maybe_file_parent_keys:
516
file_parent_keys.append(key)
518
# Now we have the parents of this content
519
annotator = self.branch.repository.texts.get_annotator()
520
text = self.get_file(file_id).read()
521
this_key =(file_id, default_revision)
522
annotator.add_special_text(this_key, file_parent_keys, text)
523
annotations = [(key[-1], line)
524
for key, line in annotator.annotate_flat(this_key)]
527
def _get_ancestors(self, default_revision):
528
ancestors = set([default_revision])
529
for parent_id in self.get_parent_ids():
530
ancestors.update(self.branch.repository.get_ancestry(
531
parent_id, topo_sorted=False))
452
return bzrlib.osutils.lexists(self.abspath(filename))
454
def get_file(self, file_id):
455
return self.get_file_byname(self.id2path(file_id))
457
def get_file_byname(self, filename):
458
return file(self.abspath(filename), 'rb')
534
460
def get_parent_ids(self):
535
461
"""See Tree.get_parent_ids.
537
463
This implementation reads the pending merges list and last_revision
538
464
value and uses that to decide what the parents list should be.
540
last_rev = _mod_revision.ensure_null(self._last_revision())
541
if _mod_revision.NULL_REVISION == last_rev:
466
last_rev = self.last_revision()
544
470
parents = [last_rev]
546
merges_bytes = self._transport.get_bytes('pending-merges')
547
except errors.NoSuchFile:
550
for l in osutils.split_lines(merges_bytes):
551
revision_id = l.rstrip('\n')
552
parents.append(revision_id)
471
other_parents = self.pending_merges()
472
return parents + other_parents
556
474
def get_root_id(self):
557
475
"""Return the id of this trees root"""
558
return self._inventory.root.file_id
476
inv = self.read_working_inventory()
477
return inv.root.file_id
560
479
def _get_store_filename(self, file_id):
561
480
## XXX: badly named; this is not in the store at all
562
481
return self.abspath(self.id2path(file_id))
565
def clone(self, to_bzrdir, revision_id=None):
484
def clone(self, to_bzrdir, revision_id=None, basis=None):
566
485
"""Duplicate this working tree into to_bzr, including all state.
568
487
Specifically modified files are kept as modified, but
569
488
ignored and unknown files are discarded.
571
490
If you want to make a new line of development, see bzrdir.sprout()
574
If not None, the cloned tree will have its last revision set to
575
revision, and difference between the source trees last revision
493
If not None, the cloned tree will have its last revision set to
494
revision, and and difference between the source trees last revision
576
495
and this one merged in.
498
If not None, a closer copy of a tree which may have some files in
499
common, and which file content should be preferentially copied from.
578
501
# assumes the target bzr dir format is compatible.
579
result = to_bzrdir.create_workingtree()
502
result = self._format.initialize(to_bzrdir)
580
503
self.copy_content_into(result, revision_id)
584
507
def copy_content_into(self, tree, revision_id=None):
585
508
"""Copy the current content and user files of this tree into tree."""
586
tree.set_root_id(self.get_root_id())
587
509
if revision_id is None:
588
merge.transform_tree(tree, self)
510
transform_tree(tree, self)
590
# TODO now merge from tree.last_revision to revision (to preserve
591
# user local changes)
592
merge.transform_tree(tree, self)
593
tree.set_parent_ids([revision_id])
512
# TODO now merge from tree.last_revision to revision
513
transform_tree(tree, self)
514
tree.set_last_revision(revision_id)
517
def commit(self, message=None, revprops=None, *args, **kwargs):
518
# avoid circular imports
519
from bzrlib.commit import Commit
522
if not 'branch-nick' in revprops:
523
revprops['branch-nick'] = self.branch.nick
524
# args for wt.commit start at message from the Commit.commit method,
525
# but with branch a kwarg now, passing in args as is results in the
526
#message being used for the branch
527
args = (DEPRECATED_PARAMETER, message, ) + args
528
committed_id = Commit().commit( working_tree=self, revprops=revprops,
530
self._set_inventory(self.read_working_inventory())
595
533
def id2abspath(self, file_id):
596
534
return self.abspath(self.id2path(file_id))
598
536
def has_id(self, file_id):
599
537
# files that have been deleted are excluded
538
inv = self._inventory
601
539
if not inv.has_id(file_id):
603
541
path = inv.id2path(file_id)
604
return osutils.lexists(self.abspath(path))
542
return bzrlib.osutils.lexists(self.abspath(path))
606
544
def has_or_had_id(self, file_id):
607
545
if file_id == self.inventory.root.file_id:
611
549
__contains__ = has_id
613
551
def get_file_size(self, file_id):
614
"""See Tree.get_file_size"""
615
# XXX: this returns the on-disk size; it should probably return the
618
return os.path.getsize(self.id2abspath(file_id))
620
if e.errno != errno.ENOENT:
552
return os.path.getsize(self.id2abspath(file_id))
626
def get_file_sha1(self, file_id, path=None, stat_value=None):
555
def get_file_sha1(self, file_id, path=None):
628
557
path = self._inventory.id2path(file_id)
629
return self._hashcache.get_sha1(path, stat_value)
558
return self._hashcache.get_sha1(path)
631
560
def get_file_mtime(self, file_id, path=None):
633
path = self.inventory.id2path(file_id)
562
path = self._inventory.id2path(file_id)
634
563
return os.lstat(self.abspath(path)).st_mtime
636
def _is_executable_from_path_and_stat_from_basis(self, path, stat_result):
637
file_id = self.path2id(path)
639
# For unversioned files on win32, we just assume they are not
642
return self._inventory[file_id].executable
644
def _is_executable_from_path_and_stat_from_stat(self, path, stat_result):
645
mode = stat_result.st_mode
646
return bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode)
648
565
if not supports_executable():
649
566
def is_executable(self, file_id, path=None):
650
567
return self._inventory[file_id].executable
652
_is_executable_from_path_and_stat = \
653
_is_executable_from_path_and_stat_from_basis
655
569
def is_executable(self, file_id, path=None):
657
path = self.id2path(file_id)
571
path = self._inventory.id2path(file_id)
658
572
mode = os.lstat(self.abspath(path)).st_mode
659
573
return bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode)
661
_is_executable_from_path_and_stat = \
662
_is_executable_from_path_and_stat_from_stat
664
@needs_tree_write_lock
665
def _add(self, files, ids, kinds):
666
"""See MutableTree._add."""
576
def add(self, files, ids=None):
577
"""Make files versioned.
579
Note that the command line normally calls smart_add instead,
580
which can automatically recurse.
582
This adds the files to the inventory, so that they will be
583
recorded by the next commit.
586
List of paths to add, relative to the base of the tree.
589
If set, use these instead of automatically generated ids.
590
Must be the same length as the list of files, but may
591
contain None for ids that are to be autogenerated.
593
TODO: Perhaps have an option to add the ids even if the files do
596
TODO: Perhaps callback with the ids and paths as they're added.
667
598
# TODO: Re-adding a file that is removed in the working copy
668
599
# should probably put it back with the previous ID.
669
# the read and write working inventory should not occur in this
670
# function - they should be part of lock_write and unlock.
672
for f, file_id, kind in zip(files, ids, kinds):
600
if isinstance(files, basestring):
601
assert(ids is None or isinstance(ids, basestring))
607
ids = [None] * len(files)
609
assert(len(ids) == len(files))
611
inv = self.read_working_inventory()
612
for f,file_id in zip(files, ids):
613
if self.is_control_filename(f):
614
raise errors.ForbiddenControlFileError(filename=f)
619
raise BzrError("cannot add top-level %r" % f)
621
fullpath = normpath(self.abspath(f))
623
kind = file_kind(fullpath)
625
if e.errno == errno.ENOENT:
626
raise NoSuchFile(fullpath)
627
if not InventoryEntry.versionable_kind(kind):
628
raise errors.BadFileKindError(filename=f, kind=kind)
673
629
if file_id is None:
674
630
inv.add_path(f, kind=kind)
676
632
inv.add_path(f, kind=kind, file_id=file_id)
677
self._inventory_is_modified = True
679
@needs_tree_write_lock
680
def _gather_kinds(self, files, kinds):
681
"""See MutableTree._gather_kinds."""
682
for pos, f in enumerate(files):
683
if kinds[pos] is None:
684
fullpath = normpath(self.abspath(f))
686
kinds[pos] = file_kind(fullpath)
688
if e.errno == errno.ENOENT:
689
raise errors.NoSuchFile(fullpath)
634
self._write_inventory(inv)
691
636
@needs_write_lock
692
def add_parent_tree_id(self, revision_id, allow_leftmost_as_ghost=False):
693
"""Add revision_id as a parent.
695
This is equivalent to retrieving the current list of parent ids
696
and setting the list to its value plus revision_id.
698
:param revision_id: The revision id to add to the parent list. It may
699
be a ghost revision as long as its not the first parent to be added,
700
or the allow_leftmost_as_ghost parameter is set True.
701
:param allow_leftmost_as_ghost: Allow the first parent to be a ghost.
703
parents = self.get_parent_ids() + [revision_id]
704
self.set_parent_ids(parents, allow_leftmost_as_ghost=len(parents) > 1
705
or allow_leftmost_as_ghost)
707
@needs_tree_write_lock
708
def add_parent_tree(self, parent_tuple, allow_leftmost_as_ghost=False):
709
"""Add revision_id, tree tuple as a parent.
711
This is equivalent to retrieving the current list of parent trees
712
and setting the list to its value plus parent_tuple. See also
713
add_parent_tree_id - if you only have a parent id available it will be
714
simpler to use that api. If you have the parent already available, using
715
this api is preferred.
717
:param parent_tuple: The (revision id, tree) to add to the parent list.
718
If the revision_id is a ghost, pass None for the tree.
719
:param allow_leftmost_as_ghost: Allow the first parent to be a ghost.
721
parent_ids = self.get_parent_ids() + [parent_tuple[0]]
722
if len(parent_ids) > 1:
723
# the leftmost may have already been a ghost, preserve that if it
725
allow_leftmost_as_ghost = True
726
self.set_parent_ids(parent_ids,
727
allow_leftmost_as_ghost=allow_leftmost_as_ghost)
729
@needs_tree_write_lock
730
637
def add_pending_merge(self, *revision_ids):
731
638
# TODO: Perhaps should check at this point that the
732
639
# history of the revision is actually present?
733
parents = self.get_parent_ids()
640
p = self.pending_merges()
735
642
for rev_id in revision_ids:
736
if rev_id in parents:
738
parents.append(rev_id)
741
self.set_parent_ids(parents, allow_leftmost_as_ghost=True)
743
def path_content_summary(self, path, _lstat=os.lstat,
744
_mapper=osutils.file_kind_from_stat_mode):
745
"""See Tree.path_content_summary."""
746
abspath = self.abspath(path)
648
self.set_pending_merges(p)
651
def pending_merges(self):
652
"""Return a list of pending merges.
654
These are revisions that have been merged into the working
655
directory but not yet committed.
748
stat_result = _lstat(abspath)
750
if getattr(e, 'errno', None) == errno.ENOENT:
752
return ('missing', None, None, None)
753
# propagate other errors
755
kind = _mapper(stat_result.st_mode)
757
return self._file_content_summary(path, stat_result)
758
elif kind == 'directory':
759
# perhaps it looks like a plain directory, but it's really a
761
if self._directory_is_tree_reference(path):
762
kind = 'tree-reference'
763
return kind, None, None, None
764
elif kind == 'symlink':
765
target = osutils.readlink(abspath)
766
return ('symlink', None, None, target)
768
return (kind, None, None, None)
770
def _file_content_summary(self, path, stat_result):
771
size = stat_result.st_size
772
executable = self._is_executable_from_path_and_stat(path, stat_result)
773
# try for a stat cache lookup
774
return ('file', size, executable, self._sha_from_stat(
777
def _check_parents_for_ghosts(self, revision_ids, allow_leftmost_as_ghost):
778
"""Common ghost checking functionality from set_parent_*.
780
This checks that the left hand-parent exists if there are any
783
if len(revision_ids) > 0:
784
leftmost_id = revision_ids[0]
785
if (not allow_leftmost_as_ghost and not
786
self.branch.repository.has_revision(leftmost_id)):
787
raise errors.GhostRevisionUnusableHere(leftmost_id)
789
def _set_merges_from_parent_ids(self, parent_ids):
790
merges = parent_ids[1:]
791
self._transport.put_bytes('pending-merges', '\n'.join(merges),
792
mode=self.bzrdir._get_file_mode())
794
def _filter_parent_ids_by_ancestry(self, revision_ids):
795
"""Check that all merged revisions are proper 'heads'.
797
This will always return the first revision_id, and any merged revisions
800
if len(revision_ids) == 0:
802
graph = self.branch.repository.get_graph()
803
heads = graph.heads(revision_ids)
804
new_revision_ids = revision_ids[:1]
805
for revision_id in revision_ids[1:]:
806
if revision_id in heads and revision_id not in new_revision_ids:
807
new_revision_ids.append(revision_id)
808
if new_revision_ids != revision_ids:
809
trace.mutter('requested to set revision_ids = %s,'
810
' but filtered to %s', revision_ids, new_revision_ids)
811
return new_revision_ids
813
@needs_tree_write_lock
814
def set_parent_ids(self, revision_ids, allow_leftmost_as_ghost=False):
815
"""Set the parent ids to revision_ids.
817
See also set_parent_trees. This api will try to retrieve the tree data
818
for each element of revision_ids from the trees repository. If you have
819
tree data already available, it is more efficient to use
820
set_parent_trees rather than set_parent_ids. set_parent_ids is however
821
an easier API to use.
823
:param revision_ids: The revision_ids to set as the parent ids of this
824
working tree. Any of these may be ghosts.
826
self._check_parents_for_ghosts(revision_ids,
827
allow_leftmost_as_ghost=allow_leftmost_as_ghost)
828
for revision_id in revision_ids:
829
_mod_revision.check_not_reserved_id(revision_id)
831
revision_ids = self._filter_parent_ids_by_ancestry(revision_ids)
833
if len(revision_ids) > 0:
834
self.set_last_revision(revision_ids[0])
836
self.set_last_revision(_mod_revision.NULL_REVISION)
838
self._set_merges_from_parent_ids(revision_ids)
840
@needs_tree_write_lock
841
def set_parent_trees(self, parents_list, allow_leftmost_as_ghost=False):
842
"""See MutableTree.set_parent_trees."""
843
parent_ids = [rev for (rev, tree) in parents_list]
844
for revision_id in parent_ids:
845
_mod_revision.check_not_reserved_id(revision_id)
847
self._check_parents_for_ghosts(parent_ids,
848
allow_leftmost_as_ghost=allow_leftmost_as_ghost)
850
parent_ids = self._filter_parent_ids_by_ancestry(parent_ids)
852
if len(parent_ids) == 0:
853
leftmost_parent_id = _mod_revision.NULL_REVISION
854
leftmost_parent_tree = None
856
leftmost_parent_id, leftmost_parent_tree = parents_list[0]
858
if self._change_last_revision(leftmost_parent_id):
859
if leftmost_parent_tree is None:
860
# If we don't have a tree, fall back to reading the
861
# parent tree from the repository.
862
self._cache_basis_inventory(leftmost_parent_id)
864
inv = leftmost_parent_tree.inventory
865
xml = self._create_basis_xml_from_inventory(
866
leftmost_parent_id, inv)
867
self._write_basis_inventory(xml)
868
self._set_merges_from_parent_ids(parent_ids)
870
@needs_tree_write_lock
658
merges_file = self._control_files.get_utf8('pending-merges')
662
for l in merges_file.readlines():
663
p.append(l.rstrip('\n'))
871
667
def set_pending_merges(self, rev_list):
872
parents = self.get_parent_ids()
873
leftmost = parents[:1]
874
new_parents = leftmost + rev_list
875
self.set_parent_ids(new_parents)
668
self._control_files.put_utf8('pending-merges', '\n'.join(rev_list))
877
@needs_tree_write_lock
878
671
def set_merge_modified(self, modified_hashes):
879
672
def iter_stanzas():
880
673
for file_id, hash in modified_hashes.iteritems():
881
yield Stanza(file_id=file_id.decode('utf8'), hash=hash)
674
yield Stanza(file_id=file_id, hash=hash)
882
675
self._put_rio('merge-hashes', iter_stanzas(), MERGE_MODIFIED_HEADER_1)
884
def _sha_from_stat(self, path, stat_result):
885
"""Get a sha digest from the tree's stat cache.
887
The default implementation assumes no stat cache is present.
889
:param path: The path.
890
:param stat_result: The stat result being looked up.
894
678
def _put_rio(self, filename, stanzas, header):
895
self._must_be_locked()
896
679
my_file = rio_file(stanzas, header)
897
self._transport.put_file(filename, my_file,
898
mode=self.bzrdir._get_file_mode())
900
@needs_write_lock # because merge pulls data into the branch.
901
def merge_from_branch(self, branch, to_revision=None, from_revision=None,
902
merge_type=None, force=False):
903
"""Merge from a branch into this working tree.
905
:param branch: The branch to merge from.
906
:param to_revision: If non-None, the merge will merge to to_revision,
907
but not beyond it. to_revision does not need to be in the history
908
of the branch when it is supplied. If None, to_revision defaults to
909
branch.last_revision().
911
from bzrlib.merge import Merger, Merge3Merger
912
pb = ui.ui_factory.nested_progress_bar()
914
merger = Merger(self.branch, this_tree=self, pb=pb)
915
merger.pp = ProgressPhase("Merge phase", 5, pb)
916
merger.pp.next_phase()
917
# check that there are no local alterations
918
if not force and self.has_changes():
919
raise errors.UncommittedChanges(self)
920
if to_revision is None:
921
to_revision = _mod_revision.ensure_null(branch.last_revision())
922
merger.other_rev_id = to_revision
923
if _mod_revision.is_null(merger.other_rev_id):
924
raise errors.NoCommits(branch)
925
self.branch.fetch(branch, last_revision=merger.other_rev_id)
926
merger.other_basis = merger.other_rev_id
927
merger.other_tree = self.branch.repository.revision_tree(
929
merger.other_branch = branch
930
merger.pp.next_phase()
931
if from_revision is None:
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:
939
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()
680
self._control_files.put(filename, my_file)
952
683
def merge_modified(self):
953
"""Return a dictionary of files modified by a merge.
955
The list is initialized by WorkingTree.set_merge_modified, which is
956
typically called after we make some automatic updates to the tree
959
This returns a map of file_id->sha1, containing only files which are
960
still in the working inventory and have that text hash.
963
hashfile = self._transport.get('merge-hashes')
964
except errors.NoSuchFile:
685
hashfile = self._control_files.get('merge-hashes')
969
if hashfile.next() != MERGE_MODIFIED_HEADER_1 + '\n':
970
raise errors.MergeModifiedFormatError()
971
except StopIteration:
972
raise errors.MergeModifiedFormatError()
973
for s in RioReader(hashfile):
974
# RioReader reads in Unicode, so convert file_ids back to utf8
975
file_id = osutils.safe_file_id(s.get("file_id"), warn=False)
976
if file_id not in self.inventory:
978
text_hash = s.get("hash")
979
if text_hash == self.get_file_sha1(file_id):
980
merge_hashes[file_id] = text_hash
986
def mkdir(self, path, file_id=None):
987
"""See MutableTree.mkdir()."""
989
file_id = generate_ids.gen_file_id(os.path.basename(path))
990
os.mkdir(self.abspath(path))
991
self.add(path, file_id, 'directory')
690
if hashfile.next() != MERGE_MODIFIED_HEADER_1 + '\n':
691
raise MergeModifiedFormatError()
692
except StopIteration:
693
raise MergeModifiedFormatError()
694
for s in RioReader(hashfile):
695
file_id = s.get("file_id")
696
if file_id not in self.inventory:
699
if hash == self.get_file_sha1(file_id):
700
merge_hashes[file_id] = hash
994
703
def get_symlink_target(self, file_id):
995
abspath = self.id2abspath(file_id)
996
target = osutils.readlink(abspath)
1000
def subsume(self, other_tree):
1001
def add_children(inventory, entry):
1002
for child_entry in entry.children.values():
1003
inventory._byid[child_entry.file_id] = child_entry
1004
if child_entry.kind == 'directory':
1005
add_children(inventory, child_entry)
1006
if other_tree.get_root_id() == self.get_root_id():
1007
raise errors.BadSubsumeSource(self, other_tree,
1008
'Trees have the same root')
1010
other_tree_path = self.relpath(other_tree.basedir)
1011
except errors.PathNotChild:
1012
raise errors.BadSubsumeSource(self, other_tree,
1013
'Tree is not contained by the other')
1014
new_root_parent = self.path2id(osutils.dirname(other_tree_path))
1015
if new_root_parent is None:
1016
raise errors.BadSubsumeSource(self, other_tree,
1017
'Parent directory is not versioned.')
1018
# We need to ensure that the result of a fetch will have a
1019
# versionedfile for the other_tree root, and only fetching into
1020
# RepositoryKnit2 guarantees that.
1021
if not self.branch.repository.supports_rich_root():
1022
raise errors.SubsumeTargetNeedsUpgrade(other_tree)
1023
other_tree.lock_tree_write()
1025
new_parents = other_tree.get_parent_ids()
1026
other_root = other_tree.inventory.root
1027
other_root.parent_id = new_root_parent
1028
other_root.name = osutils.basename(other_tree_path)
1029
self.inventory.add(other_root)
1030
add_children(self.inventory, other_root)
1031
self._write_inventory(self.inventory)
1032
# normally we don't want to fetch whole repositories, but i think
1033
# here we really do want to consolidate the whole thing.
1034
for parent_id in other_tree.get_parent_ids():
1035
self.branch.fetch(other_tree.branch, parent_id)
1036
self.add_parent_tree_id(parent_id)
1039
other_tree.bzrdir.retire_bzrdir()
1041
def _setup_directory_is_tree_reference(self):
1042
if self._branch.repository._format.supports_tree_reference:
1043
self._directory_is_tree_reference = \
1044
self._directory_may_be_tree_reference
1046
self._directory_is_tree_reference = \
1047
self._directory_is_never_tree_reference
1049
def _directory_is_never_tree_reference(self, relpath):
1052
def _directory_may_be_tree_reference(self, relpath):
1053
# as a special case, if a directory contains control files then
1054
# it's a tree reference, except that the root of the tree is not
1055
return relpath and osutils.isdir(self.abspath(relpath) + u"/.bzr")
1056
# TODO: We could ask all the control formats whether they
1057
# recognize this directory, but at the moment there's no cheap api
1058
# to do that. Since we probably can only nest bzr checkouts and
1059
# they always use this name it's ok for now. -- mbp 20060306
1061
# FIXME: There is an unhandled case here of a subdirectory
1062
# containing .bzr but not a branch; that will probably blow up
1063
# when you try to commit it. It might happen if there is a
1064
# checkout in a subdirectory. This can be avoided by not adding
1067
@needs_tree_write_lock
1068
def extract(self, file_id, format=None):
1069
"""Extract a subtree from this tree.
1071
A new branch will be created, relative to the path for this tree.
1075
segments = osutils.splitpath(path)
1076
transport = self.branch.bzrdir.root_transport
1077
for name in segments:
1078
transport = transport.clone(name)
1079
transport.ensure_base()
1082
sub_path = self.id2path(file_id)
1083
branch_transport = mkdirs(sub_path)
1085
format = self.bzrdir.cloning_metadir()
1086
branch_transport.ensure_base()
1087
branch_bzrdir = format.initialize_on_transport(branch_transport)
1089
repo = branch_bzrdir.find_repository()
1090
except errors.NoRepositoryPresent:
1091
repo = branch_bzrdir.create_repository()
1092
if not repo.supports_rich_root():
1093
raise errors.RootNotRich()
1094
new_branch = branch_bzrdir.create_branch()
1095
new_branch.pull(self.branch)
1096
for parent_id in self.get_parent_ids():
1097
new_branch.fetch(self.branch, parent_id)
1098
tree_transport = self.bzrdir.root_transport.clone(sub_path)
1099
if tree_transport.base != branch_transport.base:
1100
tree_bzrdir = format.initialize_on_transport(tree_transport)
1101
branch.BranchReferenceFormat().initialize(tree_bzrdir, new_branch)
1103
tree_bzrdir = branch_bzrdir
1104
wt = tree_bzrdir.create_workingtree(_mod_revision.NULL_REVISION)
1105
wt.set_parent_ids(self.get_parent_ids())
1106
my_inv = self.inventory
1107
child_inv = inventory.Inventory(root_id=None)
1108
new_root = my_inv[file_id]
1109
my_inv.remove_recursive_id(file_id)
1110
new_root.parent_id = None
1111
child_inv.add(new_root)
1112
self._write_inventory(my_inv)
1113
wt._write_inventory(child_inv)
1116
def _serialize(self, inventory, out_file):
1117
xml5.serializer_v5.write_inventory(self._inventory, out_file,
1120
def _deserialize(selt, in_file):
1121
return xml5.serializer_v5.read_inventory(in_file)
1124
"""Write the in memory inventory to disk."""
1125
# TODO: Maybe this should only write on dirty ?
1126
if self._control_files._lock_mode != 'w':
1127
raise errors.NotWriteLocked(self)
1129
self._serialize(self._inventory, sio)
1131
self._transport.put_file('inventory', sio,
1132
mode=self.bzrdir._get_file_mode())
1133
self._inventory_is_modified = False
1135
def _kind(self, relpath):
1136
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).
704
return os.readlink(self.id2abspath(file_id))
706
def file_class(self, filename):
707
if self.path2id(filename):
709
elif self.is_ignored(filename):
714
def list_files(self):
715
"""Recursively list all files as (path, class, kind, id, entry).
1141
717
Lists, but does not descend into unversioned directories.
1142
719
This does not include files that have been deleted in this
1143
tree. Skips the control directory.
1145
:param include_root: if True, do not 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
722
Skips the control directory.
1149
# list_files is an iterator, so @needs_read_lock doesn't work properly
1150
# with it. So callers should be careful to always read_lock the tree.
1151
if not self.is_locked():
1152
raise errors.ObjectNotLocked(self)
1154
inv = self.inventory
1155
if from_dir is None and include_root is True:
1156
yield ('', 'V', 'directory', inv.root.file_id, inv.root)
724
inv = self._inventory
1157
725
# Convert these into local objects to save lookup times
1158
pathjoin = osutils.pathjoin
1159
file_kind = self._kind
726
pathjoin = bzrlib.osutils.pathjoin
727
file_kind = bzrlib.osutils.file_kind
1161
729
# transport.base ends in a slash, we want the piece
1162
730
# between the last two slashes
1240
787
except KeyError:
1241
788
yield fp[1:], c, fk, None, TreeEntry()
1244
791
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
794
# But do this child first
795
new_children = os.listdir(fap)
797
new_children = collections.deque(new_children)
798
stack.append((f_ie.file_id, fp, fap, new_children))
799
# Break out of inner loop, so that we start outer loop with child
1257
802
# if we finished all children, pop it off the stack
1260
@needs_tree_write_lock
1261
def move(self, from_paths, to_dir=None, after=False, **kwargs):
807
def move(self, from_paths, to_name):
1262
808
"""Rename files.
1264
to_dir must exist in the inventory.
1266
If to_dir exists and is a directory, the files are moved into
1267
it, keeping their old names.
1269
Note that to_dir is only the last component of the new name;
810
to_name must exist in the inventory.
812
If to_name exists and is a directory, the files are moved into
813
it, keeping their old names.
815
Note that to_name is only the last component of the new name;
1270
816
this doesn't change the directory.
1272
For each entry in from_paths the move mode will be determined
1275
The first mode moves the file in the filesystem and updates the
1276
inventory. The second mode only updates the inventory without
1277
touching the file on the filesystem. This is the new mode introduced
1280
move uses the second mode if 'after == True' and the target is not
1281
versioned but present in the working tree.
1283
move uses the second mode if 'after == False' and the source is
1284
versioned but no longer in the working tree, and the target is not
1285
versioned but present in the working tree.
1287
move uses the first mode if 'after == False' and the source is
1288
versioned and present in the working tree, and the target is not
1289
versioned and not present in the working tree.
1291
Everything else results in an error.
1293
818
This returns a list of (from_path, to_path) pairs for each
1294
819
entry that is moved.
1299
# check for deprecated use of signature
1301
to_dir = kwargs.get('to_name', None)
1303
raise TypeError('You must supply a target directory')
1305
symbol_versioning.warn('The parameter to_name was deprecated'
1306
' in version 0.13. Use to_dir instead',
1309
# check destination directory
1310
if isinstance(from_paths, basestring):
822
## TODO: Option to move IDs only
823
assert not isinstance(from_paths, basestring)
1312
824
inv = self.inventory
1313
to_abs = self.abspath(to_dir)
825
to_abs = self.abspath(to_name)
1314
826
if not isdir(to_abs):
1315
raise errors.BzrMoveFailedError('',to_dir,
1316
errors.NotADirectory(to_abs))
1317
if not self.has_filename(to_dir):
1318
raise errors.BzrMoveFailedError('',to_dir,
1319
errors.NotInWorkingDirectory(to_dir))
1320
to_dir_id = inv.path2id(to_dir)
1321
if to_dir_id is None:
1322
raise errors.BzrMoveFailedError('',to_dir,
1323
errors.NotVersionedError(path=str(to_dir)))
827
raise BzrError("destination %r is not a directory" % to_abs)
828
if not self.has_filename(to_name):
829
raise BzrError("destination %r not in working directory" % to_abs)
830
to_dir_id = inv.path2id(to_name)
831
if to_dir_id == None and to_name != '':
832
raise BzrError("destination %r is not a versioned directory" % to_name)
1325
833
to_dir_ie = inv[to_dir_id]
1326
if to_dir_ie.kind != 'directory':
1327
raise errors.BzrMoveFailedError('',to_dir,
1328
errors.NotADirectory(to_abs))
1330
# create rename entries and tuples
1331
for from_rel in from_paths:
1332
from_tail = splitpath(from_rel)[-1]
1333
from_id = inv.path2id(from_rel)
1335
raise errors.BzrMoveFailedError(from_rel,to_dir,
1336
errors.NotVersionedError(path=str(from_rel)))
1338
from_entry = inv[from_id]
1339
from_parent_id = from_entry.parent_id
1340
to_rel = pathjoin(to_dir, from_tail)
1341
rename_entry = WorkingTree._RenameEntry(from_rel=from_rel,
1343
from_tail=from_tail,
1344
from_parent_id=from_parent_id,
1345
to_rel=to_rel, to_tail=from_tail,
1346
to_parent_id=to_dir_id)
1347
rename_entries.append(rename_entry)
1348
rename_tuples.append((from_rel, to_rel))
1350
# determine which move mode to use. checks also for movability
1351
rename_entries = self._determine_mv_mode(rename_entries, after)
1353
original_modified = self._inventory_is_modified
834
if to_dir_ie.kind not in ('directory', 'root_directory'):
835
raise BzrError("destination %r is not a directory" % to_abs)
837
to_idpath = inv.get_idpath(to_dir_id)
840
if not self.has_filename(f):
841
raise BzrError("%r does not exist in working tree" % f)
842
f_id = inv.path2id(f)
844
raise BzrError("%r is not versioned" % f)
845
name_tail = splitpath(f)[-1]
846
dest_path = pathjoin(to_name, name_tail)
847
if self.has_filename(dest_path):
848
raise BzrError("destination %r already exists" % dest_path)
849
if f_id in to_idpath:
850
raise BzrError("can't move %r to a subdirectory of itself" % f)
852
# OK, so there's a race here, it's possible that someone will
853
# create a file in this interval and then the rename might be
854
# left half-done. But we should have caught most problems.
855
orig_inv = deepcopy(self.inventory)
1356
self._inventory_is_modified = True
1357
self._move(rename_entries)
858
name_tail = splitpath(f)[-1]
859
dest_path = pathjoin(to_name, name_tail)
860
result.append((f, dest_path))
861
inv.rename(inv.path2id(f), to_dir_id, name_tail)
863
rename(self.abspath(f), self.abspath(dest_path))
865
raise BzrError("failed to rename %r to %r: %s" %
866
(f, dest_path, e[1]),
867
["rename rolled back"])
1359
869
# restore the inventory on error
1360
self._inventory_is_modified = original_modified
870
self._set_inventory(orig_inv)
1362
872
self._write_inventory(inv)
1363
return rename_tuples
1365
def _determine_mv_mode(self, rename_entries, after=False):
1366
"""Determines for each from-to pair if both inventory and working tree
1367
or only the inventory has to be changed.
1369
Also does basic plausability tests.
1371
inv = self.inventory
1373
for rename_entry in rename_entries:
1374
# store to local variables for easier reference
1375
from_rel = rename_entry.from_rel
1376
from_id = rename_entry.from_id
1377
to_rel = rename_entry.to_rel
1378
to_id = inv.path2id(to_rel)
1379
only_change_inv = False
1381
# check the inventory for source and destination
1383
raise errors.BzrMoveFailedError(from_rel,to_rel,
1384
errors.NotVersionedError(path=str(from_rel)))
1385
if to_id is not None:
1386
raise errors.BzrMoveFailedError(from_rel,to_rel,
1387
errors.AlreadyVersionedError(path=str(to_rel)))
1389
# try to determine the mode for rename (only change inv or change
1390
# inv and file system)
1392
if not self.has_filename(to_rel):
1393
raise errors.BzrMoveFailedError(from_id,to_rel,
1394
errors.NoSuchFile(path=str(to_rel),
1395
extra="New file has not been created yet"))
1396
only_change_inv = True
1397
elif not self.has_filename(from_rel) and self.has_filename(to_rel):
1398
only_change_inv = True
1399
elif self.has_filename(from_rel) and not self.has_filename(to_rel):
1400
only_change_inv = False
1401
elif (not self.case_sensitive
1402
and from_rel.lower() == to_rel.lower()
1403
and self.has_filename(from_rel)):
1404
only_change_inv = False
1406
# something is wrong, so lets determine what exactly
1407
if not self.has_filename(from_rel) and \
1408
not self.has_filename(to_rel):
1409
raise errors.BzrRenameFailedError(from_rel,to_rel,
1410
errors.PathsDoNotExist(paths=(str(from_rel),
1413
raise errors.RenameFailedFilesExist(from_rel, to_rel)
1414
rename_entry.only_change_inv = only_change_inv
1415
return rename_entries
1417
def _move(self, rename_entries):
1418
"""Moves a list of files.
1420
Depending on the value of the flag 'only_change_inv', the
1421
file will be moved on the file system or not.
1423
inv = self.inventory
1426
for entry in rename_entries:
1428
self._move_entry(entry)
1430
self._rollback_move(moved)
1434
def _rollback_move(self, moved):
1435
"""Try to rollback a previous move in case of an filesystem error."""
1436
inv = self.inventory
1439
self._move_entry(WorkingTree._RenameEntry(
1440
entry.to_rel, entry.from_id,
1441
entry.to_tail, entry.to_parent_id, entry.from_rel,
1442
entry.from_tail, entry.from_parent_id,
1443
entry.only_change_inv))
1444
except errors.BzrMoveFailedError, e:
1445
raise errors.BzrMoveFailedError( '', '', "Rollback failed."
1446
" The working tree is in an inconsistent state."
1447
" Please consider doing a 'bzr revert'."
1448
" Error message is: %s" % e)
1450
def _move_entry(self, entry):
1451
inv = self.inventory
1452
from_rel_abs = self.abspath(entry.from_rel)
1453
to_rel_abs = self.abspath(entry.to_rel)
1454
if from_rel_abs == to_rel_abs:
1455
raise errors.BzrMoveFailedError(entry.from_rel, entry.to_rel,
1456
"Source and target are identical.")
1458
if not entry.only_change_inv:
1460
osutils.rename(from_rel_abs, to_rel_abs)
1462
raise errors.BzrMoveFailedError(entry.from_rel,
1464
inv.rename(entry.from_id, entry.to_parent_id, entry.to_tail)
1466
@needs_tree_write_lock
1467
def rename_one(self, from_rel, to_rel, after=False):
876
def rename_one(self, from_rel, to_rel):
1468
877
"""Rename one file.
1470
879
This can change the directory or the filename or both.
1472
rename_one has several 'modes' to work. First, it can rename a physical
1473
file and change the file_id. That is the normal mode. Second, it can
1474
only change the file_id without touching any physical file. This is
1475
the new mode introduced in version 0.15.
1477
rename_one uses the second mode if 'after == True' and 'to_rel' is not
1478
versioned but present in the working tree.
1480
rename_one uses the second mode if 'after == False' and 'from_rel' is
1481
versioned but no longer in the working tree, and 'to_rel' is not
1482
versioned but present in the working tree.
1484
rename_one uses the first mode if 'after == False' and 'from_rel' is
1485
versioned and present in the working tree, and 'to_rel' is not
1486
versioned and not present in the working tree.
1488
Everything else results in an error.
1490
881
inv = self.inventory
1493
# create rename entries and tuples
1494
from_tail = splitpath(from_rel)[-1]
1495
from_id = inv.path2id(from_rel)
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]
1508
from_parent_id = from_entry.parent_id
882
if not self.has_filename(from_rel):
883
raise BzrError("can't rename: old working file %r does not exist" % from_rel)
884
if self.has_filename(to_rel):
885
raise BzrError("can't rename: new working file %r already exists" % to_rel)
887
file_id = inv.path2id(from_rel)
889
raise BzrError("can't rename: old name %r is not versioned" % from_rel)
892
from_parent = entry.parent_id
893
from_name = entry.name
895
if inv.path2id(to_rel):
896
raise BzrError("can't rename: new name %r is already versioned" % to_rel)
1509
898
to_dir, to_tail = os.path.split(to_rel)
1510
899
to_dir_id = inv.path2id(to_dir)
1511
rename_entry = WorkingTree._RenameEntry(from_rel=from_rel,
1513
from_tail=from_tail,
1514
from_parent_id=from_parent_id,
1515
to_rel=to_rel, to_tail=to_tail,
1516
to_parent_id=to_dir_id)
1517
rename_entries.append(rename_entry)
1519
# determine which move mode to use. checks also for movability
1520
rename_entries = self._determine_mv_mode(rename_entries, after)
1522
# check if the target changed directory and if the target directory is
1524
if to_dir_id is None:
1525
raise errors.BzrMoveFailedError(from_rel,to_rel,
1526
errors.NotVersionedError(path=str(to_dir)))
1528
# all checks done. now we can continue with our actual work
1529
mutter('rename_one:\n'
1534
' to_dir_id {%s}\n',
1535
from_id, from_rel, to_rel, to_dir, to_dir_id)
1537
self._move(rename_entries)
900
if to_dir_id == None and to_dir != '':
901
raise BzrError("can't determine destination directory id for %r" % to_dir)
903
mutter("rename_one:")
904
mutter(" file_id {%s}" % file_id)
905
mutter(" from_rel %r" % from_rel)
906
mutter(" to_rel %r" % to_rel)
907
mutter(" to_dir %r" % to_dir)
908
mutter(" to_dir_id {%s}" % to_dir_id)
910
inv.rename(file_id, to_dir_id, to_tail)
912
from_abs = self.abspath(from_rel)
913
to_abs = self.abspath(to_rel)
915
rename(from_abs, to_abs)
917
inv.rename(file_id, from_parent, from_name)
918
raise BzrError("failed to rename %r to %r: %s"
919
% (from_abs, to_abs, e[1]),
920
["rename rolled back"])
1538
921
self._write_inventory(inv)
1540
class _RenameEntry(object):
1541
def __init__(self, from_rel, from_id, from_tail, from_parent_id,
1542
to_rel, to_tail, to_parent_id, only_change_inv=False):
1543
self.from_rel = from_rel
1544
self.from_id = from_id
1545
self.from_tail = from_tail
1546
self.from_parent_id = from_parent_id
1547
self.to_rel = to_rel
1548
self.to_tail = to_tail
1549
self.to_parent_id = to_parent_id
1550
self.only_change_inv = only_change_inv
1552
923
@needs_read_lock
1553
924
def unknowns(self):
1554
925
"""Return all unknown files.
1861
1178
def _change_last_revision(self, new_revision):
1862
1179
"""Template method part of set_last_revision to perform the change.
1864
1181
This is used to allow WorkingTree3 instances to not affect branch
1865
1182
when their last revision is set.
1867
if _mod_revision.is_null(new_revision):
1184
if new_revision is None:
1868
1185
self.branch.set_revision_history([])
1187
# current format is locked in with the branch
1188
revision_history = self.branch.revision_history()
1871
self.branch.generate_revision_history(new_revision)
1872
except errors.NoSuchRevision:
1873
# not present in the repo - dont try to set it deeper than the tip
1874
self.branch.set_revision_history([new_revision])
1190
position = revision_history.index(new_revision)
1192
raise errors.NoSuchRevision(self.branch, new_revision)
1193
self.branch.set_revision_history(revision_history[:position + 1])
1877
def _write_basis_inventory(self, xml):
1878
"""Write the basis inventory XML to the basis-inventory file"""
1879
path = self._basis_inventory_name()
1881
self._transport.put_file(path, sio,
1882
mode=self.bzrdir._get_file_mode())
1884
def _create_basis_xml_from_inventory(self, revision_id, inventory):
1885
"""Create the text that will be saved in basis-inventory"""
1886
inventory.revision_id = revision_id
1887
return xml7.serializer_v7.write_inventory_to_string(inventory)
1889
1196
def _cache_basis_inventory(self, new_revision):
1890
1197
"""Cache new_revision as the basis inventory."""
1891
1198
# TODO: this should allow the ready-to-use inventory to be passed in,
1892
1199
# as commit already has that ready-to-use [while the format is the
1893
1200
# same, that is].
1895
# this double handles the inventory - unpack and repack -
1202
# this double handles the inventory - unpack and repack -
1896
1203
# but is easier to understand. We can/should put a conditional
1897
1204
# in here based on whether the inventory is in the latest format
1898
1205
# - perhaps we should repack all inventories on a repository
1900
1207
# the fast path is to copy the raw xml from the repository. If the
1901
# xml contains 'revision_id="', then we assume the right
1208
# xml contains 'revision_id="', then we assume the right
1902
1209
# revision_id is set. We must check for this full string, because a
1903
1210
# root node id can legitimately look like 'revision_id' but cannot
1904
1211
# contain a '"'.
1905
1212
xml = self.branch.repository.get_inventory_xml(new_revision)
1906
firstline = xml.split('\n', 1)[0]
1907
if (not 'revision_id="' in firstline or
1908
'format="7"' not in firstline):
1909
inv = self.branch.repository._serializer.read_inventory_from_string(
1911
xml = self._create_basis_xml_from_inventory(new_revision, inv)
1912
self._write_basis_inventory(xml)
1913
except (errors.NoSuchRevision, errors.RevisionNotPresent):
1213
if not 'revision_id="' in xml.split('\n', 1)[0]:
1214
inv = self.branch.repository.deserialise_inventory(
1216
inv.revision_id = new_revision
1217
xml = bzrlib.xml5.serializer_v5.write_inventory_to_string(inv)
1218
assert isinstance(xml, str), 'serialised xml must be bytestring.'
1219
path = self._basis_inventory_name()
1221
self._control_files.put(path, sio)
1222
except WeaveRevisionNotPresent:
1916
1225
def read_basis_inventory(self):
1917
1226
"""Read the cached basis inventory."""
1918
1227
path = self._basis_inventory_name()
1919
return self._transport.get_bytes(path)
1228
return self._control_files.get(path).read()
1921
1230
@needs_read_lock
1922
1231
def read_working_inventory(self):
1923
"""Read the working inventory.
1925
:raises errors.InventoryModified: read_working_inventory will fail
1926
when the current in memory inventory has been modified.
1928
# conceptually this should be an implementation detail of the tree.
1929
# XXX: Deprecate this.
1232
"""Read the working inventory."""
1930
1233
# ElementTree does its own conversion from UTF-8, so open in
1932
if self._inventory_is_modified:
1933
raise errors.InventoryModified(self)
1934
f = self._transport.get('inventory')
1936
result = self._deserialize(f)
1939
self._set_inventory(result, dirty=False)
1235
result = bzrlib.xml5.serializer_v5.read_inventory(
1236
self._control_files.get('inventory'))
1237
self._set_inventory(result)
1942
@needs_tree_write_lock
1943
def remove(self, files, verbose=False, to_file=None, keep_files=True,
1945
"""Remove nominated files from the working inventory.
1947
:files: File paths relative to the basedir.
1948
:keep_files: If true, the files will also be kept.
1949
:force: Delete files and directories, even if they are changed and
1950
even if the directories are not empty.
1241
def remove(self, files, verbose=False, to_file=None):
1242
"""Remove nominated files from the working inventory..
1244
This does not remove their text. This does not run on XXX on what? RBC
1246
TODO: Refuse to remove modified files unless --force is given?
1248
TODO: Do something useful with directories.
1250
TODO: Should this remove the text or not? Tough call; not
1251
removing may be useful and the user can just use use rm, and
1252
is the opposite of add. Removing it is consistent with most
1253
other tools. Maybe an option.
1255
## TODO: Normalize names
1256
## TODO: Remove nested loops; better scalability
1952
1257
if isinstance(files, basestring):
1953
1258
files = [files]
1958
unknown_nested_files=set()
1960
to_file = sys.stdout
1962
def recurse_directory_to_add_files(directory):
1963
# Recurse directory and add all files
1964
# so we can check if they have changed.
1965
for parent_info, file_infos in\
1966
self.walkdirs(directory):
1967
for relpath, basename, kind, lstat, fileid, kind in file_infos:
1968
# Is it versioned or ignored?
1969
if self.path2id(relpath) or self.is_ignored(relpath):
1970
# Add nested content for deletion.
1971
new_files.add(relpath)
1973
# Files which are not versioned and not ignored
1974
# should be treated as unknown.
1975
unknown_nested_files.add((relpath, None, kind))
1977
for filename in files:
1978
# Get file name into canonical form.
1979
abspath = self.abspath(filename)
1980
filename = self.relpath(abspath)
1981
if len(filename) > 0:
1982
new_files.add(filename)
1983
recurse_directory_to_add_files(filename)
1985
files = list(new_files)
1988
return # nothing to do
1990
# Sort needed to first handle directory content before the directory
1991
files.sort(reverse=True)
1993
# Bail out if we are going to delete files we shouldn't
1994
if not keep_files and not force:
1995
has_changed_files = len(unknown_nested_files) > 0
1996
if not has_changed_files:
1997
for (file_id, path, content_change, versioned, parent_id, name,
1998
kind, executable) in self.iter_changes(self.basis_tree(),
1999
include_unchanged=True, require_versioned=False,
2000
want_unversioned=True, specific_files=files):
2001
if versioned == (False, False):
2002
# The record is unknown ...
2003
if not self.is_ignored(path[1]):
2004
# ... but not ignored
2005
has_changed_files = True
2007
elif content_change and (kind[1] is not None):
2008
# Versioned and changed, but not deleted
2009
has_changed_files = True
2012
if has_changed_files:
2013
# Make delta show ALL applicable changes in error message.
2014
tree_delta = self.changes_from(self.basis_tree(),
2015
require_versioned=False, want_unversioned=True,
2016
specific_files=files)
2017
for unknown_file in unknown_nested_files:
2018
if unknown_file not in tree_delta.unversioned:
2019
tree_delta.unversioned.extend((unknown_file,))
2020
raise errors.BzrRemoveChangedFilesError(tree_delta)
2022
# Build inv_delta and delete files where applicable,
2023
# do this before any modifications to inventory.
1260
inv = self.inventory
1262
# do this before any modifications
2024
1263
for f in files:
2025
fid = self.path2id(f)
1264
fid = inv.path2id(f)
2028
message = "%s is not versioned." % (f,)
2031
# having removed it, it must be either ignored or unknown
2032
if self.is_ignored(f):
2036
# XXX: Really should be a more abstract reporter interface
2037
kind_ch = osutils.kind_marker(self.kind(fid))
2038
to_file.write(new_status + ' ' + f + kind_ch + '\n')
2040
inv_delta.append((f, None, fid, None))
2041
message = "removed %s" % (f,)
2044
abs_path = self.abspath(f)
2045
if osutils.lexists(abs_path):
2046
if (osutils.isdir(abs_path) and
2047
len(os.listdir(abs_path)) > 0):
2049
osutils.rmtree(abs_path)
2051
message = "%s is not an empty directory "\
2052
"and won't be deleted." % (f,)
2054
osutils.delete_any(abs_path)
2055
message = "deleted %s" % (f,)
2056
elif message is not None:
2057
# Only care if we haven't done anything yet.
2058
message = "%s does not exist." % (f,)
2060
# Print only one message (if any) per file.
2061
if message is not None:
2063
self.apply_inventory_delta(inv_delta)
2065
@needs_tree_write_lock
2066
def revert(self, filenames=None, old_tree=None, backups=True,
2067
pb=DummyProgress(), report_changes=False):
2068
from bzrlib.conflicts import resolve
2071
symbol_versioning.warn('Using [] to revert all files is deprecated'
2072
' as of bzr 0.91. Please use None (the default) instead.',
2073
DeprecationWarning, stacklevel=2)
1266
# TODO: Perhaps make this just a warning, and continue?
1267
# This tends to happen when
1268
raise NotVersionedError(path=f)
1270
# having remove it, it must be either ignored or unknown
1271
if self.is_ignored(f):
1275
show_status(new_status, inv[fid].kind, f, to_file=to_file)
1278
self._write_inventory(inv)
1281
def revert(self, filenames, old_tree=None, backups=True,
1282
pb=DummyProgress()):
1283
from transform import revert
1284
from conflicts import resolve
2074
1285
if old_tree is None:
2075
basis_tree = self.basis_tree()
2076
basis_tree.lock_read()
2077
old_tree = basis_tree
1286
old_tree = self.basis_tree()
1287
conflicts = revert(self, old_tree, filenames, backups, pb)
1288
if not len(filenames):
1289
self.set_pending_merges([])
2081
conflicts = transform.revert(self, old_tree, filenames, backups, pb,
2083
if filenames is None and len(self.get_parent_ids()) > 1:
2085
last_revision = self.last_revision()
2086
if last_revision != _mod_revision.NULL_REVISION:
2087
if basis_tree is None:
2088
basis_tree = self.basis_tree()
2089
basis_tree.lock_read()
2090
parent_trees.append((last_revision, basis_tree))
2091
self.set_parent_trees(parent_trees)
2094
resolve(self, filenames, ignore_misses=True, recursive=True)
2096
if basis_tree is not None:
1292
resolve(self, filenames, ignore_misses=True)
2098
1293
return conflicts
2100
def revision_tree(self, revision_id):
2101
"""See Tree.revision_tree.
2103
WorkingTree can supply revision_trees for the basis revision only
2104
because there is only one cached inventory in the bzr directory.
2106
if revision_id == self.last_revision():
2108
xml = self.read_basis_inventory()
2109
except errors.NoSuchFile:
2113
inv = xml7.serializer_v7.read_inventory_from_string(xml)
2114
# dont use the repository revision_tree api because we want
2115
# to supply the inventory.
2116
if inv.revision_id == revision_id:
2117
return revisiontree.RevisionTree(self.branch.repository,
2119
except errors.BadInventoryFormat:
2121
# raise if there was no inventory, or if we read the wrong inventory.
2122
raise errors.NoSuchRevisionInTree(self, revision_id)
2124
1295
# XXX: This method should be deprecated in favour of taking in a proper
2125
1296
# new Inventory object.
2126
@needs_tree_write_lock
2127
1298
def set_inventory(self, new_inventory_list):
2128
1299
from bzrlib.inventory import (Inventory,
2129
1300
InventoryDirectory,
2132
1304
inv = Inventory(self.get_root_id())
2142
1314
elif kind == 'symlink':
2143
1315
inv.add(InventoryLink(file_id, name, parent))
2145
raise errors.BzrError("unknown kind %r" % kind)
1317
raise BzrError("unknown kind %r" % kind)
2146
1318
self._write_inventory(inv)
2148
@needs_tree_write_lock
2149
1321
def set_root_id(self, file_id):
2150
1322
"""Set the root id for this tree."""
2154
'WorkingTree.set_root_id with fileid=None')
2155
file_id = osutils.safe_file_id(file_id)
2156
self._set_root_id(file_id)
2158
def _set_root_id(self, file_id):
2159
"""Set the root id for this tree, in a format specific manner.
2161
:param file_id: The file id to assign to the root. It must not be
2162
present in the current inventory or an error will occur. It must
2163
not be None, but rather a valid file id.
2165
inv = self._inventory
1323
inv = self.read_working_inventory()
2166
1324
orig_root_id = inv.root.file_id
2167
# TODO: it might be nice to exit early if there was nothing
2168
# to do, saving us from trigger a sync on unlock.
2169
self._inventory_is_modified = True
2170
# we preserve the root inventory entry object, but
2171
# unlinkit from the byid index
2172
1325
del inv._byid[inv.root.file_id]
2173
1326
inv.root.file_id = file_id
2174
# and link it into the index with the new changed id.
2175
1327
inv._byid[inv.root.file_id] = inv.root
2176
# and finally update all children to reference the new id.
2177
# XXX: this should be safe to just look at the root.children
2178
# list, not the WHOLE INVENTORY.
2179
1328
for fid in inv:
2180
1329
entry = inv[fid]
2181
1330
if entry.parent_id == orig_root_id:
2182
1331
entry.parent_id = inv.root.file_id
1332
self._write_inventory(inv)
2184
1334
def unlock(self):
2185
1335
"""See Branch.unlock.
2187
1337
WorkingTree locking just uses the Branch locking facilities.
2188
1338
This is current because all working trees have an embedded branch
2189
1339
within them. IF in the future, we were to make branch data shareable
2190
between multiple working trees, i.e. via shared storage, then we
1340
between multiple working trees, i.e. via shared storage, then we
2191
1341
would probably want to lock both the local tree, and the branch.
2193
raise NotImplementedError(self.unlock)
2197
def update(self, change_reporter=None, possible_transports=None,
2198
revision=None, old_tip=_marker):
1343
# FIXME: We want to write out the hashcache only when the last lock on
1344
# this working copy is released. Peeking at the lock count is a bit
1345
# of a nasty hack; probably it's better to have a transaction object,
1346
# which can do some finalization when it's either successfully or
1347
# unsuccessfully completed. (Denys's original patch did that.)
1348
# RBC 20060206 hooking into transaction will couple lock and transaction
1349
# wrongly. Hooking into unlock on the control files object is fine though.
1351
# TODO: split this per format so there is no ugly if block
1352
if self._hashcache.needs_write and (
1353
# dedicated lock files
1354
self._control_files._lock_count==1 or
1356
(self._control_files is self.branch.control_files and
1357
self._control_files._lock_count==3)):
1358
self._hashcache.write()
1359
# reverse order of locking.
1361
return self._control_files.unlock()
1363
self.branch.unlock()
2199
1367
"""Update a working tree along its branch.
2201
This will update the branch if its bound too, which means we have
2202
multiple trees involved:
2204
- The new basis tree of the master.
2205
- The old basis tree of the branch.
2206
- The old basis tree of the working tree.
2207
- The current working tree state.
2209
Pathologically, all three may be different, and non-ancestors of each
2210
other. Conceptually we want to:
2212
- Preserve the wt.basis->wt.state changes
2213
- Transform the wt.basis to the new master basis.
2214
- Apply a merge of the old branch basis to get any 'local' changes from
2216
- Restore the wt.basis->wt.state changes.
1369
This will update the branch if its bound too, which means we have multiple trees involved:
1370
The new basis tree of the master.
1371
The old basis tree of the branch.
1372
The old basis tree of the working tree.
1373
The current working tree state.
1374
pathologically all three may be different, and non ancestors of each other.
1375
Conceptually we want to:
1376
Preserve the wt.basis->wt.state changes
1377
Transform the wt.basis to the new master basis.
1378
Apply a merge of the old branch basis to get any 'local' changes from it into the tree.
1379
Restore the wt.basis->wt.state changes.
2218
1381
There isn't a single operation at the moment to do that, so we:
2219
- Merge current state -> basis tree of the master w.r.t. the old tree
2221
- Do a 'normal' merge of the old branch basis if it is relevant.
2223
:param revision: The target revision to update to. Must be in the
2225
:param old_tip: If branch.update() has already been run, the value it
2226
returned (old tip of the branch or None). _marker is used
2229
if self.branch.get_bound_location() is not None:
2231
update_branch = (old_tip is self._marker)
2233
self.lock_tree_write()
2234
update_branch = False
2237
old_tip = self.branch.update(possible_transports)
2239
if old_tip is self._marker:
2241
return self._update_tree(old_tip, change_reporter, revision)
2245
@needs_tree_write_lock
2246
def _update_tree(self, old_tip=None, change_reporter=None, revision=None):
2247
"""Update a tree to the master branch.
2249
:param old_tip: if supplied, the previous tip revision the branch,
2250
before it was changed to the master branch's tip.
2252
# here if old_tip is not None, it is the old tip of the branch before
2253
# it was updated from the master branch. This should become a pending
2254
# merge in the working tree to preserve the user existing work. we
2255
# cant set that until we update the working trees last revision to be
2256
# one from the new branch, because it will just get absorbed by the
2257
# parent de-duplication logic.
2259
# We MUST save it even if an error occurs, because otherwise the users
2260
# local work is unreferenced and will appear to have been lost.
2264
last_rev = self.get_parent_ids()[0]
2266
last_rev = _mod_revision.NULL_REVISION
2267
if revision is None:
2268
revision = self.branch.last_revision()
2270
if revision not in self.branch.revision_history():
2271
raise errors.NoSuchRevision(self.branch, revision)
2272
if last_rev != _mod_revision.ensure_null(revision):
2273
# merge tree state up to specified revision.
2274
basis = self.basis_tree()
2277
to_tree = self.branch.repository.revision_tree(revision)
2278
to_root_id = to_tree.get_root_id()
2279
if (basis.inventory.root is None
2280
or basis.inventory.root.file_id != to_root_id):
2281
self.set_root_id(to_root_id)
2283
result += merge.merge_inner(
1382
Merge current state -> basis tree of the master w.r.t. the old tree basis.
1383
Do a 'normal' merge of the old branch basis if it is relevant.
1385
old_tip = self.branch.update()
1386
if old_tip is not None:
1387
self.add_pending_merge(old_tip)
1388
self.branch.lock_read()
1391
if self.last_revision() != self.branch.last_revision():
1392
# merge tree state up to new branch tip.
1393
basis = self.basis_tree()
1394
to_tree = self.branch.basis_tree()
1395
result += merge_inner(self.branch,
2288
change_reporter=change_reporter)
2289
self.set_last_revision(revision)
2292
# TODO - dedup parents list with things merged by pull ?
2293
# reuse the tree we've updated to to set the basis:
2294
parent_trees = [(revision, to_tree)]
2295
merges = self.get_parent_ids()[1:]
2296
# Ideally we ask the tree for the trees here, that way the working
2297
# tree can decide whether to give us the entire tree or give us a
2298
# lazy initialised tree. dirstate for instance will have the trees
2299
# in ram already, whereas a last-revision + basis-inventory tree
2300
# will not, but also does not need them when setting parents.
2301
for parent in merges:
2302
parent_trees.append(
2303
(parent, self.branch.repository.revision_tree(parent)))
2304
if (old_tip is not None and not _mod_revision.is_null(old_tip)):
2305
parent_trees.append(
2306
(old_tip, self.branch.repository.revision_tree(old_tip)))
2307
self.set_parent_trees(parent_trees)
2308
last_rev = parent_trees[0][0]
2310
# the working tree had the same last-revision as the master
2311
# branch did. We may still have pivot local work from the local
2312
# branch into old_tip:
2313
if (old_tip is not None and not _mod_revision.is_null(old_tip)):
2314
self.add_parent_tree_id(old_tip)
2315
if (old_tip is not None and not _mod_revision.is_null(old_tip)
2316
and old_tip != last_rev):
2317
# our last revision was not the prior branch last revision
2318
# and we have converted that last revision to a pending merge.
2319
# base is somewhere between the branch tip now
2320
# and the now pending merge
2322
# Since we just modified the working tree and inventory, flush out
2323
# the current state, before we modify it again.
2324
# TODO: jam 20070214 WorkingTree3 doesn't require this, dirstate
2325
# requires it only because TreeTransform directly munges the
2326
# inventory and calls tree._write_inventory(). Ultimately we
2327
# should be able to remove this extra flush.
2329
graph = self.branch.repository.get_graph()
2330
base_rev_id = graph.find_unique_lca(revision, old_tip)
2331
base_tree = self.branch.repository.revision_tree(base_rev_id)
2332
other_tree = self.branch.repository.revision_tree(old_tip)
2333
result += merge.merge_inner(
2338
change_reporter=change_reporter)
2341
def _write_hashcache_if_dirty(self):
2342
"""Write out the hashcache if it is dirty."""
2343
if self._hashcache.needs_write:
2345
self._hashcache.write()
2347
if e.errno not in (errno.EPERM, errno.EACCES):
2349
# TODO: jam 20061219 Should this be a warning? A single line
2350
# warning might be sufficient to let the user know what
2352
mutter('Could not write hashcache for %s\nError: %s',
2353
self._hashcache.cache_file_name(), e)
2355
@needs_tree_write_lock
1399
self.set_last_revision(self.branch.last_revision())
1400
if old_tip and old_tip != self.last_revision():
1401
# our last revision was not the prior branch last revision
1402
# and we have converted that last revision to a pending merge.
1403
# base is somewhere between the branch tip now
1404
# and the now pending merge
1405
from bzrlib.revision import common_ancestor
1407
base_rev_id = common_ancestor(self.branch.last_revision(),
1409
self.branch.repository)
1410
except errors.NoCommonAncestor:
1412
base_tree = self.branch.repository.revision_tree(base_rev_id)
1413
other_tree = self.branch.repository.revision_tree(old_tip)
1414
result += merge_inner(self.branch,
1420
self.branch.unlock()
2356
1423
def _write_inventory(self, inv):
2357
1424
"""Write inventory as the current inventory."""
2358
self._set_inventory(inv, dirty=True)
1426
bzrlib.xml5.serializer_v5.write_inventory(inv, sio)
1428
self._control_files.put('inventory', sio)
1429
self._set_inventory(inv)
1430
mutter('wrote working inventory')
2361
1432
def set_conflicts(self, arg):
2362
raise errors.UnsupportedOperation(self.set_conflicts, self)
2364
def add_conflicts(self, arg):
2365
raise errors.UnsupportedOperation(self.add_conflicts, self)
1433
raise UnsupportedOperation(self.set_conflicts, self)
2367
1435
@needs_read_lock
2368
1436
def conflicts(self):
2369
conflicts = _mod_conflicts.ConflictList()
1437
conflicts = ConflictList()
2370
1438
for conflicted in self._iter_conflicts():
2385
1453
if text == False:
2387
1455
ctype = {True: 'text conflict', False: 'contents conflict'}[text]
2388
conflicts.append(_mod_conflicts.Conflict.factory(ctype,
1456
conflicts.append(Conflict.factory(ctype, path=conflicted,
2390
1457
file_id=self.path2id(conflicted)))
2391
1458
return conflicts
2393
def walkdirs(self, prefix=""):
2394
"""Walk the directories of this tree.
2396
returns a generator which yields items in the form:
2397
((curren_directory_path, fileid),
2398
[(file1_path, file1_name, file1_kind, (lstat), file1_id,
2401
This API returns a generator, which is only valid during the current
2402
tree transaction - within a single lock_read or lock_write duration.
2404
If the tree is not locked, it may cause an error to be raised,
2405
depending on the tree implementation.
2407
disk_top = self.abspath(prefix)
2408
if disk_top.endswith('/'):
2409
disk_top = disk_top[:-1]
2410
top_strip_len = len(disk_top) + 1
2411
inventory_iterator = self._walkdirs(prefix)
2412
disk_iterator = osutils.walkdirs(disk_top, prefix)
2414
current_disk = disk_iterator.next()
2415
disk_finished = False
2417
if not (e.errno == errno.ENOENT or
2418
(sys.platform == 'win32' and e.errno == ERROR_PATH_NOT_FOUND)):
2421
disk_finished = True
2423
current_inv = inventory_iterator.next()
2424
inv_finished = False
2425
except StopIteration:
2428
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
if not disk_finished:
2436
# 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 -
2440
# 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])):
2447
# we dont yield the contents of, or, .bzr itself.
2448
del cur_disk_dir_content[bzrdir_loc]
2450
# everything is unknown
2453
# everything is missing
2456
direction = cmp(current_inv[0][0], cur_disk_dir_relpath)
2458
# disk is before inventory - unknown
2459
dirblock = [(relpath, basename, kind, stat, None, None) for
2460
relpath, basename, kind, stat, top_path in
2461
cur_disk_dir_content]
2462
yield (cur_disk_dir_relpath, None), dirblock
2464
current_disk = disk_iterator.next()
2465
except StopIteration:
2466
disk_finished = True
2468
# inventory is before disk - missing.
2469
dirblock = [(relpath, basename, 'unknown', None, fileid, kind)
2470
for relpath, basename, dkind, stat, fileid, kind in
2472
yield (current_inv[0][0], current_inv[0][1]), dirblock
2474
current_inv = inventory_iterator.next()
2475
except StopIteration:
2478
# versioned present directory
2479
# merge the inventory and disk data together
2481
for relpath, subiterator in itertools.groupby(sorted(
2482
current_inv[1] + cur_disk_dir_content,
2483
key=operator.itemgetter(0)), operator.itemgetter(1)):
2484
path_elements = list(subiterator)
2485
if len(path_elements) == 2:
2486
inv_row, disk_row = path_elements
2487
# versioned, present file
2488
dirblock.append((inv_row[0],
2489
inv_row[1], disk_row[2],
2490
disk_row[3], inv_row[4],
2492
elif len(path_elements[0]) == 5:
2494
dirblock.append((path_elements[0][0],
2495
path_elements[0][1], path_elements[0][2],
2496
path_elements[0][3], None, None))
2497
elif len(path_elements[0]) == 6:
2498
# versioned, absent file.
2499
dirblock.append((path_elements[0][0],
2500
path_elements[0][1], 'unknown', None,
2501
path_elements[0][4], path_elements[0][5]))
2503
raise NotImplementedError('unreachable code')
2504
yield current_inv[0], dirblock
2506
current_inv = inventory_iterator.next()
2507
except StopIteration:
2510
current_disk = disk_iterator.next()
2511
except StopIteration:
2512
disk_finished = True
2514
def _walkdirs(self, prefix=""):
2515
"""Walk the directories of this tree.
2517
:prefix: is used as the directrory to start with.
2518
returns a generator which yields items in the form:
2519
((curren_directory_path, fileid),
2520
[(file1_path, file1_name, file1_kind, None, file1_id,
2523
_directory = 'directory'
2524
# get the root in the inventory
2525
inv = self.inventory
2526
top_id = inv.path2id(prefix)
2530
pending = [(prefix, '', _directory, None, top_id, None)]
2533
currentdir = pending.pop()
2534
# 0 - relpath, 1- basename, 2- kind, 3- stat, 4-id, 5-kind
2535
top_id = currentdir[4]
2537
relroot = currentdir[0] + '/'
2540
# FIXME: stash the node in pending
2542
if entry.kind == 'directory':
2543
for name, child in entry.sorted_children():
2544
dirblock.append((relroot + name, name, child.kind, None,
2545
child.file_id, child.kind
2547
yield (currentdir[0], entry.file_id), dirblock
2548
# push the user specified dirs from dirblock
2549
for dir in reversed(dirblock):
2550
if dir[2] == _directory:
2553
@needs_tree_write_lock
2554
def auto_resolve(self):
2555
"""Automatically resolve text conflicts according to contents.
2557
Only text conflicts are auto_resolvable. Files with no conflict markers
2558
are considered 'resolved', because bzr always puts conflict markers
2559
into files that have text conflicts. The corresponding .THIS .BASE and
2560
.OTHER files are deleted, as per 'resolve'.
2561
:return: a tuple of ConflictLists: (un_resolved, resolved).
2563
un_resolved = _mod_conflicts.ConflictList()
2564
resolved = _mod_conflicts.ConflictList()
2565
conflict_re = re.compile('^(<{7}|={7}|>{7})')
2566
for conflict in self.conflicts():
2567
if (conflict.typestring != 'text conflict' or
2568
self.kind(conflict.file_id) != 'file'):
2569
un_resolved.append(conflict)
2571
my_file = open(self.id2abspath(conflict.file_id), 'rb')
2573
for line in my_file:
2574
if conflict_re.search(line):
2575
un_resolved.append(conflict)
2578
resolved.append(conflict)
2581
resolved.remove_files(self)
2582
self.set_conflicts(un_resolved)
2583
return un_resolved, resolved
2586
def _check(self, references):
2587
"""Check the tree for consistency.
2589
:param references: A dict with keys matching the items returned by
2590
self._get_check_refs(), and values from looking those keys up in
2593
tree_basis = self.basis_tree()
2594
tree_basis.lock_read()
2596
repo_basis = references[('trees', self.last_revision())]
2597
if len(list(repo_basis.iter_changes(tree_basis))) > 0:
2598
raise errors.BzrCheckError(
2599
"Mismatched basis inventory content.")
2604
def _validate(self):
2605
"""Validate internal structures.
2607
This is meant mostly for the test suite. To give it a chance to detect
2608
corruption after actions have occurred. The default implementation is a
2611
:return: None. An exception should be raised if there is an error.
2615
def _get_rules_searcher(self, default_searcher):
2616
"""See Tree._get_rules_searcher."""
2617
if self._rules_searcher is None:
2618
self._rules_searcher = super(WorkingTree,
2619
self)._get_rules_searcher(default_searcher)
2620
return self._rules_searcher
2622
def get_shelf_manager(self):
2623
"""Return the ShelfManager for this WorkingTree."""
2624
from bzrlib.shelf import ShelfManager
2625
return ShelfManager(self, self._transport)
2628
class WorkingTree2(WorkingTree):
2629
"""This is the Format 2 working tree.
2631
This was the first weave based working tree.
2632
- uses os locks for locking.
2633
- uses the branch last-revision.
2636
def __init__(self, *args, **kwargs):
2637
super(WorkingTree2, self).__init__(*args, **kwargs)
2638
# WorkingTree2 has more of a constraint that self._inventory must
2639
# exist. Because this is an older format, we don't mind the overhead
2640
# caused by the extra computation here.
2642
# Newer WorkingTree's should only have self._inventory set when they
2644
if self._inventory is None:
2645
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
def lock_tree_write(self):
2652
"""See WorkingTree.lock_tree_write().
2654
In Format2 WorkingTrees we have a single lock for the branch and tree
2655
so lock_tree_write() degrades to lock_write().
2657
self.branch.lock_write()
2659
return self._control_files.lock_write()
2661
self.branch.unlock()
2665
# do non-implementation specific cleanup
2668
# we share control files:
2669
if self._control_files._lock_count == 3:
2670
# _inventory_is_modified is always False during a read lock.
2671
if self._inventory_is_modified:
2673
self._write_hashcache_if_dirty()
2675
# reverse order of locking.
2677
return self._control_files.unlock()
2679
self.branch.unlock()
2682
1461
class WorkingTree3(WorkingTree):
2683
1462
"""This is the Format 3 working tree.
added
removed
bzrlib/workingtree.py
