342
380
inv = self._inventory
343
381
for path, ie in inv.iter_entries():
344
if bzrlib.osutils.lexists(self.abspath(path)):
382
if osutils.lexists(self.abspath(path)):
385
def all_file_ids(self):
386
"""See Tree.iter_all_file_ids"""
387
return set(self.inventory)
347
389
def __repr__(self):
348
390
return "<%s of %s>" % (self.__class__.__name__,
349
391
getattr(self, 'basedir', None))
351
393
def abspath(self, filename):
352
394
return pathjoin(self.basedir, filename)
354
396
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)
397
"""Return RevisionTree for the current last revision.
399
If the left most parent is a ghost then the returned tree will be an
400
empty tree - one obtained by calling
401
repository.revision_tree(NULL_REVISION).
404
revision_id = self.get_parent_ids()[0]
406
# no parents, return an empty revision tree.
407
# in the future this should return the tree for
408
# 'empty:' - the implicit root empty tree.
409
return self.branch.repository.revision_tree(
410
_mod_revision.NULL_REVISION)
412
return self.revision_tree(revision_id)
413
except errors.NoSuchRevision:
415
# No cached copy available, retrieve from the repository.
416
# FIXME? RBC 20060403 should we cache the inventory locally
419
return self.branch.repository.revision_tree(revision_id)
420
except (errors.RevisionNotPresent, errors.NoSuchRevision):
421
# the basis tree *may* be a ghost or a low level error may have
422
# occurred. If the revision is present, its a problem, if its not
424
if self.branch.repository.has_revision(revision_id):
426
# the basis tree is a ghost so return an empty tree.
427
return self.branch.repository.revision_tree(
428
_mod_revision.NULL_REVISION)
431
self._flush_ignore_list_cache()
433
def relpath(self, path):
434
"""Return the local path portion from a given path.
436
The path may be absolute or relative. If its a relative path it is
437
interpreted relative to the python current working directory.
439
return osutils.relpath(self.basedir, path)
411
441
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')
442
return osutils.lexists(self.abspath(filename))
444
def get_file(self, file_id, path=None, filtered=True):
445
return self.get_file_with_stat(file_id, path, filtered=filtered)[0]
447
def get_file_with_stat(self, file_id, path=None, filtered=True,
449
"""See Tree.get_file_with_stat."""
451
path = self.id2path(file_id)
452
file_obj = self.get_file_byname(path, filtered=False)
453
stat_value = _fstat(file_obj.fileno())
454
if filtered and self.supports_content_filtering():
455
filters = self._content_filter_stack(path)
456
file_obj = filtered_input_file(file_obj, filters)
457
return (file_obj, stat_value)
459
def get_file_text(self, file_id, path=None, filtered=True):
460
return self.get_file(file_id, path=path, filtered=filtered).read()
462
def get_file_byname(self, filename, filtered=True):
463
path = self.abspath(filename)
465
if filtered and self.supports_content_filtering():
466
filters = self._content_filter_stack(filename)
467
return filtered_input_file(f, filters)
471
def get_file_lines(self, file_id, path=None, filtered=True):
472
"""See Tree.get_file_lines()"""
473
file = self.get_file(file_id, path, filtered=filtered)
475
return file.readlines()
480
def annotate_iter(self, file_id, default_revision=CURRENT_REVISION):
481
"""See Tree.annotate_iter
483
This implementation will use the basis tree implementation if possible.
484
Lines not in the basis are attributed to CURRENT_REVISION
486
If there are pending merges, lines added by those merges will be
487
incorrectly attributed to CURRENT_REVISION (but after committing, the
488
attribution will be correct).
490
maybe_file_parent_keys = []
491
for parent_id in self.get_parent_ids():
493
parent_tree = self.revision_tree(parent_id)
494
except errors.NoSuchRevisionInTree:
495
parent_tree = self.branch.repository.revision_tree(parent_id)
496
parent_tree.lock_read()
498
if file_id not in parent_tree:
500
ie = parent_tree.inventory[file_id]
501
if ie.kind != 'file':
502
# Note: this is slightly unnecessary, because symlinks and
503
# directories have a "text" which is the empty text, and we
504
# know that won't mess up annotations. But it seems cleaner
506
parent_text_key = (file_id, ie.revision)
507
if parent_text_key not in maybe_file_parent_keys:
508
maybe_file_parent_keys.append(parent_text_key)
511
graph = _mod_graph.Graph(self.branch.repository.texts)
512
heads = graph.heads(maybe_file_parent_keys)
513
file_parent_keys = []
514
for key in maybe_file_parent_keys:
516
file_parent_keys.append(key)
518
# Now we have the parents of this content
519
annotator = self.branch.repository.texts.get_annotator()
520
text = self.get_file(file_id).read()
521
this_key =(file_id, default_revision)
522
annotator.add_special_text(this_key, file_parent_keys, text)
523
annotations = [(key[-1], line)
524
for key, line in annotator.annotate_flat(this_key)]
527
def _get_ancestors(self, default_revision):
528
ancestors = set([default_revision])
529
for parent_id in self.get_parent_ids():
530
ancestors.update(self.branch.repository.get_ancestry(
531
parent_id, topo_sorted=False))
534
def get_parent_ids(self):
535
"""See Tree.get_parent_ids.
537
This implementation reads the pending merges list and last_revision
538
value and uses that to decide what the parents list should be.
540
last_rev = _mod_revision.ensure_null(self._last_revision())
541
if _mod_revision.NULL_REVISION == last_rev:
546
merges_file = self._transport.get('pending-merges')
547
except errors.NoSuchFile:
550
for l in merges_file.readlines():
551
revision_id = l.rstrip('\n')
552
parents.append(revision_id)
420
556
def get_root_id(self):
421
557
"""Return the id of this trees root"""
422
inv = self.read_working_inventory()
423
return inv.root.file_id
558
return self._inventory.root.file_id
425
560
def _get_store_filename(self, file_id):
426
561
## XXX: badly named; this is not in the store at all
427
562
return self.abspath(self.id2path(file_id))
430
def clone(self, to_bzrdir, revision_id=None, basis=None):
565
def clone(self, to_bzrdir, revision_id=None):
431
566
"""Duplicate this working tree into to_bzr, including all state.
433
568
Specifically modified files are kept as modified, but
434
569
ignored and unknown files are discarded.
436
571
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
574
If not None, the cloned tree will have its last revision set to
575
revision, and difference between the source trees last revision
441
576
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
578
# assumes the target bzr dir format is compatible.
448
result = self._format.initialize(to_bzrdir)
579
result = to_bzrdir.create_workingtree()
449
580
self.copy_content_into(result, revision_id)
453
584
def copy_content_into(self, tree, revision_id=None):
454
585
"""Copy the current content and user files of this tree into tree."""
586
tree.set_root_id(self.get_root_id())
455
587
if revision_id is None:
456
transform_tree(tree, self)
588
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())
590
# TODO now merge from tree.last_revision to revision (to preserve
591
# user local changes)
592
merge.transform_tree(tree, self)
593
tree.set_parent_ids([revision_id])
477
595
def id2abspath(self, file_id):
478
596
return self.abspath(self.id2path(file_id))
480
598
def has_id(self, file_id):
481
599
# files that have been deleted are excluded
482
inv = self._inventory
483
601
if not inv.has_id(file_id):
485
603
path = inv.id2path(file_id)
486
return bzrlib.osutils.lexists(self.abspath(path))
604
return osutils.lexists(self.abspath(path))
488
606
def has_or_had_id(self, file_id):
489
607
if file_id == self.inventory.root.file_id:
493
611
__contains__ = has_id
495
613
def get_file_size(self, file_id):
496
return os.path.getsize(self.id2abspath(file_id))
614
"""See Tree.get_file_size"""
615
# XXX: this returns the on-disk size; it should probably return the
618
return os.path.getsize(self.id2abspath(file_id))
620
if e.errno != errno.ENOENT:
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():
626
def get_file_sha1(self, file_id, path=None, stat_value=None):
628
path = self._inventory.id2path(file_id)
629
return self._hashcache.get_sha1(path, stat_value)
631
def get_file_mtime(self, file_id, path=None):
633
path = self.inventory.id2path(file_id)
634
return os.lstat(self.abspath(path)).st_mtime
636
def _is_executable_from_path_and_stat_from_basis(self, path, stat_result):
637
file_id = self.path2id(path)
638
return self._inventory[file_id].executable
640
def _is_executable_from_path_and_stat_from_stat(self, path, stat_result):
641
mode = stat_result.st_mode
642
return bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode)
644
if not supports_executable():
645
def is_executable(self, file_id, path=None):
505
646
return self._inventory[file_id].executable
507
path = self._inventory.id2path(file_id)
648
_is_executable_from_path_and_stat = \
649
_is_executable_from_path_and_stat_from_basis
651
def is_executable(self, file_id, path=None):
653
path = self.id2path(file_id)
508
654
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.
655
return bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode)
657
_is_executable_from_path_and_stat = \
658
_is_executable_from_path_and_stat_from_stat
660
@needs_tree_write_lock
661
def _add(self, files, ids, kinds):
662
"""See MutableTree._add."""
534
663
# TODO: Re-adding a file that is removed in the working copy
535
664
# 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))
665
# the read and write working inventory should not occur in this
666
# function - they should be part of lock_write and unlock.
668
for f, file_id, kind in zip(files, ids, kinds):
571
669
if file_id is None:
572
file_id = gen_file_id(f)
573
inv.add_path(f, kind=kind, file_id=file_id)
670
inv.add_path(f, kind=kind)
672
inv.add_path(f, kind=kind, file_id=file_id)
673
self._inventory_is_modified = True
575
mutter("add file %s file_id:{%s} kind=%r" % (f, file_id, kind))
576
self._write_inventory(inv)
675
@needs_tree_write_lock
676
def _gather_kinds(self, files, kinds):
677
"""See MutableTree._gather_kinds."""
678
for pos, f in enumerate(files):
679
if kinds[pos] is None:
680
fullpath = normpath(self.abspath(f))
682
kinds[pos] = file_kind(fullpath)
684
if e.errno == errno.ENOENT:
685
raise errors.NoSuchFile(fullpath)
578
687
@needs_write_lock
688
def add_parent_tree_id(self, revision_id, allow_leftmost_as_ghost=False):
689
"""Add revision_id as a parent.
691
This is equivalent to retrieving the current list of parent ids
692
and setting the list to its value plus revision_id.
694
:param revision_id: The revision id to add to the parent list. It may
695
be a ghost revision as long as its not the first parent to be added,
696
or the allow_leftmost_as_ghost parameter is set True.
697
:param allow_leftmost_as_ghost: Allow the first parent to be a ghost.
699
parents = self.get_parent_ids() + [revision_id]
700
self.set_parent_ids(parents, allow_leftmost_as_ghost=len(parents) > 1
701
or allow_leftmost_as_ghost)
703
@needs_tree_write_lock
704
def add_parent_tree(self, parent_tuple, allow_leftmost_as_ghost=False):
705
"""Add revision_id, tree tuple as a parent.
707
This is equivalent to retrieving the current list of parent trees
708
and setting the list to its value plus parent_tuple. See also
709
add_parent_tree_id - if you only have a parent id available it will be
710
simpler to use that api. If you have the parent already available, using
711
this api is preferred.
713
:param parent_tuple: The (revision id, tree) to add to the parent list.
714
If the revision_id is a ghost, pass None for the tree.
715
:param allow_leftmost_as_ghost: Allow the first parent to be a ghost.
717
parent_ids = self.get_parent_ids() + [parent_tuple[0]]
718
if len(parent_ids) > 1:
719
# the leftmost may have already been a ghost, preserve that if it
721
allow_leftmost_as_ghost = True
722
self.set_parent_ids(parent_ids,
723
allow_leftmost_as_ghost=allow_leftmost_as_ghost)
725
@needs_tree_write_lock
579
726
def add_pending_merge(self, *revision_ids):
580
727
# TODO: Perhaps should check at this point that the
581
728
# history of the revision is actually present?
582
p = self.pending_merges()
729
parents = self.get_parent_ids()
584
731
for rev_id in revision_ids:
732
if rev_id in parents:
734
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.
737
self.set_parent_ids(parents, allow_leftmost_as_ghost=True)
739
def path_content_summary(self, path, _lstat=os.lstat,
740
_mapper=osutils.file_kind_from_stat_mode):
741
"""See Tree.path_content_summary."""
742
abspath = self.abspath(path)
600
merges_file = self._control_files.get_utf8('pending-merges')
744
stat_result = _lstat(abspath)
601
745
except OSError, e:
602
if e.errno != errno.ENOENT:
606
for l in merges_file.readlines():
607
p.append(l.rstrip('\n'))
746
if getattr(e, 'errno', None) == errno.ENOENT:
748
return ('missing', None, None, None)
749
# propagate other errors
751
kind = _mapper(stat_result.st_mode)
753
return self._file_content_summary(path, stat_result)
754
elif kind == 'directory':
755
# perhaps it looks like a plain directory, but it's really a
757
if self._directory_is_tree_reference(path):
758
kind = 'tree-reference'
759
return kind, None, None, None
760
elif kind == 'symlink':
761
target = osutils.readlink(abspath)
762
return ('symlink', None, None, target)
764
return (kind, None, None, None)
766
def _file_content_summary(self, path, stat_result):
767
size = stat_result.st_size
768
executable = self._is_executable_from_path_and_stat(path, stat_result)
769
# try for a stat cache lookup
770
return ('file', size, executable, self._sha_from_stat(
773
def _check_parents_for_ghosts(self, revision_ids, allow_leftmost_as_ghost):
774
"""Common ghost checking functionality from set_parent_*.
776
This checks that the left hand-parent exists if there are any
779
if len(revision_ids) > 0:
780
leftmost_id = revision_ids[0]
781
if (not allow_leftmost_as_ghost and not
782
self.branch.repository.has_revision(leftmost_id)):
783
raise errors.GhostRevisionUnusableHere(leftmost_id)
785
def _set_merges_from_parent_ids(self, parent_ids):
786
merges = parent_ids[1:]
787
self._transport.put_bytes('pending-merges', '\n'.join(merges),
788
mode=self.bzrdir._get_file_mode())
790
def _filter_parent_ids_by_ancestry(self, revision_ids):
791
"""Check that all merged revisions are proper 'heads'.
793
This will always return the first revision_id, and any merged revisions
796
if len(revision_ids) == 0:
798
graph = self.branch.repository.get_graph()
799
heads = graph.heads(revision_ids)
800
new_revision_ids = revision_ids[:1]
801
for revision_id in revision_ids[1:]:
802
if revision_id in heads and revision_id not in new_revision_ids:
803
new_revision_ids.append(revision_id)
804
if new_revision_ids != revision_ids:
805
trace.mutter('requested to set revision_ids = %s,'
806
' but filtered to %s', revision_ids, new_revision_ids)
807
return new_revision_ids
809
@needs_tree_write_lock
810
def set_parent_ids(self, revision_ids, allow_leftmost_as_ghost=False):
811
"""Set the parent ids to revision_ids.
813
See also set_parent_trees. This api will try to retrieve the tree data
814
for each element of revision_ids from the trees repository. If you have
815
tree data already available, it is more efficient to use
816
set_parent_trees rather than set_parent_ids. set_parent_ids is however
817
an easier API to use.
819
:param revision_ids: The revision_ids to set as the parent ids of this
820
working tree. Any of these may be ghosts.
822
self._check_parents_for_ghosts(revision_ids,
823
allow_leftmost_as_ghost=allow_leftmost_as_ghost)
824
for revision_id in revision_ids:
825
_mod_revision.check_not_reserved_id(revision_id)
827
revision_ids = self._filter_parent_ids_by_ancestry(revision_ids)
829
if len(revision_ids) > 0:
830
self.set_last_revision(revision_ids[0])
832
self.set_last_revision(_mod_revision.NULL_REVISION)
834
self._set_merges_from_parent_ids(revision_ids)
836
@needs_tree_write_lock
837
def set_parent_trees(self, parents_list, allow_leftmost_as_ghost=False):
838
"""See MutableTree.set_parent_trees."""
839
parent_ids = [rev for (rev, tree) in parents_list]
840
for revision_id in parent_ids:
841
_mod_revision.check_not_reserved_id(revision_id)
843
self._check_parents_for_ghosts(parent_ids,
844
allow_leftmost_as_ghost=allow_leftmost_as_ghost)
846
parent_ids = self._filter_parent_ids_by_ancestry(parent_ids)
848
if len(parent_ids) == 0:
849
leftmost_parent_id = _mod_revision.NULL_REVISION
850
leftmost_parent_tree = None
852
leftmost_parent_id, leftmost_parent_tree = parents_list[0]
854
if self._change_last_revision(leftmost_parent_id):
855
if leftmost_parent_tree is None:
856
# If we don't have a tree, fall back to reading the
857
# parent tree from the repository.
858
self._cache_basis_inventory(leftmost_parent_id)
860
inv = leftmost_parent_tree.inventory
861
xml = self._create_basis_xml_from_inventory(
862
leftmost_parent_id, inv)
863
self._write_basis_inventory(xml)
864
self._set_merges_from_parent_ids(parent_ids)
866
@needs_tree_write_lock
611
867
def set_pending_merges(self, rev_list):
612
self._control_files.put_utf8('pending-merges', '\n'.join(rev_list))
868
parents = self.get_parent_ids()
869
leftmost = parents[:1]
870
new_parents = leftmost + rev_list
871
self.set_parent_ids(new_parents)
873
@needs_tree_write_lock
615
874
def set_merge_modified(self, modified_hashes):
616
875
def iter_stanzas():
617
876
for file_id, hash in modified_hashes.iteritems():
618
yield Stanza(file_id=file_id, hash=hash)
877
yield Stanza(file_id=file_id.decode('utf8'), hash=hash)
619
878
self._put_rio('merge-hashes', iter_stanzas(), MERGE_MODIFIED_HEADER_1)
880
def _sha_from_stat(self, path, stat_result):
881
"""Get a sha digest from the tree's stat cache.
883
The default implementation assumes no stat cache is present.
885
:param path: The path.
886
:param stat_result: The stat result being looked up.
622
890
def _put_rio(self, filename, stanzas, header):
891
self._must_be_locked()
623
892
my_file = rio_file(stanzas, header)
624
self._control_files.put(filename, my_file)
893
self._transport.put_file(filename, my_file,
894
mode=self.bzrdir._get_file_mode())
896
@needs_write_lock # because merge pulls data into the branch.
897
def merge_from_branch(self, branch, to_revision=None, from_revision=None,
898
merge_type=None, force=False):
899
"""Merge from a branch into this working tree.
901
:param branch: The branch to merge from.
902
:param to_revision: If non-None, the merge will merge to to_revision,
903
but not beyond it. to_revision does not need to be in the history
904
of the branch when it is supplied. If None, to_revision defaults to
905
branch.last_revision().
907
from bzrlib.merge import Merger, Merge3Merger
908
pb = ui.ui_factory.nested_progress_bar()
910
merger = Merger(self.branch, this_tree=self, pb=pb)
911
merger.pp = ProgressPhase("Merge phase", 5, pb)
912
merger.pp.next_phase()
913
# check that there are no local alterations
914
if not force and self.has_changes():
915
raise errors.UncommittedChanges(self)
916
if to_revision is None:
917
to_revision = _mod_revision.ensure_null(branch.last_revision())
918
merger.other_rev_id = to_revision
919
if _mod_revision.is_null(merger.other_rev_id):
920
raise errors.NoCommits(branch)
921
self.branch.fetch(branch, last_revision=merger.other_rev_id)
922
merger.other_basis = merger.other_rev_id
923
merger.other_tree = self.branch.repository.revision_tree(
925
merger.other_branch = branch
926
merger.pp.next_phase()
927
if from_revision is None:
930
merger.set_base_revision(from_revision, branch)
931
if merger.base_rev_id == merger.other_rev_id:
932
raise errors.PointlessMerge
933
merger.backup_files = False
934
if merge_type is None:
935
merger.merge_type = Merge3Merger
937
merger.merge_type = merge_type
938
merger.set_interesting_files(None)
939
merger.show_base = False
940
merger.reprocess = False
941
conflicts = merger.do_merge()
627
948
def merge_modified(self):
949
"""Return a dictionary of files modified by a merge.
951
The list is initialized by WorkingTree.set_merge_modified, which is
952
typically called after we make some automatic updates to the tree
955
This returns a map of file_id->sha1, containing only files which are
956
still in the working inventory and have that text hash.
629
hashfile = self._control_files.get('merge-hashes')
959
hashfile = self._transport.get('merge-hashes')
960
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
965
if hashfile.next() != MERGE_MODIFIED_HEADER_1 + '\n':
966
raise errors.MergeModifiedFormatError()
967
except StopIteration:
968
raise errors.MergeModifiedFormatError()
969
for s in RioReader(hashfile):
970
# RioReader reads in Unicode, so convert file_ids back to utf8
971
file_id = osutils.safe_file_id(s.get("file_id"), warn=False)
972
if file_id not in self.inventory:
974
text_hash = s.get("hash")
975
if text_hash == self.get_file_sha1(file_id):
976
merge_hashes[file_id] = text_hash
982
def mkdir(self, path, file_id=None):
983
"""See MutableTree.mkdir()."""
985
file_id = generate_ids.gen_file_id(os.path.basename(path))
986
os.mkdir(self.abspath(path))
987
self.add(path, file_id, 'directory')
647
990
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).
991
abspath = self.id2abspath(file_id)
992
target = osutils.readlink(abspath)
996
def subsume(self, other_tree):
997
def add_children(inventory, entry):
998
for child_entry in entry.children.values():
999
inventory._byid[child_entry.file_id] = child_entry
1000
if child_entry.kind == 'directory':
1001
add_children(inventory, child_entry)
1002
if other_tree.get_root_id() == self.get_root_id():
1003
raise errors.BadSubsumeSource(self, other_tree,
1004
'Trees have the same root')
1006
other_tree_path = self.relpath(other_tree.basedir)
1007
except errors.PathNotChild:
1008
raise errors.BadSubsumeSource(self, other_tree,
1009
'Tree is not contained by the other')
1010
new_root_parent = self.path2id(osutils.dirname(other_tree_path))
1011
if new_root_parent is None:
1012
raise errors.BadSubsumeSource(self, other_tree,
1013
'Parent directory is not versioned.')
1014
# We need to ensure that the result of a fetch will have a
1015
# versionedfile for the other_tree root, and only fetching into
1016
# RepositoryKnit2 guarantees that.
1017
if not self.branch.repository.supports_rich_root():
1018
raise errors.SubsumeTargetNeedsUpgrade(other_tree)
1019
other_tree.lock_tree_write()
1021
new_parents = other_tree.get_parent_ids()
1022
other_root = other_tree.inventory.root
1023
other_root.parent_id = new_root_parent
1024
other_root.name = osutils.basename(other_tree_path)
1025
self.inventory.add(other_root)
1026
add_children(self.inventory, other_root)
1027
self._write_inventory(self.inventory)
1028
# normally we don't want to fetch whole repositories, but i think
1029
# here we really do want to consolidate the whole thing.
1030
for parent_id in other_tree.get_parent_ids():
1031
self.branch.fetch(other_tree.branch, parent_id)
1032
self.add_parent_tree_id(parent_id)
1035
other_tree.bzrdir.retire_bzrdir()
1037
def _setup_directory_is_tree_reference(self):
1038
if self._branch.repository._format.supports_tree_reference:
1039
self._directory_is_tree_reference = \
1040
self._directory_may_be_tree_reference
1042
self._directory_is_tree_reference = \
1043
self._directory_is_never_tree_reference
1045
def _directory_is_never_tree_reference(self, relpath):
1048
def _directory_may_be_tree_reference(self, relpath):
1049
# as a special case, if a directory contains control files then
1050
# it's a tree reference, except that the root of the tree is not
1051
return relpath and osutils.isdir(self.abspath(relpath) + u"/.bzr")
1052
# TODO: We could ask all the control formats whether they
1053
# recognize this directory, but at the moment there's no cheap api
1054
# to do that. Since we probably can only nest bzr checkouts and
1055
# they always use this name it's ok for now. -- mbp 20060306
1057
# FIXME: There is an unhandled case here of a subdirectory
1058
# containing .bzr but not a branch; that will probably blow up
1059
# when you try to commit it. It might happen if there is a
1060
# checkout in a subdirectory. This can be avoided by not adding
1063
@needs_tree_write_lock
1064
def extract(self, file_id, format=None):
1065
"""Extract a subtree from this tree.
1067
A new branch will be created, relative to the path for this tree.
1071
segments = osutils.splitpath(path)
1072
transport = self.branch.bzrdir.root_transport
1073
for name in segments:
1074
transport = transport.clone(name)
1075
transport.ensure_base()
1078
sub_path = self.id2path(file_id)
1079
branch_transport = mkdirs(sub_path)
1081
format = self.bzrdir.cloning_metadir()
1082
branch_transport.ensure_base()
1083
branch_bzrdir = format.initialize_on_transport(branch_transport)
1085
repo = branch_bzrdir.find_repository()
1086
except errors.NoRepositoryPresent:
1087
repo = branch_bzrdir.create_repository()
1088
if not repo.supports_rich_root():
1089
raise errors.RootNotRich()
1090
new_branch = branch_bzrdir.create_branch()
1091
new_branch.pull(self.branch)
1092
for parent_id in self.get_parent_ids():
1093
new_branch.fetch(self.branch, parent_id)
1094
tree_transport = self.bzrdir.root_transport.clone(sub_path)
1095
if tree_transport.base != branch_transport.base:
1096
tree_bzrdir = format.initialize_on_transport(tree_transport)
1097
branch.BranchReferenceFormat().initialize(tree_bzrdir, new_branch)
1099
tree_bzrdir = branch_bzrdir
1100
wt = tree_bzrdir.create_workingtree(_mod_revision.NULL_REVISION)
1101
wt.set_parent_ids(self.get_parent_ids())
1102
my_inv = self.inventory
1103
child_inv = inventory.Inventory(root_id=None)
1104
new_root = my_inv[file_id]
1105
my_inv.remove_recursive_id(file_id)
1106
new_root.parent_id = None
1107
child_inv.add(new_root)
1108
self._write_inventory(my_inv)
1109
wt._write_inventory(child_inv)
1112
def _serialize(self, inventory, out_file):
1113
xml5.serializer_v5.write_inventory(self._inventory, out_file,
1116
def _deserialize(selt, in_file):
1117
return xml5.serializer_v5.read_inventory(in_file)
1120
"""Write the in memory inventory to disk."""
1121
# TODO: Maybe this should only write on dirty ?
1122
if self._control_files._lock_mode != 'w':
1123
raise errors.NotWriteLocked(self)
1125
self._serialize(self._inventory, sio)
1127
self._transport.put_file('inventory', sio,
1128
mode=self.bzrdir._get_file_mode())
1129
self._inventory_is_modified = False
1131
def _kind(self, relpath):
1132
return osutils.file_kind(self.abspath(relpath))
1134
def list_files(self, include_root=False, from_dir=None, recursive=True):
1135
"""List all files as (path, class, kind, id, entry).
661
1137
Lists, but does not descend into unversioned directories.
663
1138
This does not include files that have been deleted in this
1139
tree. Skips the control directory.
666
Skips the control directory.
1141
:param include_root: if True, do not return an entry for the root
1142
:param from_dir: start from this directory or None for the root
1143
:param recursive: whether to recurse into subdirectories or not
668
inv = self._inventory
670
def descend(from_dir_relpath, from_dir_id, dp):
1145
# list_files is an iterator, so @needs_read_lock doesn't work properly
1146
# with it. So callers should be careful to always read_lock the tree.
1147
if not self.is_locked():
1148
raise errors.ObjectNotLocked(self)
1150
inv = self.inventory
1151
if from_dir is None and include_root is True:
1152
yield ('', 'V', 'directory', inv.root.file_id, inv.root)
1153
# Convert these into local objects to save lookup times
1154
pathjoin = osutils.pathjoin
1155
file_kind = self._kind
1157
# transport.base ends in a slash, we want the piece
1158
# between the last two slashes
1159
transport_base_dir = self.bzrdir.transport.base.rsplit('/', 2)[1]
1161
fk_entries = {'directory':TreeDirectory, 'file':TreeFile, 'symlink':TreeLink}
1163
# directory file_id, relative path, absolute path, reverse sorted children
1164
if from_dir is not None:
1165
from_dir_id = inv.path2id(from_dir)
1166
if from_dir_id is None:
1167
# Directory not versioned
1169
from_dir_abspath = pathjoin(self.basedir, from_dir)
1171
from_dir_id = inv.root.file_id
1172
from_dir_abspath = self.basedir
1173
children = os.listdir(from_dir_abspath)
1175
# jam 20060527 The kernel sized tree seems equivalent whether we
1176
# use a deque and popleft to keep them sorted, or if we use a plain
1177
# list and just reverse() them.
1178
children = collections.deque(children)
1179
stack = [(from_dir_id, u'', from_dir_abspath, children)]
1181
from_dir_id, from_dir_relpath, from_dir_abspath, children = stack[-1]
1184
f = children.popleft()
674
1185
## TODO: If we find a subdirectory with its own .bzr
675
1186
## directory, then that is a separate tree and we
676
1187
## should exclude it.
678
1189
# the bzrdir for this tree
679
if self.bzrdir.transport.base.endswith(f + '/'):
1190
if transport_base_dir == f:
683
fp = appendpath(from_dir_relpath, f)
1193
# we know that from_dir_relpath and from_dir_abspath never end in a slash
1194
# and 'f' doesn't begin with one, we can do a string op, rather
1195
# than the checks of pathjoin(), all relative paths will have an extra slash
1197
fp = from_dir_relpath + '/' + f
686
fap = appendpath(dp, f)
1200
fap = from_dir_abspath + '/' + f
688
1202
f_ie = inv.get_child(from_dir_id, f)
691
elif self.is_ignored(fp):
1205
elif self.is_ignored(fp[1:]):
1208
# we may not have found this file, because of a unicode issue
1209
f_norm, can_access = osutils.normalized_filename(f)
1210
if f == f_norm or not can_access:
1211
# No change, so treat this file normally
1214
# this file can be accessed by a normalized path
1215
# check again if it is versioned
1216
# these lines are repeated here for performance
1218
fp = from_dir_relpath + '/' + f
1219
fap = from_dir_abspath + '/' + f
1220
f_ie = inv.get_child(from_dir_id, f)
1223
elif self.is_ignored(fp[1:]):
696
1228
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
1230
# make a last minute entry
1232
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
1235
yield fp[1:], c, fk, None, fk_entries[fk]()
1237
yield fp[1:], c, fk, None, TreeEntry()
719
1240
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):
1243
# But do this child first if recursing down
1245
new_children = os.listdir(fap)
1247
new_children = collections.deque(new_children)
1248
stack.append((f_ie.file_id, fp, fap, new_children))
1249
# Break out of inner loop,
1250
# so that we start outer loop with child
1253
# if we finished all children, pop it off the stack
1256
@needs_tree_write_lock
1257
def move(self, from_paths, to_dir=None, after=False, **kwargs):
734
1258
"""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;
1260
to_dir must exist in the inventory.
1262
If to_dir exists and is a directory, the files are moved into
1263
it, keeping their old names.
1265
Note that to_dir is only the last component of the new name;
742
1266
this doesn't change the directory.
1268
For each entry in from_paths the move mode will be determined
1271
The first mode moves the file in the filesystem and updates the
1272
inventory. The second mode only updates the inventory without
1273
touching the file on the filesystem. This is the new mode introduced
1276
move uses the second mode if 'after == True' and the target is not
1277
versioned but present in the working tree.
1279
move uses the second mode if 'after == False' and the source is
1280
versioned but no longer in the working tree, and the target is not
1281
versioned but present in the working tree.
1283
move uses the first mode if 'after == False' and the source is
1284
versioned and present in the working tree, and the target is not
1285
versioned and not present in the working tree.
1287
Everything else results in an error.
744
1289
This returns a list of (from_path, to_path) pairs for each
745
1290
entry that is moved.
748
## TODO: Option to move IDs only
749
assert not isinstance(from_paths, basestring)
1295
# check for deprecated use of signature
1297
to_dir = kwargs.get('to_name', None)
1299
raise TypeError('You must supply a target directory')
1301
symbol_versioning.warn('The parameter to_name was deprecated'
1302
' in version 0.13. Use to_dir instead',
1305
# check destination directory
1306
if isinstance(from_paths, basestring):
750
1308
inv = self.inventory
751
to_abs = self.abspath(to_name)
1309
to_abs = self.abspath(to_dir)
752
1310
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)
1311
raise errors.BzrMoveFailedError('',to_dir,
1312
errors.NotADirectory(to_abs))
1313
if not self.has_filename(to_dir):
1314
raise errors.BzrMoveFailedError('',to_dir,
1315
errors.NotInWorkingDirectory(to_dir))
1316
to_dir_id = inv.path2id(to_dir)
1317
if to_dir_id is None:
1318
raise errors.BzrMoveFailedError('',to_dir,
1319
errors.NotVersionedError(path=str(to_dir)))
759
1321
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)
1322
if to_dir_ie.kind != 'directory':
1323
raise errors.BzrMoveFailedError('',to_dir,
1324
errors.NotADirectory(to_abs))
1326
# create rename entries and tuples
1327
for from_rel in from_paths:
1328
from_tail = splitpath(from_rel)[-1]
1329
from_id = inv.path2id(from_rel)
1331
raise errors.BzrMoveFailedError(from_rel,to_dir,
1332
errors.NotVersionedError(path=str(from_rel)))
1334
from_entry = inv[from_id]
1335
from_parent_id = from_entry.parent_id
1336
to_rel = pathjoin(to_dir, from_tail)
1337
rename_entry = WorkingTree._RenameEntry(from_rel=from_rel,
1339
from_tail=from_tail,
1340
from_parent_id=from_parent_id,
1341
to_rel=to_rel, to_tail=from_tail,
1342
to_parent_id=to_dir_id)
1343
rename_entries.append(rename_entry)
1344
rename_tuples.append((from_rel, to_rel))
1346
# determine which move mode to use. checks also for movability
1347
rename_entries = self._determine_mv_mode(rename_entries, after)
1349
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"])
1352
self._inventory_is_modified = True
1353
self._move(rename_entries)
795
1355
# restore the inventory on error
796
self._set_inventory(orig_inv)
1356
self._inventory_is_modified = original_modified
798
1358
self._write_inventory(inv)
802
def rename_one(self, from_rel, to_rel):
1359
return rename_tuples
1361
def _determine_mv_mode(self, rename_entries, after=False):
1362
"""Determines for each from-to pair if both inventory and working tree
1363
or only the inventory has to be changed.
1365
Also does basic plausability tests.
1367
inv = self.inventory
1369
for rename_entry in rename_entries:
1370
# store to local variables for easier reference
1371
from_rel = rename_entry.from_rel
1372
from_id = rename_entry.from_id
1373
to_rel = rename_entry.to_rel
1374
to_id = inv.path2id(to_rel)
1375
only_change_inv = False
1377
# check the inventory for source and destination
1379
raise errors.BzrMoveFailedError(from_rel,to_rel,
1380
errors.NotVersionedError(path=str(from_rel)))
1381
if to_id is not None:
1382
raise errors.BzrMoveFailedError(from_rel,to_rel,
1383
errors.AlreadyVersionedError(path=str(to_rel)))
1385
# try to determine the mode for rename (only change inv or change
1386
# inv and file system)
1388
if not self.has_filename(to_rel):
1389
raise errors.BzrMoveFailedError(from_id,to_rel,
1390
errors.NoSuchFile(path=str(to_rel),
1391
extra="New file has not been created yet"))
1392
only_change_inv = True
1393
elif not self.has_filename(from_rel) and self.has_filename(to_rel):
1394
only_change_inv = True
1395
elif self.has_filename(from_rel) and not self.has_filename(to_rel):
1396
only_change_inv = False
1397
elif (not self.case_sensitive
1398
and from_rel.lower() == to_rel.lower()
1399
and self.has_filename(from_rel)):
1400
only_change_inv = False
1402
# something is wrong, so lets determine what exactly
1403
if not self.has_filename(from_rel) and \
1404
not self.has_filename(to_rel):
1405
raise errors.BzrRenameFailedError(from_rel,to_rel,
1406
errors.PathsDoNotExist(paths=(str(from_rel),
1409
raise errors.RenameFailedFilesExist(from_rel, to_rel)
1410
rename_entry.only_change_inv = only_change_inv
1411
return rename_entries
1413
def _move(self, rename_entries):
1414
"""Moves a list of files.
1416
Depending on the value of the flag 'only_change_inv', the
1417
file will be moved on the file system or not.
1419
inv = self.inventory
1422
for entry in rename_entries:
1424
self._move_entry(entry)
1426
self._rollback_move(moved)
1430
def _rollback_move(self, moved):
1431
"""Try to rollback a previous move in case of an filesystem error."""
1432
inv = self.inventory
1435
self._move_entry(WorkingTree._RenameEntry(
1436
entry.to_rel, entry.from_id,
1437
entry.to_tail, entry.to_parent_id, entry.from_rel,
1438
entry.from_tail, entry.from_parent_id,
1439
entry.only_change_inv))
1440
except errors.BzrMoveFailedError, e:
1441
raise errors.BzrMoveFailedError( '', '', "Rollback failed."
1442
" The working tree is in an inconsistent state."
1443
" Please consider doing a 'bzr revert'."
1444
" Error message is: %s" % e)
1446
def _move_entry(self, entry):
1447
inv = self.inventory
1448
from_rel_abs = self.abspath(entry.from_rel)
1449
to_rel_abs = self.abspath(entry.to_rel)
1450
if from_rel_abs == to_rel_abs:
1451
raise errors.BzrMoveFailedError(entry.from_rel, entry.to_rel,
1452
"Source and target are identical.")
1454
if not entry.only_change_inv:
1456
osutils.rename(from_rel_abs, to_rel_abs)
1458
raise errors.BzrMoveFailedError(entry.from_rel,
1460
inv.rename(entry.from_id, entry.to_parent_id, entry.to_tail)
1462
@needs_tree_write_lock
1463
def rename_one(self, from_rel, to_rel, after=False):
803
1464
"""Rename one file.
805
1466
This can change the directory or the filename or both.
1468
rename_one has several 'modes' to work. First, it can rename a physical
1469
file and change the file_id. That is the normal mode. Second, it can
1470
only change the file_id without touching any physical file. This is
1471
the new mode introduced in version 0.15.
1473
rename_one uses the second mode if 'after == True' and 'to_rel' is not
1474
versioned but present in the working tree.
1476
rename_one uses the second mode if 'after == False' and 'from_rel' is
1477
versioned but no longer in the working tree, and 'to_rel' is not
1478
versioned but present in the working tree.
1480
rename_one uses the first mode if 'after == False' and 'from_rel' is
1481
versioned and present in the working tree, and 'to_rel' is not
1482
versioned and not present in the working tree.
1484
Everything else results in an error.
807
1486
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)
1489
# create rename entries and tuples
1490
from_tail = splitpath(from_rel)[-1]
1491
from_id = inv.path2id(from_rel)
1493
# if file is missing in the inventory maybe it's in the basis_tree
1494
basis_tree = self.branch.basis_tree()
1495
from_id = basis_tree.path2id(from_rel)
1497
raise errors.BzrRenameFailedError(from_rel,to_rel,
1498
errors.NotVersionedError(path=str(from_rel)))
1499
# put entry back in the inventory so we can rename it
1500
from_entry = basis_tree.inventory[from_id].copy()
1503
from_entry = inv[from_id]
1504
from_parent_id = from_entry.parent_id
824
1505
to_dir, to_tail = os.path.split(to_rel)
825
1506
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"])
1507
rename_entry = WorkingTree._RenameEntry(from_rel=from_rel,
1509
from_tail=from_tail,
1510
from_parent_id=from_parent_id,
1511
to_rel=to_rel, to_tail=to_tail,
1512
to_parent_id=to_dir_id)
1513
rename_entries.append(rename_entry)
1515
# determine which move mode to use. checks also for movability
1516
rename_entries = self._determine_mv_mode(rename_entries, after)
1518
# check if the target changed directory and if the target directory is
1520
if to_dir_id is None:
1521
raise errors.BzrMoveFailedError(from_rel,to_rel,
1522
errors.NotVersionedError(path=str(to_dir)))
1524
# all checks done. now we can continue with our actual work
1525
mutter('rename_one:\n'
1530
' to_dir_id {%s}\n',
1531
from_id, from_rel, to_rel, to_dir, to_dir_id)
1533
self._move(rename_entries)
847
1534
self._write_inventory(inv)
1536
class _RenameEntry(object):
1537
def __init__(self, from_rel, from_id, from_tail, from_parent_id,
1538
to_rel, to_tail, to_parent_id, only_change_inv=False):
1539
self.from_rel = from_rel
1540
self.from_id = from_id
1541
self.from_tail = from_tail
1542
self.from_parent_id = from_parent_id
1543
self.to_rel = to_rel
1544
self.to_tail = to_tail
1545
self.to_parent_id = to_parent_id
1546
self.only_change_inv = only_change_inv
849
1548
@needs_read_lock
850
1549
def unknowns(self):
851
1550
"""Return all unknown files.
853
1552
These are files in the working directory that are not versioned or
854
1553
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()
1555
# force the extras method to be fully executed before returning, to
1556
# prevent race conditions with the lock
1558
[subp for subp in self.extras() if not self.is_ignored(subp)])
1560
@needs_tree_write_lock
1561
def unversion(self, file_ids):
1562
"""Remove the file ids in file_ids from the current versioned set.
1564
When a file_id is unversioned, all of its children are automatically
1567
:param file_ids: The file ids to stop versioning.
1568
:raises: NoSuchId if any fileid is not currently versioned.
1570
for file_id in file_ids:
1571
if file_id not in self._inventory:
1572
raise errors.NoSuchId(self, file_id)
1573
for file_id in file_ids:
1574
if self._inventory.has_id(file_id):
1575
self._inventory.remove_recursive_id(file_id)
1577
# in the future this should just set a dirty bit to wait for the
1578
# final unlock. However, until all methods of workingtree start
1579
# with the current in -memory inventory rather than triggering
1580
# a read, it is more complex - we need to teach read_inventory
1581
# to know when to read, and when to not read first... and possibly
1582
# to save first when the in memory one may be corrupted.
1583
# so for now, we just only write it if it is indeed dirty.
1585
self._write_inventory(self._inventory)
879
1587
def _iter_conflicts(self):
880
1588
conflicted = set()
881
for path in (s[0] for s in self.list_files()):
1589
for info in self.list_files():
882
1591
stem = get_conflicted_stem(path)
883
1592
if stem is None:
1053
1852
def _change_last_revision(self, new_revision):
1054
1853
"""Template method part of set_last_revision to perform the change.
1056
1855
This is used to allow WorkingTree3 instances to not affect branch
1057
1856
when their last revision is set.
1059
if new_revision is None:
1858
if _mod_revision.is_null(new_revision):
1060
1859
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])
1862
self.branch.generate_revision_history(new_revision)
1863
except errors.NoSuchRevision:
1864
# not present in the repo - dont try to set it deeper than the tip
1865
self.branch.set_revision_history([new_revision])
1868
def _write_basis_inventory(self, xml):
1869
"""Write the basis inventory XML to the basis-inventory file"""
1870
path = self._basis_inventory_name()
1872
self._transport.put_file(path, sio,
1873
mode=self.bzrdir._get_file_mode())
1875
def _create_basis_xml_from_inventory(self, revision_id, inventory):
1876
"""Create the text that will be saved in basis-inventory"""
1877
inventory.revision_id = revision_id
1878
return xml7.serializer_v7.write_inventory_to_string(inventory)
1071
1880
def _cache_basis_inventory(self, new_revision):
1072
1881
"""Cache new_revision as the basis inventory."""
1882
# TODO: this should allow the ready-to-use inventory to be passed in,
1883
# as commit already has that ready-to-use [while the format is the
1074
# this double handles the inventory - unpack and repack -
1886
# this double handles the inventory - unpack and repack -
1075
1887
# but is easier to understand. We can/should put a conditional
1076
1888
# in here based on whether the inventory is in the latest format
1077
1889
# - 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:
1891
# the fast path is to copy the raw xml from the repository. If the
1892
# xml contains 'revision_id="', then we assume the right
1893
# revision_id is set. We must check for this full string, because a
1894
# root node id can legitimately look like 'revision_id' but cannot
1896
xml = self.branch.repository.get_inventory_xml(new_revision)
1897
firstline = xml.split('\n', 1)[0]
1898
if (not 'revision_id="' in firstline or
1899
'format="7"' not in firstline):
1900
inv = self.branch.repository._serializer.read_inventory_from_string(
1902
xml = self._create_basis_xml_from_inventory(new_revision, inv)
1903
self._write_basis_inventory(xml)
1904
except (errors.NoSuchRevision, errors.RevisionNotPresent):
1088
1907
def read_basis_inventory(self):
1089
1908
"""Read the cached basis inventory."""
1090
1909
path = self._basis_inventory_name()
1091
return self._control_files.get_utf8(path).read()
1910
return self._transport.get_bytes(path)
1093
1912
@needs_read_lock
1094
1913
def read_working_inventory(self):
1095
"""Read the working inventory."""
1914
"""Read the working inventory.
1916
:raises errors.InventoryModified: read_working_inventory will fail
1917
when the current in memory inventory has been modified.
1919
# conceptually this should be an implementation detail of the tree.
1920
# XXX: Deprecate this.
1096
1921
# 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)
1923
if self._inventory_is_modified:
1924
raise errors.InventoryModified(self)
1925
result = self._deserialize(self._transport.get('inventory'))
1926
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.
1929
@needs_tree_write_lock
1930
def remove(self, files, verbose=False, to_file=None, keep_files=True,
1932
"""Remove nominated files from the working inventory.
1934
:files: File paths relative to the basedir.
1935
:keep_files: If true, the files will also be kept.
1936
:force: Delete files and directories, even if they are changed and
1937
even if the directories are not empty.
1118
## TODO: Normalize names
1119
## TODO: Remove nested loops; better scalability
1120
1939
if isinstance(files, basestring):
1121
1940
files = [files]
1123
inv = self.inventory
1125
# do this before any modifications
1945
unknown_nested_files=set()
1947
to_file = sys.stdout
1949
def recurse_directory_to_add_files(directory):
1950
# Recurse directory and add all files
1951
# so we can check if they have changed.
1952
for parent_info, file_infos in\
1953
self.walkdirs(directory):
1954
for relpath, basename, kind, lstat, fileid, kind in file_infos:
1955
# Is it versioned or ignored?
1956
if self.path2id(relpath) or self.is_ignored(relpath):
1957
# Add nested content for deletion.
1958
new_files.add(relpath)
1960
# Files which are not versioned and not ignored
1961
# should be treated as unknown.
1962
unknown_nested_files.add((relpath, None, kind))
1964
for filename in files:
1965
# Get file name into canonical form.
1966
abspath = self.abspath(filename)
1967
filename = self.relpath(abspath)
1968
if len(filename) > 0:
1969
new_files.add(filename)
1970
recurse_directory_to_add_files(filename)
1972
files = list(new_files)
1975
return # nothing to do
1977
# Sort needed to first handle directory content before the directory
1978
files.sort(reverse=True)
1980
# Bail out if we are going to delete files we shouldn't
1981
if not keep_files and not force:
1982
has_changed_files = len(unknown_nested_files) > 0
1983
if not has_changed_files:
1984
for (file_id, path, content_change, versioned, parent_id, name,
1985
kind, executable) in self.iter_changes(self.basis_tree(),
1986
include_unchanged=True, require_versioned=False,
1987
want_unversioned=True, specific_files=files):
1988
if versioned == (False, False):
1989
# The record is unknown ...
1990
if not self.is_ignored(path[1]):
1991
# ... but not ignored
1992
has_changed_files = True
1994
elif content_change and (kind[1] is not None):
1995
# Versioned and changed, but not deleted
1996
has_changed_files = True
1999
if has_changed_files:
2000
# Make delta show ALL applicable changes in error message.
2001
tree_delta = self.changes_from(self.basis_tree(),
2002
require_versioned=False, want_unversioned=True,
2003
specific_files=files)
2004
for unknown_file in unknown_nested_files:
2005
if unknown_file not in tree_delta.unversioned:
2006
tree_delta.unversioned.extend((unknown_file,))
2007
raise errors.BzrRemoveChangedFilesError(tree_delta)
2009
# Build inv_delta and delete files where applicable,
2010
# do this before any modifications to inventory.
1126
2011
for f in files:
1127
fid = inv.path2id(f)
2012
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
2015
message = "%s is not versioned." % (f,)
2018
# having removed it, it must be either ignored or unknown
2019
if self.is_ignored(f):
2023
# XXX: Really should be a more abstract reporter interface
2024
kind_ch = osutils.kind_marker(self.kind(fid))
2025
to_file.write(new_status + ' ' + f + kind_ch + '\n')
2027
inv_delta.append((f, None, fid, None))
2028
message = "removed %s" % (f,)
2031
abs_path = self.abspath(f)
2032
if osutils.lexists(abs_path):
2033
if (osutils.isdir(abs_path) and
2034
len(os.listdir(abs_path)) > 0):
2036
osutils.rmtree(abs_path)
2038
message = "%s is not an empty directory "\
2039
"and won't be deleted." % (f,)
2041
osutils.delete_any(abs_path)
2042
message = "deleted %s" % (f,)
2043
elif message is not None:
2044
# Only care if we haven't done anything yet.
2045
message = "%s does not exist." % (f,)
2047
# Print only one message (if any) per file.
2048
if message is not None:
2050
self.apply_inventory_delta(inv_delta)
2052
@needs_tree_write_lock
2053
def revert(self, filenames=None, old_tree=None, backups=True,
2054
pb=DummyProgress(), report_changes=False):
2055
from bzrlib.conflicts import resolve
2058
symbol_versioning.warn('Using [] to revert all files is deprecated'
2059
' as of bzr 0.91. Please use None (the default) instead.',
2060
DeprecationWarning, stacklevel=2)
1149
2061
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([])
2062
basis_tree = self.basis_tree()
2063
basis_tree.lock_read()
2064
old_tree = basis_tree
1156
resolve(self, filenames, ignore_misses=True)
2068
conflicts = transform.revert(self, old_tree, filenames, backups, pb,
2070
if filenames is None and len(self.get_parent_ids()) > 1:
2072
last_revision = self.last_revision()
2073
if last_revision != _mod_revision.NULL_REVISION:
2074
if basis_tree is None:
2075
basis_tree = self.basis_tree()
2076
basis_tree.lock_read()
2077
parent_trees.append((last_revision, basis_tree))
2078
self.set_parent_trees(parent_trees)
2081
resolve(self, filenames, ignore_misses=True, recursive=True)
2083
if basis_tree is not None:
1157
2085
return conflicts
2087
def revision_tree(self, revision_id):
2088
"""See Tree.revision_tree.
2090
WorkingTree can supply revision_trees for the basis revision only
2091
because there is only one cached inventory in the bzr directory.
2093
if revision_id == self.last_revision():
2095
xml = self.read_basis_inventory()
2096
except errors.NoSuchFile:
2100
inv = xml7.serializer_v7.read_inventory_from_string(xml)
2101
# dont use the repository revision_tree api because we want
2102
# to supply the inventory.
2103
if inv.revision_id == revision_id:
2104
return revisiontree.RevisionTree(self.branch.repository,
2106
except errors.BadInventoryFormat:
2108
# raise if there was no inventory, or if we read the wrong inventory.
2109
raise errors.NoSuchRevisionInTree(self, revision_id)
1159
2111
# XXX: This method should be deprecated in favour of taking in a proper
1160
2112
# new Inventory object.
2113
@needs_tree_write_lock
1162
2114
def set_inventory(self, new_inventory_list):
1163
2115
from bzrlib.inventory import (Inventory,
1164
2116
InventoryDirectory,
1168
2119
inv = Inventory(self.get_root_id())
1178
2129
elif kind == 'symlink':
1179
2130
inv.add(InventoryLink(file_id, name, parent))
1181
raise BzrError("unknown kind %r" % kind)
2132
raise errors.BzrError("unknown kind %r" % kind)
1182
2133
self._write_inventory(inv)
2135
@needs_tree_write_lock
1185
2136
def set_root_id(self, file_id):
1186
2137
"""Set the root id for this tree."""
1187
inv = self.read_working_inventory()
2141
'WorkingTree.set_root_id with fileid=None')
2142
file_id = osutils.safe_file_id(file_id)
2143
self._set_root_id(file_id)
2145
def _set_root_id(self, file_id):
2146
"""Set the root id for this tree, in a format specific manner.
2148
:param file_id: The file id to assign to the root. It must not be
2149
present in the current inventory or an error will occur. It must
2150
not be None, but rather a valid file id.
2152
inv = self._inventory
1188
2153
orig_root_id = inv.root.file_id
2154
# TODO: it might be nice to exit early if there was nothing
2155
# to do, saving us from trigger a sync on unlock.
2156
self._inventory_is_modified = True
2157
# we preserve the root inventory entry object, but
2158
# unlinkit from the byid index
1189
2159
del inv._byid[inv.root.file_id]
1190
2160
inv.root.file_id = file_id
2161
# and link it into the index with the new changed id.
1191
2162
inv._byid[inv.root.file_id] = inv.root
2163
# and finally update all children to reference the new id.
2164
# XXX: this should be safe to just look at the root.children
2165
# list, not the WHOLE INVENTORY.
1192
2166
for fid in inv:
1193
2167
entry = inv[fid]
1194
2168
if entry.parent_id == orig_root_id:
1195
2169
entry.parent_id = inv.root.file_id
1196
self._write_inventory(inv)
1198
2171
def unlock(self):
1199
2172
"""See Branch.unlock.
1201
2174
WorkingTree locking just uses the Branch locking facilities.
1202
2175
This is current because all working trees have an embedded branch
1203
2176
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
2177
between multiple working trees, i.e. via shared storage, then we
1205
2178
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()
2180
raise NotImplementedError(self.unlock)
2182
def update(self, change_reporter=None, possible_transports=None):
1232
2183
"""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.
2185
This will update the branch if its bound too, which means we have
2186
multiple trees involved:
2188
- The new basis tree of the master.
2189
- The old basis tree of the branch.
2190
- The old basis tree of the working tree.
2191
- The current working tree state.
2193
Pathologically, all three may be different, and non-ancestors of each
2194
other. Conceptually we want to:
2196
- Preserve the wt.basis->wt.state changes
2197
- Transform the wt.basis to the new master basis.
2198
- Apply a merge of the old branch basis to get any 'local' changes from
2200
- Restore the wt.basis->wt.state changes.
1246
2202
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.
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()
2203
- Merge current state -> basis tree of the master w.r.t. the old tree
2205
- Do a 'normal' merge of the old branch basis if it is relevant.
2207
if self.branch.get_bound_location() is not None:
2209
update_branch = True
2211
self.lock_tree_write()
2212
update_branch = False
2215
old_tip = self.branch.update(possible_transports)
2218
return self._update_tree(old_tip, change_reporter)
2222
@needs_tree_write_lock
2223
def _update_tree(self, old_tip=None, change_reporter=None):
2224
"""Update a tree to the master branch.
2226
:param old_tip: if supplied, the previous tip revision the branch,
2227
before it was changed to the master branch's tip.
2229
# here if old_tip is not None, it is the old tip of the branch before
2230
# it was updated from the master branch. This should become a pending
2231
# merge in the working tree to preserve the user existing work. we
2232
# cant set that until we update the working trees last revision to be
2233
# one from the new branch, because it will just get absorbed by the
2234
# parent de-duplication logic.
2236
# We MUST save it even if an error occurs, because otherwise the users
2237
# local work is unreferenced and will appear to have been lost.
2241
last_rev = self.get_parent_ids()[0]
2243
last_rev = _mod_revision.NULL_REVISION
2244
if last_rev != _mod_revision.ensure_null(self.branch.last_revision()):
2245
# merge tree state up to new branch tip.
2246
basis = self.basis_tree()
1259
2249
to_tree = self.branch.basis_tree()
1260
result += merge_inner(self.branch,
2250
if basis.inventory.root is None:
2251
self.set_root_id(to_tree.get_root_id())
2253
result += merge.merge_inner(
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()
2258
change_reporter=change_reporter)
2261
# TODO - dedup parents list with things merged by pull ?
2262
# reuse the tree we've updated to to set the basis:
2263
parent_trees = [(self.branch.last_revision(), to_tree)]
2264
merges = self.get_parent_ids()[1:]
2265
# Ideally we ask the tree for the trees here, that way the working
2266
# tree can decide whether to give us the entire tree or give us a
2267
# lazy initialised tree. dirstate for instance will have the trees
2268
# in ram already, whereas a last-revision + basis-inventory tree
2269
# will not, but also does not need them when setting parents.
2270
for parent in merges:
2271
parent_trees.append(
2272
(parent, self.branch.repository.revision_tree(parent)))
2273
if (old_tip is not None and not _mod_revision.is_null(old_tip)):
2274
parent_trees.append(
2275
(old_tip, self.branch.repository.revision_tree(old_tip)))
2276
self.set_parent_trees(parent_trees)
2277
last_rev = parent_trees[0][0]
2279
# the working tree had the same last-revision as the master
2280
# branch did. We may still have pivot local work from the local
2281
# branch into old_tip:
2282
if (old_tip is not None and not _mod_revision.is_null(old_tip)):
2283
self.add_parent_tree_id(old_tip)
2284
if (old_tip is not None and not _mod_revision.is_null(old_tip)
2285
and old_tip != last_rev):
2286
# our last revision was not the prior branch last revision
2287
# and we have converted that last revision to a pending merge.
2288
# base is somewhere between the branch tip now
2289
# and the now pending merge
2291
# Since we just modified the working tree and inventory, flush out
2292
# the current state, before we modify it again.
2293
# TODO: jam 20070214 WorkingTree3 doesn't require this, dirstate
2294
# requires it only because TreeTransform directly munges the
2295
# inventory and calls tree._write_inventory(). Ultimately we
2296
# should be able to remove this extra flush.
2298
graph = self.branch.repository.get_graph()
2299
base_rev_id = graph.find_unique_lca(self.branch.last_revision(),
2301
base_tree = self.branch.repository.revision_tree(base_rev_id)
2302
other_tree = self.branch.repository.revision_tree(old_tip)
2303
result += merge.merge_inner(
2308
change_reporter=change_reporter)
2311
def _write_hashcache_if_dirty(self):
2312
"""Write out the hashcache if it is dirty."""
2313
if self._hashcache.needs_write:
2315
self._hashcache.write()
2317
if e.errno not in (errno.EPERM, errno.EACCES):
2319
# TODO: jam 20061219 Should this be a warning? A single line
2320
# warning might be sufficient to let the user know what
2322
mutter('Could not write hashcache for %s\nError: %s',
2323
self._hashcache.cache_file_name(), e)
2325
@needs_tree_write_lock
1288
2326
def _write_inventory(self, inv):
1289
2327
"""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')
2328
self._set_inventory(inv, dirty=True)
1297
2331
def set_conflicts(self, arg):
1298
raise UnsupportedOperation(self.set_conflicts, self)
2332
raise errors.UnsupportedOperation(self.set_conflicts, self)
2334
def add_conflicts(self, arg):
2335
raise errors.UnsupportedOperation(self.add_conflicts, self)
1300
2337
@needs_read_lock
1301
2338
def conflicts(self):
1302
conflicts = ConflictList()
2339
conflicts = _mod_conflicts.ConflictList()
1303
2340
for conflicted in self._iter_conflicts():
1306
2343
if file_kind(self.abspath(conflicted)) != "file":
1309
if e.errno == errno.ENOENT:
2345
except errors.NoSuchFile:
1313
2347
if text is True:
1314
2348
for suffix in ('.THIS', '.OTHER'):
1316
2350
kind = file_kind(self.abspath(conflicted+suffix))
1318
if e.errno == errno.ENOENT:
2353
except errors.NoSuchFile:
1326
2357
ctype = {True: 'text conflict', False: 'contents conflict'}[text]
1327
conflicts.append(Conflict.factory(ctype, path=conflicted,
2358
conflicts.append(_mod_conflicts.Conflict.factory(ctype,
1328
2360
file_id=self.path2id(conflicted)))
1329
2361
return conflicts
2363
def walkdirs(self, prefix=""):
2364
"""Walk the directories of this tree.
2366
returns a generator which yields items in the form:
2367
((curren_directory_path, fileid),
2368
[(file1_path, file1_name, file1_kind, (lstat), file1_id,
2371
This API returns a generator, which is only valid during the current
2372
tree transaction - within a single lock_read or lock_write duration.
2374
If the tree is not locked, it may cause an error to be raised,
2375
depending on the tree implementation.
2377
disk_top = self.abspath(prefix)
2378
if disk_top.endswith('/'):
2379
disk_top = disk_top[:-1]
2380
top_strip_len = len(disk_top) + 1
2381
inventory_iterator = self._walkdirs(prefix)
2382
disk_iterator = osutils.walkdirs(disk_top, prefix)
2384
current_disk = disk_iterator.next()
2385
disk_finished = False
2387
if not (e.errno == errno.ENOENT or
2388
(sys.platform == 'win32' and e.errno == ERROR_PATH_NOT_FOUND)):
2391
disk_finished = True
2393
current_inv = inventory_iterator.next()
2394
inv_finished = False
2395
except StopIteration:
2398
while not inv_finished or not disk_finished:
2400
((cur_disk_dir_relpath, cur_disk_dir_path_from_top),
2401
cur_disk_dir_content) = current_disk
2403
((cur_disk_dir_relpath, cur_disk_dir_path_from_top),
2404
cur_disk_dir_content) = ((None, None), None)
2405
if not disk_finished:
2406
# strip out .bzr dirs
2407
if (cur_disk_dir_path_from_top[top_strip_len:] == '' and
2408
len(cur_disk_dir_content) > 0):
2409
# osutils.walkdirs can be made nicer -
2410
# yield the path-from-prefix rather than the pathjoined
2412
bzrdir_loc = bisect_left(cur_disk_dir_content,
2414
if (bzrdir_loc < len(cur_disk_dir_content)
2415
and self.bzrdir.is_control_filename(
2416
cur_disk_dir_content[bzrdir_loc][0])):
2417
# we dont yield the contents of, or, .bzr itself.
2418
del cur_disk_dir_content[bzrdir_loc]
2420
# everything is unknown
2423
# everything is missing
2426
direction = cmp(current_inv[0][0], cur_disk_dir_relpath)
2428
# disk is before inventory - unknown
2429
dirblock = [(relpath, basename, kind, stat, None, None) for
2430
relpath, basename, kind, stat, top_path in
2431
cur_disk_dir_content]
2432
yield (cur_disk_dir_relpath, None), dirblock
2434
current_disk = disk_iterator.next()
2435
except StopIteration:
2436
disk_finished = True
2438
# inventory is before disk - missing.
2439
dirblock = [(relpath, basename, 'unknown', None, fileid, kind)
2440
for relpath, basename, dkind, stat, fileid, kind in
2442
yield (current_inv[0][0], current_inv[0][1]), dirblock
2444
current_inv = inventory_iterator.next()
2445
except StopIteration:
2448
# versioned present directory
2449
# merge the inventory and disk data together
2451
for relpath, subiterator in itertools.groupby(sorted(
2452
current_inv[1] + cur_disk_dir_content,
2453
key=operator.itemgetter(0)), operator.itemgetter(1)):
2454
path_elements = list(subiterator)
2455
if len(path_elements) == 2:
2456
inv_row, disk_row = path_elements
2457
# versioned, present file
2458
dirblock.append((inv_row[0],
2459
inv_row[1], disk_row[2],
2460
disk_row[3], inv_row[4],
2462
elif len(path_elements[0]) == 5:
2464
dirblock.append((path_elements[0][0],
2465
path_elements[0][1], path_elements[0][2],
2466
path_elements[0][3], None, None))
2467
elif len(path_elements[0]) == 6:
2468
# versioned, absent file.
2469
dirblock.append((path_elements[0][0],
2470
path_elements[0][1], 'unknown', None,
2471
path_elements[0][4], path_elements[0][5]))
2473
raise NotImplementedError('unreachable code')
2474
yield current_inv[0], dirblock
2476
current_inv = inventory_iterator.next()
2477
except StopIteration:
2480
current_disk = disk_iterator.next()
2481
except StopIteration:
2482
disk_finished = True
2484
def _walkdirs(self, prefix=""):
2485
"""Walk the directories of this tree.
2487
:prefix: is used as the directrory to start with.
2488
returns a generator which yields items in the form:
2489
((curren_directory_path, fileid),
2490
[(file1_path, file1_name, file1_kind, None, file1_id,
2493
_directory = 'directory'
2494
# get the root in the inventory
2495
inv = self.inventory
2496
top_id = inv.path2id(prefix)
2500
pending = [(prefix, '', _directory, None, top_id, None)]
2503
currentdir = pending.pop()
2504
# 0 - relpath, 1- basename, 2- kind, 3- stat, 4-id, 5-kind
2505
top_id = currentdir[4]
2507
relroot = currentdir[0] + '/'
2510
# FIXME: stash the node in pending
2512
if entry.kind == 'directory':
2513
for name, child in entry.sorted_children():
2514
dirblock.append((relroot + name, name, child.kind, None,
2515
child.file_id, child.kind
2517
yield (currentdir[0], entry.file_id), dirblock
2518
# push the user specified dirs from dirblock
2519
for dir in reversed(dirblock):
2520
if dir[2] == _directory:
2523
@needs_tree_write_lock
2524
def auto_resolve(self):
2525
"""Automatically resolve text conflicts according to contents.
2527
Only text conflicts are auto_resolvable. Files with no conflict markers
2528
are considered 'resolved', because bzr always puts conflict markers
2529
into files that have text conflicts. The corresponding .THIS .BASE and
2530
.OTHER files are deleted, as per 'resolve'.
2531
:return: a tuple of ConflictLists: (un_resolved, resolved).
2533
un_resolved = _mod_conflicts.ConflictList()
2534
resolved = _mod_conflicts.ConflictList()
2535
conflict_re = re.compile('^(<{7}|={7}|>{7})')
2536
for conflict in self.conflicts():
2537
if (conflict.typestring != 'text conflict' or
2538
self.kind(conflict.file_id) != 'file'):
2539
un_resolved.append(conflict)
2541
my_file = open(self.id2abspath(conflict.file_id), 'rb')
2543
for line in my_file:
2544
if conflict_re.search(line):
2545
un_resolved.append(conflict)
2548
resolved.append(conflict)
2551
resolved.remove_files(self)
2552
self.set_conflicts(un_resolved)
2553
return un_resolved, resolved
2556
def _check(self, references):
2557
"""Check the tree for consistency.
2559
:param references: A dict with keys matching the items returned by
2560
self._get_check_refs(), and values from looking those keys up in
2563
tree_basis = self.basis_tree()
2564
tree_basis.lock_read()
2566
repo_basis = references[('trees', self.last_revision())]
2567
if len(list(repo_basis.iter_changes(tree_basis))) > 0:
2568
raise errors.BzrCheckError(
2569
"Mismatched basis inventory content.")
2574
def _validate(self):
2575
"""Validate internal structures.
2577
This is meant mostly for the test suite. To give it a chance to detect
2578
corruption after actions have occurred. The default implementation is a
2581
:return: None. An exception should be raised if there is an error.
2586
def _get_rules_searcher(self, default_searcher):
2587
"""See Tree._get_rules_searcher."""
2588
if self._rules_searcher is None:
2589
self._rules_searcher = super(WorkingTree,
2590
self)._get_rules_searcher(default_searcher)
2591
return self._rules_searcher
2593
def get_shelf_manager(self):
2594
"""Return the ShelfManager for this WorkingTree."""
2595
from bzrlib.shelf import ShelfManager
2596
return ShelfManager(self, self._transport)
2599
class WorkingTree2(WorkingTree):
2600
"""This is the Format 2 working tree.
2602
This was the first weave based working tree.
2603
- uses os locks for locking.
2604
- uses the branch last-revision.
2607
def __init__(self, *args, **kwargs):
2608
super(WorkingTree2, self).__init__(*args, **kwargs)
2609
# WorkingTree2 has more of a constraint that self._inventory must
2610
# exist. Because this is an older format, we don't mind the overhead
2611
# caused by the extra computation here.
2613
# Newer WorkingTree's should only have self._inventory set when they
2615
if self._inventory is None:
2616
self.read_working_inventory()
2618
def _get_check_refs(self):
2619
"""Return the references needed to perform a check of this tree."""
2620
return [('trees', self.last_revision())]
2622
def lock_tree_write(self):
2623
"""See WorkingTree.lock_tree_write().
2625
In Format2 WorkingTrees we have a single lock for the branch and tree
2626
so lock_tree_write() degrades to lock_write().
2628
self.branch.lock_write()
2630
return self._control_files.lock_write()
2632
self.branch.unlock()
2636
# do non-implementation specific cleanup
2639
# we share control files:
2640
if self._control_files._lock_count == 3:
2641
# _inventory_is_modified is always False during a read lock.
2642
if self._inventory_is_modified:
2644
self._write_hashcache_if_dirty()
2646
# reverse order of locking.
2648
return self._control_files.unlock()
2650
self.branch.unlock()
1332
2653
class WorkingTree3(WorkingTree):
1333
2654
"""This is the Format 3 working tree.
added
removed
bzrlib/workingtree.py
