342
448
inv = self._inventory
343
449
for path, ie in inv.iter_entries():
344
if bzrlib.osutils.lexists(self.abspath(path)):
450
if osutils.lexists(self.abspath(path)):
453
def all_file_ids(self):
454
"""See Tree.iter_all_file_ids"""
455
return set(self.inventory)
347
457
def __repr__(self):
348
458
return "<%s of %s>" % (self.__class__.__name__,
349
459
getattr(self, 'basedir', None))
351
461
def abspath(self, filename):
352
462
return pathjoin(self.basedir, filename)
354
464
def basis_tree(self):
355
"""Return RevisionTree for the current last revision."""
356
revision_id = self.last_revision()
357
if revision_id is not None:
359
xml = self.read_basis_inventory()
360
inv = bzrlib.xml5.serializer_v5.read_inventory_from_string(xml)
363
if inv is not None and inv.revision_id == revision_id:
364
return bzrlib.tree.RevisionTree(self.branch.repository, inv,
366
# FIXME? RBC 20060403 should we cache the inventory here ?
367
return self.branch.repository.revision_tree(revision_id)
370
@deprecated_method(zero_eight)
371
def create(branch, directory):
372
"""Create a workingtree for branch at directory.
374
If existing_directory already exists it must have a .bzr directory.
375
If it does not exist, it will be created.
377
This returns a new WorkingTree object for the new checkout.
379
TODO FIXME RBC 20060124 when we have checkout formats in place this
380
should accept an optional revisionid to checkout [and reject this if
381
checking out into the same dir as a pre-checkout-aware branch format.]
383
XXX: When BzrDir is present, these should be created through that
386
warn('delete WorkingTree.create', stacklevel=3)
387
transport = get_transport(directory)
388
if branch.bzrdir.root_transport.base == transport.base:
390
return branch.bzrdir.create_workingtree()
391
# different directory,
392
# create a branch reference
393
# and now a working tree.
394
raise NotImplementedError
397
@deprecated_method(zero_eight)
398
def create_standalone(directory):
399
"""Create a checkout and a branch and a repo at directory.
401
Directory must exist and be empty.
403
please use BzrDir.create_standalone_workingtree
405
return bzrdir.BzrDir.create_standalone_workingtree(directory)
407
def relpath(self, abs):
408
"""Return the local path portion from a given absolute path."""
409
return relpath(self.basedir, abs)
465
"""Return RevisionTree for the current last revision.
467
If the left most parent is a ghost then the returned tree will be an
468
empty tree - one obtained by calling
469
repository.revision_tree(NULL_REVISION).
472
revision_id = self.get_parent_ids()[0]
474
# no parents, return an empty revision tree.
475
# in the future this should return the tree for
476
# 'empty:' - the implicit root empty tree.
477
return self.branch.repository.revision_tree(
478
_mod_revision.NULL_REVISION)
480
return self.revision_tree(revision_id)
481
except errors.NoSuchRevision:
483
# No cached copy available, retrieve from the repository.
484
# FIXME? RBC 20060403 should we cache the inventory locally
487
return self.branch.repository.revision_tree(revision_id)
488
except (errors.RevisionNotPresent, errors.NoSuchRevision):
489
# the basis tree *may* be a ghost or a low level error may have
490
# occurred. If the revision is present, its a problem, if its not
492
if self.branch.repository.has_revision(revision_id):
494
# the basis tree is a ghost so return an empty tree.
495
return self.branch.repository.revision_tree(
496
_mod_revision.NULL_REVISION)
499
self._flush_ignore_list_cache()
501
def relpath(self, path):
502
"""Return the local path portion from a given path.
504
The path may be absolute or relative. If its a relative path it is
505
interpreted relative to the python current working directory.
507
return osutils.relpath(self.basedir, path)
411
509
def has_filename(self, filename):
412
return bzrlib.osutils.lexists(self.abspath(filename))
414
def get_file(self, file_id):
415
return self.get_file_byname(self.id2path(file_id))
417
def get_file_byname(self, filename):
418
return file(self.abspath(filename), 'rb')
510
return osutils.lexists(self.abspath(filename))
512
def get_file(self, file_id, path=None, filtered=True):
513
return self.get_file_with_stat(file_id, path, filtered=filtered)[0]
515
def get_file_with_stat(self, file_id, path=None, filtered=True,
517
"""See Tree.get_file_with_stat."""
519
path = self.id2path(file_id)
520
file_obj = self.get_file_byname(path, filtered=False)
521
stat_value = _fstat(file_obj.fileno())
522
if filtered and self.supports_content_filtering():
523
filters = self._content_filter_stack(path)
524
file_obj = filtered_input_file(file_obj, filters)
525
return (file_obj, stat_value)
527
def get_file_text(self, file_id, path=None, filtered=True):
528
my_file = self.get_file(file_id, path=path, filtered=filtered)
530
return my_file.read()
534
def get_file_byname(self, filename, filtered=True):
535
path = self.abspath(filename)
537
if filtered and self.supports_content_filtering():
538
filters = self._content_filter_stack(filename)
539
return filtered_input_file(f, filters)
543
def get_file_lines(self, file_id, path=None, filtered=True):
544
"""See Tree.get_file_lines()"""
545
file = self.get_file(file_id, path, filtered=filtered)
547
return file.readlines()
552
def annotate_iter(self, file_id, default_revision=CURRENT_REVISION):
553
"""See Tree.annotate_iter
555
This implementation will use the basis tree implementation if possible.
556
Lines not in the basis are attributed to CURRENT_REVISION
558
If there are pending merges, lines added by those merges will be
559
incorrectly attributed to CURRENT_REVISION (but after committing, the
560
attribution will be correct).
562
maybe_file_parent_keys = []
563
for parent_id in self.get_parent_ids():
565
parent_tree = self.revision_tree(parent_id)
566
except errors.NoSuchRevisionInTree:
567
parent_tree = self.branch.repository.revision_tree(parent_id)
568
parent_tree.lock_read()
570
if file_id not in parent_tree:
572
ie = parent_tree.inventory[file_id]
573
if ie.kind != 'file':
574
# Note: this is slightly unnecessary, because symlinks and
575
# directories have a "text" which is the empty text, and we
576
# know that won't mess up annotations. But it seems cleaner
578
parent_text_key = (file_id, ie.revision)
579
if parent_text_key not in maybe_file_parent_keys:
580
maybe_file_parent_keys.append(parent_text_key)
583
graph = _mod_graph.Graph(self.branch.repository.texts)
584
heads = graph.heads(maybe_file_parent_keys)
585
file_parent_keys = []
586
for key in maybe_file_parent_keys:
588
file_parent_keys.append(key)
590
# Now we have the parents of this content
591
annotator = self.branch.repository.texts.get_annotator()
592
text = self.get_file_text(file_id)
593
this_key =(file_id, default_revision)
594
annotator.add_special_text(this_key, file_parent_keys, text)
595
annotations = [(key[-1], line)
596
for key, line in annotator.annotate_flat(this_key)]
599
def _get_ancestors(self, default_revision):
600
ancestors = set([default_revision])
601
for parent_id in self.get_parent_ids():
602
ancestors.update(self.branch.repository.get_ancestry(
603
parent_id, topo_sorted=False))
606
def get_parent_ids(self):
607
"""See Tree.get_parent_ids.
609
This implementation reads the pending merges list and last_revision
610
value and uses that to decide what the parents list should be.
612
last_rev = _mod_revision.ensure_null(self._last_revision())
613
if _mod_revision.NULL_REVISION == last_rev:
618
merges_bytes = self._transport.get_bytes('pending-merges')
619
except errors.NoSuchFile:
622
for l in osutils.split_lines(merges_bytes):
623
revision_id = l.rstrip('\n')
624
parents.append(revision_id)
420
628
def get_root_id(self):
421
629
"""Return the id of this trees root"""
422
inv = self.read_working_inventory()
423
return inv.root.file_id
630
return self._inventory.root.file_id
425
632
def _get_store_filename(self, file_id):
426
633
## XXX: badly named; this is not in the store at all
427
634
return self.abspath(self.id2path(file_id))
430
def clone(self, to_bzrdir, revision_id=None, basis=None):
637
def clone(self, to_bzrdir, revision_id=None):
431
638
"""Duplicate this working tree into to_bzr, including all state.
433
640
Specifically modified files are kept as modified, but
434
641
ignored and unknown files are discarded.
436
643
If you want to make a new line of development, see bzrdir.sprout()
439
If not None, the cloned tree will have its last revision set to
440
revision, and and difference between the source trees last revision
646
If not None, the cloned tree will have its last revision set to
647
revision, and difference between the source trees last revision
441
648
and this one merged in.
444
If not None, a closer copy of a tree which may have some files in
445
common, and which file content should be preferentially copied from.
447
650
# assumes the target bzr dir format is compatible.
448
result = self._format.initialize(to_bzrdir)
651
result = to_bzrdir.create_workingtree()
449
652
self.copy_content_into(result, revision_id)
453
656
def copy_content_into(self, tree, revision_id=None):
454
657
"""Copy the current content and user files of this tree into tree."""
658
tree.set_root_id(self.get_root_id())
455
659
if revision_id is None:
456
transform_tree(tree, self)
660
merge.transform_tree(tree, self)
458
# TODO now merge from tree.last_revision to revision
459
transform_tree(tree, self)
460
tree.set_last_revision(revision_id)
463
def commit(self, message=None, revprops=None, *args, **kwargs):
464
# avoid circular imports
465
from bzrlib.commit import Commit
468
if not 'branch-nick' in revprops:
469
revprops['branch-nick'] = self.branch.nick
470
# args for wt.commit start at message from the Commit.commit method,
471
# but with branch a kwarg now, passing in args as is results in the
472
#message being used for the branch
473
args = (DEPRECATED_PARAMETER, message, ) + args
474
Commit().commit(working_tree=self, revprops=revprops, *args, **kwargs)
475
self._set_inventory(self.read_working_inventory())
662
# TODO now merge from tree.last_revision to revision (to preserve
663
# user local changes)
664
merge.transform_tree(tree, self)
665
tree.set_parent_ids([revision_id])
477
667
def id2abspath(self, file_id):
478
668
return self.abspath(self.id2path(file_id))
480
670
def has_id(self, file_id):
481
671
# files that have been deleted are excluded
482
inv = self._inventory
483
673
if not inv.has_id(file_id):
485
675
path = inv.id2path(file_id)
486
return bzrlib.osutils.lexists(self.abspath(path))
676
return osutils.lexists(self.abspath(path))
488
678
def has_or_had_id(self, file_id):
489
679
if file_id == self.inventory.root.file_id:
493
683
__contains__ = has_id
495
685
def get_file_size(self, file_id):
496
return os.path.getsize(self.id2abspath(file_id))
686
"""See Tree.get_file_size"""
687
# XXX: this returns the on-disk size; it should probably return the
690
return os.path.getsize(self.id2abspath(file_id))
692
if e.errno != errno.ENOENT:
499
def get_file_sha1(self, file_id):
500
path = self._inventory.id2path(file_id)
501
return self._hashcache.get_sha1(path)
503
def is_executable(self, file_id):
504
if not supports_executable():
698
def get_file_sha1(self, file_id, path=None, stat_value=None):
700
path = self._inventory.id2path(file_id)
701
return self._hashcache.get_sha1(path, stat_value)
703
def get_file_mtime(self, file_id, path=None):
705
path = self.inventory.id2path(file_id)
706
return os.lstat(self.abspath(path)).st_mtime
708
def _is_executable_from_path_and_stat_from_basis(self, path, stat_result):
709
file_id = self.path2id(path)
711
# For unversioned files on win32, we just assume they are not
714
return self._inventory[file_id].executable
716
def _is_executable_from_path_and_stat_from_stat(self, path, stat_result):
717
mode = stat_result.st_mode
718
return bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode)
720
if not supports_executable():
721
def is_executable(self, file_id, path=None):
505
722
return self._inventory[file_id].executable
507
path = self._inventory.id2path(file_id)
724
_is_executable_from_path_and_stat = \
725
_is_executable_from_path_and_stat_from_basis
727
def is_executable(self, file_id, path=None):
729
path = self.id2path(file_id)
508
730
mode = os.lstat(self.abspath(path)).st_mode
509
return bool(stat.S_ISREG(mode) and stat.S_IEXEC&mode)
512
def add(self, files, ids=None):
513
"""Make files versioned.
515
Note that the command line normally calls smart_add instead,
516
which can automatically recurse.
518
This adds the files to the inventory, so that they will be
519
recorded by the next commit.
522
List of paths to add, relative to the base of the tree.
525
If set, use these instead of automatically generated ids.
526
Must be the same length as the list of files, but may
527
contain None for ids that are to be autogenerated.
529
TODO: Perhaps have an option to add the ids even if the files do
532
TODO: Perhaps callback with the ids and paths as they're added.
731
return bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode)
733
_is_executable_from_path_and_stat = \
734
_is_executable_from_path_and_stat_from_stat
736
@needs_tree_write_lock
737
def _add(self, files, ids, kinds):
738
"""See MutableTree._add."""
534
739
# TODO: Re-adding a file that is removed in the working copy
535
740
# should probably put it back with the previous ID.
536
if isinstance(files, basestring):
537
assert(ids is None or isinstance(ids, basestring))
543
ids = [None] * len(files)
545
assert(len(ids) == len(files))
547
inv = self.read_working_inventory()
548
for f,file_id in zip(files, ids):
549
if self.is_control_filename(f):
550
raise BzrError("cannot add control file %s" % quotefn(f))
555
raise BzrError("cannot add top-level %r" % f)
557
fullpath = normpath(self.abspath(f))
560
kind = file_kind(fullpath)
562
if e.errno == errno.ENOENT:
563
raise NoSuchFile(fullpath)
564
# maybe something better?
565
raise BzrError('cannot add: not a regular file, symlink or directory: %s' % quotefn(f))
567
if not InventoryEntry.versionable_kind(kind):
568
raise BzrError('cannot add: not a versionable file ('
569
'i.e. regular file, symlink or directory): %s' % quotefn(f))
741
# the read and write working inventory should not occur in this
742
# function - they should be part of lock_write and unlock.
744
for f, file_id, kind in zip(files, ids, kinds):
571
745
if file_id is None:
572
file_id = gen_file_id(f)
573
inv.add_path(f, kind=kind, file_id=file_id)
746
inv.add_path(f, kind=kind)
748
inv.add_path(f, kind=kind, file_id=file_id)
749
self._inventory_is_modified = True
575
mutter("add file %s file_id:{%s} kind=%r" % (f, file_id, kind))
576
self._write_inventory(inv)
751
@needs_tree_write_lock
752
def _gather_kinds(self, files, kinds):
753
"""See MutableTree._gather_kinds."""
754
for pos, f in enumerate(files):
755
if kinds[pos] is None:
756
fullpath = normpath(self.abspath(f))
758
kinds[pos] = file_kind(fullpath)
760
if e.errno == errno.ENOENT:
761
raise errors.NoSuchFile(fullpath)
578
763
@needs_write_lock
764
def add_parent_tree_id(self, revision_id, allow_leftmost_as_ghost=False):
765
"""Add revision_id as a parent.
767
This is equivalent to retrieving the current list of parent ids
768
and setting the list to its value plus revision_id.
770
:param revision_id: The revision id to add to the parent list. It may
771
be a ghost revision as long as its not the first parent to be added,
772
or the allow_leftmost_as_ghost parameter is set True.
773
:param allow_leftmost_as_ghost: Allow the first parent to be a ghost.
775
parents = self.get_parent_ids() + [revision_id]
776
self.set_parent_ids(parents, allow_leftmost_as_ghost=len(parents) > 1
777
or allow_leftmost_as_ghost)
779
@needs_tree_write_lock
780
def add_parent_tree(self, parent_tuple, allow_leftmost_as_ghost=False):
781
"""Add revision_id, tree tuple as a parent.
783
This is equivalent to retrieving the current list of parent trees
784
and setting the list to its value plus parent_tuple. See also
785
add_parent_tree_id - if you only have a parent id available it will be
786
simpler to use that api. If you have the parent already available, using
787
this api is preferred.
789
:param parent_tuple: The (revision id, tree) to add to the parent list.
790
If the revision_id is a ghost, pass None for the tree.
791
:param allow_leftmost_as_ghost: Allow the first parent to be a ghost.
793
parent_ids = self.get_parent_ids() + [parent_tuple[0]]
794
if len(parent_ids) > 1:
795
# the leftmost may have already been a ghost, preserve that if it
797
allow_leftmost_as_ghost = True
798
self.set_parent_ids(parent_ids,
799
allow_leftmost_as_ghost=allow_leftmost_as_ghost)
801
@needs_tree_write_lock
579
802
def add_pending_merge(self, *revision_ids):
580
803
# TODO: Perhaps should check at this point that the
581
804
# history of the revision is actually present?
582
p = self.pending_merges()
805
parents = self.get_parent_ids()
584
807
for rev_id in revision_ids:
808
if rev_id in parents:
810
parents.append(rev_id)
590
self.set_pending_merges(p)
593
def pending_merges(self):
594
"""Return a list of pending merges.
596
These are revisions that have been merged into the working
597
directory but not yet committed.
813
self.set_parent_ids(parents, allow_leftmost_as_ghost=True)
815
def path_content_summary(self, path, _lstat=os.lstat,
816
_mapper=osutils.file_kind_from_stat_mode):
817
"""See Tree.path_content_summary."""
818
abspath = self.abspath(path)
600
merges_file = self._control_files.get_utf8('pending-merges')
820
stat_result = _lstat(abspath)
601
821
except OSError, e:
602
if e.errno != errno.ENOENT:
606
for l in merges_file.readlines():
607
p.append(l.rstrip('\n'))
822
if getattr(e, 'errno', None) == errno.ENOENT:
824
return ('missing', None, None, None)
825
# propagate other errors
827
kind = _mapper(stat_result.st_mode)
829
return self._file_content_summary(path, stat_result)
830
elif kind == 'directory':
831
# perhaps it looks like a plain directory, but it's really a
833
if self._directory_is_tree_reference(path):
834
kind = 'tree-reference'
835
return kind, None, None, None
836
elif kind == 'symlink':
837
target = osutils.readlink(abspath)
838
return ('symlink', None, None, target)
840
return (kind, None, None, None)
842
def _file_content_summary(self, path, stat_result):
843
size = stat_result.st_size
844
executable = self._is_executable_from_path_and_stat(path, stat_result)
845
# try for a stat cache lookup
846
return ('file', size, executable, self._sha_from_stat(
849
def _check_parents_for_ghosts(self, revision_ids, allow_leftmost_as_ghost):
850
"""Common ghost checking functionality from set_parent_*.
852
This checks that the left hand-parent exists if there are any
855
if len(revision_ids) > 0:
856
leftmost_id = revision_ids[0]
857
if (not allow_leftmost_as_ghost and not
858
self.branch.repository.has_revision(leftmost_id)):
859
raise errors.GhostRevisionUnusableHere(leftmost_id)
861
def _set_merges_from_parent_ids(self, parent_ids):
862
merges = parent_ids[1:]
863
self._transport.put_bytes('pending-merges', '\n'.join(merges),
864
mode=self.bzrdir._get_file_mode())
866
def _filter_parent_ids_by_ancestry(self, revision_ids):
867
"""Check that all merged revisions are proper 'heads'.
869
This will always return the first revision_id, and any merged revisions
872
if len(revision_ids) == 0:
874
graph = self.branch.repository.get_graph()
875
heads = graph.heads(revision_ids)
876
new_revision_ids = revision_ids[:1]
877
for revision_id in revision_ids[1:]:
878
if revision_id in heads and revision_id not in new_revision_ids:
879
new_revision_ids.append(revision_id)
880
if new_revision_ids != revision_ids:
881
trace.mutter('requested to set revision_ids = %s,'
882
' but filtered to %s', revision_ids, new_revision_ids)
883
return new_revision_ids
885
@needs_tree_write_lock
886
def set_parent_ids(self, revision_ids, allow_leftmost_as_ghost=False):
887
"""Set the parent ids to revision_ids.
889
See also set_parent_trees. This api will try to retrieve the tree data
890
for each element of revision_ids from the trees repository. If you have
891
tree data already available, it is more efficient to use
892
set_parent_trees rather than set_parent_ids. set_parent_ids is however
893
an easier API to use.
895
:param revision_ids: The revision_ids to set as the parent ids of this
896
working tree. Any of these may be ghosts.
898
self._check_parents_for_ghosts(revision_ids,
899
allow_leftmost_as_ghost=allow_leftmost_as_ghost)
900
for revision_id in revision_ids:
901
_mod_revision.check_not_reserved_id(revision_id)
903
revision_ids = self._filter_parent_ids_by_ancestry(revision_ids)
905
if len(revision_ids) > 0:
906
self.set_last_revision(revision_ids[0])
908
self.set_last_revision(_mod_revision.NULL_REVISION)
910
self._set_merges_from_parent_ids(revision_ids)
912
@needs_tree_write_lock
913
def set_parent_trees(self, parents_list, allow_leftmost_as_ghost=False):
914
"""See MutableTree.set_parent_trees."""
915
parent_ids = [rev for (rev, tree) in parents_list]
916
for revision_id in parent_ids:
917
_mod_revision.check_not_reserved_id(revision_id)
919
self._check_parents_for_ghosts(parent_ids,
920
allow_leftmost_as_ghost=allow_leftmost_as_ghost)
922
parent_ids = self._filter_parent_ids_by_ancestry(parent_ids)
924
if len(parent_ids) == 0:
925
leftmost_parent_id = _mod_revision.NULL_REVISION
926
leftmost_parent_tree = None
928
leftmost_parent_id, leftmost_parent_tree = parents_list[0]
930
if self._change_last_revision(leftmost_parent_id):
931
if leftmost_parent_tree is None:
932
# If we don't have a tree, fall back to reading the
933
# parent tree from the repository.
934
self._cache_basis_inventory(leftmost_parent_id)
936
inv = leftmost_parent_tree.inventory
937
xml = self._create_basis_xml_from_inventory(
938
leftmost_parent_id, inv)
939
self._write_basis_inventory(xml)
940
self._set_merges_from_parent_ids(parent_ids)
942
@needs_tree_write_lock
611
943
def set_pending_merges(self, rev_list):
612
self._control_files.put_utf8('pending-merges', '\n'.join(rev_list))
944
parents = self.get_parent_ids()
945
leftmost = parents[:1]
946
new_parents = leftmost + rev_list
947
self.set_parent_ids(new_parents)
949
@needs_tree_write_lock
615
950
def set_merge_modified(self, modified_hashes):
616
951
def iter_stanzas():
617
952
for file_id, hash in modified_hashes.iteritems():
618
yield Stanza(file_id=file_id, hash=hash)
953
yield Stanza(file_id=file_id.decode('utf8'), hash=hash)
619
954
self._put_rio('merge-hashes', iter_stanzas(), MERGE_MODIFIED_HEADER_1)
956
def _sha_from_stat(self, path, stat_result):
957
"""Get a sha digest from the tree's stat cache.
959
The default implementation assumes no stat cache is present.
961
:param path: The path.
962
:param stat_result: The stat result being looked up.
622
966
def _put_rio(self, filename, stanzas, header):
967
self._must_be_locked()
623
968
my_file = rio_file(stanzas, header)
624
self._control_files.put(filename, my_file)
969
self._transport.put_file(filename, my_file,
970
mode=self.bzrdir._get_file_mode())
972
@needs_write_lock # because merge pulls data into the branch.
973
def merge_from_branch(self, branch, to_revision=None, from_revision=None,
974
merge_type=None, force=False):
975
"""Merge from a branch into this working tree.
977
:param branch: The branch to merge from.
978
:param to_revision: If non-None, the merge will merge to to_revision,
979
but not beyond it. to_revision does not need to be in the history
980
of the branch when it is supplied. If None, to_revision defaults to
981
branch.last_revision().
983
from bzrlib.merge import Merger, Merge3Merger
984
merger = Merger(self.branch, this_tree=self)
985
# check that there are no local alterations
986
if not force and self.has_changes():
987
raise errors.UncommittedChanges(self)
988
if to_revision is None:
989
to_revision = _mod_revision.ensure_null(branch.last_revision())
990
merger.other_rev_id = to_revision
991
if _mod_revision.is_null(merger.other_rev_id):
992
raise errors.NoCommits(branch)
993
self.branch.fetch(branch, last_revision=merger.other_rev_id)
994
merger.other_basis = merger.other_rev_id
995
merger.other_tree = self.branch.repository.revision_tree(
997
merger.other_branch = branch
998
if from_revision is None:
1001
merger.set_base_revision(from_revision, branch)
1002
if merger.base_rev_id == merger.other_rev_id:
1003
raise errors.PointlessMerge
1004
merger.backup_files = False
1005
if merge_type is None:
1006
merger.merge_type = Merge3Merger
1008
merger.merge_type = merge_type
1009
merger.set_interesting_files(None)
1010
merger.show_base = False
1011
merger.reprocess = False
1012
conflicts = merger.do_merge()
1013
merger.set_pending()
626
1016
@needs_read_lock
627
1017
def merge_modified(self):
1018
"""Return a dictionary of files modified by a merge.
1020
The list is initialized by WorkingTree.set_merge_modified, which is
1021
typically called after we make some automatic updates to the tree
1024
This returns a map of file_id->sha1, containing only files which are
1025
still in the working inventory and have that text hash.
629
hashfile = self._control_files.get('merge-hashes')
1028
hashfile = self._transport.get('merge-hashes')
1029
except errors.NoSuchFile:
634
if hashfile.next() != MERGE_MODIFIED_HEADER_1 + '\n':
635
raise MergeModifiedFormatError()
636
except StopIteration:
637
raise MergeModifiedFormatError()
638
for s in RioReader(hashfile):
639
file_id = s.get("file_id")
640
if file_id not in self.inventory:
643
if hash == self.get_file_sha1(file_id):
644
merge_hashes[file_id] = hash
1034
if hashfile.next() != MERGE_MODIFIED_HEADER_1 + '\n':
1035
raise errors.MergeModifiedFormatError()
1036
except StopIteration:
1037
raise errors.MergeModifiedFormatError()
1038
for s in RioReader(hashfile):
1039
# RioReader reads in Unicode, so convert file_ids back to utf8
1040
file_id = osutils.safe_file_id(s.get("file_id"), warn=False)
1041
if file_id not in self.inventory:
1043
text_hash = s.get("hash")
1044
if text_hash == self.get_file_sha1(file_id):
1045
merge_hashes[file_id] = text_hash
1051
def mkdir(self, path, file_id=None):
1052
"""See MutableTree.mkdir()."""
1054
file_id = generate_ids.gen_file_id(os.path.basename(path))
1055
os.mkdir(self.abspath(path))
1056
self.add(path, file_id, 'directory')
647
1059
def get_symlink_target(self, file_id):
648
return os.readlink(self.id2abspath(file_id))
650
def file_class(self, filename):
651
if self.path2id(filename):
653
elif self.is_ignored(filename):
658
def list_files(self):
659
"""Recursively list all files as (path, class, kind, id).
1060
abspath = self.id2abspath(file_id)
1061
target = osutils.readlink(abspath)
1065
def subsume(self, other_tree):
1066
def add_children(inventory, entry):
1067
for child_entry in entry.children.values():
1068
inventory._byid[child_entry.file_id] = child_entry
1069
if child_entry.kind == 'directory':
1070
add_children(inventory, child_entry)
1071
if other_tree.get_root_id() == self.get_root_id():
1072
raise errors.BadSubsumeSource(self, other_tree,
1073
'Trees have the same root')
1075
other_tree_path = self.relpath(other_tree.basedir)
1076
except errors.PathNotChild:
1077
raise errors.BadSubsumeSource(self, other_tree,
1078
'Tree is not contained by the other')
1079
new_root_parent = self.path2id(osutils.dirname(other_tree_path))
1080
if new_root_parent is None:
1081
raise errors.BadSubsumeSource(self, other_tree,
1082
'Parent directory is not versioned.')
1083
# We need to ensure that the result of a fetch will have a
1084
# versionedfile for the other_tree root, and only fetching into
1085
# RepositoryKnit2 guarantees that.
1086
if not self.branch.repository.supports_rich_root():
1087
raise errors.SubsumeTargetNeedsUpgrade(other_tree)
1088
other_tree.lock_tree_write()
1090
new_parents = other_tree.get_parent_ids()
1091
other_root = other_tree.inventory.root
1092
other_root.parent_id = new_root_parent
1093
other_root.name = osutils.basename(other_tree_path)
1094
self.inventory.add(other_root)
1095
add_children(self.inventory, other_root)
1096
self._write_inventory(self.inventory)
1097
# normally we don't want to fetch whole repositories, but i think
1098
# here we really do want to consolidate the whole thing.
1099
for parent_id in other_tree.get_parent_ids():
1100
self.branch.fetch(other_tree.branch, parent_id)
1101
self.add_parent_tree_id(parent_id)
1104
other_tree.bzrdir.retire_bzrdir()
1106
def _setup_directory_is_tree_reference(self):
1107
if self._branch.repository._format.supports_tree_reference:
1108
self._directory_is_tree_reference = \
1109
self._directory_may_be_tree_reference
1111
self._directory_is_tree_reference = \
1112
self._directory_is_never_tree_reference
1114
def _directory_is_never_tree_reference(self, relpath):
1117
def _directory_may_be_tree_reference(self, relpath):
1118
# as a special case, if a directory contains control files then
1119
# it's a tree reference, except that the root of the tree is not
1120
return relpath and osutils.isdir(self.abspath(relpath) + u"/.bzr")
1121
# TODO: We could ask all the control formats whether they
1122
# recognize this directory, but at the moment there's no cheap api
1123
# to do that. Since we probably can only nest bzr checkouts and
1124
# they always use this name it's ok for now. -- mbp 20060306
1126
# FIXME: There is an unhandled case here of a subdirectory
1127
# containing .bzr but not a branch; that will probably blow up
1128
# when you try to commit it. It might happen if there is a
1129
# checkout in a subdirectory. This can be avoided by not adding
1132
@needs_tree_write_lock
1133
def extract(self, file_id, format=None):
1134
"""Extract a subtree from this tree.
1136
A new branch will be created, relative to the path for this tree.
1140
segments = osutils.splitpath(path)
1141
transport = self.branch.bzrdir.root_transport
1142
for name in segments:
1143
transport = transport.clone(name)
1144
transport.ensure_base()
1147
sub_path = self.id2path(file_id)
1148
branch_transport = mkdirs(sub_path)
1150
format = self.bzrdir.cloning_metadir()
1151
branch_transport.ensure_base()
1152
branch_bzrdir = format.initialize_on_transport(branch_transport)
1154
repo = branch_bzrdir.find_repository()
1155
except errors.NoRepositoryPresent:
1156
repo = branch_bzrdir.create_repository()
1157
if not repo.supports_rich_root():
1158
raise errors.RootNotRich()
1159
new_branch = branch_bzrdir.create_branch()
1160
new_branch.pull(self.branch)
1161
for parent_id in self.get_parent_ids():
1162
new_branch.fetch(self.branch, parent_id)
1163
tree_transport = self.bzrdir.root_transport.clone(sub_path)
1164
if tree_transport.base != branch_transport.base:
1165
tree_bzrdir = format.initialize_on_transport(tree_transport)
1166
branch.BranchReferenceFormat().initialize(tree_bzrdir,
1167
target_branch=new_branch)
1169
tree_bzrdir = branch_bzrdir
1170
wt = tree_bzrdir.create_workingtree(_mod_revision.NULL_REVISION)
1171
wt.set_parent_ids(self.get_parent_ids())
1172
my_inv = self.inventory
1173
child_inv = inventory.Inventory(root_id=None)
1174
new_root = my_inv[file_id]
1175
my_inv.remove_recursive_id(file_id)
1176
new_root.parent_id = None
1177
child_inv.add(new_root)
1178
self._write_inventory(my_inv)
1179
wt._write_inventory(child_inv)
1182
def _serialize(self, inventory, out_file):
1183
xml5.serializer_v5.write_inventory(self._inventory, out_file,
1186
def _deserialize(selt, in_file):
1187
return xml5.serializer_v5.read_inventory(in_file)
1190
"""Write the in memory inventory to disk."""
1191
# TODO: Maybe this should only write on dirty ?
1192
if self._control_files._lock_mode != 'w':
1193
raise errors.NotWriteLocked(self)
1195
self._serialize(self._inventory, sio)
1197
self._transport.put_file('inventory', sio,
1198
mode=self.bzrdir._get_file_mode())
1199
self._inventory_is_modified = False
1201
def _kind(self, relpath):
1202
return osutils.file_kind(self.abspath(relpath))
1204
def list_files(self, include_root=False, from_dir=None, recursive=True):
1205
"""List all files as (path, class, kind, id, entry).
661
1207
Lists, but does not descend into unversioned directories.
663
1208
This does not include files that have been deleted in this
1209
tree. Skips the control directory.
666
Skips the control directory.
1211
:param include_root: if True, return an entry for the root
1212
:param from_dir: start from this directory or None for the root
1213
:param recursive: whether to recurse into subdirectories or not
668
inv = self._inventory
670
def descend(from_dir_relpath, from_dir_id, dp):
1215
# list_files is an iterator, so @needs_read_lock doesn't work properly
1216
# with it. So callers should be careful to always read_lock the tree.
1217
if not self.is_locked():
1218
raise errors.ObjectNotLocked(self)
1220
inv = self.inventory
1221
if from_dir is None and include_root is True:
1222
yield ('', 'V', 'directory', inv.root.file_id, inv.root)
1223
# Convert these into local objects to save lookup times
1224
pathjoin = osutils.pathjoin
1225
file_kind = self._kind
1227
# transport.base ends in a slash, we want the piece
1228
# between the last two slashes
1229
transport_base_dir = self.bzrdir.transport.base.rsplit('/', 2)[1]
1231
fk_entries = {'directory':TreeDirectory, 'file':TreeFile, 'symlink':TreeLink}
1233
# directory file_id, relative path, absolute path, reverse sorted children
1234
if from_dir is not None:
1235
from_dir_id = inv.path2id(from_dir)
1236
if from_dir_id is None:
1237
# Directory not versioned
1239
from_dir_abspath = pathjoin(self.basedir, from_dir)
1241
from_dir_id = inv.root.file_id
1242
from_dir_abspath = self.basedir
1243
children = os.listdir(from_dir_abspath)
1245
# jam 20060527 The kernel sized tree seems equivalent whether we
1246
# use a deque and popleft to keep them sorted, or if we use a plain
1247
# list and just reverse() them.
1248
children = collections.deque(children)
1249
stack = [(from_dir_id, u'', from_dir_abspath, children)]
1251
from_dir_id, from_dir_relpath, from_dir_abspath, children = stack[-1]
1254
f = children.popleft()
674
1255
## TODO: If we find a subdirectory with its own .bzr
675
1256
## directory, then that is a separate tree and we
676
1257
## should exclude it.
678
1259
# the bzrdir for this tree
679
if self.bzrdir.transport.base.endswith(f + '/'):
1260
if transport_base_dir == f:
683
fp = appendpath(from_dir_relpath, f)
1263
# we know that from_dir_relpath and from_dir_abspath never end in a slash
1264
# and 'f' doesn't begin with one, we can do a string op, rather
1265
# than the checks of pathjoin(), all relative paths will have an extra slash
1267
fp = from_dir_relpath + '/' + f
686
fap = appendpath(dp, f)
688
f_ie = inv.get_child(from_dir_id, f)
1270
fap = from_dir_abspath + '/' + f
1272
dir_ie = inv[from_dir_id]
1273
if dir_ie.kind == 'directory':
1274
f_ie = dir_ie.children.get(f)
691
elif self.is_ignored(fp):
1279
elif self.is_ignored(fp[1:]):
1282
# we may not have found this file, because of a unicode
1283
# issue, or because the directory was actually a symlink.
1284
f_norm, can_access = osutils.normalized_filename(f)
1285
if f == f_norm or not can_access:
1286
# No change, so treat this file normally
1289
# this file can be accessed by a normalized path
1290
# check again if it is versioned
1291
# these lines are repeated here for performance
1293
fp = from_dir_relpath + '/' + f
1294
fap = from_dir_abspath + '/' + f
1295
f_ie = inv.get_child(from_dir_id, f)
1298
elif self.is_ignored(fp[1:]):
696
1303
fk = file_kind(fap)
700
raise BzrCheckError("file %r entered as kind %r id %r, "
702
% (fap, f_ie.kind, f_ie.file_id, fk))
704
1305
# make a last minute entry
1307
yield fp[1:], c, fk, f_ie.file_id, f_ie
708
if fk == 'directory':
709
entry = TreeDirectory()
712
elif fk == 'symlink':
717
yield fp, c, fk, (f_ie and f_ie.file_id), entry
1310
yield fp[1:], c, fk, None, fk_entries[fk]()
1312
yield fp[1:], c, fk, None, TreeEntry()
719
1315
if fk != 'directory':
723
# don't descend unversioned directories
726
for ff in descend(fp, f_ie.file_id, fap):
729
for f in descend(u'', inv.root.file_id, self.basedir):
733
def move(self, from_paths, to_name):
1318
# But do this child first if recursing down
1320
new_children = os.listdir(fap)
1322
new_children = collections.deque(new_children)
1323
stack.append((f_ie.file_id, fp, fap, new_children))
1324
# Break out of inner loop,
1325
# so that we start outer loop with child
1328
# if we finished all children, pop it off the stack
1331
@needs_tree_write_lock
1332
def move(self, from_paths, to_dir=None, after=False):
734
1333
"""Rename files.
736
to_name must exist in the inventory.
738
If to_name exists and is a directory, the files are moved into
739
it, keeping their old names.
741
Note that to_name is only the last component of the new name;
1335
to_dir must exist in the inventory.
1337
If to_dir exists and is a directory, the files are moved into
1338
it, keeping their old names.
1340
Note that to_dir is only the last component of the new name;
742
1341
this doesn't change the directory.
1343
For each entry in from_paths the move mode will be determined
1346
The first mode moves the file in the filesystem and updates the
1347
inventory. The second mode only updates the inventory without
1348
touching the file on the filesystem. This is the new mode introduced
1351
move uses the second mode if 'after == True' and the target is not
1352
versioned but present in the working tree.
1354
move uses the second mode if 'after == False' and the source is
1355
versioned but no longer in the working tree, and the target is not
1356
versioned but present in the working tree.
1358
move uses the first mode if 'after == False' and the source is
1359
versioned and present in the working tree, and the target is not
1360
versioned and not present in the working tree.
1362
Everything else results in an error.
744
1364
This returns a list of (from_path, to_path) pairs for each
745
1365
entry that is moved.
748
## TODO: Option to move IDs only
749
assert not isinstance(from_paths, basestring)
1370
# check for deprecated use of signature
1372
raise TypeError('You must supply a target directory')
1373
# check destination directory
1374
if isinstance(from_paths, basestring):
750
1376
inv = self.inventory
751
to_abs = self.abspath(to_name)
1377
to_abs = self.abspath(to_dir)
752
1378
if not isdir(to_abs):
753
raise BzrError("destination %r is not a directory" % to_abs)
754
if not self.has_filename(to_name):
755
raise BzrError("destination %r not in working directory" % to_abs)
756
to_dir_id = inv.path2id(to_name)
757
if to_dir_id == None and to_name != '':
758
raise BzrError("destination %r is not a versioned directory" % to_name)
1379
raise errors.BzrMoveFailedError('',to_dir,
1380
errors.NotADirectory(to_abs))
1381
if not self.has_filename(to_dir):
1382
raise errors.BzrMoveFailedError('',to_dir,
1383
errors.NotInWorkingDirectory(to_dir))
1384
to_dir_id = inv.path2id(to_dir)
1385
if to_dir_id is None:
1386
raise errors.BzrMoveFailedError('',to_dir,
1387
errors.NotVersionedError(path=to_dir))
759
1389
to_dir_ie = inv[to_dir_id]
760
if to_dir_ie.kind not in ('directory', 'root_directory'):
761
raise BzrError("destination %r is not a directory" % to_abs)
763
to_idpath = inv.get_idpath(to_dir_id)
766
if not self.has_filename(f):
767
raise BzrError("%r does not exist in working tree" % f)
768
f_id = inv.path2id(f)
770
raise BzrError("%r is not versioned" % f)
771
name_tail = splitpath(f)[-1]
772
dest_path = appendpath(to_name, name_tail)
773
if self.has_filename(dest_path):
774
raise BzrError("destination %r already exists" % dest_path)
775
if f_id in to_idpath:
776
raise BzrError("can't move %r to a subdirectory of itself" % f)
778
# OK, so there's a race here, it's possible that someone will
779
# create a file in this interval and then the rename might be
780
# left half-done. But we should have caught most problems.
781
orig_inv = deepcopy(self.inventory)
1390
if to_dir_ie.kind != 'directory':
1391
raise errors.BzrMoveFailedError('',to_dir,
1392
errors.NotADirectory(to_abs))
1394
# create rename entries and tuples
1395
for from_rel in from_paths:
1396
from_tail = splitpath(from_rel)[-1]
1397
from_id = inv.path2id(from_rel)
1399
raise errors.BzrMoveFailedError(from_rel,to_dir,
1400
errors.NotVersionedError(path=from_rel))
1402
from_entry = inv[from_id]
1403
from_parent_id = from_entry.parent_id
1404
to_rel = pathjoin(to_dir, from_tail)
1405
rename_entry = WorkingTree._RenameEntry(from_rel=from_rel,
1407
from_tail=from_tail,
1408
from_parent_id=from_parent_id,
1409
to_rel=to_rel, to_tail=from_tail,
1410
to_parent_id=to_dir_id)
1411
rename_entries.append(rename_entry)
1412
rename_tuples.append((from_rel, to_rel))
1414
# determine which move mode to use. checks also for movability
1415
rename_entries = self._determine_mv_mode(rename_entries, after)
1417
original_modified = self._inventory_is_modified
784
name_tail = splitpath(f)[-1]
785
dest_path = appendpath(to_name, name_tail)
786
result.append((f, dest_path))
787
inv.rename(inv.path2id(f), to_dir_id, name_tail)
789
rename(self.abspath(f), self.abspath(dest_path))
791
raise BzrError("failed to rename %r to %r: %s" %
792
(f, dest_path, e[1]),
793
["rename rolled back"])
1420
self._inventory_is_modified = True
1421
self._move(rename_entries)
795
1423
# restore the inventory on error
796
self._set_inventory(orig_inv)
1424
self._inventory_is_modified = original_modified
798
1426
self._write_inventory(inv)
802
def rename_one(self, from_rel, to_rel):
1427
return rename_tuples
1429
def _determine_mv_mode(self, rename_entries, after=False):
1430
"""Determines for each from-to pair if both inventory and working tree
1431
or only the inventory has to be changed.
1433
Also does basic plausability tests.
1435
inv = self.inventory
1437
for rename_entry in rename_entries:
1438
# store to local variables for easier reference
1439
from_rel = rename_entry.from_rel
1440
from_id = rename_entry.from_id
1441
to_rel = rename_entry.to_rel
1442
to_id = inv.path2id(to_rel)
1443
only_change_inv = False
1445
# check the inventory for source and destination
1447
raise errors.BzrMoveFailedError(from_rel,to_rel,
1448
errors.NotVersionedError(path=from_rel))
1449
if to_id is not None:
1450
raise errors.BzrMoveFailedError(from_rel,to_rel,
1451
errors.AlreadyVersionedError(path=to_rel))
1453
# try to determine the mode for rename (only change inv or change
1454
# inv and file system)
1456
if not self.has_filename(to_rel):
1457
raise errors.BzrMoveFailedError(from_id,to_rel,
1458
errors.NoSuchFile(path=to_rel,
1459
extra="New file has not been created yet"))
1460
only_change_inv = True
1461
elif not self.has_filename(from_rel) and self.has_filename(to_rel):
1462
only_change_inv = True
1463
elif self.has_filename(from_rel) and not self.has_filename(to_rel):
1464
only_change_inv = False
1465
elif (not self.case_sensitive
1466
and from_rel.lower() == to_rel.lower()
1467
and self.has_filename(from_rel)):
1468
only_change_inv = False
1470
# something is wrong, so lets determine what exactly
1471
if not self.has_filename(from_rel) and \
1472
not self.has_filename(to_rel):
1473
raise errors.BzrRenameFailedError(from_rel,to_rel,
1474
errors.PathsDoNotExist(paths=(str(from_rel),
1477
raise errors.RenameFailedFilesExist(from_rel, to_rel)
1478
rename_entry.only_change_inv = only_change_inv
1479
return rename_entries
1481
def _move(self, rename_entries):
1482
"""Moves a list of files.
1484
Depending on the value of the flag 'only_change_inv', the
1485
file will be moved on the file system or not.
1487
inv = self.inventory
1490
for entry in rename_entries:
1492
self._move_entry(entry)
1494
self._rollback_move(moved)
1498
def _rollback_move(self, moved):
1499
"""Try to rollback a previous move in case of an filesystem error."""
1500
inv = self.inventory
1503
self._move_entry(WorkingTree._RenameEntry(
1504
entry.to_rel, entry.from_id,
1505
entry.to_tail, entry.to_parent_id, entry.from_rel,
1506
entry.from_tail, entry.from_parent_id,
1507
entry.only_change_inv))
1508
except errors.BzrMoveFailedError, e:
1509
raise errors.BzrMoveFailedError( '', '', "Rollback failed."
1510
" The working tree is in an inconsistent state."
1511
" Please consider doing a 'bzr revert'."
1512
" Error message is: %s" % e)
1514
def _move_entry(self, entry):
1515
inv = self.inventory
1516
from_rel_abs = self.abspath(entry.from_rel)
1517
to_rel_abs = self.abspath(entry.to_rel)
1518
if from_rel_abs == to_rel_abs:
1519
raise errors.BzrMoveFailedError(entry.from_rel, entry.to_rel,
1520
"Source and target are identical.")
1522
if not entry.only_change_inv:
1524
osutils.rename(from_rel_abs, to_rel_abs)
1526
raise errors.BzrMoveFailedError(entry.from_rel,
1528
inv.rename(entry.from_id, entry.to_parent_id, entry.to_tail)
1530
@needs_tree_write_lock
1531
def rename_one(self, from_rel, to_rel, after=False):
803
1532
"""Rename one file.
805
1534
This can change the directory or the filename or both.
1536
rename_one has several 'modes' to work. First, it can rename a physical
1537
file and change the file_id. That is the normal mode. Second, it can
1538
only change the file_id without touching any physical file. This is
1539
the new mode introduced in version 0.15.
1541
rename_one uses the second mode if 'after == True' and 'to_rel' is not
1542
versioned but present in the working tree.
1544
rename_one uses the second mode if 'after == False' and 'from_rel' is
1545
versioned but no longer in the working tree, and 'to_rel' is not
1546
versioned but present in the working tree.
1548
rename_one uses the first mode if 'after == False' and 'from_rel' is
1549
versioned and present in the working tree, and 'to_rel' is not
1550
versioned and not present in the working tree.
1552
Everything else results in an error.
807
1554
inv = self.inventory
808
if not self.has_filename(from_rel):
809
raise BzrError("can't rename: old working file %r does not exist" % from_rel)
810
if self.has_filename(to_rel):
811
raise BzrError("can't rename: new working file %r already exists" % to_rel)
813
file_id = inv.path2id(from_rel)
815
raise BzrError("can't rename: old name %r is not versioned" % from_rel)
818
from_parent = entry.parent_id
819
from_name = entry.name
821
if inv.path2id(to_rel):
822
raise BzrError("can't rename: new name %r is already versioned" % to_rel)
1557
# create rename entries and tuples
1558
from_tail = splitpath(from_rel)[-1]
1559
from_id = inv.path2id(from_rel)
1561
# if file is missing in the inventory maybe it's in the basis_tree
1562
basis_tree = self.branch.basis_tree()
1563
from_id = basis_tree.path2id(from_rel)
1565
raise errors.BzrRenameFailedError(from_rel,to_rel,
1566
errors.NotVersionedError(path=from_rel))
1567
# put entry back in the inventory so we can rename it
1568
from_entry = basis_tree.inventory[from_id].copy()
1571
from_entry = inv[from_id]
1572
from_parent_id = from_entry.parent_id
824
1573
to_dir, to_tail = os.path.split(to_rel)
825
1574
to_dir_id = inv.path2id(to_dir)
826
if to_dir_id == None and to_dir != '':
827
raise BzrError("can't determine destination directory id for %r" % to_dir)
829
mutter("rename_one:")
830
mutter(" file_id {%s}" % file_id)
831
mutter(" from_rel %r" % from_rel)
832
mutter(" to_rel %r" % to_rel)
833
mutter(" to_dir %r" % to_dir)
834
mutter(" to_dir_id {%s}" % to_dir_id)
836
inv.rename(file_id, to_dir_id, to_tail)
838
from_abs = self.abspath(from_rel)
839
to_abs = self.abspath(to_rel)
841
rename(from_abs, to_abs)
843
inv.rename(file_id, from_parent, from_name)
844
raise BzrError("failed to rename %r to %r: %s"
845
% (from_abs, to_abs, e[1]),
846
["rename rolled back"])
1575
rename_entry = WorkingTree._RenameEntry(from_rel=from_rel,
1577
from_tail=from_tail,
1578
from_parent_id=from_parent_id,
1579
to_rel=to_rel, to_tail=to_tail,
1580
to_parent_id=to_dir_id)
1581
rename_entries.append(rename_entry)
1583
# determine which move mode to use. checks also for movability
1584
rename_entries = self._determine_mv_mode(rename_entries, after)
1586
# check if the target changed directory and if the target directory is
1588
if to_dir_id is None:
1589
raise errors.BzrMoveFailedError(from_rel,to_rel,
1590
errors.NotVersionedError(path=to_dir))
1592
# all checks done. now we can continue with our actual work
1593
mutter('rename_one:\n'
1598
' to_dir_id {%s}\n',
1599
from_id, from_rel, to_rel, to_dir, to_dir_id)
1601
self._move(rename_entries)
847
1602
self._write_inventory(inv)
1604
class _RenameEntry(object):
1605
def __init__(self, from_rel, from_id, from_tail, from_parent_id,
1606
to_rel, to_tail, to_parent_id, only_change_inv=False):
1607
self.from_rel = from_rel
1608
self.from_id = from_id
1609
self.from_tail = from_tail
1610
self.from_parent_id = from_parent_id
1611
self.to_rel = to_rel
1612
self.to_tail = to_tail
1613
self.to_parent_id = to_parent_id
1614
self.only_change_inv = only_change_inv
849
1616
@needs_read_lock
850
1617
def unknowns(self):
851
1618
"""Return all unknown files.
853
1620
These are files in the working directory that are not versioned or
854
1621
control files or ignored.
856
>>> from bzrlib.bzrdir import ScratchDir
857
>>> d = ScratchDir(files=['foo', 'foo~'])
858
>>> b = d.open_branch()
859
>>> tree = d.open_workingtree()
860
>>> map(str, tree.unknowns())
863
>>> list(b.unknowns())
865
>>> tree.remove('foo')
866
>>> list(b.unknowns())
869
for subp in self.extras():
870
if not self.is_ignored(subp):
873
@deprecated_method(zero_eight)
874
def iter_conflicts(self):
875
"""List all files in the tree that have text or content conflicts.
876
DEPRECATED. Use conflicts instead."""
877
return self._iter_conflicts()
1623
# force the extras method to be fully executed before returning, to
1624
# prevent race conditions with the lock
1626
[subp for subp in self.extras() if not self.is_ignored(subp)])
1628
@needs_tree_write_lock
1629
def unversion(self, file_ids):
1630
"""Remove the file ids in file_ids from the current versioned set.
1632
When a file_id is unversioned, all of its children are automatically
1635
:param file_ids: The file ids to stop versioning.
1636
:raises: NoSuchId if any fileid is not currently versioned.
1638
for file_id in file_ids:
1639
if file_id not in self._inventory:
1640
raise errors.NoSuchId(self, file_id)
1641
for file_id in file_ids:
1642
if self._inventory.has_id(file_id):
1643
self._inventory.remove_recursive_id(file_id)
1645
# in the future this should just set a dirty bit to wait for the
1646
# final unlock. However, until all methods of workingtree start
1647
# with the current in -memory inventory rather than triggering
1648
# a read, it is more complex - we need to teach read_inventory
1649
# to know when to read, and when to not read first... and possibly
1650
# to save first when the in memory one may be corrupted.
1651
# so for now, we just only write it if it is indeed dirty.
1653
self._write_inventory(self._inventory)
879
1655
def _iter_conflicts(self):
880
1656
conflicted = set()
881
for path in (s[0] for s in self.list_files()):
1657
for info in self.list_files():
882
1659
stem = get_conflicted_stem(path)
883
1660
if stem is None:
1053
1936
def _change_last_revision(self, new_revision):
1054
1937
"""Template method part of set_last_revision to perform the change.
1056
1939
This is used to allow WorkingTree3 instances to not affect branch
1057
1940
when their last revision is set.
1059
if new_revision is None:
1942
if _mod_revision.is_null(new_revision):
1060
1943
self.branch.set_revision_history([])
1062
# current format is locked in with the branch
1063
revision_history = self.branch.revision_history()
1065
position = revision_history.index(new_revision)
1067
raise errors.NoSuchRevision(self.branch, new_revision)
1068
self.branch.set_revision_history(revision_history[:position + 1])
1946
self.branch.generate_revision_history(new_revision)
1947
except errors.NoSuchRevision:
1948
# not present in the repo - dont try to set it deeper than the tip
1949
self.branch.set_revision_history([new_revision])
1952
def _write_basis_inventory(self, xml):
1953
"""Write the basis inventory XML to the basis-inventory file"""
1954
path = self._basis_inventory_name()
1956
self._transport.put_file(path, sio,
1957
mode=self.bzrdir._get_file_mode())
1959
def _create_basis_xml_from_inventory(self, revision_id, inventory):
1960
"""Create the text that will be saved in basis-inventory"""
1961
inventory.revision_id = revision_id
1962
return xml7.serializer_v7.write_inventory_to_string(inventory)
1071
1964
def _cache_basis_inventory(self, new_revision):
1072
1965
"""Cache new_revision as the basis inventory."""
1966
# TODO: this should allow the ready-to-use inventory to be passed in,
1967
# as commit already has that ready-to-use [while the format is the
1074
# this double handles the inventory - unpack and repack -
1970
# this double handles the inventory - unpack and repack -
1075
1971
# but is easier to understand. We can/should put a conditional
1076
1972
# in here based on whether the inventory is in the latest format
1077
1973
# - perhaps we should repack all inventories on a repository
1079
inv = self.branch.repository.get_inventory(new_revision)
1080
inv.revision_id = new_revision
1081
xml = bzrlib.xml5.serializer_v5.write_inventory_to_string(inv)
1083
path = self._basis_inventory_name()
1084
self._control_files.put_utf8(path, xml)
1085
except WeaveRevisionNotPresent:
1975
# the fast path is to copy the raw xml from the repository. If the
1976
# xml contains 'revision_id="', then we assume the right
1977
# revision_id is set. We must check for this full string, because a
1978
# root node id can legitimately look like 'revision_id' but cannot
1980
xml = self.branch.repository._get_inventory_xml(new_revision)
1981
firstline = xml.split('\n', 1)[0]
1982
if (not 'revision_id="' in firstline or
1983
'format="7"' not in firstline):
1984
inv = self.branch.repository._serializer.read_inventory_from_string(
1986
xml = self._create_basis_xml_from_inventory(new_revision, inv)
1987
self._write_basis_inventory(xml)
1988
except (errors.NoSuchRevision, errors.RevisionNotPresent):
1088
1991
def read_basis_inventory(self):
1089
1992
"""Read the cached basis inventory."""
1090
1993
path = self._basis_inventory_name()
1091
return self._control_files.get_utf8(path).read()
1994
return self._transport.get_bytes(path)
1093
1996
@needs_read_lock
1094
1997
def read_working_inventory(self):
1095
"""Read the working inventory."""
1998
"""Read the working inventory.
2000
:raises errors.InventoryModified: read_working_inventory will fail
2001
when the current in memory inventory has been modified.
2003
# conceptually this should be an implementation detail of the tree.
2004
# XXX: Deprecate this.
1096
2005
# ElementTree does its own conversion from UTF-8, so open in
1098
result = bzrlib.xml5.serializer_v5.read_inventory(
1099
self._control_files.get('inventory'))
1100
self._set_inventory(result)
2007
if self._inventory_is_modified:
2008
raise errors.InventoryModified(self)
2009
f = self._transport.get('inventory')
2011
result = self._deserialize(f)
2014
self._set_inventory(result, dirty=False)
1104
def remove(self, files, verbose=False):
1105
"""Remove nominated files from the working inventory..
1107
This does not remove their text. This does not run on XXX on what? RBC
1109
TODO: Refuse to remove modified files unless --force is given?
1111
TODO: Do something useful with directories.
1113
TODO: Should this remove the text or not? Tough call; not
1114
removing may be useful and the user can just use use rm, and
1115
is the opposite of add. Removing it is consistent with most
1116
other tools. Maybe an option.
2017
@needs_tree_write_lock
2018
def remove(self, files, verbose=False, to_file=None, keep_files=True,
2020
"""Remove nominated files from the working inventory.
2022
:files: File paths relative to the basedir.
2023
:keep_files: If true, the files will also be kept.
2024
:force: Delete files and directories, even if they are changed and
2025
even if the directories are not empty.
1118
## TODO: Normalize names
1119
## TODO: Remove nested loops; better scalability
1120
2027
if isinstance(files, basestring):
1121
2028
files = [files]
1123
inv = self.inventory
1125
# do this before any modifications
2032
all_files = set() # specified and nested files
2033
unknown_nested_files=set()
2035
to_file = sys.stdout
2037
files_to_backup = []
2039
def recurse_directory_to_add_files(directory):
2040
# Recurse directory and add all files
2041
# so we can check if they have changed.
2042
for parent_info, file_infos in self.walkdirs(directory):
2043
for relpath, basename, kind, lstat, fileid, kind in file_infos:
2044
# Is it versioned or ignored?
2045
if self.path2id(relpath):
2046
# Add nested content for deletion.
2047
all_files.add(relpath)
2049
# Files which are not versioned
2050
# should be treated as unknown.
2051
files_to_backup.append(relpath)
2053
for filename in files:
2054
# Get file name into canonical form.
2055
abspath = self.abspath(filename)
2056
filename = self.relpath(abspath)
2057
if len(filename) > 0:
2058
all_files.add(filename)
2059
recurse_directory_to_add_files(filename)
2061
files = list(all_files)
2064
return # nothing to do
2066
# Sort needed to first handle directory content before the directory
2067
files.sort(reverse=True)
2069
# Bail out if we are going to delete files we shouldn't
2070
if not keep_files and not force:
2071
for (file_id, path, content_change, versioned, parent_id, name,
2072
kind, executable) in self.iter_changes(self.basis_tree(),
2073
include_unchanged=True, require_versioned=False,
2074
want_unversioned=True, specific_files=files):
2075
if versioned[0] == False:
2076
# The record is unknown or newly added
2077
files_to_backup.append(path[1])
2078
elif (content_change and (kind[1] is not None) and
2079
osutils.is_inside_any(files, path[1])):
2080
# Versioned and changed, but not deleted, and still
2081
# in one of the dirs to be deleted.
2082
files_to_backup.append(path[1])
2084
def backup(file_to_backup):
2085
backup_name = self.bzrdir._available_backup_name(file_to_backup)
2086
osutils.rename(abs_path, self.abspath(backup_name))
2087
return "removed %s (but kept a copy: %s)" % (file_to_backup,
2090
# Build inv_delta and delete files where applicable,
2091
# do this before any modifications to inventory.
1126
2092
for f in files:
1127
fid = inv.path2id(f)
2093
fid = self.path2id(f)
1129
# TODO: Perhaps make this just a warning, and continue?
1130
# This tends to happen when
1131
raise NotVersionedError(path=f)
1132
mutter("remove inventory entry %s {%s}", quotefn(f), fid)
1134
# having remove it, it must be either ignored or unknown
1135
if self.is_ignored(f):
1139
show_status(new_status, inv[fid].kind, quotefn(f))
1142
self._write_inventory(inv)
1145
def revert(self, filenames, old_tree=None, backups=True,
1146
pb=DummyProgress()):
1147
from transform import revert
1148
from conflicts import resolve
2096
message = "%s is not versioned." % (f,)
2099
# having removed it, it must be either ignored or unknown
2100
if self.is_ignored(f):
2104
# XXX: Really should be a more abstract reporter interface
2105
kind_ch = osutils.kind_marker(self.kind(fid))
2106
to_file.write(new_status + ' ' + f + kind_ch + '\n')
2108
inv_delta.append((f, None, fid, None))
2109
message = "removed %s" % (f,)
2112
abs_path = self.abspath(f)
2113
if osutils.lexists(abs_path):
2114
if (osutils.isdir(abs_path) and
2115
len(os.listdir(abs_path)) > 0):
2117
osutils.rmtree(abs_path)
2118
message = "deleted %s" % (f,)
2122
if f in files_to_backup:
2125
osutils.delete_any(abs_path)
2126
message = "deleted %s" % (f,)
2127
elif message is not None:
2128
# Only care if we haven't done anything yet.
2129
message = "%s does not exist." % (f,)
2131
# Print only one message (if any) per file.
2132
if message is not None:
2134
self.apply_inventory_delta(inv_delta)
2136
@needs_tree_write_lock
2137
def revert(self, filenames=None, old_tree=None, backups=True,
2138
pb=None, report_changes=False):
2139
from bzrlib.conflicts import resolve
2142
symbol_versioning.warn('Using [] to revert all files is deprecated'
2143
' as of bzr 0.91. Please use None (the default) instead.',
2144
DeprecationWarning, stacklevel=2)
1149
2145
if old_tree is None:
1150
old_tree = self.basis_tree()
1151
conflicts = revert(self, old_tree, filenames, backups, pb)
1152
if not len(filenames):
1153
self.set_pending_merges([])
2146
basis_tree = self.basis_tree()
2147
basis_tree.lock_read()
2148
old_tree = basis_tree
1156
resolve(self, filenames, ignore_misses=True)
2152
conflicts = transform.revert(self, old_tree, filenames, backups, pb,
2154
if filenames is None and len(self.get_parent_ids()) > 1:
2156
last_revision = self.last_revision()
2157
if last_revision != _mod_revision.NULL_REVISION:
2158
if basis_tree is None:
2159
basis_tree = self.basis_tree()
2160
basis_tree.lock_read()
2161
parent_trees.append((last_revision, basis_tree))
2162
self.set_parent_trees(parent_trees)
2165
resolve(self, filenames, ignore_misses=True, recursive=True)
2167
if basis_tree is not None:
1157
2169
return conflicts
2171
def revision_tree(self, revision_id):
2172
"""See Tree.revision_tree.
2174
WorkingTree can supply revision_trees for the basis revision only
2175
because there is only one cached inventory in the bzr directory.
2177
if revision_id == self.last_revision():
2179
xml = self.read_basis_inventory()
2180
except errors.NoSuchFile:
2184
inv = xml7.serializer_v7.read_inventory_from_string(xml)
2185
# dont use the repository revision_tree api because we want
2186
# to supply the inventory.
2187
if inv.revision_id == revision_id:
2188
return revisiontree.RevisionTree(self.branch.repository,
2190
except errors.BadInventoryFormat:
2192
# raise if there was no inventory, or if we read the wrong inventory.
2193
raise errors.NoSuchRevisionInTree(self, revision_id)
1159
2195
# XXX: This method should be deprecated in favour of taking in a proper
1160
2196
# new Inventory object.
2197
@needs_tree_write_lock
1162
2198
def set_inventory(self, new_inventory_list):
1163
2199
from bzrlib.inventory import (Inventory,
1164
2200
InventoryDirectory,
1168
2203
inv = Inventory(self.get_root_id())
1178
2213
elif kind == 'symlink':
1179
2214
inv.add(InventoryLink(file_id, name, parent))
1181
raise BzrError("unknown kind %r" % kind)
2216
raise errors.BzrError("unknown kind %r" % kind)
1182
2217
self._write_inventory(inv)
2219
@needs_tree_write_lock
1185
2220
def set_root_id(self, file_id):
1186
2221
"""Set the root id for this tree."""
1187
inv = self.read_working_inventory()
2225
'WorkingTree.set_root_id with fileid=None')
2226
file_id = osutils.safe_file_id(file_id)
2227
self._set_root_id(file_id)
2229
def _set_root_id(self, file_id):
2230
"""Set the root id for this tree, in a format specific manner.
2232
:param file_id: The file id to assign to the root. It must not be
2233
present in the current inventory or an error will occur. It must
2234
not be None, but rather a valid file id.
2236
inv = self._inventory
1188
2237
orig_root_id = inv.root.file_id
2238
# TODO: it might be nice to exit early if there was nothing
2239
# to do, saving us from trigger a sync on unlock.
2240
self._inventory_is_modified = True
2241
# we preserve the root inventory entry object, but
2242
# unlinkit from the byid index
1189
2243
del inv._byid[inv.root.file_id]
1190
2244
inv.root.file_id = file_id
2245
# and link it into the index with the new changed id.
1191
2246
inv._byid[inv.root.file_id] = inv.root
2247
# and finally update all children to reference the new id.
2248
# XXX: this should be safe to just look at the root.children
2249
# list, not the WHOLE INVENTORY.
1192
2250
for fid in inv:
1193
2251
entry = inv[fid]
1194
2252
if entry.parent_id == orig_root_id:
1195
2253
entry.parent_id = inv.root.file_id
1196
self._write_inventory(inv)
1198
2255
def unlock(self):
1199
2256
"""See Branch.unlock.
1201
2258
WorkingTree locking just uses the Branch locking facilities.
1202
2259
This is current because all working trees have an embedded branch
1203
2260
within them. IF in the future, we were to make branch data shareable
1204
between multiple working trees, i.e. via shared storage, then we
2261
between multiple working trees, i.e. via shared storage, then we
1205
2262
would probably want to lock both the local tree, and the branch.
1207
# FIXME: We want to write out the hashcache only when the last lock on
1208
# this working copy is released. Peeking at the lock count is a bit
1209
# of a nasty hack; probably it's better to have a transaction object,
1210
# which can do some finalization when it's either successfully or
1211
# unsuccessfully completed. (Denys's original patch did that.)
1212
# RBC 20060206 hookinhg into transaction will couple lock and transaction
1213
# wrongly. Hookinh into unllock on the control files object is fine though.
1215
# TODO: split this per format so there is no ugly if block
1216
if self._hashcache.needs_write and (
1217
# dedicated lock files
1218
self._control_files._lock_count==1 or
1220
(self._control_files is self.branch.control_files and
1221
self._control_files._lock_count==3)):
1222
self._hashcache.write()
1223
# reverse order of locking.
1224
result = self._control_files.unlock()
1226
self.branch.unlock()
2264
raise NotImplementedError(self.unlock)
2268
def update(self, change_reporter=None, possible_transports=None,
2269
revision=None, old_tip=_marker, show_base=False):
1232
2270
"""Update a working tree along its branch.
1234
This will update the branch if its bound too, which means we have multiple trees involved:
1235
The new basis tree of the master.
1236
The old basis tree of the branch.
1237
The old basis tree of the working tree.
1238
The current working tree state.
1239
pathologically all three may be different, and non ancestors of each other.
1240
Conceptually we want to:
1241
Preserve the wt.basis->wt.state changes
1242
Transform the wt.basis to the new master basis.
1243
Apply a merge of the old branch basis to get any 'local' changes from it into the tree.
1244
Restore the wt.basis->wt.state changes.
2272
This will update the branch if its bound too, which means we have
2273
multiple trees involved:
2275
- The new basis tree of the master.
2276
- The old basis tree of the branch.
2277
- The old basis tree of the working tree.
2278
- The current working tree state.
2280
Pathologically, all three may be different, and non-ancestors of each
2281
other. Conceptually we want to:
2283
- Preserve the wt.basis->wt.state changes
2284
- Transform the wt.basis to the new master basis.
2285
- Apply a merge of the old branch basis to get any 'local' changes from
2287
- Restore the wt.basis->wt.state changes.
1246
2289
There isn't a single operation at the moment to do that, so we:
1247
Merge current state -> basis tree of the master w.r.t. the old tree basis.
1248
Do a 'normal' merge of the old branch basis if it is relevant.
2290
- Merge current state -> basis tree of the master w.r.t. the old tree
2292
- Do a 'normal' merge of the old branch basis if it is relevant.
2294
:param revision: The target revision to update to. Must be in the
2296
:param old_tip: If branch.update() has already been run, the value it
2297
returned (old tip of the branch or None). _marker is used
1250
old_tip = self.branch.update()
1251
if old_tip is not None:
1252
self.add_pending_merge(old_tip)
1253
self.branch.lock_read()
2300
if self.branch.get_bound_location() is not None:
2302
update_branch = (old_tip is self._marker)
2304
self.lock_tree_write()
2305
update_branch = False
1256
if self.last_revision() != self.branch.last_revision():
1257
# merge tree state up to new branch tip.
1258
basis = self.basis_tree()
1259
to_tree = self.branch.basis_tree()
1260
result += merge_inner(self.branch,
1264
self.set_last_revision(self.branch.last_revision())
1265
if old_tip and old_tip != self.last_revision():
1266
# our last revision was not the prior branch last reivison
1267
# and we have converted that last revision to a pending merge.
1268
# base is somewhere between the branch tip now
1269
# and the now pending merge
1270
from bzrlib.revision import common_ancestor
1272
base_rev_id = common_ancestor(self.branch.last_revision(),
1274
self.branch.repository)
1275
except errors.NoCommonAncestor:
1277
base_tree = self.branch.repository.revision_tree(base_rev_id)
1278
other_tree = self.branch.repository.revision_tree(old_tip)
1279
result += merge_inner(self.branch,
2308
old_tip = self.branch.update(possible_transports)
2310
if old_tip is self._marker:
2312
return self._update_tree(old_tip, change_reporter, revision, show_base)
1285
self.branch.unlock()
2316
@needs_tree_write_lock
2317
def _update_tree(self, old_tip=None, change_reporter=None, revision=None,
2319
"""Update a tree to the master branch.
2321
:param old_tip: if supplied, the previous tip revision the branch,
2322
before it was changed to the master branch's tip.
2324
# here if old_tip is not None, it is the old tip of the branch before
2325
# it was updated from the master branch. This should become a pending
2326
# merge in the working tree to preserve the user existing work. we
2327
# cant set that until we update the working trees last revision to be
2328
# one from the new branch, because it will just get absorbed by the
2329
# parent de-duplication logic.
2331
# We MUST save it even if an error occurs, because otherwise the users
2332
# local work is unreferenced and will appear to have been lost.
2336
last_rev = self.get_parent_ids()[0]
2338
last_rev = _mod_revision.NULL_REVISION
2339
if revision is None:
2340
revision = self.branch.last_revision()
2342
old_tip = old_tip or _mod_revision.NULL_REVISION
2344
if not _mod_revision.is_null(old_tip) and old_tip != last_rev:
2345
# the branch we are bound to was updated
2346
# merge those changes in first
2347
base_tree = self.basis_tree()
2348
other_tree = self.branch.repository.revision_tree(old_tip)
2349
nb_conflicts = merge.merge_inner(self.branch, other_tree,
2350
base_tree, this_tree=self,
2351
change_reporter=change_reporter,
2352
show_base=show_base)
2354
self.add_parent_tree((old_tip, other_tree))
2355
trace.note('Rerun update after fixing the conflicts.')
2358
if last_rev != _mod_revision.ensure_null(revision):
2359
# the working tree is up to date with the branch
2360
# we can merge the specified revision from master
2361
to_tree = self.branch.repository.revision_tree(revision)
2362
to_root_id = to_tree.get_root_id()
2364
basis = self.basis_tree()
2367
if (basis.inventory.root is None
2368
or basis.inventory.root.file_id != to_root_id):
2369
self.set_root_id(to_root_id)
2374
# determine the branch point
2375
graph = self.branch.repository.get_graph()
2376
base_rev_id = graph.find_unique_lca(self.branch.last_revision(),
2378
base_tree = self.branch.repository.revision_tree(base_rev_id)
2380
nb_conflicts = merge.merge_inner(self.branch, to_tree, base_tree,
2382
change_reporter=change_reporter,
2383
show_base=show_base)
2384
self.set_last_revision(revision)
2385
# TODO - dedup parents list with things merged by pull ?
2386
# reuse the tree we've updated to to set the basis:
2387
parent_trees = [(revision, to_tree)]
2388
merges = self.get_parent_ids()[1:]
2389
# Ideally we ask the tree for the trees here, that way the working
2390
# tree can decide whether to give us the entire tree or give us a
2391
# lazy initialised tree. dirstate for instance will have the trees
2392
# in ram already, whereas a last-revision + basis-inventory tree
2393
# will not, but also does not need them when setting parents.
2394
for parent in merges:
2395
parent_trees.append(
2396
(parent, self.branch.repository.revision_tree(parent)))
2397
if not _mod_revision.is_null(old_tip):
2398
parent_trees.append(
2399
(old_tip, self.branch.repository.revision_tree(old_tip)))
2400
self.set_parent_trees(parent_trees)
2401
last_rev = parent_trees[0][0]
2404
def _write_hashcache_if_dirty(self):
2405
"""Write out the hashcache if it is dirty."""
2406
if self._hashcache.needs_write:
2408
self._hashcache.write()
2410
if e.errno not in (errno.EPERM, errno.EACCES):
2412
# TODO: jam 20061219 Should this be a warning? A single line
2413
# warning might be sufficient to let the user know what
2415
mutter('Could not write hashcache for %s\nError: %s',
2416
self._hashcache.cache_file_name(), e)
2418
@needs_tree_write_lock
1288
2419
def _write_inventory(self, inv):
1289
2420
"""Write inventory as the current inventory."""
1291
bzrlib.xml5.serializer_v5.write_inventory(inv, sio)
1293
self._control_files.put('inventory', sio)
1294
self._set_inventory(inv)
1295
mutter('wrote working inventory')
2421
self._set_inventory(inv, dirty=True)
1297
2424
def set_conflicts(self, arg):
1298
raise UnsupportedOperation(self.set_conflicts, self)
2425
raise errors.UnsupportedOperation(self.set_conflicts, self)
2427
def add_conflicts(self, arg):
2428
raise errors.UnsupportedOperation(self.add_conflicts, self)
1300
2430
@needs_read_lock
1301
2431
def conflicts(self):
1302
conflicts = ConflictList()
2432
conflicts = _mod_conflicts.ConflictList()
1303
2433
for conflicted in self._iter_conflicts():
1306
2436
if file_kind(self.abspath(conflicted)) != "file":
1309
if e.errno == errno.ENOENT:
2438
except errors.NoSuchFile:
1313
2440
if text is True:
1314
2441
for suffix in ('.THIS', '.OTHER'):
1316
2443
kind = file_kind(self.abspath(conflicted+suffix))
1318
if e.errno == errno.ENOENT:
2446
except errors.NoSuchFile:
1326
2450
ctype = {True: 'text conflict', False: 'contents conflict'}[text]
1327
conflicts.append(Conflict.factory(ctype, path=conflicted,
2451
conflicts.append(_mod_conflicts.Conflict.factory(ctype,
1328
2453
file_id=self.path2id(conflicted)))
1329
2454
return conflicts
2456
def walkdirs(self, prefix=""):
2457
"""Walk the directories of this tree.
2459
returns a generator which yields items in the form:
2460
((curren_directory_path, fileid),
2461
[(file1_path, file1_name, file1_kind, (lstat), file1_id,
2464
This API returns a generator, which is only valid during the current
2465
tree transaction - within a single lock_read or lock_write duration.
2467
If the tree is not locked, it may cause an error to be raised,
2468
depending on the tree implementation.
2470
disk_top = self.abspath(prefix)
2471
if disk_top.endswith('/'):
2472
disk_top = disk_top[:-1]
2473
top_strip_len = len(disk_top) + 1
2474
inventory_iterator = self._walkdirs(prefix)
2475
disk_iterator = osutils.walkdirs(disk_top, prefix)
2477
current_disk = disk_iterator.next()
2478
disk_finished = False
2480
if not (e.errno == errno.ENOENT or
2481
(sys.platform == 'win32' and e.errno == ERROR_PATH_NOT_FOUND)):
2484
disk_finished = True
2486
current_inv = inventory_iterator.next()
2487
inv_finished = False
2488
except StopIteration:
2491
while not inv_finished or not disk_finished:
2493
((cur_disk_dir_relpath, cur_disk_dir_path_from_top),
2494
cur_disk_dir_content) = current_disk
2496
((cur_disk_dir_relpath, cur_disk_dir_path_from_top),
2497
cur_disk_dir_content) = ((None, None), None)
2498
if not disk_finished:
2499
# strip out .bzr dirs
2500
if (cur_disk_dir_path_from_top[top_strip_len:] == '' and
2501
len(cur_disk_dir_content) > 0):
2502
# osutils.walkdirs can be made nicer -
2503
# yield the path-from-prefix rather than the pathjoined
2505
bzrdir_loc = bisect_left(cur_disk_dir_content,
2507
if (bzrdir_loc < len(cur_disk_dir_content)
2508
and self.bzrdir.is_control_filename(
2509
cur_disk_dir_content[bzrdir_loc][0])):
2510
# we dont yield the contents of, or, .bzr itself.
2511
del cur_disk_dir_content[bzrdir_loc]
2513
# everything is unknown
2516
# everything is missing
2519
direction = cmp(current_inv[0][0], cur_disk_dir_relpath)
2521
# disk is before inventory - unknown
2522
dirblock = [(relpath, basename, kind, stat, None, None) for
2523
relpath, basename, kind, stat, top_path in
2524
cur_disk_dir_content]
2525
yield (cur_disk_dir_relpath, None), dirblock
2527
current_disk = disk_iterator.next()
2528
except StopIteration:
2529
disk_finished = True
2531
# inventory is before disk - missing.
2532
dirblock = [(relpath, basename, 'unknown', None, fileid, kind)
2533
for relpath, basename, dkind, stat, fileid, kind in
2535
yield (current_inv[0][0], current_inv[0][1]), dirblock
2537
current_inv = inventory_iterator.next()
2538
except StopIteration:
2541
# versioned present directory
2542
# merge the inventory and disk data together
2544
for relpath, subiterator in itertools.groupby(sorted(
2545
current_inv[1] + cur_disk_dir_content,
2546
key=operator.itemgetter(0)), operator.itemgetter(1)):
2547
path_elements = list(subiterator)
2548
if len(path_elements) == 2:
2549
inv_row, disk_row = path_elements
2550
# versioned, present file
2551
dirblock.append((inv_row[0],
2552
inv_row[1], disk_row[2],
2553
disk_row[3], inv_row[4],
2555
elif len(path_elements[0]) == 5:
2557
dirblock.append((path_elements[0][0],
2558
path_elements[0][1], path_elements[0][2],
2559
path_elements[0][3], None, None))
2560
elif len(path_elements[0]) == 6:
2561
# versioned, absent file.
2562
dirblock.append((path_elements[0][0],
2563
path_elements[0][1], 'unknown', None,
2564
path_elements[0][4], path_elements[0][5]))
2566
raise NotImplementedError('unreachable code')
2567
yield current_inv[0], dirblock
2569
current_inv = inventory_iterator.next()
2570
except StopIteration:
2573
current_disk = disk_iterator.next()
2574
except StopIteration:
2575
disk_finished = True
2577
def _walkdirs(self, prefix=""):
2578
"""Walk the directories of this tree.
2580
:prefix: is used as the directrory to start with.
2581
returns a generator which yields items in the form:
2582
((curren_directory_path, fileid),
2583
[(file1_path, file1_name, file1_kind, None, file1_id,
2586
_directory = 'directory'
2587
# get the root in the inventory
2588
inv = self.inventory
2589
top_id = inv.path2id(prefix)
2593
pending = [(prefix, '', _directory, None, top_id, None)]
2596
currentdir = pending.pop()
2597
# 0 - relpath, 1- basename, 2- kind, 3- stat, 4-id, 5-kind
2598
top_id = currentdir[4]
2600
relroot = currentdir[0] + '/'
2603
# FIXME: stash the node in pending
2605
if entry.kind == 'directory':
2606
for name, child in entry.sorted_children():
2607
dirblock.append((relroot + name, name, child.kind, None,
2608
child.file_id, child.kind
2610
yield (currentdir[0], entry.file_id), dirblock
2611
# push the user specified dirs from dirblock
2612
for dir in reversed(dirblock):
2613
if dir[2] == _directory:
2616
@needs_tree_write_lock
2617
def auto_resolve(self):
2618
"""Automatically resolve text conflicts according to contents.
2620
Only text conflicts are auto_resolvable. Files with no conflict markers
2621
are considered 'resolved', because bzr always puts conflict markers
2622
into files that have text conflicts. The corresponding .THIS .BASE and
2623
.OTHER files are deleted, as per 'resolve'.
2624
:return: a tuple of ConflictLists: (un_resolved, resolved).
2626
un_resolved = _mod_conflicts.ConflictList()
2627
resolved = _mod_conflicts.ConflictList()
2628
conflict_re = re.compile('^(<{7}|={7}|>{7})')
2629
for conflict in self.conflicts():
2630
if (conflict.typestring != 'text conflict' or
2631
self.kind(conflict.file_id) != 'file'):
2632
un_resolved.append(conflict)
2634
my_file = open(self.id2abspath(conflict.file_id), 'rb')
2636
for line in my_file:
2637
if conflict_re.search(line):
2638
un_resolved.append(conflict)
2641
resolved.append(conflict)
2644
resolved.remove_files(self)
2645
self.set_conflicts(un_resolved)
2646
return un_resolved, resolved
2649
def _check(self, references):
2650
"""Check the tree for consistency.
2652
:param references: A dict with keys matching the items returned by
2653
self._get_check_refs(), and values from looking those keys up in
2656
tree_basis = self.basis_tree()
2657
tree_basis.lock_read()
2659
repo_basis = references[('trees', self.last_revision())]
2660
if len(list(repo_basis.iter_changes(tree_basis))) > 0:
2661
raise errors.BzrCheckError(
2662
"Mismatched basis inventory content.")
2667
def _validate(self):
2668
"""Validate internal structures.
2670
This is meant mostly for the test suite. To give it a chance to detect
2671
corruption after actions have occurred. The default implementation is a
2674
:return: None. An exception should be raised if there is an error.
2679
def check_state(self):
2680
"""Check that the working state is/isn't valid."""
2681
check_refs = self._get_check_refs()
2683
for ref in check_refs:
2686
refs[ref] = self.branch.repository.revision_tree(value)
2689
@needs_tree_write_lock
2690
def reset_state(self, revision_ids=None):
2691
"""Reset the state of the working tree.
2693
This does a hard-reset to a last-known-good state. This is a way to
2694
fix if something got corrupted (like the .bzr/checkout/dirstate file)
2696
if revision_ids is None:
2697
revision_ids = self.get_parent_ids()
2698
if not revision_ids:
2699
rt = self.branch.repository.revision_tree(
2700
_mod_revision.NULL_REVISION)
2702
rt = self.branch.repository.revision_tree(revision_ids[0])
2703
self._write_inventory(rt.inventory)
2704
self.set_parent_ids(revision_ids)
2706
def _get_rules_searcher(self, default_searcher):
2707
"""See Tree._get_rules_searcher."""
2708
if self._rules_searcher is None:
2709
self._rules_searcher = super(WorkingTree,
2710
self)._get_rules_searcher(default_searcher)
2711
return self._rules_searcher
2713
def get_shelf_manager(self):
2714
"""Return the ShelfManager for this WorkingTree."""
2715
from bzrlib.shelf import ShelfManager
2716
return ShelfManager(self, self._transport)
2719
class WorkingTree2(WorkingTree):
2720
"""This is the Format 2 working tree.
2722
This was the first weave based working tree.
2723
- uses os locks for locking.
2724
- uses the branch last-revision.
2727
def __init__(self, *args, **kwargs):
2728
super(WorkingTree2, self).__init__(*args, **kwargs)
2729
# WorkingTree2 has more of a constraint that self._inventory must
2730
# exist. Because this is an older format, we don't mind the overhead
2731
# caused by the extra computation here.
2733
# Newer WorkingTree's should only have self._inventory set when they
2735
if self._inventory is None:
2736
self.read_working_inventory()
2738
def _get_check_refs(self):
2739
"""Return the references needed to perform a check of this tree."""
2740
return [('trees', self.last_revision())]
2742
def lock_tree_write(self):
2743
"""See WorkingTree.lock_tree_write().
2745
In Format2 WorkingTrees we have a single lock for the branch and tree
2746
so lock_tree_write() degrades to lock_write().
2748
:return: An object with an unlock method which will release the lock
2751
self.branch.lock_write()
2753
self._control_files.lock_write()
2756
self.branch.unlock()
2760
# do non-implementation specific cleanup
2763
# we share control files:
2764
if self._control_files._lock_count == 3:
2765
# _inventory_is_modified is always False during a read lock.
2766
if self._inventory_is_modified:
2768
self._write_hashcache_if_dirty()
2770
# reverse order of locking.
2772
return self._control_files.unlock()
2774
self.branch.unlock()
1332
2777
class WorkingTree3(WorkingTree):
1333
2778
"""This is the Format 3 working tree.
added
removed
bzrlib/workingtree.py
