342
445
inv = self._inventory
343
446
for path, ie in inv.iter_entries():
344
if bzrlib.osutils.lexists(self.abspath(path)):
447
if osutils.lexists(self.abspath(path)):
450
def all_file_ids(self):
451
"""See Tree.iter_all_file_ids"""
452
return set(self.inventory)
347
454
def __repr__(self):
348
455
return "<%s of %s>" % (self.__class__.__name__,
349
456
getattr(self, 'basedir', None))
351
458
def abspath(self, filename):
352
459
return pathjoin(self.basedir, filename)
354
461
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)
462
"""Return RevisionTree for the current last revision.
464
If the left most parent is a ghost then the returned tree will be an
465
empty tree - one obtained by calling
466
repository.revision_tree(NULL_REVISION).
469
revision_id = self.get_parent_ids()[0]
471
# no parents, return an empty revision tree.
472
# in the future this should return the tree for
473
# 'empty:' - the implicit root empty tree.
474
return self.branch.repository.revision_tree(
475
_mod_revision.NULL_REVISION)
477
return self.revision_tree(revision_id)
478
except errors.NoSuchRevision:
480
# No cached copy available, retrieve from the repository.
481
# FIXME? RBC 20060403 should we cache the inventory locally
484
return self.branch.repository.revision_tree(revision_id)
485
except (errors.RevisionNotPresent, errors.NoSuchRevision):
486
# the basis tree *may* be a ghost or a low level error may have
487
# occurred. If the revision is present, its a problem, if its not
489
if self.branch.repository.has_revision(revision_id):
491
# the basis tree is a ghost so return an empty tree.
492
return self.branch.repository.revision_tree(
493
_mod_revision.NULL_REVISION)
496
self._flush_ignore_list_cache()
498
def relpath(self, path):
499
"""Return the local path portion from a given path.
501
The path may be absolute or relative. If its a relative path it is
502
interpreted relative to the python current working directory.
504
return osutils.relpath(self.basedir, path)
411
506
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')
507
return osutils.lexists(self.abspath(filename))
509
def get_file(self, file_id, path=None, filtered=True):
510
return self.get_file_with_stat(file_id, path, filtered=filtered)[0]
512
def get_file_with_stat(self, file_id, path=None, filtered=True,
514
"""See Tree.get_file_with_stat."""
516
path = self.id2path(file_id)
517
file_obj = self.get_file_byname(path, filtered=False)
518
stat_value = _fstat(file_obj.fileno())
519
if filtered and self.supports_content_filtering():
520
filters = self._content_filter_stack(path)
521
file_obj = filtered_input_file(file_obj, filters)
522
return (file_obj, stat_value)
524
def get_file_text(self, file_id, path=None, filtered=True):
525
my_file = self.get_file(file_id, path=path, filtered=filtered)
527
return my_file.read()
531
def get_file_byname(self, filename, filtered=True):
532
path = self.abspath(filename)
534
if filtered and self.supports_content_filtering():
535
filters = self._content_filter_stack(filename)
536
return filtered_input_file(f, filters)
540
def get_file_lines(self, file_id, path=None, filtered=True):
541
"""See Tree.get_file_lines()"""
542
file = self.get_file(file_id, path, filtered=filtered)
544
return file.readlines()
549
def annotate_iter(self, file_id, default_revision=CURRENT_REVISION):
550
"""See Tree.annotate_iter
552
This implementation will use the basis tree implementation if possible.
553
Lines not in the basis are attributed to CURRENT_REVISION
555
If there are pending merges, lines added by those merges will be
556
incorrectly attributed to CURRENT_REVISION (but after committing, the
557
attribution will be correct).
559
maybe_file_parent_keys = []
560
for parent_id in self.get_parent_ids():
562
parent_tree = self.revision_tree(parent_id)
563
except errors.NoSuchRevisionInTree:
564
parent_tree = self.branch.repository.revision_tree(parent_id)
565
parent_tree.lock_read()
567
if file_id not in parent_tree:
569
ie = parent_tree.inventory[file_id]
570
if ie.kind != 'file':
571
# Note: this is slightly unnecessary, because symlinks and
572
# directories have a "text" which is the empty text, and we
573
# know that won't mess up annotations. But it seems cleaner
575
parent_text_key = (file_id, ie.revision)
576
if parent_text_key not in maybe_file_parent_keys:
577
maybe_file_parent_keys.append(parent_text_key)
580
graph = _mod_graph.Graph(self.branch.repository.texts)
581
heads = graph.heads(maybe_file_parent_keys)
582
file_parent_keys = []
583
for key in maybe_file_parent_keys:
585
file_parent_keys.append(key)
587
# Now we have the parents of this content
588
annotator = self.branch.repository.texts.get_annotator()
589
text = self.get_file_text(file_id)
590
this_key =(file_id, default_revision)
591
annotator.add_special_text(this_key, file_parent_keys, text)
592
annotations = [(key[-1], line)
593
for key, line in annotator.annotate_flat(this_key)]
596
def _get_ancestors(self, default_revision):
597
ancestors = set([default_revision])
598
for parent_id in self.get_parent_ids():
599
ancestors.update(self.branch.repository.get_ancestry(
600
parent_id, topo_sorted=False))
603
def get_parent_ids(self):
604
"""See Tree.get_parent_ids.
606
This implementation reads the pending merges list and last_revision
607
value and uses that to decide what the parents list should be.
609
last_rev = _mod_revision.ensure_null(self._last_revision())
610
if _mod_revision.NULL_REVISION == last_rev:
615
merges_bytes = self._transport.get_bytes('pending-merges')
616
except errors.NoSuchFile:
619
for l in osutils.split_lines(merges_bytes):
620
revision_id = l.rstrip('\n')
621
parents.append(revision_id)
420
625
def get_root_id(self):
421
626
"""Return the id of this trees root"""
422
inv = self.read_working_inventory()
423
return inv.root.file_id
627
return self._inventory.root.file_id
425
629
def _get_store_filename(self, file_id):
426
630
## XXX: badly named; this is not in the store at all
427
631
return self.abspath(self.id2path(file_id))
430
def clone(self, to_bzrdir, revision_id=None, basis=None):
634
def clone(self, to_bzrdir, revision_id=None):
431
635
"""Duplicate this working tree into to_bzr, including all state.
433
637
Specifically modified files are kept as modified, but
434
638
ignored and unknown files are discarded.
436
640
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
643
If not None, the cloned tree will have its last revision set to
644
revision, and difference between the source trees last revision
441
645
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
647
# assumes the target bzr dir format is compatible.
448
result = self._format.initialize(to_bzrdir)
648
result = to_bzrdir.create_workingtree()
449
649
self.copy_content_into(result, revision_id)
453
653
def copy_content_into(self, tree, revision_id=None):
454
654
"""Copy the current content and user files of this tree into tree."""
655
tree.set_root_id(self.get_root_id())
455
656
if revision_id is None:
456
transform_tree(tree, self)
657
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())
659
# TODO now merge from tree.last_revision to revision (to preserve
660
# user local changes)
661
merge.transform_tree(tree, self)
662
tree.set_parent_ids([revision_id])
477
664
def id2abspath(self, file_id):
478
665
return self.abspath(self.id2path(file_id))
480
667
def has_id(self, file_id):
481
668
# files that have been deleted are excluded
482
inv = self._inventory
483
670
if not inv.has_id(file_id):
485
672
path = inv.id2path(file_id)
486
return bzrlib.osutils.lexists(self.abspath(path))
673
return osutils.lexists(self.abspath(path))
488
675
def has_or_had_id(self, file_id):
489
676
if file_id == self.inventory.root.file_id:
493
680
__contains__ = has_id
495
682
def get_file_size(self, file_id):
496
return os.path.getsize(self.id2abspath(file_id))
683
"""See Tree.get_file_size"""
684
# XXX: this returns the on-disk size; it should probably return the
687
return os.path.getsize(self.id2abspath(file_id))
689
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():
695
def get_file_sha1(self, file_id, path=None, stat_value=None):
697
path = self._inventory.id2path(file_id)
698
return self._hashcache.get_sha1(path, stat_value)
700
def get_file_mtime(self, file_id, path=None):
702
path = self.inventory.id2path(file_id)
703
return os.lstat(self.abspath(path)).st_mtime
705
def _is_executable_from_path_and_stat_from_basis(self, path, stat_result):
706
file_id = self.path2id(path)
708
# For unversioned files on win32, we just assume they are not
711
return self._inventory[file_id].executable
713
def _is_executable_from_path_and_stat_from_stat(self, path, stat_result):
714
mode = stat_result.st_mode
715
return bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode)
717
if not supports_executable():
718
def is_executable(self, file_id, path=None):
505
719
return self._inventory[file_id].executable
507
path = self._inventory.id2path(file_id)
721
_is_executable_from_path_and_stat = \
722
_is_executable_from_path_and_stat_from_basis
724
def is_executable(self, file_id, path=None):
726
path = self.id2path(file_id)
508
727
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.
728
return bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode)
730
_is_executable_from_path_and_stat = \
731
_is_executable_from_path_and_stat_from_stat
733
@needs_tree_write_lock
734
def _add(self, files, ids, kinds):
735
"""See MutableTree._add."""
534
736
# TODO: Re-adding a file that is removed in the working copy
535
737
# 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))
738
# the read and write working inventory should not occur in this
739
# function - they should be part of lock_write and unlock.
741
for f, file_id, kind in zip(files, ids, kinds):
571
742
if file_id is None:
572
file_id = gen_file_id(f)
573
inv.add_path(f, kind=kind, file_id=file_id)
743
inv.add_path(f, kind=kind)
745
inv.add_path(f, kind=kind, file_id=file_id)
746
self._inventory_is_modified = True
575
mutter("add file %s file_id:{%s} kind=%r" % (f, file_id, kind))
576
self._write_inventory(inv)
748
@needs_tree_write_lock
749
def _gather_kinds(self, files, kinds):
750
"""See MutableTree._gather_kinds."""
751
for pos, f in enumerate(files):
752
if kinds[pos] is None:
753
fullpath = normpath(self.abspath(f))
755
kinds[pos] = file_kind(fullpath)
757
if e.errno == errno.ENOENT:
758
raise errors.NoSuchFile(fullpath)
578
760
@needs_write_lock
761
def add_parent_tree_id(self, revision_id, allow_leftmost_as_ghost=False):
762
"""Add revision_id as a parent.
764
This is equivalent to retrieving the current list of parent ids
765
and setting the list to its value plus revision_id.
767
:param revision_id: The revision id to add to the parent list. It may
768
be a ghost revision as long as its not the first parent to be added,
769
or the allow_leftmost_as_ghost parameter is set True.
770
:param allow_leftmost_as_ghost: Allow the first parent to be a ghost.
772
parents = self.get_parent_ids() + [revision_id]
773
self.set_parent_ids(parents, allow_leftmost_as_ghost=len(parents) > 1
774
or allow_leftmost_as_ghost)
776
@needs_tree_write_lock
777
def add_parent_tree(self, parent_tuple, allow_leftmost_as_ghost=False):
778
"""Add revision_id, tree tuple as a parent.
780
This is equivalent to retrieving the current list of parent trees
781
and setting the list to its value plus parent_tuple. See also
782
add_parent_tree_id - if you only have a parent id available it will be
783
simpler to use that api. If you have the parent already available, using
784
this api is preferred.
786
:param parent_tuple: The (revision id, tree) to add to the parent list.
787
If the revision_id is a ghost, pass None for the tree.
788
:param allow_leftmost_as_ghost: Allow the first parent to be a ghost.
790
parent_ids = self.get_parent_ids() + [parent_tuple[0]]
791
if len(parent_ids) > 1:
792
# the leftmost may have already been a ghost, preserve that if it
794
allow_leftmost_as_ghost = True
795
self.set_parent_ids(parent_ids,
796
allow_leftmost_as_ghost=allow_leftmost_as_ghost)
798
@needs_tree_write_lock
579
799
def add_pending_merge(self, *revision_ids):
580
800
# TODO: Perhaps should check at this point that the
581
801
# history of the revision is actually present?
582
p = self.pending_merges()
802
parents = self.get_parent_ids()
584
804
for rev_id in revision_ids:
805
if rev_id in parents:
807
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.
810
self.set_parent_ids(parents, allow_leftmost_as_ghost=True)
812
def path_content_summary(self, path, _lstat=os.lstat,
813
_mapper=osutils.file_kind_from_stat_mode):
814
"""See Tree.path_content_summary."""
815
abspath = self.abspath(path)
600
merges_file = self._control_files.get_utf8('pending-merges')
817
stat_result = _lstat(abspath)
601
818
except OSError, e:
602
if e.errno != errno.ENOENT:
606
for l in merges_file.readlines():
607
p.append(l.rstrip('\n'))
819
if getattr(e, 'errno', None) == errno.ENOENT:
821
return ('missing', None, None, None)
822
# propagate other errors
824
kind = _mapper(stat_result.st_mode)
826
return self._file_content_summary(path, stat_result)
827
elif kind == 'directory':
828
# perhaps it looks like a plain directory, but it's really a
830
if self._directory_is_tree_reference(path):
831
kind = 'tree-reference'
832
return kind, None, None, None
833
elif kind == 'symlink':
834
target = osutils.readlink(abspath)
835
return ('symlink', None, None, target)
837
return (kind, None, None, None)
839
def _file_content_summary(self, path, stat_result):
840
size = stat_result.st_size
841
executable = self._is_executable_from_path_and_stat(path, stat_result)
842
# try for a stat cache lookup
843
return ('file', size, executable, self._sha_from_stat(
846
def _check_parents_for_ghosts(self, revision_ids, allow_leftmost_as_ghost):
847
"""Common ghost checking functionality from set_parent_*.
849
This checks that the left hand-parent exists if there are any
852
if len(revision_ids) > 0:
853
leftmost_id = revision_ids[0]
854
if (not allow_leftmost_as_ghost and not
855
self.branch.repository.has_revision(leftmost_id)):
856
raise errors.GhostRevisionUnusableHere(leftmost_id)
858
def _set_merges_from_parent_ids(self, parent_ids):
859
merges = parent_ids[1:]
860
self._transport.put_bytes('pending-merges', '\n'.join(merges),
861
mode=self.bzrdir._get_file_mode())
863
def _filter_parent_ids_by_ancestry(self, revision_ids):
864
"""Check that all merged revisions are proper 'heads'.
866
This will always return the first revision_id, and any merged revisions
869
if len(revision_ids) == 0:
871
graph = self.branch.repository.get_graph()
872
heads = graph.heads(revision_ids)
873
new_revision_ids = revision_ids[:1]
874
for revision_id in revision_ids[1:]:
875
if revision_id in heads and revision_id not in new_revision_ids:
876
new_revision_ids.append(revision_id)
877
if new_revision_ids != revision_ids:
878
trace.mutter('requested to set revision_ids = %s,'
879
' but filtered to %s', revision_ids, new_revision_ids)
880
return new_revision_ids
882
@needs_tree_write_lock
883
def set_parent_ids(self, revision_ids, allow_leftmost_as_ghost=False):
884
"""Set the parent ids to revision_ids.
886
See also set_parent_trees. This api will try to retrieve the tree data
887
for each element of revision_ids from the trees repository. If you have
888
tree data already available, it is more efficient to use
889
set_parent_trees rather than set_parent_ids. set_parent_ids is however
890
an easier API to use.
892
:param revision_ids: The revision_ids to set as the parent ids of this
893
working tree. Any of these may be ghosts.
895
self._check_parents_for_ghosts(revision_ids,
896
allow_leftmost_as_ghost=allow_leftmost_as_ghost)
897
for revision_id in revision_ids:
898
_mod_revision.check_not_reserved_id(revision_id)
900
revision_ids = self._filter_parent_ids_by_ancestry(revision_ids)
902
if len(revision_ids) > 0:
903
self.set_last_revision(revision_ids[0])
905
self.set_last_revision(_mod_revision.NULL_REVISION)
907
self._set_merges_from_parent_ids(revision_ids)
909
@needs_tree_write_lock
910
def set_parent_trees(self, parents_list, allow_leftmost_as_ghost=False):
911
"""See MutableTree.set_parent_trees."""
912
parent_ids = [rev for (rev, tree) in parents_list]
913
for revision_id in parent_ids:
914
_mod_revision.check_not_reserved_id(revision_id)
916
self._check_parents_for_ghosts(parent_ids,
917
allow_leftmost_as_ghost=allow_leftmost_as_ghost)
919
parent_ids = self._filter_parent_ids_by_ancestry(parent_ids)
921
if len(parent_ids) == 0:
922
leftmost_parent_id = _mod_revision.NULL_REVISION
923
leftmost_parent_tree = None
925
leftmost_parent_id, leftmost_parent_tree = parents_list[0]
927
if self._change_last_revision(leftmost_parent_id):
928
if leftmost_parent_tree is None:
929
# If we don't have a tree, fall back to reading the
930
# parent tree from the repository.
931
self._cache_basis_inventory(leftmost_parent_id)
933
inv = leftmost_parent_tree.inventory
934
xml = self._create_basis_xml_from_inventory(
935
leftmost_parent_id, inv)
936
self._write_basis_inventory(xml)
937
self._set_merges_from_parent_ids(parent_ids)
939
@needs_tree_write_lock
611
940
def set_pending_merges(self, rev_list):
612
self._control_files.put_utf8('pending-merges', '\n'.join(rev_list))
941
parents = self.get_parent_ids()
942
leftmost = parents[:1]
943
new_parents = leftmost + rev_list
944
self.set_parent_ids(new_parents)
946
@needs_tree_write_lock
615
947
def set_merge_modified(self, modified_hashes):
616
948
def iter_stanzas():
617
949
for file_id, hash in modified_hashes.iteritems():
618
yield Stanza(file_id=file_id, hash=hash)
950
yield Stanza(file_id=file_id.decode('utf8'), hash=hash)
619
951
self._put_rio('merge-hashes', iter_stanzas(), MERGE_MODIFIED_HEADER_1)
953
def _sha_from_stat(self, path, stat_result):
954
"""Get a sha digest from the tree's stat cache.
956
The default implementation assumes no stat cache is present.
958
:param path: The path.
959
:param stat_result: The stat result being looked up.
622
963
def _put_rio(self, filename, stanzas, header):
964
self._must_be_locked()
623
965
my_file = rio_file(stanzas, header)
624
self._control_files.put(filename, my_file)
966
self._transport.put_file(filename, my_file,
967
mode=self.bzrdir._get_file_mode())
969
@needs_write_lock # because merge pulls data into the branch.
970
def merge_from_branch(self, branch, to_revision=None, from_revision=None,
971
merge_type=None, force=False):
972
"""Merge from a branch into this working tree.
974
:param branch: The branch to merge from.
975
:param to_revision: If non-None, the merge will merge to to_revision,
976
but not beyond it. to_revision does not need to be in the history
977
of the branch when it is supplied. If None, to_revision defaults to
978
branch.last_revision().
980
from bzrlib.merge import Merger, Merge3Merger
981
merger = Merger(self.branch, this_tree=self)
982
# check that there are no local alterations
983
if not force and self.has_changes():
984
raise errors.UncommittedChanges(self)
985
if to_revision is None:
986
to_revision = _mod_revision.ensure_null(branch.last_revision())
987
merger.other_rev_id = to_revision
988
if _mod_revision.is_null(merger.other_rev_id):
989
raise errors.NoCommits(branch)
990
self.branch.fetch(branch, last_revision=merger.other_rev_id)
991
merger.other_basis = merger.other_rev_id
992
merger.other_tree = self.branch.repository.revision_tree(
994
merger.other_branch = branch
995
if from_revision is None:
998
merger.set_base_revision(from_revision, branch)
999
if merger.base_rev_id == merger.other_rev_id:
1000
raise errors.PointlessMerge
1001
merger.backup_files = False
1002
if merge_type is None:
1003
merger.merge_type = Merge3Merger
1005
merger.merge_type = merge_type
1006
merger.set_interesting_files(None)
1007
merger.show_base = False
1008
merger.reprocess = False
1009
conflicts = merger.do_merge()
1010
merger.set_pending()
626
1013
@needs_read_lock
627
1014
def merge_modified(self):
1015
"""Return a dictionary of files modified by a merge.
1017
The list is initialized by WorkingTree.set_merge_modified, which is
1018
typically called after we make some automatic updates to the tree
1021
This returns a map of file_id->sha1, containing only files which are
1022
still in the working inventory and have that text hash.
629
hashfile = self._control_files.get('merge-hashes')
1025
hashfile = self._transport.get('merge-hashes')
1026
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
1031
if hashfile.next() != MERGE_MODIFIED_HEADER_1 + '\n':
1032
raise errors.MergeModifiedFormatError()
1033
except StopIteration:
1034
raise errors.MergeModifiedFormatError()
1035
for s in RioReader(hashfile):
1036
# RioReader reads in Unicode, so convert file_ids back to utf8
1037
file_id = osutils.safe_file_id(s.get("file_id"), warn=False)
1038
if file_id not in self.inventory:
1040
text_hash = s.get("hash")
1041
if text_hash == self.get_file_sha1(file_id):
1042
merge_hashes[file_id] = text_hash
1048
def mkdir(self, path, file_id=None):
1049
"""See MutableTree.mkdir()."""
1051
file_id = generate_ids.gen_file_id(os.path.basename(path))
1052
os.mkdir(self.abspath(path))
1053
self.add(path, file_id, 'directory')
647
1056
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).
1057
abspath = self.id2abspath(file_id)
1058
target = osutils.readlink(abspath)
1062
def subsume(self, other_tree):
1063
def add_children(inventory, entry):
1064
for child_entry in entry.children.values():
1065
inventory._byid[child_entry.file_id] = child_entry
1066
if child_entry.kind == 'directory':
1067
add_children(inventory, child_entry)
1068
if other_tree.get_root_id() == self.get_root_id():
1069
raise errors.BadSubsumeSource(self, other_tree,
1070
'Trees have the same root')
1072
other_tree_path = self.relpath(other_tree.basedir)
1073
except errors.PathNotChild:
1074
raise errors.BadSubsumeSource(self, other_tree,
1075
'Tree is not contained by the other')
1076
new_root_parent = self.path2id(osutils.dirname(other_tree_path))
1077
if new_root_parent is None:
1078
raise errors.BadSubsumeSource(self, other_tree,
1079
'Parent directory is not versioned.')
1080
# We need to ensure that the result of a fetch will have a
1081
# versionedfile for the other_tree root, and only fetching into
1082
# RepositoryKnit2 guarantees that.
1083
if not self.branch.repository.supports_rich_root():
1084
raise errors.SubsumeTargetNeedsUpgrade(other_tree)
1085
other_tree.lock_tree_write()
1087
new_parents = other_tree.get_parent_ids()
1088
other_root = other_tree.inventory.root
1089
other_root.parent_id = new_root_parent
1090
other_root.name = osutils.basename(other_tree_path)
1091
self.inventory.add(other_root)
1092
add_children(self.inventory, other_root)
1093
self._write_inventory(self.inventory)
1094
# normally we don't want to fetch whole repositories, but i think
1095
# here we really do want to consolidate the whole thing.
1096
for parent_id in other_tree.get_parent_ids():
1097
self.branch.fetch(other_tree.branch, parent_id)
1098
self.add_parent_tree_id(parent_id)
1101
other_tree.bzrdir.retire_bzrdir()
1103
def _setup_directory_is_tree_reference(self):
1104
if self._branch.repository._format.supports_tree_reference:
1105
self._directory_is_tree_reference = \
1106
self._directory_may_be_tree_reference
1108
self._directory_is_tree_reference = \
1109
self._directory_is_never_tree_reference
1111
def _directory_is_never_tree_reference(self, relpath):
1114
def _directory_may_be_tree_reference(self, relpath):
1115
# as a special case, if a directory contains control files then
1116
# it's a tree reference, except that the root of the tree is not
1117
return relpath and osutils.isdir(self.abspath(relpath) + u"/.bzr")
1118
# TODO: We could ask all the control formats whether they
1119
# recognize this directory, but at the moment there's no cheap api
1120
# to do that. Since we probably can only nest bzr checkouts and
1121
# they always use this name it's ok for now. -- mbp 20060306
1123
# FIXME: There is an unhandled case here of a subdirectory
1124
# containing .bzr but not a branch; that will probably blow up
1125
# when you try to commit it. It might happen if there is a
1126
# checkout in a subdirectory. This can be avoided by not adding
1129
@needs_tree_write_lock
1130
def extract(self, file_id, format=None):
1131
"""Extract a subtree from this tree.
1133
A new branch will be created, relative to the path for this tree.
1137
segments = osutils.splitpath(path)
1138
transport = self.branch.bzrdir.root_transport
1139
for name in segments:
1140
transport = transport.clone(name)
1141
transport.ensure_base()
1144
sub_path = self.id2path(file_id)
1145
branch_transport = mkdirs(sub_path)
1147
format = self.bzrdir.cloning_metadir()
1148
branch_transport.ensure_base()
1149
branch_bzrdir = format.initialize_on_transport(branch_transport)
1151
repo = branch_bzrdir.find_repository()
1152
except errors.NoRepositoryPresent:
1153
repo = branch_bzrdir.create_repository()
1154
if not repo.supports_rich_root():
1155
raise errors.RootNotRich()
1156
new_branch = branch_bzrdir.create_branch()
1157
new_branch.pull(self.branch)
1158
for parent_id in self.get_parent_ids():
1159
new_branch.fetch(self.branch, parent_id)
1160
tree_transport = self.bzrdir.root_transport.clone(sub_path)
1161
if tree_transport.base != branch_transport.base:
1162
tree_bzrdir = format.initialize_on_transport(tree_transport)
1163
branch.BranchReferenceFormat().initialize(tree_bzrdir,
1164
target_branch=new_branch)
1166
tree_bzrdir = branch_bzrdir
1167
wt = tree_bzrdir.create_workingtree(_mod_revision.NULL_REVISION)
1168
wt.set_parent_ids(self.get_parent_ids())
1169
my_inv = self.inventory
1170
child_inv = inventory.Inventory(root_id=None)
1171
new_root = my_inv[file_id]
1172
my_inv.remove_recursive_id(file_id)
1173
new_root.parent_id = None
1174
child_inv.add(new_root)
1175
self._write_inventory(my_inv)
1176
wt._write_inventory(child_inv)
1179
def _serialize(self, inventory, out_file):
1180
xml5.serializer_v5.write_inventory(self._inventory, out_file,
1183
def _deserialize(selt, in_file):
1184
return xml5.serializer_v5.read_inventory(in_file)
1187
"""Write the in memory inventory to disk."""
1188
# TODO: Maybe this should only write on dirty ?
1189
if self._control_files._lock_mode != 'w':
1190
raise errors.NotWriteLocked(self)
1192
self._serialize(self._inventory, sio)
1194
self._transport.put_file('inventory', sio,
1195
mode=self.bzrdir._get_file_mode())
1196
self._inventory_is_modified = False
1198
def _kind(self, relpath):
1199
return osutils.file_kind(self.abspath(relpath))
1201
def list_files(self, include_root=False, from_dir=None, recursive=True):
1202
"""List all files as (path, class, kind, id, entry).
661
1204
Lists, but does not descend into unversioned directories.
663
1205
This does not include files that have been deleted in this
1206
tree. Skips the control directory.
666
Skips the control directory.
1208
:param include_root: if True, return an entry for the root
1209
:param from_dir: start from this directory or None for the root
1210
:param recursive: whether to recurse into subdirectories or not
668
inv = self._inventory
670
def descend(from_dir_relpath, from_dir_id, dp):
1212
# list_files is an iterator, so @needs_read_lock doesn't work properly
1213
# with it. So callers should be careful to always read_lock the tree.
1214
if not self.is_locked():
1215
raise errors.ObjectNotLocked(self)
1217
inv = self.inventory
1218
if from_dir is None and include_root is True:
1219
yield ('', 'V', 'directory', inv.root.file_id, inv.root)
1220
# Convert these into local objects to save lookup times
1221
pathjoin = osutils.pathjoin
1222
file_kind = self._kind
1224
# transport.base ends in a slash, we want the piece
1225
# between the last two slashes
1226
transport_base_dir = self.bzrdir.transport.base.rsplit('/', 2)[1]
1228
fk_entries = {'directory':TreeDirectory, 'file':TreeFile, 'symlink':TreeLink}
1230
# directory file_id, relative path, absolute path, reverse sorted children
1231
if from_dir is not None:
1232
from_dir_id = inv.path2id(from_dir)
1233
if from_dir_id is None:
1234
# Directory not versioned
1236
from_dir_abspath = pathjoin(self.basedir, from_dir)
1238
from_dir_id = inv.root.file_id
1239
from_dir_abspath = self.basedir
1240
children = os.listdir(from_dir_abspath)
1242
# jam 20060527 The kernel sized tree seems equivalent whether we
1243
# use a deque and popleft to keep them sorted, or if we use a plain
1244
# list and just reverse() them.
1245
children = collections.deque(children)
1246
stack = [(from_dir_id, u'', from_dir_abspath, children)]
1248
from_dir_id, from_dir_relpath, from_dir_abspath, children = stack[-1]
1251
f = children.popleft()
674
1252
## TODO: If we find a subdirectory with its own .bzr
675
1253
## directory, then that is a separate tree and we
676
1254
## should exclude it.
678
1256
# the bzrdir for this tree
679
if self.bzrdir.transport.base.endswith(f + '/'):
1257
if transport_base_dir == f:
683
fp = appendpath(from_dir_relpath, f)
1260
# we know that from_dir_relpath and from_dir_abspath never end in a slash
1261
# and 'f' doesn't begin with one, we can do a string op, rather
1262
# than the checks of pathjoin(), all relative paths will have an extra slash
1264
fp = from_dir_relpath + '/' + f
686
fap = appendpath(dp, f)
1267
fap = from_dir_abspath + '/' + f
688
1269
f_ie = inv.get_child(from_dir_id, f)
691
elif self.is_ignored(fp):
1272
elif self.is_ignored(fp[1:]):
1275
# we may not have found this file, because of a unicode issue
1276
f_norm, can_access = osutils.normalized_filename(f)
1277
if f == f_norm or not can_access:
1278
# No change, so treat this file normally
1281
# this file can be accessed by a normalized path
1282
# check again if it is versioned
1283
# these lines are repeated here for performance
1285
fp = from_dir_relpath + '/' + f
1286
fap = from_dir_abspath + '/' + f
1287
f_ie = inv.get_child(from_dir_id, f)
1290
elif self.is_ignored(fp[1:]):
696
1295
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
1297
# make a last minute entry
1299
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
1302
yield fp[1:], c, fk, None, fk_entries[fk]()
1304
yield fp[1:], c, fk, None, TreeEntry()
719
1307
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):
1310
# But do this child first if recursing down
1312
new_children = os.listdir(fap)
1314
new_children = collections.deque(new_children)
1315
stack.append((f_ie.file_id, fp, fap, new_children))
1316
# Break out of inner loop,
1317
# so that we start outer loop with child
1320
# if we finished all children, pop it off the stack
1323
@needs_tree_write_lock
1324
def move(self, from_paths, to_dir=None, after=False):
734
1325
"""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;
1327
to_dir must exist in the inventory.
1329
If to_dir exists and is a directory, the files are moved into
1330
it, keeping their old names.
1332
Note that to_dir is only the last component of the new name;
742
1333
this doesn't change the directory.
1335
For each entry in from_paths the move mode will be determined
1338
The first mode moves the file in the filesystem and updates the
1339
inventory. The second mode only updates the inventory without
1340
touching the file on the filesystem. This is the new mode introduced
1343
move uses the second mode if 'after == True' and the target is not
1344
versioned but present in the working tree.
1346
move uses the second mode if 'after == False' and the source is
1347
versioned but no longer in the working tree, and the target is not
1348
versioned but present in the working tree.
1350
move uses the first mode if 'after == False' and the source is
1351
versioned and present in the working tree, and the target is not
1352
versioned and not present in the working tree.
1354
Everything else results in an error.
744
1356
This returns a list of (from_path, to_path) pairs for each
745
1357
entry that is moved.
748
## TODO: Option to move IDs only
749
assert not isinstance(from_paths, basestring)
1362
# check for deprecated use of signature
1364
raise TypeError('You must supply a target directory')
1365
# check destination directory
1366
if isinstance(from_paths, basestring):
750
1368
inv = self.inventory
751
to_abs = self.abspath(to_name)
1369
to_abs = self.abspath(to_dir)
752
1370
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)
1371
raise errors.BzrMoveFailedError('',to_dir,
1372
errors.NotADirectory(to_abs))
1373
if not self.has_filename(to_dir):
1374
raise errors.BzrMoveFailedError('',to_dir,
1375
errors.NotInWorkingDirectory(to_dir))
1376
to_dir_id = inv.path2id(to_dir)
1377
if to_dir_id is None:
1378
raise errors.BzrMoveFailedError('',to_dir,
1379
errors.NotVersionedError(path=str(to_dir)))
759
1381
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)
1382
if to_dir_ie.kind != 'directory':
1383
raise errors.BzrMoveFailedError('',to_dir,
1384
errors.NotADirectory(to_abs))
1386
# create rename entries and tuples
1387
for from_rel in from_paths:
1388
from_tail = splitpath(from_rel)[-1]
1389
from_id = inv.path2id(from_rel)
1391
raise errors.BzrMoveFailedError(from_rel,to_dir,
1392
errors.NotVersionedError(path=str(from_rel)))
1394
from_entry = inv[from_id]
1395
from_parent_id = from_entry.parent_id
1396
to_rel = pathjoin(to_dir, from_tail)
1397
rename_entry = WorkingTree._RenameEntry(from_rel=from_rel,
1399
from_tail=from_tail,
1400
from_parent_id=from_parent_id,
1401
to_rel=to_rel, to_tail=from_tail,
1402
to_parent_id=to_dir_id)
1403
rename_entries.append(rename_entry)
1404
rename_tuples.append((from_rel, to_rel))
1406
# determine which move mode to use. checks also for movability
1407
rename_entries = self._determine_mv_mode(rename_entries, after)
1409
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"])
1412
self._inventory_is_modified = True
1413
self._move(rename_entries)
795
1415
# restore the inventory on error
796
self._set_inventory(orig_inv)
1416
self._inventory_is_modified = original_modified
798
1418
self._write_inventory(inv)
802
def rename_one(self, from_rel, to_rel):
1419
return rename_tuples
1421
def _determine_mv_mode(self, rename_entries, after=False):
1422
"""Determines for each from-to pair if both inventory and working tree
1423
or only the inventory has to be changed.
1425
Also does basic plausability tests.
1427
inv = self.inventory
1429
for rename_entry in rename_entries:
1430
# store to local variables for easier reference
1431
from_rel = rename_entry.from_rel
1432
from_id = rename_entry.from_id
1433
to_rel = rename_entry.to_rel
1434
to_id = inv.path2id(to_rel)
1435
only_change_inv = False
1437
# check the inventory for source and destination
1439
raise errors.BzrMoveFailedError(from_rel,to_rel,
1440
errors.NotVersionedError(path=str(from_rel)))
1441
if to_id is not None:
1442
raise errors.BzrMoveFailedError(from_rel,to_rel,
1443
errors.AlreadyVersionedError(path=str(to_rel)))
1445
# try to determine the mode for rename (only change inv or change
1446
# inv and file system)
1448
if not self.has_filename(to_rel):
1449
raise errors.BzrMoveFailedError(from_id,to_rel,
1450
errors.NoSuchFile(path=str(to_rel),
1451
extra="New file has not been created yet"))
1452
only_change_inv = True
1453
elif not self.has_filename(from_rel) and self.has_filename(to_rel):
1454
only_change_inv = True
1455
elif self.has_filename(from_rel) and not self.has_filename(to_rel):
1456
only_change_inv = False
1457
elif (not self.case_sensitive
1458
and from_rel.lower() == to_rel.lower()
1459
and self.has_filename(from_rel)):
1460
only_change_inv = False
1462
# something is wrong, so lets determine what exactly
1463
if not self.has_filename(from_rel) and \
1464
not self.has_filename(to_rel):
1465
raise errors.BzrRenameFailedError(from_rel,to_rel,
1466
errors.PathsDoNotExist(paths=(str(from_rel),
1469
raise errors.RenameFailedFilesExist(from_rel, to_rel)
1470
rename_entry.only_change_inv = only_change_inv
1471
return rename_entries
1473
def _move(self, rename_entries):
1474
"""Moves a list of files.
1476
Depending on the value of the flag 'only_change_inv', the
1477
file will be moved on the file system or not.
1479
inv = self.inventory
1482
for entry in rename_entries:
1484
self._move_entry(entry)
1486
self._rollback_move(moved)
1490
def _rollback_move(self, moved):
1491
"""Try to rollback a previous move in case of an filesystem error."""
1492
inv = self.inventory
1495
self._move_entry(WorkingTree._RenameEntry(
1496
entry.to_rel, entry.from_id,
1497
entry.to_tail, entry.to_parent_id, entry.from_rel,
1498
entry.from_tail, entry.from_parent_id,
1499
entry.only_change_inv))
1500
except errors.BzrMoveFailedError, e:
1501
raise errors.BzrMoveFailedError( '', '', "Rollback failed."
1502
" The working tree is in an inconsistent state."
1503
" Please consider doing a 'bzr revert'."
1504
" Error message is: %s" % e)
1506
def _move_entry(self, entry):
1507
inv = self.inventory
1508
from_rel_abs = self.abspath(entry.from_rel)
1509
to_rel_abs = self.abspath(entry.to_rel)
1510
if from_rel_abs == to_rel_abs:
1511
raise errors.BzrMoveFailedError(entry.from_rel, entry.to_rel,
1512
"Source and target are identical.")
1514
if not entry.only_change_inv:
1516
osutils.rename(from_rel_abs, to_rel_abs)
1518
raise errors.BzrMoveFailedError(entry.from_rel,
1520
inv.rename(entry.from_id, entry.to_parent_id, entry.to_tail)
1522
@needs_tree_write_lock
1523
def rename_one(self, from_rel, to_rel, after=False):
803
1524
"""Rename one file.
805
1526
This can change the directory or the filename or both.
1528
rename_one has several 'modes' to work. First, it can rename a physical
1529
file and change the file_id. That is the normal mode. Second, it can
1530
only change the file_id without touching any physical file. This is
1531
the new mode introduced in version 0.15.
1533
rename_one uses the second mode if 'after == True' and 'to_rel' is not
1534
versioned but present in the working tree.
1536
rename_one uses the second mode if 'after == False' and 'from_rel' is
1537
versioned but no longer in the working tree, and 'to_rel' is not
1538
versioned but present in the working tree.
1540
rename_one uses the first mode if 'after == False' and 'from_rel' is
1541
versioned and present in the working tree, and 'to_rel' is not
1542
versioned and not present in the working tree.
1544
Everything else results in an error.
807
1546
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)
1549
# create rename entries and tuples
1550
from_tail = splitpath(from_rel)[-1]
1551
from_id = inv.path2id(from_rel)
1553
# if file is missing in the inventory maybe it's in the basis_tree
1554
basis_tree = self.branch.basis_tree()
1555
from_id = basis_tree.path2id(from_rel)
1557
raise errors.BzrRenameFailedError(from_rel,to_rel,
1558
errors.NotVersionedError(path=str(from_rel)))
1559
# put entry back in the inventory so we can rename it
1560
from_entry = basis_tree.inventory[from_id].copy()
1563
from_entry = inv[from_id]
1564
from_parent_id = from_entry.parent_id
824
1565
to_dir, to_tail = os.path.split(to_rel)
825
1566
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"])
1567
rename_entry = WorkingTree._RenameEntry(from_rel=from_rel,
1569
from_tail=from_tail,
1570
from_parent_id=from_parent_id,
1571
to_rel=to_rel, to_tail=to_tail,
1572
to_parent_id=to_dir_id)
1573
rename_entries.append(rename_entry)
1575
# determine which move mode to use. checks also for movability
1576
rename_entries = self._determine_mv_mode(rename_entries, after)
1578
# check if the target changed directory and if the target directory is
1580
if to_dir_id is None:
1581
raise errors.BzrMoveFailedError(from_rel,to_rel,
1582
errors.NotVersionedError(path=str(to_dir)))
1584
# all checks done. now we can continue with our actual work
1585
mutter('rename_one:\n'
1590
' to_dir_id {%s}\n',
1591
from_id, from_rel, to_rel, to_dir, to_dir_id)
1593
self._move(rename_entries)
847
1594
self._write_inventory(inv)
1596
class _RenameEntry(object):
1597
def __init__(self, from_rel, from_id, from_tail, from_parent_id,
1598
to_rel, to_tail, to_parent_id, only_change_inv=False):
1599
self.from_rel = from_rel
1600
self.from_id = from_id
1601
self.from_tail = from_tail
1602
self.from_parent_id = from_parent_id
1603
self.to_rel = to_rel
1604
self.to_tail = to_tail
1605
self.to_parent_id = to_parent_id
1606
self.only_change_inv = only_change_inv
849
1608
@needs_read_lock
850
1609
def unknowns(self):
851
1610
"""Return all unknown files.
853
1612
These are files in the working directory that are not versioned or
854
1613
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()
1615
# force the extras method to be fully executed before returning, to
1616
# prevent race conditions with the lock
1618
[subp for subp in self.extras() if not self.is_ignored(subp)])
1620
@needs_tree_write_lock
1621
def unversion(self, file_ids):
1622
"""Remove the file ids in file_ids from the current versioned set.
1624
When a file_id is unversioned, all of its children are automatically
1627
:param file_ids: The file ids to stop versioning.
1628
:raises: NoSuchId if any fileid is not currently versioned.
1630
for file_id in file_ids:
1631
if file_id not in self._inventory:
1632
raise errors.NoSuchId(self, file_id)
1633
for file_id in file_ids:
1634
if self._inventory.has_id(file_id):
1635
self._inventory.remove_recursive_id(file_id)
1637
# in the future this should just set a dirty bit to wait for the
1638
# final unlock. However, until all methods of workingtree start
1639
# with the current in -memory inventory rather than triggering
1640
# a read, it is more complex - we need to teach read_inventory
1641
# to know when to read, and when to not read first... and possibly
1642
# to save first when the in memory one may be corrupted.
1643
# so for now, we just only write it if it is indeed dirty.
1645
self._write_inventory(self._inventory)
879
1647
def _iter_conflicts(self):
880
1648
conflicted = set()
881
for path in (s[0] for s in self.list_files()):
1649
for info in self.list_files():
882
1651
stem = get_conflicted_stem(path)
883
1652
if stem is None:
1053
1926
def _change_last_revision(self, new_revision):
1054
1927
"""Template method part of set_last_revision to perform the change.
1056
1929
This is used to allow WorkingTree3 instances to not affect branch
1057
1930
when their last revision is set.
1059
if new_revision is None:
1932
if _mod_revision.is_null(new_revision):
1060
1933
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])
1936
self.branch.generate_revision_history(new_revision)
1937
except errors.NoSuchRevision:
1938
# not present in the repo - dont try to set it deeper than the tip
1939
self.branch.set_revision_history([new_revision])
1942
def _write_basis_inventory(self, xml):
1943
"""Write the basis inventory XML to the basis-inventory file"""
1944
path = self._basis_inventory_name()
1946
self._transport.put_file(path, sio,
1947
mode=self.bzrdir._get_file_mode())
1949
def _create_basis_xml_from_inventory(self, revision_id, inventory):
1950
"""Create the text that will be saved in basis-inventory"""
1951
inventory.revision_id = revision_id
1952
return xml7.serializer_v7.write_inventory_to_string(inventory)
1071
1954
def _cache_basis_inventory(self, new_revision):
1072
1955
"""Cache new_revision as the basis inventory."""
1956
# TODO: this should allow the ready-to-use inventory to be passed in,
1957
# as commit already has that ready-to-use [while the format is the
1074
# this double handles the inventory - unpack and repack -
1960
# this double handles the inventory - unpack and repack -
1075
1961
# but is easier to understand. We can/should put a conditional
1076
1962
# in here based on whether the inventory is in the latest format
1077
1963
# - 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:
1965
# the fast path is to copy the raw xml from the repository. If the
1966
# xml contains 'revision_id="', then we assume the right
1967
# revision_id is set. We must check for this full string, because a
1968
# root node id can legitimately look like 'revision_id' but cannot
1970
xml = self.branch.repository._get_inventory_xml(new_revision)
1971
firstline = xml.split('\n', 1)[0]
1972
if (not 'revision_id="' in firstline or
1973
'format="7"' not in firstline):
1974
inv = self.branch.repository._serializer.read_inventory_from_string(
1976
xml = self._create_basis_xml_from_inventory(new_revision, inv)
1977
self._write_basis_inventory(xml)
1978
except (errors.NoSuchRevision, errors.RevisionNotPresent):
1088
1981
def read_basis_inventory(self):
1089
1982
"""Read the cached basis inventory."""
1090
1983
path = self._basis_inventory_name()
1091
return self._control_files.get_utf8(path).read()
1984
return self._transport.get_bytes(path)
1093
1986
@needs_read_lock
1094
1987
def read_working_inventory(self):
1095
"""Read the working inventory."""
1988
"""Read the working inventory.
1990
:raises errors.InventoryModified: read_working_inventory will fail
1991
when the current in memory inventory has been modified.
1993
# conceptually this should be an implementation detail of the tree.
1994
# XXX: Deprecate this.
1096
1995
# 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)
1997
if self._inventory_is_modified:
1998
raise errors.InventoryModified(self)
1999
f = self._transport.get('inventory')
2001
result = self._deserialize(f)
2004
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.
2007
@needs_tree_write_lock
2008
def remove(self, files, verbose=False, to_file=None, keep_files=True,
2010
"""Remove nominated files from the working inventory.
2012
:files: File paths relative to the basedir.
2013
:keep_files: If true, the files will also be kept.
2014
:force: Delete files and directories, even if they are changed and
2015
even if the directories are not empty.
1118
## TODO: Normalize names
1119
## TODO: Remove nested loops; better scalability
1120
2017
if isinstance(files, basestring):
1121
2018
files = [files]
1123
inv = self.inventory
1125
# do this before any modifications
2023
unknown_nested_files=set()
2025
to_file = sys.stdout
2027
def recurse_directory_to_add_files(directory):
2028
# Recurse directory and add all files
2029
# so we can check if they have changed.
2030
for parent_info, file_infos in self.walkdirs(directory):
2031
for relpath, basename, kind, lstat, fileid, kind in file_infos:
2032
# Is it versioned or ignored?
2033
if self.path2id(relpath) or self.is_ignored(relpath):
2034
# Add nested content for deletion.
2035
new_files.add(relpath)
2037
# Files which are not versioned and not ignored
2038
# should be treated as unknown.
2039
unknown_nested_files.add((relpath, None, kind))
2041
for filename in files:
2042
# Get file name into canonical form.
2043
abspath = self.abspath(filename)
2044
filename = self.relpath(abspath)
2045
if len(filename) > 0:
2046
new_files.add(filename)
2047
recurse_directory_to_add_files(filename)
2049
files = list(new_files)
2052
return # nothing to do
2054
# Sort needed to first handle directory content before the directory
2055
files.sort(reverse=True)
2057
# Bail out if we are going to delete files we shouldn't
2058
if not keep_files and not force:
2059
has_changed_files = len(unknown_nested_files) > 0
2060
if not has_changed_files:
2061
for (file_id, path, content_change, versioned, parent_id, name,
2062
kind, executable) in self.iter_changes(self.basis_tree(),
2063
include_unchanged=True, require_versioned=False,
2064
want_unversioned=True, specific_files=files):
2065
if versioned == (False, False):
2066
# The record is unknown ...
2067
if not self.is_ignored(path[1]):
2068
# ... but not ignored
2069
has_changed_files = True
2071
elif (content_change and (kind[1] is not None) and
2072
osutils.is_inside_any(files, path[1])):
2073
# Versioned and changed, but not deleted, and still
2074
# in one of the dirs to be deleted.
2075
has_changed_files = True
2078
if has_changed_files:
2079
# Make delta show ALL applicable changes in error message.
2080
tree_delta = self.changes_from(self.basis_tree(),
2081
require_versioned=False, want_unversioned=True,
2082
specific_files=files)
2083
for unknown_file in unknown_nested_files:
2084
if unknown_file not in tree_delta.unversioned:
2085
tree_delta.unversioned.extend((unknown_file,))
2086
raise errors.BzrRemoveChangedFilesError(tree_delta)
2088
# Build inv_delta and delete files where applicable,
2089
# do this before any modifications to inventory.
1126
2090
for f in files:
1127
fid = inv.path2id(f)
2091
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
2094
message = "%s is not versioned." % (f,)
2097
# having removed it, it must be either ignored or unknown
2098
if self.is_ignored(f):
2102
# XXX: Really should be a more abstract reporter interface
2103
kind_ch = osutils.kind_marker(self.kind(fid))
2104
to_file.write(new_status + ' ' + f + kind_ch + '\n')
2106
inv_delta.append((f, None, fid, None))
2107
message = "removed %s" % (f,)
2110
abs_path = self.abspath(f)
2111
if osutils.lexists(abs_path):
2112
if (osutils.isdir(abs_path) and
2113
len(os.listdir(abs_path)) > 0):
2115
osutils.rmtree(abs_path)
2117
message = "%s is not an empty directory "\
2118
"and won't be deleted." % (f,)
2120
osutils.delete_any(abs_path)
2121
message = "deleted %s" % (f,)
2122
elif message is not None:
2123
# Only care if we haven't done anything yet.
2124
message = "%s does not exist." % (f,)
2126
# Print only one message (if any) per file.
2127
if message is not None:
2129
self.apply_inventory_delta(inv_delta)
2131
@needs_tree_write_lock
2132
def revert(self, filenames=None, old_tree=None, backups=True,
2133
pb=None, report_changes=False):
2134
from bzrlib.conflicts import resolve
2137
symbol_versioning.warn('Using [] to revert all files is deprecated'
2138
' as of bzr 0.91. Please use None (the default) instead.',
2139
DeprecationWarning, stacklevel=2)
1149
2140
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([])
2141
basis_tree = self.basis_tree()
2142
basis_tree.lock_read()
2143
old_tree = basis_tree
1156
resolve(self, filenames, ignore_misses=True)
2147
conflicts = transform.revert(self, old_tree, filenames, backups, pb,
2149
if filenames is None and len(self.get_parent_ids()) > 1:
2151
last_revision = self.last_revision()
2152
if last_revision != _mod_revision.NULL_REVISION:
2153
if basis_tree is None:
2154
basis_tree = self.basis_tree()
2155
basis_tree.lock_read()
2156
parent_trees.append((last_revision, basis_tree))
2157
self.set_parent_trees(parent_trees)
2160
resolve(self, filenames, ignore_misses=True, recursive=True)
2162
if basis_tree is not None:
1157
2164
return conflicts
2166
def revision_tree(self, revision_id):
2167
"""See Tree.revision_tree.
2169
WorkingTree can supply revision_trees for the basis revision only
2170
because there is only one cached inventory in the bzr directory.
2172
if revision_id == self.last_revision():
2174
xml = self.read_basis_inventory()
2175
except errors.NoSuchFile:
2179
inv = xml7.serializer_v7.read_inventory_from_string(xml)
2180
# dont use the repository revision_tree api because we want
2181
# to supply the inventory.
2182
if inv.revision_id == revision_id:
2183
return revisiontree.RevisionTree(self.branch.repository,
2185
except errors.BadInventoryFormat:
2187
# raise if there was no inventory, or if we read the wrong inventory.
2188
raise errors.NoSuchRevisionInTree(self, revision_id)
1159
2190
# XXX: This method should be deprecated in favour of taking in a proper
1160
2191
# new Inventory object.
2192
@needs_tree_write_lock
1162
2193
def set_inventory(self, new_inventory_list):
1163
2194
from bzrlib.inventory import (Inventory,
1164
2195
InventoryDirectory,
1168
2198
inv = Inventory(self.get_root_id())
1178
2208
elif kind == 'symlink':
1179
2209
inv.add(InventoryLink(file_id, name, parent))
1181
raise BzrError("unknown kind %r" % kind)
2211
raise errors.BzrError("unknown kind %r" % kind)
1182
2212
self._write_inventory(inv)
2214
@needs_tree_write_lock
1185
2215
def set_root_id(self, file_id):
1186
2216
"""Set the root id for this tree."""
1187
inv = self.read_working_inventory()
2220
'WorkingTree.set_root_id with fileid=None')
2221
file_id = osutils.safe_file_id(file_id)
2222
self._set_root_id(file_id)
2224
def _set_root_id(self, file_id):
2225
"""Set the root id for this tree, in a format specific manner.
2227
:param file_id: The file id to assign to the root. It must not be
2228
present in the current inventory or an error will occur. It must
2229
not be None, but rather a valid file id.
2231
inv = self._inventory
1188
2232
orig_root_id = inv.root.file_id
2233
# TODO: it might be nice to exit early if there was nothing
2234
# to do, saving us from trigger a sync on unlock.
2235
self._inventory_is_modified = True
2236
# we preserve the root inventory entry object, but
2237
# unlinkit from the byid index
1189
2238
del inv._byid[inv.root.file_id]
1190
2239
inv.root.file_id = file_id
2240
# and link it into the index with the new changed id.
1191
2241
inv._byid[inv.root.file_id] = inv.root
2242
# and finally update all children to reference the new id.
2243
# XXX: this should be safe to just look at the root.children
2244
# list, not the WHOLE INVENTORY.
1192
2245
for fid in inv:
1193
2246
entry = inv[fid]
1194
2247
if entry.parent_id == orig_root_id:
1195
2248
entry.parent_id = inv.root.file_id
1196
self._write_inventory(inv)
1198
2250
def unlock(self):
1199
2251
"""See Branch.unlock.
1201
2253
WorkingTree locking just uses the Branch locking facilities.
1202
2254
This is current because all working trees have an embedded branch
1203
2255
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
2256
between multiple working trees, i.e. via shared storage, then we
1205
2257
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()
2259
raise NotImplementedError(self.unlock)
2263
def update(self, change_reporter=None, possible_transports=None,
2264
revision=None, old_tip=_marker):
1232
2265
"""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.
2267
This will update the branch if its bound too, which means we have
2268
multiple trees involved:
2270
- The new basis tree of the master.
2271
- The old basis tree of the branch.
2272
- The old basis tree of the working tree.
2273
- The current working tree state.
2275
Pathologically, all three may be different, and non-ancestors of each
2276
other. Conceptually we want to:
2278
- Preserve the wt.basis->wt.state changes
2279
- Transform the wt.basis to the new master basis.
2280
- Apply a merge of the old branch basis to get any 'local' changes from
2282
- Restore the wt.basis->wt.state changes.
1246
2284
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.
2285
- Merge current state -> basis tree of the master w.r.t. the old tree
2287
- Do a 'normal' merge of the old branch basis if it is relevant.
2289
:param revision: The target revision to update to. Must be in the
2291
:param old_tip: If branch.update() has already been run, the value it
2292
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()
2295
if self.branch.get_bound_location() is not None:
2297
update_branch = (old_tip is self._marker)
2299
self.lock_tree_write()
2300
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,
2303
old_tip = self.branch.update(possible_transports)
2305
if old_tip is self._marker:
2307
return self._update_tree(old_tip, change_reporter, revision)
1285
self.branch.unlock()
2311
@needs_tree_write_lock
2312
def _update_tree(self, old_tip=None, change_reporter=None, revision=None):
2313
"""Update a tree to the master branch.
2315
:param old_tip: if supplied, the previous tip revision the branch,
2316
before it was changed to the master branch's tip.
2318
# here if old_tip is not None, it is the old tip of the branch before
2319
# it was updated from the master branch. This should become a pending
2320
# merge in the working tree to preserve the user existing work. we
2321
# cant set that until we update the working trees last revision to be
2322
# one from the new branch, because it will just get absorbed by the
2323
# parent de-duplication logic.
2325
# We MUST save it even if an error occurs, because otherwise the users
2326
# local work is unreferenced and will appear to have been lost.
2330
last_rev = self.get_parent_ids()[0]
2332
last_rev = _mod_revision.NULL_REVISION
2333
if revision is None:
2334
revision = self.branch.last_revision()
2336
old_tip = old_tip or _mod_revision.NULL_REVISION
2338
if not _mod_revision.is_null(old_tip) and old_tip != last_rev:
2339
# the branch we are bound to was updated
2340
# merge those changes in first
2341
base_tree = self.basis_tree()
2342
other_tree = self.branch.repository.revision_tree(old_tip)
2343
nb_conflicts = merge.merge_inner(self.branch, other_tree,
2344
base_tree, this_tree=self,
2345
change_reporter=change_reporter)
2347
self.add_parent_tree((old_tip, other_tree))
2348
trace.note('Rerun update after fixing the conflicts.')
2351
if last_rev != _mod_revision.ensure_null(revision):
2352
# the working tree is up to date with the branch
2353
# we can merge the specified revision from master
2354
to_tree = self.branch.repository.revision_tree(revision)
2355
to_root_id = to_tree.get_root_id()
2357
basis = self.basis_tree()
2360
if (basis.inventory.root is None
2361
or basis.inventory.root.file_id != to_root_id):
2362
self.set_root_id(to_root_id)
2367
# determine the branch point
2368
graph = self.branch.repository.get_graph()
2369
base_rev_id = graph.find_unique_lca(self.branch.last_revision(),
2371
base_tree = self.branch.repository.revision_tree(base_rev_id)
2373
nb_conflicts = merge.merge_inner(self.branch, to_tree, base_tree,
2375
change_reporter=change_reporter)
2376
self.set_last_revision(revision)
2377
# TODO - dedup parents list with things merged by pull ?
2378
# reuse the tree we've updated to to set the basis:
2379
parent_trees = [(revision, to_tree)]
2380
merges = self.get_parent_ids()[1:]
2381
# Ideally we ask the tree for the trees here, that way the working
2382
# tree can decide whether to give us the entire tree or give us a
2383
# lazy initialised tree. dirstate for instance will have the trees
2384
# in ram already, whereas a last-revision + basis-inventory tree
2385
# will not, but also does not need them when setting parents.
2386
for parent in merges:
2387
parent_trees.append(
2388
(parent, self.branch.repository.revision_tree(parent)))
2389
if not _mod_revision.is_null(old_tip):
2390
parent_trees.append(
2391
(old_tip, self.branch.repository.revision_tree(old_tip)))
2392
self.set_parent_trees(parent_trees)
2393
last_rev = parent_trees[0][0]
2396
def _write_hashcache_if_dirty(self):
2397
"""Write out the hashcache if it is dirty."""
2398
if self._hashcache.needs_write:
2400
self._hashcache.write()
2402
if e.errno not in (errno.EPERM, errno.EACCES):
2404
# TODO: jam 20061219 Should this be a warning? A single line
2405
# warning might be sufficient to let the user know what
2407
mutter('Could not write hashcache for %s\nError: %s',
2408
self._hashcache.cache_file_name(), e)
2410
@needs_tree_write_lock
1288
2411
def _write_inventory(self, inv):
1289
2412
"""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')
2413
self._set_inventory(inv, dirty=True)
1297
2416
def set_conflicts(self, arg):
1298
raise UnsupportedOperation(self.set_conflicts, self)
2417
raise errors.UnsupportedOperation(self.set_conflicts, self)
2419
def add_conflicts(self, arg):
2420
raise errors.UnsupportedOperation(self.add_conflicts, self)
1300
2422
@needs_read_lock
1301
2423
def conflicts(self):
1302
conflicts = ConflictList()
2424
conflicts = _mod_conflicts.ConflictList()
1303
2425
for conflicted in self._iter_conflicts():
1306
2428
if file_kind(self.abspath(conflicted)) != "file":
1309
if e.errno == errno.ENOENT:
2430
except errors.NoSuchFile:
1313
2432
if text is True:
1314
2433
for suffix in ('.THIS', '.OTHER'):
1316
2435
kind = file_kind(self.abspath(conflicted+suffix))
1318
if e.errno == errno.ENOENT:
2438
except errors.NoSuchFile:
1326
2442
ctype = {True: 'text conflict', False: 'contents conflict'}[text]
1327
conflicts.append(Conflict.factory(ctype, path=conflicted,
2443
conflicts.append(_mod_conflicts.Conflict.factory(ctype,
1328
2445
file_id=self.path2id(conflicted)))
1329
2446
return conflicts
2448
def walkdirs(self, prefix=""):
2449
"""Walk the directories of this tree.
2451
returns a generator which yields items in the form:
2452
((curren_directory_path, fileid),
2453
[(file1_path, file1_name, file1_kind, (lstat), file1_id,
2456
This API returns a generator, which is only valid during the current
2457
tree transaction - within a single lock_read or lock_write duration.
2459
If the tree is not locked, it may cause an error to be raised,
2460
depending on the tree implementation.
2462
disk_top = self.abspath(prefix)
2463
if disk_top.endswith('/'):
2464
disk_top = disk_top[:-1]
2465
top_strip_len = len(disk_top) + 1
2466
inventory_iterator = self._walkdirs(prefix)
2467
disk_iterator = osutils.walkdirs(disk_top, prefix)
2469
current_disk = disk_iterator.next()
2470
disk_finished = False
2472
if not (e.errno == errno.ENOENT or
2473
(sys.platform == 'win32' and e.errno == ERROR_PATH_NOT_FOUND)):
2476
disk_finished = True
2478
current_inv = inventory_iterator.next()
2479
inv_finished = False
2480
except StopIteration:
2483
while not inv_finished or not disk_finished:
2485
((cur_disk_dir_relpath, cur_disk_dir_path_from_top),
2486
cur_disk_dir_content) = current_disk
2488
((cur_disk_dir_relpath, cur_disk_dir_path_from_top),
2489
cur_disk_dir_content) = ((None, None), None)
2490
if not disk_finished:
2491
# strip out .bzr dirs
2492
if (cur_disk_dir_path_from_top[top_strip_len:] == '' and
2493
len(cur_disk_dir_content) > 0):
2494
# osutils.walkdirs can be made nicer -
2495
# yield the path-from-prefix rather than the pathjoined
2497
bzrdir_loc = bisect_left(cur_disk_dir_content,
2499
if (bzrdir_loc < len(cur_disk_dir_content)
2500
and self.bzrdir.is_control_filename(
2501
cur_disk_dir_content[bzrdir_loc][0])):
2502
# we dont yield the contents of, or, .bzr itself.
2503
del cur_disk_dir_content[bzrdir_loc]
2505
# everything is unknown
2508
# everything is missing
2511
direction = cmp(current_inv[0][0], cur_disk_dir_relpath)
2513
# disk is before inventory - unknown
2514
dirblock = [(relpath, basename, kind, stat, None, None) for
2515
relpath, basename, kind, stat, top_path in
2516
cur_disk_dir_content]
2517
yield (cur_disk_dir_relpath, None), dirblock
2519
current_disk = disk_iterator.next()
2520
except StopIteration:
2521
disk_finished = True
2523
# inventory is before disk - missing.
2524
dirblock = [(relpath, basename, 'unknown', None, fileid, kind)
2525
for relpath, basename, dkind, stat, fileid, kind in
2527
yield (current_inv[0][0], current_inv[0][1]), dirblock
2529
current_inv = inventory_iterator.next()
2530
except StopIteration:
2533
# versioned present directory
2534
# merge the inventory and disk data together
2536
for relpath, subiterator in itertools.groupby(sorted(
2537
current_inv[1] + cur_disk_dir_content,
2538
key=operator.itemgetter(0)), operator.itemgetter(1)):
2539
path_elements = list(subiterator)
2540
if len(path_elements) == 2:
2541
inv_row, disk_row = path_elements
2542
# versioned, present file
2543
dirblock.append((inv_row[0],
2544
inv_row[1], disk_row[2],
2545
disk_row[3], inv_row[4],
2547
elif len(path_elements[0]) == 5:
2549
dirblock.append((path_elements[0][0],
2550
path_elements[0][1], path_elements[0][2],
2551
path_elements[0][3], None, None))
2552
elif len(path_elements[0]) == 6:
2553
# versioned, absent file.
2554
dirblock.append((path_elements[0][0],
2555
path_elements[0][1], 'unknown', None,
2556
path_elements[0][4], path_elements[0][5]))
2558
raise NotImplementedError('unreachable code')
2559
yield current_inv[0], dirblock
2561
current_inv = inventory_iterator.next()
2562
except StopIteration:
2565
current_disk = disk_iterator.next()
2566
except StopIteration:
2567
disk_finished = True
2569
def _walkdirs(self, prefix=""):
2570
"""Walk the directories of this tree.
2572
:prefix: is used as the directrory to start with.
2573
returns a generator which yields items in the form:
2574
((curren_directory_path, fileid),
2575
[(file1_path, file1_name, file1_kind, None, file1_id,
2578
_directory = 'directory'
2579
# get the root in the inventory
2580
inv = self.inventory
2581
top_id = inv.path2id(prefix)
2585
pending = [(prefix, '', _directory, None, top_id, None)]
2588
currentdir = pending.pop()
2589
# 0 - relpath, 1- basename, 2- kind, 3- stat, 4-id, 5-kind
2590
top_id = currentdir[4]
2592
relroot = currentdir[0] + '/'
2595
# FIXME: stash the node in pending
2597
if entry.kind == 'directory':
2598
for name, child in entry.sorted_children():
2599
dirblock.append((relroot + name, name, child.kind, None,
2600
child.file_id, child.kind
2602
yield (currentdir[0], entry.file_id), dirblock
2603
# push the user specified dirs from dirblock
2604
for dir in reversed(dirblock):
2605
if dir[2] == _directory:
2608
@needs_tree_write_lock
2609
def auto_resolve(self):
2610
"""Automatically resolve text conflicts according to contents.
2612
Only text conflicts are auto_resolvable. Files with no conflict markers
2613
are considered 'resolved', because bzr always puts conflict markers
2614
into files that have text conflicts. The corresponding .THIS .BASE and
2615
.OTHER files are deleted, as per 'resolve'.
2616
:return: a tuple of ConflictLists: (un_resolved, resolved).
2618
un_resolved = _mod_conflicts.ConflictList()
2619
resolved = _mod_conflicts.ConflictList()
2620
conflict_re = re.compile('^(<{7}|={7}|>{7})')
2621
for conflict in self.conflicts():
2622
if (conflict.typestring != 'text conflict' or
2623
self.kind(conflict.file_id) != 'file'):
2624
un_resolved.append(conflict)
2626
my_file = open(self.id2abspath(conflict.file_id), 'rb')
2628
for line in my_file:
2629
if conflict_re.search(line):
2630
un_resolved.append(conflict)
2633
resolved.append(conflict)
2636
resolved.remove_files(self)
2637
self.set_conflicts(un_resolved)
2638
return un_resolved, resolved
2641
def _check(self, references):
2642
"""Check the tree for consistency.
2644
:param references: A dict with keys matching the items returned by
2645
self._get_check_refs(), and values from looking those keys up in
2648
tree_basis = self.basis_tree()
2649
tree_basis.lock_read()
2651
repo_basis = references[('trees', self.last_revision())]
2652
if len(list(repo_basis.iter_changes(tree_basis))) > 0:
2653
raise errors.BzrCheckError(
2654
"Mismatched basis inventory content.")
2659
def _validate(self):
2660
"""Validate internal structures.
2662
This is meant mostly for the test suite. To give it a chance to detect
2663
corruption after actions have occurred. The default implementation is a
2666
:return: None. An exception should be raised if there is an error.
2670
def _get_rules_searcher(self, default_searcher):
2671
"""See Tree._get_rules_searcher."""
2672
if self._rules_searcher is None:
2673
self._rules_searcher = super(WorkingTree,
2674
self)._get_rules_searcher(default_searcher)
2675
return self._rules_searcher
2677
def get_shelf_manager(self):
2678
"""Return the ShelfManager for this WorkingTree."""
2679
from bzrlib.shelf import ShelfManager
2680
return ShelfManager(self, self._transport)
2683
class WorkingTree2(WorkingTree):
2684
"""This is the Format 2 working tree.
2686
This was the first weave based working tree.
2687
- uses os locks for locking.
2688
- uses the branch last-revision.
2691
def __init__(self, *args, **kwargs):
2692
super(WorkingTree2, self).__init__(*args, **kwargs)
2693
# WorkingTree2 has more of a constraint that self._inventory must
2694
# exist. Because this is an older format, we don't mind the overhead
2695
# caused by the extra computation here.
2697
# Newer WorkingTree's should only have self._inventory set when they
2699
if self._inventory is None:
2700
self.read_working_inventory()
2702
def _get_check_refs(self):
2703
"""Return the references needed to perform a check of this tree."""
2704
return [('trees', self.last_revision())]
2706
def lock_tree_write(self):
2707
"""See WorkingTree.lock_tree_write().
2709
In Format2 WorkingTrees we have a single lock for the branch and tree
2710
so lock_tree_write() degrades to lock_write().
2712
:return: An object with an unlock method which will release the lock
2715
self.branch.lock_write()
2717
self._control_files.lock_write()
2720
self.branch.unlock()
2724
# do non-implementation specific cleanup
2727
# we share control files:
2728
if self._control_files._lock_count == 3:
2729
# _inventory_is_modified is always False during a read lock.
2730
if self._inventory_is_modified:
2732
self._write_hashcache_if_dirty()
2734
# reverse order of locking.
2736
return self._control_files.unlock()
2738
self.branch.unlock()
1332
2741
class WorkingTree3(WorkingTree):
1333
2742
"""This is the Format 3 working tree.
added
removed
bzrlib/workingtree.py
