381
342
inv = self._inventory
382
343
for path, ie in inv.iter_entries():
383
if osutils.lexists(self.abspath(path)):
344
if bzrlib.osutils.lexists(self.abspath(path)):
386
def all_file_ids(self):
387
"""See Tree.iter_all_file_ids"""
388
return set(self.inventory)
390
347
def __repr__(self):
391
348
return "<%s of %s>" % (self.__class__.__name__,
392
349
getattr(self, 'basedir', None))
394
351
def abspath(self, filename):
395
352
return pathjoin(self.basedir, filename)
397
354
def basis_tree(self):
398
"""Return RevisionTree for the current last revision.
400
If the left most parent is a ghost then the returned tree will be an
401
empty tree - one obtained by calling
402
repository.revision_tree(NULL_REVISION).
405
revision_id = self.get_parent_ids()[0]
407
# no parents, return an empty revision tree.
408
# in the future this should return the tree for
409
# 'empty:' - the implicit root empty tree.
410
return self.branch.repository.revision_tree(
411
_mod_revision.NULL_REVISION)
413
return self.revision_tree(revision_id)
414
except errors.NoSuchRevision:
416
# No cached copy available, retrieve from the repository.
417
# FIXME? RBC 20060403 should we cache the inventory locally
420
return self.branch.repository.revision_tree(revision_id)
421
except (errors.RevisionNotPresent, errors.NoSuchRevision):
422
# the basis tree *may* be a ghost or a low level error may have
423
# occurred. If the revision is present, its a problem, if its not
425
if self.branch.repository.has_revision(revision_id):
427
# the basis tree is a ghost so return an empty tree.
428
return self.branch.repository.revision_tree(
429
_mod_revision.NULL_REVISION)
432
self._flush_ignore_list_cache()
434
def relpath(self, path):
435
"""Return the local path portion from a given path.
437
The path may be absolute or relative. If its a relative path it is
438
interpreted relative to the python current working directory.
440
return osutils.relpath(self.basedir, path)
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)
442
411
def has_filename(self, filename):
443
return osutils.lexists(self.abspath(filename))
445
def get_file(self, file_id, path=None, filtered=True):
446
return self.get_file_with_stat(file_id, path, filtered=filtered)[0]
448
def get_file_with_stat(self, file_id, path=None, filtered=True,
450
"""See Tree.get_file_with_stat."""
452
path = self.id2path(file_id)
453
file_obj = self.get_file_byname(path, filtered=False)
454
stat_value = _fstat(file_obj.fileno())
455
if filtered and self.supports_content_filtering():
456
filters = self._content_filter_stack(path)
457
file_obj = filtered_input_file(file_obj, filters)
458
return (file_obj, stat_value)
460
def get_file_text(self, file_id, path=None, filtered=True):
461
return self.get_file(file_id, path=path, filtered=filtered).read()
463
def get_file_byname(self, filename, filtered=True):
464
path = self.abspath(filename)
466
if filtered and self.supports_content_filtering():
467
filters = self._content_filter_stack(filename)
468
return filtered_input_file(f, filters)
472
def get_file_lines(self, file_id, path=None, filtered=True):
473
"""See Tree.get_file_lines()"""
474
file = self.get_file(file_id, path, filtered=filtered)
476
return file.readlines()
481
def annotate_iter(self, file_id, default_revision=CURRENT_REVISION):
482
"""See Tree.annotate_iter
484
This implementation will use the basis tree implementation if possible.
485
Lines not in the basis are attributed to CURRENT_REVISION
487
If there are pending merges, lines added by those merges will be
488
incorrectly attributed to CURRENT_REVISION (but after committing, the
489
attribution will be correct).
491
maybe_file_parent_keys = []
492
for parent_id in self.get_parent_ids():
494
parent_tree = self.revision_tree(parent_id)
495
except errors.NoSuchRevisionInTree:
496
parent_tree = self.branch.repository.revision_tree(parent_id)
497
parent_tree.lock_read()
499
if file_id not in parent_tree:
501
ie = parent_tree.inventory[file_id]
502
if ie.kind != 'file':
503
# Note: this is slightly unnecessary, because symlinks and
504
# directories have a "text" which is the empty text, and we
505
# know that won't mess up annotations. But it seems cleaner
507
parent_text_key = (file_id, ie.revision)
508
if parent_text_key not in maybe_file_parent_keys:
509
maybe_file_parent_keys.append(parent_text_key)
512
graph = _mod_graph.Graph(self.branch.repository.texts)
513
heads = graph.heads(maybe_file_parent_keys)
514
file_parent_keys = []
515
for key in maybe_file_parent_keys:
517
file_parent_keys.append(key)
519
# Now we have the parents of this content
520
annotator = self.branch.repository.texts.get_annotator()
521
text = self.get_file(file_id).read()
522
this_key =(file_id, default_revision)
523
annotator.add_special_text(this_key, file_parent_keys, text)
524
annotations = [(key[-1], line)
525
for key, line in annotator.annotate_flat(this_key)]
528
def _get_ancestors(self, default_revision):
529
ancestors = set([default_revision])
530
for parent_id in self.get_parent_ids():
531
ancestors.update(self.branch.repository.get_ancestry(
532
parent_id, topo_sorted=False))
535
def get_parent_ids(self):
536
"""See Tree.get_parent_ids.
538
This implementation reads the pending merges list and last_revision
539
value and uses that to decide what the parents list should be.
541
last_rev = _mod_revision.ensure_null(self._last_revision())
542
if _mod_revision.NULL_REVISION == last_rev:
547
merges_file = self._transport.get('pending-merges')
548
except errors.NoSuchFile:
551
for l in merges_file.readlines():
552
revision_id = l.rstrip('\n')
553
parents.append(revision_id)
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')
557
420
def get_root_id(self):
558
421
"""Return the id of this trees root"""
559
return self._inventory.root.file_id
422
inv = self.read_working_inventory()
423
return inv.root.file_id
561
425
def _get_store_filename(self, file_id):
562
426
## XXX: badly named; this is not in the store at all
563
427
return self.abspath(self.id2path(file_id))
566
def clone(self, to_bzrdir, revision_id=None):
430
def clone(self, to_bzrdir, revision_id=None, basis=None):
567
431
"""Duplicate this working tree into to_bzr, including all state.
569
433
Specifically modified files are kept as modified, but
570
434
ignored and unknown files are discarded.
572
436
If you want to make a new line of development, see bzrdir.sprout()
575
If not None, the cloned tree will have its last revision set to
576
revision, and difference between the source trees last revision
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
577
441
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.
579
447
# assumes the target bzr dir format is compatible.
580
result = to_bzrdir.create_workingtree()
448
result = self._format.initialize(to_bzrdir)
581
449
self.copy_content_into(result, revision_id)
585
453
def copy_content_into(self, tree, revision_id=None):
586
454
"""Copy the current content and user files of this tree into tree."""
587
tree.set_root_id(self.get_root_id())
588
455
if revision_id is None:
589
merge.transform_tree(tree, self)
456
transform_tree(tree, self)
591
# TODO now merge from tree.last_revision to revision (to preserve
592
# user local changes)
593
merge.transform_tree(tree, self)
594
tree.set_parent_ids([revision_id])
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())
596
477
def id2abspath(self, file_id):
597
478
return self.abspath(self.id2path(file_id))
599
480
def has_id(self, file_id):
600
481
# files that have been deleted are excluded
482
inv = self._inventory
602
483
if not inv.has_id(file_id):
604
485
path = inv.id2path(file_id)
605
return osutils.lexists(self.abspath(path))
486
return bzrlib.osutils.lexists(self.abspath(path))
607
488
def has_or_had_id(self, file_id):
608
489
if file_id == self.inventory.root.file_id:
612
493
__contains__ = has_id
614
495
def get_file_size(self, file_id):
615
"""See Tree.get_file_size"""
616
# XXX: this returns the on-disk size; it should probably return the
619
return os.path.getsize(self.id2abspath(file_id))
621
if e.errno != errno.ENOENT:
496
return os.path.getsize(self.id2abspath(file_id))
627
def get_file_sha1(self, file_id, path=None, stat_value=None):
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():
505
return self._inventory[file_id].executable
629
507
path = self._inventory.id2path(file_id)
630
return self._hashcache.get_sha1(path, stat_value)
632
def get_file_mtime(self, file_id, path=None):
634
path = self.inventory.id2path(file_id)
635
return os.lstat(self.abspath(path)).st_mtime
637
def _is_executable_from_path_and_stat_from_basis(self, path, stat_result):
638
file_id = self.path2id(path)
639
return self._inventory[file_id].executable
641
def _is_executable_from_path_and_stat_from_stat(self, path, stat_result):
642
mode = stat_result.st_mode
643
return bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode)
645
if not supports_executable():
646
def is_executable(self, file_id, path=None):
647
return self._inventory[file_id].executable
649
_is_executable_from_path_and_stat = \
650
_is_executable_from_path_and_stat_from_basis
652
def is_executable(self, file_id, path=None):
654
path = self.id2path(file_id)
655
508
mode = os.lstat(self.abspath(path)).st_mode
656
return bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode)
658
_is_executable_from_path_and_stat = \
659
_is_executable_from_path_and_stat_from_stat
661
@needs_tree_write_lock
662
def _add(self, files, ids, kinds):
663
"""See MutableTree._add."""
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.
664
534
# TODO: Re-adding a file that is removed in the working copy
665
535
# should probably put it back with the previous ID.
666
# the read and write working inventory should not occur in this
667
# function - they should be part of lock_write and unlock.
669
for f, file_id, kind in zip(files, ids, kinds):
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))
670
571
if file_id is None:
671
inv.add_path(f, kind=kind)
673
inv.add_path(f, kind=kind, file_id=file_id)
674
self._inventory_is_modified = True
572
file_id = gen_file_id(f)
573
inv.add_path(f, kind=kind, file_id=file_id)
676
@needs_tree_write_lock
677
def _gather_kinds(self, files, kinds):
678
"""See MutableTree._gather_kinds."""
679
for pos, f in enumerate(files):
680
if kinds[pos] is None:
681
fullpath = normpath(self.abspath(f))
683
kinds[pos] = file_kind(fullpath)
685
if e.errno == errno.ENOENT:
686
raise errors.NoSuchFile(fullpath)
575
mutter("add file %s file_id:{%s} kind=%r" % (f, file_id, kind))
576
self._write_inventory(inv)
688
578
@needs_write_lock
689
def add_parent_tree_id(self, revision_id, allow_leftmost_as_ghost=False):
690
"""Add revision_id as a parent.
692
This is equivalent to retrieving the current list of parent ids
693
and setting the list to its value plus revision_id.
695
:param revision_id: The revision id to add to the parent list. It may
696
be a ghost revision as long as its not the first parent to be added,
697
or the allow_leftmost_as_ghost parameter is set True.
698
:param allow_leftmost_as_ghost: Allow the first parent to be a ghost.
700
parents = self.get_parent_ids() + [revision_id]
701
self.set_parent_ids(parents, allow_leftmost_as_ghost=len(parents) > 1
702
or allow_leftmost_as_ghost)
704
@needs_tree_write_lock
705
def add_parent_tree(self, parent_tuple, allow_leftmost_as_ghost=False):
706
"""Add revision_id, tree tuple as a parent.
708
This is equivalent to retrieving the current list of parent trees
709
and setting the list to its value plus parent_tuple. See also
710
add_parent_tree_id - if you only have a parent id available it will be
711
simpler to use that api. If you have the parent already available, using
712
this api is preferred.
714
:param parent_tuple: The (revision id, tree) to add to the parent list.
715
If the revision_id is a ghost, pass None for the tree.
716
:param allow_leftmost_as_ghost: Allow the first parent to be a ghost.
718
parent_ids = self.get_parent_ids() + [parent_tuple[0]]
719
if len(parent_ids) > 1:
720
# the leftmost may have already been a ghost, preserve that if it
722
allow_leftmost_as_ghost = True
723
self.set_parent_ids(parent_ids,
724
allow_leftmost_as_ghost=allow_leftmost_as_ghost)
726
@needs_tree_write_lock
727
579
def add_pending_merge(self, *revision_ids):
728
580
# TODO: Perhaps should check at this point that the
729
581
# history of the revision is actually present?
730
parents = self.get_parent_ids()
582
p = self.pending_merges()
732
584
for rev_id in revision_ids:
733
if rev_id in parents:
735
parents.append(rev_id)
738
self.set_parent_ids(parents, allow_leftmost_as_ghost=True)
740
def path_content_summary(self, path, _lstat=os.lstat,
741
_mapper=osutils.file_kind_from_stat_mode):
742
"""See Tree.path_content_summary."""
743
abspath = self.abspath(path)
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.
745
stat_result = _lstat(abspath)
600
merges_file = self._control_files.get_utf8('pending-merges')
746
601
except OSError, e:
747
if getattr(e, 'errno', None) == errno.ENOENT:
749
return ('missing', None, None, None)
750
# propagate other errors
752
kind = _mapper(stat_result.st_mode)
754
return self._file_content_summary(path, stat_result)
755
elif kind == 'directory':
756
# perhaps it looks like a plain directory, but it's really a
758
if self._directory_is_tree_reference(path):
759
kind = 'tree-reference'
760
return kind, None, None, None
761
elif kind == 'symlink':
762
target = osutils.readlink(abspath)
763
return ('symlink', None, None, target)
765
return (kind, None, None, None)
767
def _file_content_summary(self, path, stat_result):
768
size = stat_result.st_size
769
executable = self._is_executable_from_path_and_stat(path, stat_result)
770
# try for a stat cache lookup
771
return ('file', size, executable, self._sha_from_stat(
774
def _check_parents_for_ghosts(self, revision_ids, allow_leftmost_as_ghost):
775
"""Common ghost checking functionality from set_parent_*.
777
This checks that the left hand-parent exists if there are any
780
if len(revision_ids) > 0:
781
leftmost_id = revision_ids[0]
782
if (not allow_leftmost_as_ghost and not
783
self.branch.repository.has_revision(leftmost_id)):
784
raise errors.GhostRevisionUnusableHere(leftmost_id)
786
def _set_merges_from_parent_ids(self, parent_ids):
787
merges = parent_ids[1:]
788
self._transport.put_bytes('pending-merges', '\n'.join(merges),
789
mode=self.bzrdir._get_file_mode())
791
def _filter_parent_ids_by_ancestry(self, revision_ids):
792
"""Check that all merged revisions are proper 'heads'.
794
This will always return the first revision_id, and any merged revisions
797
if len(revision_ids) == 0:
799
graph = self.branch.repository.get_graph()
800
heads = graph.heads(revision_ids)
801
new_revision_ids = revision_ids[:1]
802
for revision_id in revision_ids[1:]:
803
if revision_id in heads and revision_id not in new_revision_ids:
804
new_revision_ids.append(revision_id)
805
if new_revision_ids != revision_ids:
806
trace.mutter('requested to set revision_ids = %s,'
807
' but filtered to %s', revision_ids, new_revision_ids)
808
return new_revision_ids
810
@needs_tree_write_lock
811
def set_parent_ids(self, revision_ids, allow_leftmost_as_ghost=False):
812
"""Set the parent ids to revision_ids.
814
See also set_parent_trees. This api will try to retrieve the tree data
815
for each element of revision_ids from the trees repository. If you have
816
tree data already available, it is more efficient to use
817
set_parent_trees rather than set_parent_ids. set_parent_ids is however
818
an easier API to use.
820
:param revision_ids: The revision_ids to set as the parent ids of this
821
working tree. Any of these may be ghosts.
823
self._check_parents_for_ghosts(revision_ids,
824
allow_leftmost_as_ghost=allow_leftmost_as_ghost)
825
for revision_id in revision_ids:
826
_mod_revision.check_not_reserved_id(revision_id)
828
revision_ids = self._filter_parent_ids_by_ancestry(revision_ids)
830
if len(revision_ids) > 0:
831
self.set_last_revision(revision_ids[0])
833
self.set_last_revision(_mod_revision.NULL_REVISION)
835
self._set_merges_from_parent_ids(revision_ids)
837
@needs_tree_write_lock
838
def set_parent_trees(self, parents_list, allow_leftmost_as_ghost=False):
839
"""See MutableTree.set_parent_trees."""
840
parent_ids = [rev for (rev, tree) in parents_list]
841
for revision_id in parent_ids:
842
_mod_revision.check_not_reserved_id(revision_id)
844
self._check_parents_for_ghosts(parent_ids,
845
allow_leftmost_as_ghost=allow_leftmost_as_ghost)
847
parent_ids = self._filter_parent_ids_by_ancestry(parent_ids)
849
if len(parent_ids) == 0:
850
leftmost_parent_id = _mod_revision.NULL_REVISION
851
leftmost_parent_tree = None
853
leftmost_parent_id, leftmost_parent_tree = parents_list[0]
855
if self._change_last_revision(leftmost_parent_id):
856
if leftmost_parent_tree is None:
857
# If we don't have a tree, fall back to reading the
858
# parent tree from the repository.
859
self._cache_basis_inventory(leftmost_parent_id)
861
inv = leftmost_parent_tree.inventory
862
xml = self._create_basis_xml_from_inventory(
863
leftmost_parent_id, inv)
864
self._write_basis_inventory(xml)
865
self._set_merges_from_parent_ids(parent_ids)
867
@needs_tree_write_lock
602
if e.errno != errno.ENOENT:
606
for l in merges_file.readlines():
607
p.append(l.rstrip('\n'))
868
611
def set_pending_merges(self, rev_list):
869
parents = self.get_parent_ids()
870
leftmost = parents[:1]
871
new_parents = leftmost + rev_list
872
self.set_parent_ids(new_parents)
612
self._control_files.put_utf8('pending-merges', '\n'.join(rev_list))
874
@needs_tree_write_lock
875
615
def set_merge_modified(self, modified_hashes):
876
616
def iter_stanzas():
877
617
for file_id, hash in modified_hashes.iteritems():
878
yield Stanza(file_id=file_id.decode('utf8'), hash=hash)
618
yield Stanza(file_id=file_id, hash=hash)
879
619
self._put_rio('merge-hashes', iter_stanzas(), MERGE_MODIFIED_HEADER_1)
881
def _sha_from_stat(self, path, stat_result):
882
"""Get a sha digest from the tree's stat cache.
884
The default implementation assumes no stat cache is present.
886
:param path: The path.
887
:param stat_result: The stat result being looked up.
891
622
def _put_rio(self, filename, stanzas, header):
892
self._must_be_locked()
893
623
my_file = rio_file(stanzas, header)
894
self._transport.put_file(filename, my_file,
895
mode=self.bzrdir._get_file_mode())
897
@needs_write_lock # because merge pulls data into the branch.
898
def merge_from_branch(self, branch, to_revision=None, from_revision=None,
899
merge_type=None, force=False):
900
"""Merge from a branch into this working tree.
902
:param branch: The branch to merge from.
903
:param to_revision: If non-None, the merge will merge to to_revision,
904
but not beyond it. to_revision does not need to be in the history
905
of the branch when it is supplied. If None, to_revision defaults to
906
branch.last_revision().
908
from bzrlib.merge import Merger, Merge3Merger
909
pb = ui.ui_factory.nested_progress_bar()
911
merger = Merger(self.branch, this_tree=self, pb=pb)
912
merger.pp = ProgressPhase("Merge phase", 5, pb)
913
merger.pp.next_phase()
914
# check that there are no local alterations
915
if not force and self.has_changes():
916
raise errors.UncommittedChanges(self)
917
if to_revision is None:
918
to_revision = _mod_revision.ensure_null(branch.last_revision())
919
merger.other_rev_id = to_revision
920
if _mod_revision.is_null(merger.other_rev_id):
921
raise errors.NoCommits(branch)
922
self.branch.fetch(branch, last_revision=merger.other_rev_id)
923
merger.other_basis = merger.other_rev_id
924
merger.other_tree = self.branch.repository.revision_tree(
926
merger.other_branch = branch
927
merger.pp.next_phase()
928
if from_revision is None:
931
merger.set_base_revision(from_revision, branch)
932
if merger.base_rev_id == merger.other_rev_id:
933
raise errors.PointlessMerge
934
merger.backup_files = False
935
if merge_type is None:
936
merger.merge_type = Merge3Merger
938
merger.merge_type = merge_type
939
merger.set_interesting_files(None)
940
merger.show_base = False
941
merger.reprocess = False
942
conflicts = merger.do_merge()
624
self._control_files.put(filename, my_file)
949
627
def merge_modified(self):
950
"""Return a dictionary of files modified by a merge.
952
The list is initialized by WorkingTree.set_merge_modified, which is
953
typically called after we make some automatic updates to the tree
956
This returns a map of file_id->sha1, containing only files which are
957
still in the working inventory and have that text hash.
960
hashfile = self._transport.get('merge-hashes')
961
except errors.NoSuchFile:
629
hashfile = self._control_files.get('merge-hashes')
966
if hashfile.next() != MERGE_MODIFIED_HEADER_1 + '\n':
967
raise errors.MergeModifiedFormatError()
968
except StopIteration:
969
raise errors.MergeModifiedFormatError()
970
for s in RioReader(hashfile):
971
# RioReader reads in Unicode, so convert file_ids back to utf8
972
file_id = osutils.safe_file_id(s.get("file_id"), warn=False)
973
if file_id not in self.inventory:
975
text_hash = s.get("hash")
976
if text_hash == self.get_file_sha1(file_id):
977
merge_hashes[file_id] = text_hash
983
def mkdir(self, path, file_id=None):
984
"""See MutableTree.mkdir()."""
986
file_id = generate_ids.gen_file_id(os.path.basename(path))
987
os.mkdir(self.abspath(path))
988
self.add(path, file_id, 'directory')
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
991
647
def get_symlink_target(self, file_id):
992
abspath = self.id2abspath(file_id)
993
target = osutils.readlink(abspath)
997
def subsume(self, other_tree):
998
def add_children(inventory, entry):
999
for child_entry in entry.children.values():
1000
inventory._byid[child_entry.file_id] = child_entry
1001
if child_entry.kind == 'directory':
1002
add_children(inventory, child_entry)
1003
if other_tree.get_root_id() == self.get_root_id():
1004
raise errors.BadSubsumeSource(self, other_tree,
1005
'Trees have the same root')
1007
other_tree_path = self.relpath(other_tree.basedir)
1008
except errors.PathNotChild:
1009
raise errors.BadSubsumeSource(self, other_tree,
1010
'Tree is not contained by the other')
1011
new_root_parent = self.path2id(osutils.dirname(other_tree_path))
1012
if new_root_parent is None:
1013
raise errors.BadSubsumeSource(self, other_tree,
1014
'Parent directory is not versioned.')
1015
# We need to ensure that the result of a fetch will have a
1016
# versionedfile for the other_tree root, and only fetching into
1017
# RepositoryKnit2 guarantees that.
1018
if not self.branch.repository.supports_rich_root():
1019
raise errors.SubsumeTargetNeedsUpgrade(other_tree)
1020
other_tree.lock_tree_write()
1022
new_parents = other_tree.get_parent_ids()
1023
other_root = other_tree.inventory.root
1024
other_root.parent_id = new_root_parent
1025
other_root.name = osutils.basename(other_tree_path)
1026
self.inventory.add(other_root)
1027
add_children(self.inventory, other_root)
1028
self._write_inventory(self.inventory)
1029
# normally we don't want to fetch whole repositories, but i think
1030
# here we really do want to consolidate the whole thing.
1031
for parent_id in other_tree.get_parent_ids():
1032
self.branch.fetch(other_tree.branch, parent_id)
1033
self.add_parent_tree_id(parent_id)
1036
other_tree.bzrdir.retire_bzrdir()
1038
def _setup_directory_is_tree_reference(self):
1039
if self._branch.repository._format.supports_tree_reference:
1040
self._directory_is_tree_reference = \
1041
self._directory_may_be_tree_reference
1043
self._directory_is_tree_reference = \
1044
self._directory_is_never_tree_reference
1046
def _directory_is_never_tree_reference(self, relpath):
1049
def _directory_may_be_tree_reference(self, relpath):
1050
# as a special case, if a directory contains control files then
1051
# it's a tree reference, except that the root of the tree is not
1052
return relpath and osutils.isdir(self.abspath(relpath) + u"/.bzr")
1053
# TODO: We could ask all the control formats whether they
1054
# recognize this directory, but at the moment there's no cheap api
1055
# to do that. Since we probably can only nest bzr checkouts and
1056
# they always use this name it's ok for now. -- mbp 20060306
1058
# FIXME: There is an unhandled case here of a subdirectory
1059
# containing .bzr but not a branch; that will probably blow up
1060
# when you try to commit it. It might happen if there is a
1061
# checkout in a subdirectory. This can be avoided by not adding
1064
@needs_tree_write_lock
1065
def extract(self, file_id, format=None):
1066
"""Extract a subtree from this tree.
1068
A new branch will be created, relative to the path for this tree.
1072
segments = osutils.splitpath(path)
1073
transport = self.branch.bzrdir.root_transport
1074
for name in segments:
1075
transport = transport.clone(name)
1076
transport.ensure_base()
1079
sub_path = self.id2path(file_id)
1080
branch_transport = mkdirs(sub_path)
1082
format = self.bzrdir.cloning_metadir()
1083
branch_transport.ensure_base()
1084
branch_bzrdir = format.initialize_on_transport(branch_transport)
1086
repo = branch_bzrdir.find_repository()
1087
except errors.NoRepositoryPresent:
1088
repo = branch_bzrdir.create_repository()
1089
if not repo.supports_rich_root():
1090
raise errors.RootNotRich()
1091
new_branch = branch_bzrdir.create_branch()
1092
new_branch.pull(self.branch)
1093
for parent_id in self.get_parent_ids():
1094
new_branch.fetch(self.branch, parent_id)
1095
tree_transport = self.bzrdir.root_transport.clone(sub_path)
1096
if tree_transport.base != branch_transport.base:
1097
tree_bzrdir = format.initialize_on_transport(tree_transport)
1098
branch.BranchReferenceFormat().initialize(tree_bzrdir, new_branch)
1100
tree_bzrdir = branch_bzrdir
1101
wt = tree_bzrdir.create_workingtree(_mod_revision.NULL_REVISION)
1102
wt.set_parent_ids(self.get_parent_ids())
1103
my_inv = self.inventory
1104
child_inv = inventory.Inventory(root_id=None)
1105
new_root = my_inv[file_id]
1106
my_inv.remove_recursive_id(file_id)
1107
new_root.parent_id = None
1108
child_inv.add(new_root)
1109
self._write_inventory(my_inv)
1110
wt._write_inventory(child_inv)
1113
def _serialize(self, inventory, out_file):
1114
xml5.serializer_v5.write_inventory(self._inventory, out_file,
1117
def _deserialize(selt, in_file):
1118
return xml5.serializer_v5.read_inventory(in_file)
1121
"""Write the in memory inventory to disk."""
1122
# TODO: Maybe this should only write on dirty ?
1123
if self._control_files._lock_mode != 'w':
1124
raise errors.NotWriteLocked(self)
1126
self._serialize(self._inventory, sio)
1128
self._transport.put_file('inventory', sio,
1129
mode=self.bzrdir._get_file_mode())
1130
self._inventory_is_modified = False
1132
def _kind(self, relpath):
1133
return osutils.file_kind(self.abspath(relpath))
1135
def list_files(self, include_root=False, from_dir=None, recursive=True):
1136
"""List all files as (path, class, kind, id, entry).
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).
1138
661
Lists, but does not descend into unversioned directories.
1139
663
This does not include files that have been deleted in this
1140
tree. Skips the control directory.
1142
:param include_root: if True, do not return an entry for the root
1143
:param from_dir: start from this directory or None for the root
1144
:param recursive: whether to recurse into subdirectories or not
666
Skips the control directory.
1146
# list_files is an iterator, so @needs_read_lock doesn't work properly
1147
# with it. So callers should be careful to always read_lock the tree.
1148
if not self.is_locked():
1149
raise errors.ObjectNotLocked(self)
1151
inv = self.inventory
1152
if from_dir is None and include_root is True:
1153
yield ('', 'V', 'directory', inv.root.file_id, inv.root)
1154
# Convert these into local objects to save lookup times
1155
pathjoin = osutils.pathjoin
1156
file_kind = self._kind
1158
# transport.base ends in a slash, we want the piece
1159
# between the last two slashes
1160
transport_base_dir = self.bzrdir.transport.base.rsplit('/', 2)[1]
1162
fk_entries = {'directory':TreeDirectory, 'file':TreeFile, 'symlink':TreeLink}
1164
# directory file_id, relative path, absolute path, reverse sorted children
1165
if from_dir is not None:
1166
from_dir_id = inv.path2id(from_dir)
1167
if from_dir_id is None:
1168
# Directory not versioned
1170
from_dir_abspath = pathjoin(self.basedir, from_dir)
1172
from_dir_id = inv.root.file_id
1173
from_dir_abspath = self.basedir
1174
children = os.listdir(from_dir_abspath)
1176
# jam 20060527 The kernel sized tree seems equivalent whether we
1177
# use a deque and popleft to keep them sorted, or if we use a plain
1178
# list and just reverse() them.
1179
children = collections.deque(children)
1180
stack = [(from_dir_id, u'', from_dir_abspath, children)]
1182
from_dir_id, from_dir_relpath, from_dir_abspath, children = stack[-1]
1185
f = children.popleft()
668
inv = self._inventory
670
def descend(from_dir_relpath, from_dir_id, dp):
1186
674
## TODO: If we find a subdirectory with its own .bzr
1187
675
## directory, then that is a separate tree and we
1188
676
## should exclude it.
1190
678
# the bzrdir for this tree
1191
if transport_base_dir == f:
679
if self.bzrdir.transport.base.endswith(f + '/'):
1194
# we know that from_dir_relpath and from_dir_abspath never end in a slash
1195
# and 'f' doesn't begin with one, we can do a string op, rather
1196
# than the checks of pathjoin(), all relative paths will have an extra slash
1198
fp = from_dir_relpath + '/' + f
683
fp = appendpath(from_dir_relpath, f)
1201
fap = from_dir_abspath + '/' + f
686
fap = appendpath(dp, f)
1203
688
f_ie = inv.get_child(from_dir_id, f)
1206
elif self.is_ignored(fp[1:]):
691
elif self.is_ignored(fp):
1209
# we may not have found this file, because of a unicode issue
1210
f_norm, can_access = osutils.normalized_filename(f)
1211
if f == f_norm or not can_access:
1212
# No change, so treat this file normally
1215
# this file can be accessed by a normalized path
1216
# check again if it is versioned
1217
# these lines are repeated here for performance
1219
fp = from_dir_relpath + '/' + f
1220
fap = from_dir_abspath + '/' + f
1221
f_ie = inv.get_child(from_dir_id, f)
1224
elif self.is_ignored(fp[1:]):
1229
696
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))
1231
704
# make a last minute entry
1233
yield fp[1:], c, fk, f_ie.file_id, f_ie
1236
yield fp[1:], c, fk, None, fk_entries[fk]()
1238
yield fp[1:], c, fk, None, TreeEntry()
708
if fk == 'directory':
709
entry = TreeDirectory()
712
elif fk == 'symlink':
717
yield fp, c, fk, (f_ie and f_ie.file_id), entry
1241
719
if fk != 'directory':
1244
# But do this child first if recursing down
1246
new_children = os.listdir(fap)
1248
new_children = collections.deque(new_children)
1249
stack.append((f_ie.file_id, fp, fap, new_children))
1250
# Break out of inner loop,
1251
# so that we start outer loop with child
1254
# if we finished all children, pop it off the stack
1257
@needs_tree_write_lock
1258
def move(self, from_paths, to_dir=None, after=False, **kwargs):
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):
1259
734
"""Rename files.
1261
to_dir must exist in the inventory.
1263
If to_dir exists and is a directory, the files are moved into
1264
it, keeping their old names.
1266
Note that to_dir is only the last component of the new name;
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;
1267
742
this doesn't change the directory.
1269
For each entry in from_paths the move mode will be determined
1272
The first mode moves the file in the filesystem and updates the
1273
inventory. The second mode only updates the inventory without
1274
touching the file on the filesystem. This is the new mode introduced
1277
move uses the second mode if 'after == True' and the target is not
1278
versioned but present in the working tree.
1280
move uses the second mode if 'after == False' and the source is
1281
versioned but no longer in the working tree, and the target is not
1282
versioned but present in the working tree.
1284
move uses the first mode if 'after == False' and the source is
1285
versioned and present in the working tree, and the target is not
1286
versioned and not present in the working tree.
1288
Everything else results in an error.
1290
744
This returns a list of (from_path, to_path) pairs for each
1291
745
entry that is moved.
1296
# check for deprecated use of signature
1298
to_dir = kwargs.get('to_name', None)
1300
raise TypeError('You must supply a target directory')
1302
symbol_versioning.warn('The parameter to_name was deprecated'
1303
' in version 0.13. Use to_dir instead',
1306
# check destination directory
1307
if isinstance(from_paths, basestring):
748
## TODO: Option to move IDs only
749
assert not isinstance(from_paths, basestring)
1309
750
inv = self.inventory
1310
to_abs = self.abspath(to_dir)
751
to_abs = self.abspath(to_name)
1311
752
if not isdir(to_abs):
1312
raise errors.BzrMoveFailedError('',to_dir,
1313
errors.NotADirectory(to_abs))
1314
if not self.has_filename(to_dir):
1315
raise errors.BzrMoveFailedError('',to_dir,
1316
errors.NotInWorkingDirectory(to_dir))
1317
to_dir_id = inv.path2id(to_dir)
1318
if to_dir_id is None:
1319
raise errors.BzrMoveFailedError('',to_dir,
1320
errors.NotVersionedError(path=str(to_dir)))
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)
1322
759
to_dir_ie = inv[to_dir_id]
1323
if to_dir_ie.kind != 'directory':
1324
raise errors.BzrMoveFailedError('',to_dir,
1325
errors.NotADirectory(to_abs))
1327
# create rename entries and tuples
1328
for from_rel in from_paths:
1329
from_tail = splitpath(from_rel)[-1]
1330
from_id = inv.path2id(from_rel)
1332
raise errors.BzrMoveFailedError(from_rel,to_dir,
1333
errors.NotVersionedError(path=str(from_rel)))
1335
from_entry = inv[from_id]
1336
from_parent_id = from_entry.parent_id
1337
to_rel = pathjoin(to_dir, from_tail)
1338
rename_entry = WorkingTree._RenameEntry(from_rel=from_rel,
1340
from_tail=from_tail,
1341
from_parent_id=from_parent_id,
1342
to_rel=to_rel, to_tail=from_tail,
1343
to_parent_id=to_dir_id)
1344
rename_entries.append(rename_entry)
1345
rename_tuples.append((from_rel, to_rel))
1347
# determine which move mode to use. checks also for movability
1348
rename_entries = self._determine_mv_mode(rename_entries, after)
1350
original_modified = self._inventory_is_modified
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)
1353
self._inventory_is_modified = True
1354
self._move(rename_entries)
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"])
1356
795
# restore the inventory on error
1357
self._inventory_is_modified = original_modified
796
self._set_inventory(orig_inv)
1359
798
self._write_inventory(inv)
1360
return rename_tuples
1362
def _determine_mv_mode(self, rename_entries, after=False):
1363
"""Determines for each from-to pair if both inventory and working tree
1364
or only the inventory has to be changed.
1366
Also does basic plausability tests.
1368
inv = self.inventory
1370
for rename_entry in rename_entries:
1371
# store to local variables for easier reference
1372
from_rel = rename_entry.from_rel
1373
from_id = rename_entry.from_id
1374
to_rel = rename_entry.to_rel
1375
to_id = inv.path2id(to_rel)
1376
only_change_inv = False
1378
# check the inventory for source and destination
1380
raise errors.BzrMoveFailedError(from_rel,to_rel,
1381
errors.NotVersionedError(path=str(from_rel)))
1382
if to_id is not None:
1383
raise errors.BzrMoveFailedError(from_rel,to_rel,
1384
errors.AlreadyVersionedError(path=str(to_rel)))
1386
# try to determine the mode for rename (only change inv or change
1387
# inv and file system)
1389
if not self.has_filename(to_rel):
1390
raise errors.BzrMoveFailedError(from_id,to_rel,
1391
errors.NoSuchFile(path=str(to_rel),
1392
extra="New file has not been created yet"))
1393
only_change_inv = True
1394
elif not self.has_filename(from_rel) and self.has_filename(to_rel):
1395
only_change_inv = True
1396
elif self.has_filename(from_rel) and not self.has_filename(to_rel):
1397
only_change_inv = False
1398
elif (not self.case_sensitive
1399
and from_rel.lower() == to_rel.lower()
1400
and self.has_filename(from_rel)):
1401
only_change_inv = False
1403
# something is wrong, so lets determine what exactly
1404
if not self.has_filename(from_rel) and \
1405
not self.has_filename(to_rel):
1406
raise errors.BzrRenameFailedError(from_rel,to_rel,
1407
errors.PathsDoNotExist(paths=(str(from_rel),
1410
raise errors.RenameFailedFilesExist(from_rel, to_rel)
1411
rename_entry.only_change_inv = only_change_inv
1412
return rename_entries
1414
def _move(self, rename_entries):
1415
"""Moves a list of files.
1417
Depending on the value of the flag 'only_change_inv', the
1418
file will be moved on the file system or not.
1420
inv = self.inventory
1423
for entry in rename_entries:
1425
self._move_entry(entry)
1427
self._rollback_move(moved)
1431
def _rollback_move(self, moved):
1432
"""Try to rollback a previous move in case of an filesystem error."""
1433
inv = self.inventory
1436
self._move_entry(WorkingTree._RenameEntry(
1437
entry.to_rel, entry.from_id,
1438
entry.to_tail, entry.to_parent_id, entry.from_rel,
1439
entry.from_tail, entry.from_parent_id,
1440
entry.only_change_inv))
1441
except errors.BzrMoveFailedError, e:
1442
raise errors.BzrMoveFailedError( '', '', "Rollback failed."
1443
" The working tree is in an inconsistent state."
1444
" Please consider doing a 'bzr revert'."
1445
" Error message is: %s" % e)
1447
def _move_entry(self, entry):
1448
inv = self.inventory
1449
from_rel_abs = self.abspath(entry.from_rel)
1450
to_rel_abs = self.abspath(entry.to_rel)
1451
if from_rel_abs == to_rel_abs:
1452
raise errors.BzrMoveFailedError(entry.from_rel, entry.to_rel,
1453
"Source and target are identical.")
1455
if not entry.only_change_inv:
1457
osutils.rename(from_rel_abs, to_rel_abs)
1459
raise errors.BzrMoveFailedError(entry.from_rel,
1461
inv.rename(entry.from_id, entry.to_parent_id, entry.to_tail)
1463
@needs_tree_write_lock
1464
def rename_one(self, from_rel, to_rel, after=False):
802
def rename_one(self, from_rel, to_rel):
1465
803
"""Rename one file.
1467
805
This can change the directory or the filename or both.
1469
rename_one has several 'modes' to work. First, it can rename a physical
1470
file and change the file_id. That is the normal mode. Second, it can
1471
only change the file_id without touching any physical file. This is
1472
the new mode introduced in version 0.15.
1474
rename_one uses the second mode if 'after == True' and 'to_rel' is not
1475
versioned but present in the working tree.
1477
rename_one uses the second mode if 'after == False' and 'from_rel' is
1478
versioned but no longer in the working tree, and 'to_rel' is not
1479
versioned but present in the working tree.
1481
rename_one uses the first mode if 'after == False' and 'from_rel' is
1482
versioned and present in the working tree, and 'to_rel' is not
1483
versioned and not present in the working tree.
1485
Everything else results in an error.
1487
807
inv = self.inventory
1490
# create rename entries and tuples
1491
from_tail = splitpath(from_rel)[-1]
1492
from_id = inv.path2id(from_rel)
1494
# if file is missing in the inventory maybe it's in the basis_tree
1495
basis_tree = self.branch.basis_tree()
1496
from_id = basis_tree.path2id(from_rel)
1498
raise errors.BzrRenameFailedError(from_rel,to_rel,
1499
errors.NotVersionedError(path=str(from_rel)))
1500
# put entry back in the inventory so we can rename it
1501
from_entry = basis_tree.inventory[from_id].copy()
1504
from_entry = inv[from_id]
1505
from_parent_id = from_entry.parent_id
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)
1506
824
to_dir, to_tail = os.path.split(to_rel)
1507
825
to_dir_id = inv.path2id(to_dir)
1508
rename_entry = WorkingTree._RenameEntry(from_rel=from_rel,
1510
from_tail=from_tail,
1511
from_parent_id=from_parent_id,
1512
to_rel=to_rel, to_tail=to_tail,
1513
to_parent_id=to_dir_id)
1514
rename_entries.append(rename_entry)
1516
# determine which move mode to use. checks also for movability
1517
rename_entries = self._determine_mv_mode(rename_entries, after)
1519
# check if the target changed directory and if the target directory is
1521
if to_dir_id is None:
1522
raise errors.BzrMoveFailedError(from_rel,to_rel,
1523
errors.NotVersionedError(path=str(to_dir)))
1525
# all checks done. now we can continue with our actual work
1526
mutter('rename_one:\n'
1531
' to_dir_id {%s}\n',
1532
from_id, from_rel, to_rel, to_dir, to_dir_id)
1534
self._move(rename_entries)
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"])
1535
847
self._write_inventory(inv)
1537
class _RenameEntry(object):
1538
def __init__(self, from_rel, from_id, from_tail, from_parent_id,
1539
to_rel, to_tail, to_parent_id, only_change_inv=False):
1540
self.from_rel = from_rel
1541
self.from_id = from_id
1542
self.from_tail = from_tail
1543
self.from_parent_id = from_parent_id
1544
self.to_rel = to_rel
1545
self.to_tail = to_tail
1546
self.to_parent_id = to_parent_id
1547
self.only_change_inv = only_change_inv
1549
849
@needs_read_lock
1550
850
def unknowns(self):
1551
851
"""Return all unknown files.
1553
853
These are files in the working directory that are not versioned or
1554
854
control files or ignored.
1556
# force the extras method to be fully executed before returning, to
1557
# prevent race conditions with the lock
1559
[subp for subp in self.extras() if not self.is_ignored(subp)])
1561
@needs_tree_write_lock
1562
def unversion(self, file_ids):
1563
"""Remove the file ids in file_ids from the current versioned set.
1565
When a file_id is unversioned, all of its children are automatically
1568
:param file_ids: The file ids to stop versioning.
1569
:raises: NoSuchId if any fileid is not currently versioned.
1571
for file_id in file_ids:
1572
if file_id not in self._inventory:
1573
raise errors.NoSuchId(self, file_id)
1574
for file_id in file_ids:
1575
if self._inventory.has_id(file_id):
1576
self._inventory.remove_recursive_id(file_id)
1578
# in the future this should just set a dirty bit to wait for the
1579
# final unlock. However, until all methods of workingtree start
1580
# with the current in -memory inventory rather than triggering
1581
# a read, it is more complex - we need to teach read_inventory
1582
# to know when to read, and when to not read first... and possibly
1583
# to save first when the in memory one may be corrupted.
1584
# so for now, we just only write it if it is indeed dirty.
1586
self._write_inventory(self._inventory)
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()
1588
879
def _iter_conflicts(self):
1589
880
conflicted = set()
1590
for info in self.list_files():
881
for path in (s[0] for s in self.list_files()):
1592
882
stem = get_conflicted_stem(path)
1593
883
if stem is None:
1853
1053
def _change_last_revision(self, new_revision):
1854
1054
"""Template method part of set_last_revision to perform the change.
1856
1056
This is used to allow WorkingTree3 instances to not affect branch
1857
1057
when their last revision is set.
1859
if _mod_revision.is_null(new_revision):
1059
if new_revision is None:
1860
1060
self.branch.set_revision_history([])
1062
# current format is locked in with the branch
1063
revision_history = self.branch.revision_history()
1863
self.branch.generate_revision_history(new_revision)
1864
except errors.NoSuchRevision:
1865
# not present in the repo - dont try to set it deeper than the tip
1866
self.branch.set_revision_history([new_revision])
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])
1869
def _write_basis_inventory(self, xml):
1870
"""Write the basis inventory XML to the basis-inventory file"""
1871
path = self._basis_inventory_name()
1873
self._transport.put_file(path, sio,
1874
mode=self.bzrdir._get_file_mode())
1876
def _create_basis_xml_from_inventory(self, revision_id, inventory):
1877
"""Create the text that will be saved in basis-inventory"""
1878
inventory.revision_id = revision_id
1879
return xml7.serializer_v7.write_inventory_to_string(inventory)
1881
1071
def _cache_basis_inventory(self, new_revision):
1882
1072
"""Cache new_revision as the basis inventory."""
1883
# TODO: this should allow the ready-to-use inventory to be passed in,
1884
# as commit already has that ready-to-use [while the format is the
1887
# this double handles the inventory - unpack and repack -
1074
# this double handles the inventory - unpack and repack -
1888
1075
# but is easier to understand. We can/should put a conditional
1889
1076
# in here based on whether the inventory is in the latest format
1890
1077
# - perhaps we should repack all inventories on a repository
1892
# the fast path is to copy the raw xml from the repository. If the
1893
# xml contains 'revision_id="', then we assume the right
1894
# revision_id is set. We must check for this full string, because a
1895
# root node id can legitimately look like 'revision_id' but cannot
1897
xml = self.branch.repository.get_inventory_xml(new_revision)
1898
firstline = xml.split('\n', 1)[0]
1899
if (not 'revision_id="' in firstline or
1900
'format="7"' not in firstline):
1901
inv = self.branch.repository._serializer.read_inventory_from_string(
1903
xml = self._create_basis_xml_from_inventory(new_revision, inv)
1904
self._write_basis_inventory(xml)
1905
except (errors.NoSuchRevision, errors.RevisionNotPresent):
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:
1908
1088
def read_basis_inventory(self):
1909
1089
"""Read the cached basis inventory."""
1910
1090
path = self._basis_inventory_name()
1911
return self._transport.get_bytes(path)
1091
return self._control_files.get_utf8(path).read()
1913
1093
@needs_read_lock
1914
1094
def read_working_inventory(self):
1915
"""Read the working inventory.
1917
:raises errors.InventoryModified: read_working_inventory will fail
1918
when the current in memory inventory has been modified.
1920
# conceptually this should be an implementation detail of the tree.
1921
# XXX: Deprecate this.
1095
"""Read the working inventory."""
1922
1096
# ElementTree does its own conversion from UTF-8, so open in
1924
if self._inventory_is_modified:
1925
raise errors.InventoryModified(self)
1926
result = self._deserialize(self._transport.get('inventory'))
1927
self._set_inventory(result, dirty=False)
1098
result = bzrlib.xml5.serializer_v5.read_inventory(
1099
self._control_files.get('inventory'))
1100
self._set_inventory(result)
1930
@needs_tree_write_lock
1931
def remove(self, files, verbose=False, to_file=None, keep_files=True,
1933
"""Remove nominated files from the working inventory.
1935
:files: File paths relative to the basedir.
1936
:keep_files: If true, the files will also be kept.
1937
:force: Delete files and directories, even if they are changed and
1938
even if the directories are not empty.
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.
1118
## TODO: Normalize names
1119
## TODO: Remove nested loops; better scalability
1940
1120
if isinstance(files, basestring):
1941
1121
files = [files]
1946
unknown_nested_files=set()
1948
def recurse_directory_to_add_files(directory):
1949
# Recurse directory and add all files
1950
# so we can check if they have changed.
1951
for parent_info, file_infos in\
1952
self.walkdirs(directory):
1953
for relpath, basename, kind, lstat, fileid, kind in file_infos:
1954
# Is it versioned or ignored?
1955
if self.path2id(relpath) or self.is_ignored(relpath):
1956
# Add nested content for deletion.
1957
new_files.add(relpath)
1959
# Files which are not versioned and not ignored
1960
# should be treated as unknown.
1961
unknown_nested_files.add((relpath, None, kind))
1963
for filename in files:
1964
# Get file name into canonical form.
1965
abspath = self.abspath(filename)
1966
filename = self.relpath(abspath)
1967
if len(filename) > 0:
1968
new_files.add(filename)
1969
recurse_directory_to_add_files(filename)
1971
files = list(new_files)
1974
return # nothing to do
1976
# Sort needed to first handle directory content before the directory
1977
files.sort(reverse=True)
1979
# Bail out if we are going to delete files we shouldn't
1980
if not keep_files and not force:
1981
has_changed_files = len(unknown_nested_files) > 0
1982
if not has_changed_files:
1983
for (file_id, path, content_change, versioned, parent_id, name,
1984
kind, executable) in self.iter_changes(self.basis_tree(),
1985
include_unchanged=True, require_versioned=False,
1986
want_unversioned=True, specific_files=files):
1987
if versioned == (False, False):
1988
# The record is unknown ...
1989
if not self.is_ignored(path[1]):
1990
# ... but not ignored
1991
has_changed_files = True
1993
elif content_change and (kind[1] is not None):
1994
# Versioned and changed, but not deleted
1995
has_changed_files = True
1998
if has_changed_files:
1999
# Make delta show ALL applicable changes in error message.
2000
tree_delta = self.changes_from(self.basis_tree(),
2001
require_versioned=False, want_unversioned=True,
2002
specific_files=files)
2003
for unknown_file in unknown_nested_files:
2004
if unknown_file not in tree_delta.unversioned:
2005
tree_delta.unversioned.extend((unknown_file,))
2006
raise errors.BzrRemoveChangedFilesError(tree_delta)
2008
# Build inv_delta and delete files where applicable,
2009
# do this before any modifications to inventory.
1123
inv = self.inventory
1125
# do this before any modifications
2010
1126
for f in files:
2011
fid = self.path2id(f)
1127
fid = inv.path2id(f)
2014
message = "%s is not versioned." % (f,)
2017
# having removed it, it must be either ignored or unknown
2018
if self.is_ignored(f):
2022
textui.show_status(new_status, self.kind(fid), f,
2025
inv_delta.append((f, None, fid, None))
2026
message = "removed %s" % (f,)
2029
abs_path = self.abspath(f)
2030
if osutils.lexists(abs_path):
2031
if (osutils.isdir(abs_path) and
2032
len(os.listdir(abs_path)) > 0):
2034
osutils.rmtree(abs_path)
2036
message = "%s is not an empty directory "\
2037
"and won't be deleted." % (f,)
2039
osutils.delete_any(abs_path)
2040
message = "deleted %s" % (f,)
2041
elif message is not None:
2042
# Only care if we haven't done anything yet.
2043
message = "%s does not exist." % (f,)
2045
# Print only one message (if any) per file.
2046
if message is not None:
2048
self.apply_inventory_delta(inv_delta)
2050
@needs_tree_write_lock
2051
def revert(self, filenames=None, old_tree=None, backups=True,
2052
pb=DummyProgress(), report_changes=False):
2053
from bzrlib.conflicts import resolve
2056
symbol_versioning.warn('Using [] to revert all files is deprecated'
2057
' as of bzr 0.91. Please use None (the default) instead.',
2058
DeprecationWarning, stacklevel=2)
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
2059
1149
if old_tree is None:
2060
basis_tree = self.basis_tree()
2061
basis_tree.lock_read()
2062
old_tree = basis_tree
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([])
2066
conflicts = transform.revert(self, old_tree, filenames, backups, pb,
2068
if filenames is None and len(self.get_parent_ids()) > 1:
2070
last_revision = self.last_revision()
2071
if last_revision != _mod_revision.NULL_REVISION:
2072
if basis_tree is None:
2073
basis_tree = self.basis_tree()
2074
basis_tree.lock_read()
2075
parent_trees.append((last_revision, basis_tree))
2076
self.set_parent_trees(parent_trees)
2079
resolve(self, filenames, ignore_misses=True, recursive=True)
2081
if basis_tree is not None:
1156
resolve(self, filenames, ignore_misses=True)
2083
1157
return conflicts
2085
def revision_tree(self, revision_id):
2086
"""See Tree.revision_tree.
2088
WorkingTree can supply revision_trees for the basis revision only
2089
because there is only one cached inventory in the bzr directory.
2091
if revision_id == self.last_revision():
2093
xml = self.read_basis_inventory()
2094
except errors.NoSuchFile:
2098
inv = xml7.serializer_v7.read_inventory_from_string(xml)
2099
# dont use the repository revision_tree api because we want
2100
# to supply the inventory.
2101
if inv.revision_id == revision_id:
2102
return revisiontree.RevisionTree(self.branch.repository,
2104
except errors.BadInventoryFormat:
2106
# raise if there was no inventory, or if we read the wrong inventory.
2107
raise errors.NoSuchRevisionInTree(self, revision_id)
2109
1159
# XXX: This method should be deprecated in favour of taking in a proper
2110
1160
# new Inventory object.
2111
@needs_tree_write_lock
2112
1162
def set_inventory(self, new_inventory_list):
2113
1163
from bzrlib.inventory import (Inventory,
2114
1164
InventoryDirectory,
2117
1168
inv = Inventory(self.get_root_id())
2127
1178
elif kind == 'symlink':
2128
1179
inv.add(InventoryLink(file_id, name, parent))
2130
raise errors.BzrError("unknown kind %r" % kind)
1181
raise BzrError("unknown kind %r" % kind)
2131
1182
self._write_inventory(inv)
2133
@needs_tree_write_lock
2134
1185
def set_root_id(self, file_id):
2135
1186
"""Set the root id for this tree."""
2139
'WorkingTree.set_root_id with fileid=None')
2140
file_id = osutils.safe_file_id(file_id)
2141
self._set_root_id(file_id)
2143
def _set_root_id(self, file_id):
2144
"""Set the root id for this tree, in a format specific manner.
2146
:param file_id: The file id to assign to the root. It must not be
2147
present in the current inventory or an error will occur. It must
2148
not be None, but rather a valid file id.
2150
inv = self._inventory
1187
inv = self.read_working_inventory()
2151
1188
orig_root_id = inv.root.file_id
2152
# TODO: it might be nice to exit early if there was nothing
2153
# to do, saving us from trigger a sync on unlock.
2154
self._inventory_is_modified = True
2155
# we preserve the root inventory entry object, but
2156
# unlinkit from the byid index
2157
1189
del inv._byid[inv.root.file_id]
2158
1190
inv.root.file_id = file_id
2159
# and link it into the index with the new changed id.
2160
1191
inv._byid[inv.root.file_id] = inv.root
2161
# and finally update all children to reference the new id.
2162
# XXX: this should be safe to just look at the root.children
2163
# list, not the WHOLE INVENTORY.
2164
1192
for fid in inv:
2165
1193
entry = inv[fid]
2166
1194
if entry.parent_id == orig_root_id:
2167
1195
entry.parent_id = inv.root.file_id
1196
self._write_inventory(inv)
2169
1198
def unlock(self):
2170
1199
"""See Branch.unlock.
2172
1201
WorkingTree locking just uses the Branch locking facilities.
2173
1202
This is current because all working trees have an embedded branch
2174
1203
within them. IF in the future, we were to make branch data shareable
2175
between multiple working trees, i.e. via shared storage, then we
1204
between multiple working trees, i.e. via shared storage, then we
2176
1205
would probably want to lock both the local tree, and the branch.
2178
raise NotImplementedError(self.unlock)
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()
2180
def update(self, change_reporter=None, possible_transports=None):
2181
1232
"""Update a working tree along its branch.
2183
This will update the branch if its bound too, which means we have
2184
multiple trees involved:
2186
- The new basis tree of the master.
2187
- The old basis tree of the branch.
2188
- The old basis tree of the working tree.
2189
- The current working tree state.
2191
Pathologically, all three may be different, and non-ancestors of each
2192
other. Conceptually we want to:
2194
- Preserve the wt.basis->wt.state changes
2195
- Transform the wt.basis to the new master basis.
2196
- Apply a merge of the old branch basis to get any 'local' changes from
2198
- Restore the wt.basis->wt.state changes.
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.
2200
1246
There isn't a single operation at the moment to do that, so we:
2201
- Merge current state -> basis tree of the master w.r.t. the old tree
2203
- Do a 'normal' merge of the old branch basis if it is relevant.
2205
if self.branch.get_bound_location() is not None:
2207
update_branch = True
2209
self.lock_tree_write()
2210
update_branch = False
2213
old_tip = self.branch.update(possible_transports)
2216
return self._update_tree(old_tip, change_reporter)
2220
@needs_tree_write_lock
2221
def _update_tree(self, old_tip=None, change_reporter=None):
2222
"""Update a tree to the master branch.
2224
:param old_tip: if supplied, the previous tip revision the branch,
2225
before it was changed to the master branch's tip.
2227
# here if old_tip is not None, it is the old tip of the branch before
2228
# it was updated from the master branch. This should become a pending
2229
# merge in the working tree to preserve the user existing work. we
2230
# cant set that until we update the working trees last revision to be
2231
# one from the new branch, because it will just get absorbed by the
2232
# parent de-duplication logic.
2234
# We MUST save it even if an error occurs, because otherwise the users
2235
# local work is unreferenced and will appear to have been lost.
2239
last_rev = self.get_parent_ids()[0]
2241
last_rev = _mod_revision.NULL_REVISION
2242
if last_rev != _mod_revision.ensure_null(self.branch.last_revision()):
2243
# merge tree state up to new branch tip.
2244
basis = self.basis_tree()
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.
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()
1256
if self.last_revision() != self.branch.last_revision():
1257
# merge tree state up to new branch tip.
1258
basis = self.basis_tree()
2247
1259
to_tree = self.branch.basis_tree()
2248
if basis.inventory.root is None:
2249
self.set_root_id(to_tree.get_root_id())
2251
result += merge.merge_inner(
1260
result += merge_inner(self.branch,
2256
change_reporter=change_reporter)
2259
# TODO - dedup parents list with things merged by pull ?
2260
# reuse the tree we've updated to to set the basis:
2261
parent_trees = [(self.branch.last_revision(), to_tree)]
2262
merges = self.get_parent_ids()[1:]
2263
# Ideally we ask the tree for the trees here, that way the working
2264
# tree can decide whether to give us the entire tree or give us a
2265
# lazy initialised tree. dirstate for instance will have the trees
2266
# in ram already, whereas a last-revision + basis-inventory tree
2267
# will not, but also does not need them when setting parents.
2268
for parent in merges:
2269
parent_trees.append(
2270
(parent, self.branch.repository.revision_tree(parent)))
2271
if (old_tip is not None and not _mod_revision.is_null(old_tip)):
2272
parent_trees.append(
2273
(old_tip, self.branch.repository.revision_tree(old_tip)))
2274
self.set_parent_trees(parent_trees)
2275
last_rev = parent_trees[0][0]
2277
# the working tree had the same last-revision as the master
2278
# branch did. We may still have pivot local work from the local
2279
# branch into old_tip:
2280
if (old_tip is not None and not _mod_revision.is_null(old_tip)):
2281
self.add_parent_tree_id(old_tip)
2282
if (old_tip is not None and not _mod_revision.is_null(old_tip)
2283
and old_tip != last_rev):
2284
# our last revision was not the prior branch last revision
2285
# and we have converted that last revision to a pending merge.
2286
# base is somewhere between the branch tip now
2287
# and the now pending merge
2289
# Since we just modified the working tree and inventory, flush out
2290
# the current state, before we modify it again.
2291
# TODO: jam 20070214 WorkingTree3 doesn't require this, dirstate
2292
# requires it only because TreeTransform directly munges the
2293
# inventory and calls tree._write_inventory(). Ultimately we
2294
# should be able to remove this extra flush.
2296
graph = self.branch.repository.get_graph()
2297
base_rev_id = graph.find_unique_lca(self.branch.last_revision(),
2299
base_tree = self.branch.repository.revision_tree(base_rev_id)
2300
other_tree = self.branch.repository.revision_tree(old_tip)
2301
result += merge.merge_inner(
2306
change_reporter=change_reporter)
2309
def _write_hashcache_if_dirty(self):
2310
"""Write out the hashcache if it is dirty."""
2311
if self._hashcache.needs_write:
2313
self._hashcache.write()
2315
if e.errno not in (errno.EPERM, errno.EACCES):
2317
# TODO: jam 20061219 Should this be a warning? A single line
2318
# warning might be sufficient to let the user know what
2320
mutter('Could not write hashcache for %s\nError: %s',
2321
self._hashcache.cache_file_name(), e)
2323
@needs_tree_write_lock
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,
1285
self.branch.unlock()
2324
1288
def _write_inventory(self, inv):
2325
1289
"""Write inventory as the current inventory."""
2326
self._set_inventory(inv, dirty=True)
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')
2329
1297
def set_conflicts(self, arg):
2330
raise errors.UnsupportedOperation(self.set_conflicts, self)
2332
def add_conflicts(self, arg):
2333
raise errors.UnsupportedOperation(self.add_conflicts, self)
1298
raise UnsupportedOperation(self.set_conflicts, self)
2335
1300
@needs_read_lock
2336
1301
def conflicts(self):
2337
conflicts = _mod_conflicts.ConflictList()
1302
conflicts = ConflictList()
2338
1303
for conflicted in self._iter_conflicts():
2341
1306
if file_kind(self.abspath(conflicted)) != "file":
2343
except errors.NoSuchFile:
1309
if e.errno == errno.ENOENT:
2345
1313
if text is True:
2346
1314
for suffix in ('.THIS', '.OTHER'):
2348
1316
kind = file_kind(self.abspath(conflicted+suffix))
1318
if e.errno == errno.ENOENT:
2351
except errors.NoSuchFile:
2355
1326
ctype = {True: 'text conflict', False: 'contents conflict'}[text]
2356
conflicts.append(_mod_conflicts.Conflict.factory(ctype,
1327
conflicts.append(Conflict.factory(ctype, path=conflicted,
2358
1328
file_id=self.path2id(conflicted)))
2359
1329
return conflicts
2361
def walkdirs(self, prefix=""):
2362
"""Walk the directories of this tree.
2364
returns a generator which yields items in the form:
2365
((curren_directory_path, fileid),
2366
[(file1_path, file1_name, file1_kind, (lstat), file1_id,
2369
This API returns a generator, which is only valid during the current
2370
tree transaction - within a single lock_read or lock_write duration.
2372
If the tree is not locked, it may cause an error to be raised,
2373
depending on the tree implementation.
2375
disk_top = self.abspath(prefix)
2376
if disk_top.endswith('/'):
2377
disk_top = disk_top[:-1]
2378
top_strip_len = len(disk_top) + 1
2379
inventory_iterator = self._walkdirs(prefix)
2380
disk_iterator = osutils.walkdirs(disk_top, prefix)
2382
current_disk = disk_iterator.next()
2383
disk_finished = False
2385
if not (e.errno == errno.ENOENT or
2386
(sys.platform == 'win32' and e.errno == ERROR_PATH_NOT_FOUND)):
2389
disk_finished = True
2391
current_inv = inventory_iterator.next()
2392
inv_finished = False
2393
except StopIteration:
2396
while not inv_finished or not disk_finished:
2398
((cur_disk_dir_relpath, cur_disk_dir_path_from_top),
2399
cur_disk_dir_content) = current_disk
2401
((cur_disk_dir_relpath, cur_disk_dir_path_from_top),
2402
cur_disk_dir_content) = ((None, None), None)
2403
if not disk_finished:
2404
# strip out .bzr dirs
2405
if (cur_disk_dir_path_from_top[top_strip_len:] == '' and
2406
len(cur_disk_dir_content) > 0):
2407
# osutils.walkdirs can be made nicer -
2408
# yield the path-from-prefix rather than the pathjoined
2410
bzrdir_loc = bisect_left(cur_disk_dir_content,
2412
if (bzrdir_loc < len(cur_disk_dir_content)
2413
and self.bzrdir.is_control_filename(
2414
cur_disk_dir_content[bzrdir_loc][0])):
2415
# we dont yield the contents of, or, .bzr itself.
2416
del cur_disk_dir_content[bzrdir_loc]
2418
# everything is unknown
2421
# everything is missing
2424
direction = cmp(current_inv[0][0], cur_disk_dir_relpath)
2426
# disk is before inventory - unknown
2427
dirblock = [(relpath, basename, kind, stat, None, None) for
2428
relpath, basename, kind, stat, top_path in
2429
cur_disk_dir_content]
2430
yield (cur_disk_dir_relpath, None), dirblock
2432
current_disk = disk_iterator.next()
2433
except StopIteration:
2434
disk_finished = True
2436
# inventory is before disk - missing.
2437
dirblock = [(relpath, basename, 'unknown', None, fileid, kind)
2438
for relpath, basename, dkind, stat, fileid, kind in
2440
yield (current_inv[0][0], current_inv[0][1]), dirblock
2442
current_inv = inventory_iterator.next()
2443
except StopIteration:
2446
# versioned present directory
2447
# merge the inventory and disk data together
2449
for relpath, subiterator in itertools.groupby(sorted(
2450
current_inv[1] + cur_disk_dir_content,
2451
key=operator.itemgetter(0)), operator.itemgetter(1)):
2452
path_elements = list(subiterator)
2453
if len(path_elements) == 2:
2454
inv_row, disk_row = path_elements
2455
# versioned, present file
2456
dirblock.append((inv_row[0],
2457
inv_row[1], disk_row[2],
2458
disk_row[3], inv_row[4],
2460
elif len(path_elements[0]) == 5:
2462
dirblock.append((path_elements[0][0],
2463
path_elements[0][1], path_elements[0][2],
2464
path_elements[0][3], None, None))
2465
elif len(path_elements[0]) == 6:
2466
# versioned, absent file.
2467
dirblock.append((path_elements[0][0],
2468
path_elements[0][1], 'unknown', None,
2469
path_elements[0][4], path_elements[0][5]))
2471
raise NotImplementedError('unreachable code')
2472
yield current_inv[0], dirblock
2474
current_inv = inventory_iterator.next()
2475
except StopIteration:
2478
current_disk = disk_iterator.next()
2479
except StopIteration:
2480
disk_finished = True
2482
def _walkdirs(self, prefix=""):
2483
"""Walk the directories of this tree.
2485
:prefix: is used as the directrory to start with.
2486
returns a generator which yields items in the form:
2487
((curren_directory_path, fileid),
2488
[(file1_path, file1_name, file1_kind, None, file1_id,
2491
_directory = 'directory'
2492
# get the root in the inventory
2493
inv = self.inventory
2494
top_id = inv.path2id(prefix)
2498
pending = [(prefix, '', _directory, None, top_id, None)]
2501
currentdir = pending.pop()
2502
# 0 - relpath, 1- basename, 2- kind, 3- stat, 4-id, 5-kind
2503
top_id = currentdir[4]
2505
relroot = currentdir[0] + '/'
2508
# FIXME: stash the node in pending
2510
if entry.kind == 'directory':
2511
for name, child in entry.sorted_children():
2512
dirblock.append((relroot + name, name, child.kind, None,
2513
child.file_id, child.kind
2515
yield (currentdir[0], entry.file_id), dirblock
2516
# push the user specified dirs from dirblock
2517
for dir in reversed(dirblock):
2518
if dir[2] == _directory:
2521
@needs_tree_write_lock
2522
def auto_resolve(self):
2523
"""Automatically resolve text conflicts according to contents.
2525
Only text conflicts are auto_resolvable. Files with no conflict markers
2526
are considered 'resolved', because bzr always puts conflict markers
2527
into files that have text conflicts. The corresponding .THIS .BASE and
2528
.OTHER files are deleted, as per 'resolve'.
2529
:return: a tuple of ConflictLists: (un_resolved, resolved).
2531
un_resolved = _mod_conflicts.ConflictList()
2532
resolved = _mod_conflicts.ConflictList()
2533
conflict_re = re.compile('^(<{7}|={7}|>{7})')
2534
for conflict in self.conflicts():
2535
if (conflict.typestring != 'text conflict' or
2536
self.kind(conflict.file_id) != 'file'):
2537
un_resolved.append(conflict)
2539
my_file = open(self.id2abspath(conflict.file_id), 'rb')
2541
for line in my_file:
2542
if conflict_re.search(line):
2543
un_resolved.append(conflict)
2546
resolved.append(conflict)
2549
resolved.remove_files(self)
2550
self.set_conflicts(un_resolved)
2551
return un_resolved, resolved
2554
def _check(self, references):
2555
"""Check the tree for consistency.
2557
:param references: A dict with keys matching the items returned by
2558
self._get_check_refs(), and values from looking those keys up in
2561
tree_basis = self.basis_tree()
2562
tree_basis.lock_read()
2564
repo_basis = references[('trees', self.last_revision())]
2565
if len(list(repo_basis.iter_changes(tree_basis))) > 0:
2566
raise errors.BzrCheckError(
2567
"Mismatched basis inventory content.")
2572
def _validate(self):
2573
"""Validate internal structures.
2575
This is meant mostly for the test suite. To give it a chance to detect
2576
corruption after actions have occurred. The default implementation is a
2579
:return: None. An exception should be raised if there is an error.
2584
def _get_rules_searcher(self, default_searcher):
2585
"""See Tree._get_rules_searcher."""
2586
if self._rules_searcher is None:
2587
self._rules_searcher = super(WorkingTree,
2588
self)._get_rules_searcher(default_searcher)
2589
return self._rules_searcher
2591
def get_shelf_manager(self):
2592
"""Return the ShelfManager for this WorkingTree."""
2593
from bzrlib.shelf import ShelfManager
2594
return ShelfManager(self, self._transport)
2597
class WorkingTree2(WorkingTree):
2598
"""This is the Format 2 working tree.
2600
This was the first weave based working tree.
2601
- uses os locks for locking.
2602
- uses the branch last-revision.
2605
def __init__(self, *args, **kwargs):
2606
super(WorkingTree2, self).__init__(*args, **kwargs)
2607
# WorkingTree2 has more of a constraint that self._inventory must
2608
# exist. Because this is an older format, we don't mind the overhead
2609
# caused by the extra computation here.
2611
# Newer WorkingTree's should only have self._inventory set when they
2613
if self._inventory is None:
2614
self.read_working_inventory()
2616
def _get_check_refs(self):
2617
"""Return the references needed to perform a check of this tree."""
2618
return [('trees', self.last_revision())]
2620
def lock_tree_write(self):
2621
"""See WorkingTree.lock_tree_write().
2623
In Format2 WorkingTrees we have a single lock for the branch and tree
2624
so lock_tree_write() degrades to lock_write().
2626
self.branch.lock_write()
2628
return self._control_files.lock_write()
2630
self.branch.unlock()
2634
# do non-implementation specific cleanup
2637
# we share control files:
2638
if self._control_files._lock_count == 3:
2639
# _inventory_is_modified is always False during a read lock.
2640
if self._inventory_is_modified:
2642
self._write_hashcache_if_dirty()
2644
# reverse order of locking.
2646
return self._control_files.unlock()
2648
self.branch.unlock()
2651
1332
class WorkingTree3(WorkingTree):
2652
1333
"""This is the Format 3 working tree.
added
removed
bzrlib/workingtree.py
