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)
639
# For unversioned files on win32, we just assume they are not
642
return self._inventory[file_id].executable
644
def _is_executable_from_path_and_stat_from_stat(self, path, stat_result):
645
mode = stat_result.st_mode
646
return bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode)
648
if not supports_executable():
649
def is_executable(self, file_id, path=None):
505
650
return self._inventory[file_id].executable
507
path = self._inventory.id2path(file_id)
652
_is_executable_from_path_and_stat = \
653
_is_executable_from_path_and_stat_from_basis
655
def is_executable(self, file_id, path=None):
657
path = self.id2path(file_id)
508
658
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.
659
return bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode)
661
_is_executable_from_path_and_stat = \
662
_is_executable_from_path_and_stat_from_stat
664
@needs_tree_write_lock
665
def _add(self, files, ids, kinds):
666
"""See MutableTree._add."""
534
667
# TODO: Re-adding a file that is removed in the working copy
535
668
# 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))
669
# the read and write working inventory should not occur in this
670
# function - they should be part of lock_write and unlock.
672
for f, file_id, kind in zip(files, ids, kinds):
571
673
if file_id is None:
572
file_id = gen_file_id(f)
573
inv.add_path(f, kind=kind, file_id=file_id)
674
inv.add_path(f, kind=kind)
676
inv.add_path(f, kind=kind, file_id=file_id)
677
self._inventory_is_modified = True
575
mutter("add file %s file_id:{%s} kind=%r" % (f, file_id, kind))
576
self._write_inventory(inv)
679
@needs_tree_write_lock
680
def _gather_kinds(self, files, kinds):
681
"""See MutableTree._gather_kinds."""
682
for pos, f in enumerate(files):
683
if kinds[pos] is None:
684
fullpath = normpath(self.abspath(f))
686
kinds[pos] = file_kind(fullpath)
688
if e.errno == errno.ENOENT:
689
raise errors.NoSuchFile(fullpath)
578
691
@needs_write_lock
692
def add_parent_tree_id(self, revision_id, allow_leftmost_as_ghost=False):
693
"""Add revision_id as a parent.
695
This is equivalent to retrieving the current list of parent ids
696
and setting the list to its value plus revision_id.
698
:param revision_id: The revision id to add to the parent list. It may
699
be a ghost revision as long as its not the first parent to be added,
700
or the allow_leftmost_as_ghost parameter is set True.
701
:param allow_leftmost_as_ghost: Allow the first parent to be a ghost.
703
parents = self.get_parent_ids() + [revision_id]
704
self.set_parent_ids(parents, allow_leftmost_as_ghost=len(parents) > 1
705
or allow_leftmost_as_ghost)
707
@needs_tree_write_lock
708
def add_parent_tree(self, parent_tuple, allow_leftmost_as_ghost=False):
709
"""Add revision_id, tree tuple as a parent.
711
This is equivalent to retrieving the current list of parent trees
712
and setting the list to its value plus parent_tuple. See also
713
add_parent_tree_id - if you only have a parent id available it will be
714
simpler to use that api. If you have the parent already available, using
715
this api is preferred.
717
:param parent_tuple: The (revision id, tree) to add to the parent list.
718
If the revision_id is a ghost, pass None for the tree.
719
:param allow_leftmost_as_ghost: Allow the first parent to be a ghost.
721
parent_ids = self.get_parent_ids() + [parent_tuple[0]]
722
if len(parent_ids) > 1:
723
# the leftmost may have already been a ghost, preserve that if it
725
allow_leftmost_as_ghost = True
726
self.set_parent_ids(parent_ids,
727
allow_leftmost_as_ghost=allow_leftmost_as_ghost)
729
@needs_tree_write_lock
579
730
def add_pending_merge(self, *revision_ids):
580
731
# TODO: Perhaps should check at this point that the
581
732
# history of the revision is actually present?
582
p = self.pending_merges()
733
parents = self.get_parent_ids()
584
735
for rev_id in revision_ids:
736
if rev_id in parents:
738
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.
741
self.set_parent_ids(parents, allow_leftmost_as_ghost=True)
743
def path_content_summary(self, path, _lstat=os.lstat,
744
_mapper=osutils.file_kind_from_stat_mode):
745
"""See Tree.path_content_summary."""
746
abspath = self.abspath(path)
600
merges_file = self._control_files.get_utf8('pending-merges')
748
stat_result = _lstat(abspath)
601
749
except OSError, e:
602
if e.errno != errno.ENOENT:
606
for l in merges_file.readlines():
607
p.append(l.rstrip('\n'))
750
if getattr(e, 'errno', None) == errno.ENOENT:
752
return ('missing', None, None, None)
753
# propagate other errors
755
kind = _mapper(stat_result.st_mode)
757
return self._file_content_summary(path, stat_result)
758
elif kind == 'directory':
759
# perhaps it looks like a plain directory, but it's really a
761
if self._directory_is_tree_reference(path):
762
kind = 'tree-reference'
763
return kind, None, None, None
764
elif kind == 'symlink':
765
target = osutils.readlink(abspath)
766
return ('symlink', None, None, target)
768
return (kind, None, None, None)
770
def _file_content_summary(self, path, stat_result):
771
size = stat_result.st_size
772
executable = self._is_executable_from_path_and_stat(path, stat_result)
773
# try for a stat cache lookup
774
return ('file', size, executable, self._sha_from_stat(
777
def _check_parents_for_ghosts(self, revision_ids, allow_leftmost_as_ghost):
778
"""Common ghost checking functionality from set_parent_*.
780
This checks that the left hand-parent exists if there are any
783
if len(revision_ids) > 0:
784
leftmost_id = revision_ids[0]
785
if (not allow_leftmost_as_ghost and not
786
self.branch.repository.has_revision(leftmost_id)):
787
raise errors.GhostRevisionUnusableHere(leftmost_id)
789
def _set_merges_from_parent_ids(self, parent_ids):
790
merges = parent_ids[1:]
791
self._transport.put_bytes('pending-merges', '\n'.join(merges),
792
mode=self.bzrdir._get_file_mode())
794
def _filter_parent_ids_by_ancestry(self, revision_ids):
795
"""Check that all merged revisions are proper 'heads'.
797
This will always return the first revision_id, and any merged revisions
800
if len(revision_ids) == 0:
802
graph = self.branch.repository.get_graph()
803
heads = graph.heads(revision_ids)
804
new_revision_ids = revision_ids[:1]
805
for revision_id in revision_ids[1:]:
806
if revision_id in heads and revision_id not in new_revision_ids:
807
new_revision_ids.append(revision_id)
808
if new_revision_ids != revision_ids:
809
trace.mutter('requested to set revision_ids = %s,'
810
' but filtered to %s', revision_ids, new_revision_ids)
811
return new_revision_ids
813
@needs_tree_write_lock
814
def set_parent_ids(self, revision_ids, allow_leftmost_as_ghost=False):
815
"""Set the parent ids to revision_ids.
817
See also set_parent_trees. This api will try to retrieve the tree data
818
for each element of revision_ids from the trees repository. If you have
819
tree data already available, it is more efficient to use
820
set_parent_trees rather than set_parent_ids. set_parent_ids is however
821
an easier API to use.
823
:param revision_ids: The revision_ids to set as the parent ids of this
824
working tree. Any of these may be ghosts.
826
self._check_parents_for_ghosts(revision_ids,
827
allow_leftmost_as_ghost=allow_leftmost_as_ghost)
828
for revision_id in revision_ids:
829
_mod_revision.check_not_reserved_id(revision_id)
831
revision_ids = self._filter_parent_ids_by_ancestry(revision_ids)
833
if len(revision_ids) > 0:
834
self.set_last_revision(revision_ids[0])
836
self.set_last_revision(_mod_revision.NULL_REVISION)
838
self._set_merges_from_parent_ids(revision_ids)
840
@needs_tree_write_lock
841
def set_parent_trees(self, parents_list, allow_leftmost_as_ghost=False):
842
"""See MutableTree.set_parent_trees."""
843
parent_ids = [rev for (rev, tree) in parents_list]
844
for revision_id in parent_ids:
845
_mod_revision.check_not_reserved_id(revision_id)
847
self._check_parents_for_ghosts(parent_ids,
848
allow_leftmost_as_ghost=allow_leftmost_as_ghost)
850
parent_ids = self._filter_parent_ids_by_ancestry(parent_ids)
852
if len(parent_ids) == 0:
853
leftmost_parent_id = _mod_revision.NULL_REVISION
854
leftmost_parent_tree = None
856
leftmost_parent_id, leftmost_parent_tree = parents_list[0]
858
if self._change_last_revision(leftmost_parent_id):
859
if leftmost_parent_tree is None:
860
# If we don't have a tree, fall back to reading the
861
# parent tree from the repository.
862
self._cache_basis_inventory(leftmost_parent_id)
864
inv = leftmost_parent_tree.inventory
865
xml = self._create_basis_xml_from_inventory(
866
leftmost_parent_id, inv)
867
self._write_basis_inventory(xml)
868
self._set_merges_from_parent_ids(parent_ids)
870
@needs_tree_write_lock
611
871
def set_pending_merges(self, rev_list):
612
self._control_files.put_utf8('pending-merges', '\n'.join(rev_list))
872
parents = self.get_parent_ids()
873
leftmost = parents[:1]
874
new_parents = leftmost + rev_list
875
self.set_parent_ids(new_parents)
877
@needs_tree_write_lock
615
878
def set_merge_modified(self, modified_hashes):
616
879
def iter_stanzas():
617
880
for file_id, hash in modified_hashes.iteritems():
618
yield Stanza(file_id=file_id, hash=hash)
881
yield Stanza(file_id=file_id.decode('utf8'), hash=hash)
619
882
self._put_rio('merge-hashes', iter_stanzas(), MERGE_MODIFIED_HEADER_1)
884
def _sha_from_stat(self, path, stat_result):
885
"""Get a sha digest from the tree's stat cache.
887
The default implementation assumes no stat cache is present.
889
:param path: The path.
890
:param stat_result: The stat result being looked up.
622
894
def _put_rio(self, filename, stanzas, header):
895
self._must_be_locked()
623
896
my_file = rio_file(stanzas, header)
624
self._control_files.put(filename, my_file)
897
self._transport.put_file(filename, my_file,
898
mode=self.bzrdir._get_file_mode())
900
@needs_write_lock # because merge pulls data into the branch.
901
def merge_from_branch(self, branch, to_revision=None, from_revision=None,
902
merge_type=None, force=False):
903
"""Merge from a branch into this working tree.
905
:param branch: The branch to merge from.
906
:param to_revision: If non-None, the merge will merge to to_revision,
907
but not beyond it. to_revision does not need to be in the history
908
of the branch when it is supplied. If None, to_revision defaults to
909
branch.last_revision().
911
from bzrlib.merge import Merger, Merge3Merger
912
pb = ui.ui_factory.nested_progress_bar()
914
merger = Merger(self.branch, this_tree=self, pb=pb)
915
merger.pp = ProgressPhase("Merge phase", 5, pb)
916
merger.pp.next_phase()
917
# check that there are no local alterations
918
if not force and self.has_changes():
919
raise errors.UncommittedChanges(self)
920
if to_revision is None:
921
to_revision = _mod_revision.ensure_null(branch.last_revision())
922
merger.other_rev_id = to_revision
923
if _mod_revision.is_null(merger.other_rev_id):
924
raise errors.NoCommits(branch)
925
self.branch.fetch(branch, last_revision=merger.other_rev_id)
926
merger.other_basis = merger.other_rev_id
927
merger.other_tree = self.branch.repository.revision_tree(
929
merger.other_branch = branch
930
merger.pp.next_phase()
931
if from_revision is None:
934
merger.set_base_revision(from_revision, branch)
935
if merger.base_rev_id == merger.other_rev_id:
936
raise errors.PointlessMerge
937
merger.backup_files = False
938
if merge_type is None:
939
merger.merge_type = Merge3Merger
941
merger.merge_type = merge_type
942
merger.set_interesting_files(None)
943
merger.show_base = False
944
merger.reprocess = False
945
conflicts = merger.do_merge()
627
952
def merge_modified(self):
953
"""Return a dictionary of files modified by a merge.
955
The list is initialized by WorkingTree.set_merge_modified, which is
956
typically called after we make some automatic updates to the tree
959
This returns a map of file_id->sha1, containing only files which are
960
still in the working inventory and have that text hash.
629
hashfile = self._control_files.get('merge-hashes')
963
hashfile = self._transport.get('merge-hashes')
964
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
969
if hashfile.next() != MERGE_MODIFIED_HEADER_1 + '\n':
970
raise errors.MergeModifiedFormatError()
971
except StopIteration:
972
raise errors.MergeModifiedFormatError()
973
for s in RioReader(hashfile):
974
# RioReader reads in Unicode, so convert file_ids back to utf8
975
file_id = osutils.safe_file_id(s.get("file_id"), warn=False)
976
if file_id not in self.inventory:
978
text_hash = s.get("hash")
979
if text_hash == self.get_file_sha1(file_id):
980
merge_hashes[file_id] = text_hash
986
def mkdir(self, path, file_id=None):
987
"""See MutableTree.mkdir()."""
989
file_id = generate_ids.gen_file_id(os.path.basename(path))
990
os.mkdir(self.abspath(path))
991
self.add(path, file_id, 'directory')
647
994
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).
995
abspath = self.id2abspath(file_id)
996
target = osutils.readlink(abspath)
1000
def subsume(self, other_tree):
1001
def add_children(inventory, entry):
1002
for child_entry in entry.children.values():
1003
inventory._byid[child_entry.file_id] = child_entry
1004
if child_entry.kind == 'directory':
1005
add_children(inventory, child_entry)
1006
if other_tree.get_root_id() == self.get_root_id():
1007
raise errors.BadSubsumeSource(self, other_tree,
1008
'Trees have the same root')
1010
other_tree_path = self.relpath(other_tree.basedir)
1011
except errors.PathNotChild:
1012
raise errors.BadSubsumeSource(self, other_tree,
1013
'Tree is not contained by the other')
1014
new_root_parent = self.path2id(osutils.dirname(other_tree_path))
1015
if new_root_parent is None:
1016
raise errors.BadSubsumeSource(self, other_tree,
1017
'Parent directory is not versioned.')
1018
# We need to ensure that the result of a fetch will have a
1019
# versionedfile for the other_tree root, and only fetching into
1020
# RepositoryKnit2 guarantees that.
1021
if not self.branch.repository.supports_rich_root():
1022
raise errors.SubsumeTargetNeedsUpgrade(other_tree)
1023
other_tree.lock_tree_write()
1025
new_parents = other_tree.get_parent_ids()
1026
other_root = other_tree.inventory.root
1027
other_root.parent_id = new_root_parent
1028
other_root.name = osutils.basename(other_tree_path)
1029
self.inventory.add(other_root)
1030
add_children(self.inventory, other_root)
1031
self._write_inventory(self.inventory)
1032
# normally we don't want to fetch whole repositories, but i think
1033
# here we really do want to consolidate the whole thing.
1034
for parent_id in other_tree.get_parent_ids():
1035
self.branch.fetch(other_tree.branch, parent_id)
1036
self.add_parent_tree_id(parent_id)
1039
other_tree.bzrdir.retire_bzrdir()
1041
def _setup_directory_is_tree_reference(self):
1042
if self._branch.repository._format.supports_tree_reference:
1043
self._directory_is_tree_reference = \
1044
self._directory_may_be_tree_reference
1046
self._directory_is_tree_reference = \
1047
self._directory_is_never_tree_reference
1049
def _directory_is_never_tree_reference(self, relpath):
1052
def _directory_may_be_tree_reference(self, relpath):
1053
# as a special case, if a directory contains control files then
1054
# it's a tree reference, except that the root of the tree is not
1055
return relpath and osutils.isdir(self.abspath(relpath) + u"/.bzr")
1056
# TODO: We could ask all the control formats whether they
1057
# recognize this directory, but at the moment there's no cheap api
1058
# to do that. Since we probably can only nest bzr checkouts and
1059
# they always use this name it's ok for now. -- mbp 20060306
1061
# FIXME: There is an unhandled case here of a subdirectory
1062
# containing .bzr but not a branch; that will probably blow up
1063
# when you try to commit it. It might happen if there is a
1064
# checkout in a subdirectory. This can be avoided by not adding
1067
@needs_tree_write_lock
1068
def extract(self, file_id, format=None):
1069
"""Extract a subtree from this tree.
1071
A new branch will be created, relative to the path for this tree.
1075
segments = osutils.splitpath(path)
1076
transport = self.branch.bzrdir.root_transport
1077
for name in segments:
1078
transport = transport.clone(name)
1079
transport.ensure_base()
1082
sub_path = self.id2path(file_id)
1083
branch_transport = mkdirs(sub_path)
1085
format = self.bzrdir.cloning_metadir()
1086
branch_transport.ensure_base()
1087
branch_bzrdir = format.initialize_on_transport(branch_transport)
1089
repo = branch_bzrdir.find_repository()
1090
except errors.NoRepositoryPresent:
1091
repo = branch_bzrdir.create_repository()
1092
if not repo.supports_rich_root():
1093
raise errors.RootNotRich()
1094
new_branch = branch_bzrdir.create_branch()
1095
new_branch.pull(self.branch)
1096
for parent_id in self.get_parent_ids():
1097
new_branch.fetch(self.branch, parent_id)
1098
tree_transport = self.bzrdir.root_transport.clone(sub_path)
1099
if tree_transport.base != branch_transport.base:
1100
tree_bzrdir = format.initialize_on_transport(tree_transport)
1101
branch.BranchReferenceFormat().initialize(tree_bzrdir, new_branch)
1103
tree_bzrdir = branch_bzrdir
1104
wt = tree_bzrdir.create_workingtree(_mod_revision.NULL_REVISION)
1105
wt.set_parent_ids(self.get_parent_ids())
1106
my_inv = self.inventory
1107
child_inv = inventory.Inventory(root_id=None)
1108
new_root = my_inv[file_id]
1109
my_inv.remove_recursive_id(file_id)
1110
new_root.parent_id = None
1111
child_inv.add(new_root)
1112
self._write_inventory(my_inv)
1113
wt._write_inventory(child_inv)
1116
def _serialize(self, inventory, out_file):
1117
xml5.serializer_v5.write_inventory(self._inventory, out_file,
1120
def _deserialize(selt, in_file):
1121
return xml5.serializer_v5.read_inventory(in_file)
1124
"""Write the in memory inventory to disk."""
1125
# TODO: Maybe this should only write on dirty ?
1126
if self._control_files._lock_mode != 'w':
1127
raise errors.NotWriteLocked(self)
1129
self._serialize(self._inventory, sio)
1131
self._transport.put_file('inventory', sio,
1132
mode=self.bzrdir._get_file_mode())
1133
self._inventory_is_modified = False
1135
def _kind(self, relpath):
1136
return osutils.file_kind(self.abspath(relpath))
1138
def list_files(self, include_root=False, from_dir=None, recursive=True):
1139
"""List all files as (path, class, kind, id, entry).
661
1141
Lists, but does not descend into unversioned directories.
663
1142
This does not include files that have been deleted in this
1143
tree. Skips the control directory.
666
Skips the control directory.
1145
:param include_root: if True, do not return an entry for the root
1146
:param from_dir: start from this directory or None for the root
1147
:param recursive: whether to recurse into subdirectories or not
668
inv = self._inventory
670
def descend(from_dir_relpath, from_dir_id, dp):
1149
# list_files is an iterator, so @needs_read_lock doesn't work properly
1150
# with it. So callers should be careful to always read_lock the tree.
1151
if not self.is_locked():
1152
raise errors.ObjectNotLocked(self)
1154
inv = self.inventory
1155
if from_dir is None and include_root is True:
1156
yield ('', 'V', 'directory', inv.root.file_id, inv.root)
1157
# Convert these into local objects to save lookup times
1158
pathjoin = osutils.pathjoin
1159
file_kind = self._kind
1161
# transport.base ends in a slash, we want the piece
1162
# between the last two slashes
1163
transport_base_dir = self.bzrdir.transport.base.rsplit('/', 2)[1]
1165
fk_entries = {'directory':TreeDirectory, 'file':TreeFile, 'symlink':TreeLink}
1167
# directory file_id, relative path, absolute path, reverse sorted children
1168
if from_dir is not None:
1169
from_dir_id = inv.path2id(from_dir)
1170
if from_dir_id is None:
1171
# Directory not versioned
1173
from_dir_abspath = pathjoin(self.basedir, from_dir)
1175
from_dir_id = inv.root.file_id
1176
from_dir_abspath = self.basedir
1177
children = os.listdir(from_dir_abspath)
1179
# jam 20060527 The kernel sized tree seems equivalent whether we
1180
# use a deque and popleft to keep them sorted, or if we use a plain
1181
# list and just reverse() them.
1182
children = collections.deque(children)
1183
stack = [(from_dir_id, u'', from_dir_abspath, children)]
1185
from_dir_id, from_dir_relpath, from_dir_abspath, children = stack[-1]
1188
f = children.popleft()
674
1189
## TODO: If we find a subdirectory with its own .bzr
675
1190
## directory, then that is a separate tree and we
676
1191
## should exclude it.
678
1193
# the bzrdir for this tree
679
if self.bzrdir.transport.base.endswith(f + '/'):
1194
if transport_base_dir == f:
683
fp = appendpath(from_dir_relpath, f)
1197
# we know that from_dir_relpath and from_dir_abspath never end in a slash
1198
# and 'f' doesn't begin with one, we can do a string op, rather
1199
# than the checks of pathjoin(), all relative paths will have an extra slash
1201
fp = from_dir_relpath + '/' + f
686
fap = appendpath(dp, f)
1204
fap = from_dir_abspath + '/' + f
688
1206
f_ie = inv.get_child(from_dir_id, f)
691
elif self.is_ignored(fp):
1209
elif self.is_ignored(fp[1:]):
1212
# we may not have found this file, because of a unicode issue
1213
f_norm, can_access = osutils.normalized_filename(f)
1214
if f == f_norm or not can_access:
1215
# No change, so treat this file normally
1218
# this file can be accessed by a normalized path
1219
# check again if it is versioned
1220
# these lines are repeated here for performance
1222
fp = from_dir_relpath + '/' + f
1223
fap = from_dir_abspath + '/' + f
1224
f_ie = inv.get_child(from_dir_id, f)
1227
elif self.is_ignored(fp[1:]):
696
1232
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
1234
# make a last minute entry
1236
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
1239
yield fp[1:], c, fk, None, fk_entries[fk]()
1241
yield fp[1:], c, fk, None, TreeEntry()
719
1244
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):
1247
# But do this child first if recursing down
1249
new_children = os.listdir(fap)
1251
new_children = collections.deque(new_children)
1252
stack.append((f_ie.file_id, fp, fap, new_children))
1253
# Break out of inner loop,
1254
# so that we start outer loop with child
1257
# if we finished all children, pop it off the stack
1260
@needs_tree_write_lock
1261
def move(self, from_paths, to_dir=None, after=False, **kwargs):
734
1262
"""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;
1264
to_dir must exist in the inventory.
1266
If to_dir exists and is a directory, the files are moved into
1267
it, keeping their old names.
1269
Note that to_dir is only the last component of the new name;
742
1270
this doesn't change the directory.
1272
For each entry in from_paths the move mode will be determined
1275
The first mode moves the file in the filesystem and updates the
1276
inventory. The second mode only updates the inventory without
1277
touching the file on the filesystem. This is the new mode introduced
1280
move uses the second mode if 'after == True' and the target is not
1281
versioned but present in the working tree.
1283
move uses the second mode if 'after == False' and the source is
1284
versioned but no longer in the working tree, and the target is not
1285
versioned but present in the working tree.
1287
move uses the first mode if 'after == False' and the source is
1288
versioned and present in the working tree, and the target is not
1289
versioned and not present in the working tree.
1291
Everything else results in an error.
744
1293
This returns a list of (from_path, to_path) pairs for each
745
1294
entry that is moved.
748
## TODO: Option to move IDs only
749
assert not isinstance(from_paths, basestring)
1299
# check for deprecated use of signature
1301
to_dir = kwargs.get('to_name', None)
1303
raise TypeError('You must supply a target directory')
1305
symbol_versioning.warn('The parameter to_name was deprecated'
1306
' in version 0.13. Use to_dir instead',
1309
# check destination directory
1310
if isinstance(from_paths, basestring):
750
1312
inv = self.inventory
751
to_abs = self.abspath(to_name)
1313
to_abs = self.abspath(to_dir)
752
1314
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)
1315
raise errors.BzrMoveFailedError('',to_dir,
1316
errors.NotADirectory(to_abs))
1317
if not self.has_filename(to_dir):
1318
raise errors.BzrMoveFailedError('',to_dir,
1319
errors.NotInWorkingDirectory(to_dir))
1320
to_dir_id = inv.path2id(to_dir)
1321
if to_dir_id is None:
1322
raise errors.BzrMoveFailedError('',to_dir,
1323
errors.NotVersionedError(path=str(to_dir)))
759
1325
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)
1326
if to_dir_ie.kind != 'directory':
1327
raise errors.BzrMoveFailedError('',to_dir,
1328
errors.NotADirectory(to_abs))
1330
# create rename entries and tuples
1331
for from_rel in from_paths:
1332
from_tail = splitpath(from_rel)[-1]
1333
from_id = inv.path2id(from_rel)
1335
raise errors.BzrMoveFailedError(from_rel,to_dir,
1336
errors.NotVersionedError(path=str(from_rel)))
1338
from_entry = inv[from_id]
1339
from_parent_id = from_entry.parent_id
1340
to_rel = pathjoin(to_dir, from_tail)
1341
rename_entry = WorkingTree._RenameEntry(from_rel=from_rel,
1343
from_tail=from_tail,
1344
from_parent_id=from_parent_id,
1345
to_rel=to_rel, to_tail=from_tail,
1346
to_parent_id=to_dir_id)
1347
rename_entries.append(rename_entry)
1348
rename_tuples.append((from_rel, to_rel))
1350
# determine which move mode to use. checks also for movability
1351
rename_entries = self._determine_mv_mode(rename_entries, after)
1353
original_modified = self._inventory_is_modified
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
self._inventory_is_modified = True
1357
self._move(rename_entries)
795
1359
# restore the inventory on error
796
self._set_inventory(orig_inv)
1360
self._inventory_is_modified = original_modified
798
1362
self._write_inventory(inv)
802
def rename_one(self, from_rel, to_rel):
1363
return rename_tuples
1365
def _determine_mv_mode(self, rename_entries, after=False):
1366
"""Determines for each from-to pair if both inventory and working tree
1367
or only the inventory has to be changed.
1369
Also does basic plausability tests.
1371
inv = self.inventory
1373
for rename_entry in rename_entries:
1374
# store to local variables for easier reference
1375
from_rel = rename_entry.from_rel
1376
from_id = rename_entry.from_id
1377
to_rel = rename_entry.to_rel
1378
to_id = inv.path2id(to_rel)
1379
only_change_inv = False
1381
# check the inventory for source and destination
1383
raise errors.BzrMoveFailedError(from_rel,to_rel,
1384
errors.NotVersionedError(path=str(from_rel)))
1385
if to_id is not None:
1386
raise errors.BzrMoveFailedError(from_rel,to_rel,
1387
errors.AlreadyVersionedError(path=str(to_rel)))
1389
# try to determine the mode for rename (only change inv or change
1390
# inv and file system)
1392
if not self.has_filename(to_rel):
1393
raise errors.BzrMoveFailedError(from_id,to_rel,
1394
errors.NoSuchFile(path=str(to_rel),
1395
extra="New file has not been created yet"))
1396
only_change_inv = True
1397
elif not self.has_filename(from_rel) and self.has_filename(to_rel):
1398
only_change_inv = True
1399
elif self.has_filename(from_rel) and not self.has_filename(to_rel):
1400
only_change_inv = False
1401
elif (not self.case_sensitive
1402
and from_rel.lower() == to_rel.lower()
1403
and self.has_filename(from_rel)):
1404
only_change_inv = False
1406
# something is wrong, so lets determine what exactly
1407
if not self.has_filename(from_rel) and \
1408
not self.has_filename(to_rel):
1409
raise errors.BzrRenameFailedError(from_rel,to_rel,
1410
errors.PathsDoNotExist(paths=(str(from_rel),
1413
raise errors.RenameFailedFilesExist(from_rel, to_rel)
1414
rename_entry.only_change_inv = only_change_inv
1415
return rename_entries
1417
def _move(self, rename_entries):
1418
"""Moves a list of files.
1420
Depending on the value of the flag 'only_change_inv', the
1421
file will be moved on the file system or not.
1423
inv = self.inventory
1426
for entry in rename_entries:
1428
self._move_entry(entry)
1430
self._rollback_move(moved)
1434
def _rollback_move(self, moved):
1435
"""Try to rollback a previous move in case of an filesystem error."""
1436
inv = self.inventory
1439
self._move_entry(WorkingTree._RenameEntry(
1440
entry.to_rel, entry.from_id,
1441
entry.to_tail, entry.to_parent_id, entry.from_rel,
1442
entry.from_tail, entry.from_parent_id,
1443
entry.only_change_inv))
1444
except errors.BzrMoveFailedError, e:
1445
raise errors.BzrMoveFailedError( '', '', "Rollback failed."
1446
" The working tree is in an inconsistent state."
1447
" Please consider doing a 'bzr revert'."
1448
" Error message is: %s" % e)
1450
def _move_entry(self, entry):
1451
inv = self.inventory
1452
from_rel_abs = self.abspath(entry.from_rel)
1453
to_rel_abs = self.abspath(entry.to_rel)
1454
if from_rel_abs == to_rel_abs:
1455
raise errors.BzrMoveFailedError(entry.from_rel, entry.to_rel,
1456
"Source and target are identical.")
1458
if not entry.only_change_inv:
1460
osutils.rename(from_rel_abs, to_rel_abs)
1462
raise errors.BzrMoveFailedError(entry.from_rel,
1464
inv.rename(entry.from_id, entry.to_parent_id, entry.to_tail)
1466
@needs_tree_write_lock
1467
def rename_one(self, from_rel, to_rel, after=False):
803
1468
"""Rename one file.
805
1470
This can change the directory or the filename or both.
1472
rename_one has several 'modes' to work. First, it can rename a physical
1473
file and change the file_id. That is the normal mode. Second, it can
1474
only change the file_id without touching any physical file. This is
1475
the new mode introduced in version 0.15.
1477
rename_one uses the second mode if 'after == True' and 'to_rel' is not
1478
versioned but present in the working tree.
1480
rename_one uses the second mode if 'after == False' and 'from_rel' is
1481
versioned but no longer in the working tree, and 'to_rel' is not
1482
versioned but present in the working tree.
1484
rename_one uses the first mode if 'after == False' and 'from_rel' is
1485
versioned and present in the working tree, and 'to_rel' is not
1486
versioned and not present in the working tree.
1488
Everything else results in an error.
807
1490
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)
1493
# create rename entries and tuples
1494
from_tail = splitpath(from_rel)[-1]
1495
from_id = inv.path2id(from_rel)
1497
# if file is missing in the inventory maybe it's in the basis_tree
1498
basis_tree = self.branch.basis_tree()
1499
from_id = basis_tree.path2id(from_rel)
1501
raise errors.BzrRenameFailedError(from_rel,to_rel,
1502
errors.NotVersionedError(path=str(from_rel)))
1503
# put entry back in the inventory so we can rename it
1504
from_entry = basis_tree.inventory[from_id].copy()
1507
from_entry = inv[from_id]
1508
from_parent_id = from_entry.parent_id
824
1509
to_dir, to_tail = os.path.split(to_rel)
825
1510
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"])
1511
rename_entry = WorkingTree._RenameEntry(from_rel=from_rel,
1513
from_tail=from_tail,
1514
from_parent_id=from_parent_id,
1515
to_rel=to_rel, to_tail=to_tail,
1516
to_parent_id=to_dir_id)
1517
rename_entries.append(rename_entry)
1519
# determine which move mode to use. checks also for movability
1520
rename_entries = self._determine_mv_mode(rename_entries, after)
1522
# check if the target changed directory and if the target directory is
1524
if to_dir_id is None:
1525
raise errors.BzrMoveFailedError(from_rel,to_rel,
1526
errors.NotVersionedError(path=str(to_dir)))
1528
# all checks done. now we can continue with our actual work
1529
mutter('rename_one:\n'
1534
' to_dir_id {%s}\n',
1535
from_id, from_rel, to_rel, to_dir, to_dir_id)
1537
self._move(rename_entries)
847
1538
self._write_inventory(inv)
1540
class _RenameEntry(object):
1541
def __init__(self, from_rel, from_id, from_tail, from_parent_id,
1542
to_rel, to_tail, to_parent_id, only_change_inv=False):
1543
self.from_rel = from_rel
1544
self.from_id = from_id
1545
self.from_tail = from_tail
1546
self.from_parent_id = from_parent_id
1547
self.to_rel = to_rel
1548
self.to_tail = to_tail
1549
self.to_parent_id = to_parent_id
1550
self.only_change_inv = only_change_inv
849
1552
@needs_read_lock
850
1553
def unknowns(self):
851
1554
"""Return all unknown files.
853
1556
These are files in the working directory that are not versioned or
854
1557
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()
1559
# force the extras method to be fully executed before returning, to
1560
# prevent race conditions with the lock
1562
[subp for subp in self.extras() if not self.is_ignored(subp)])
1564
@needs_tree_write_lock
1565
def unversion(self, file_ids):
1566
"""Remove the file ids in file_ids from the current versioned set.
1568
When a file_id is unversioned, all of its children are automatically
1571
:param file_ids: The file ids to stop versioning.
1572
:raises: NoSuchId if any fileid is not currently versioned.
1574
for file_id in file_ids:
1575
if file_id not in self._inventory:
1576
raise errors.NoSuchId(self, file_id)
1577
for file_id in file_ids:
1578
if self._inventory.has_id(file_id):
1579
self._inventory.remove_recursive_id(file_id)
1581
# in the future this should just set a dirty bit to wait for the
1582
# final unlock. However, until all methods of workingtree start
1583
# with the current in -memory inventory rather than triggering
1584
# a read, it is more complex - we need to teach read_inventory
1585
# to know when to read, and when to not read first... and possibly
1586
# to save first when the in memory one may be corrupted.
1587
# so for now, we just only write it if it is indeed dirty.
1589
self._write_inventory(self._inventory)
879
1591
def _iter_conflicts(self):
880
1592
conflicted = set()
881
for path in (s[0] for s in self.list_files()):
1593
for info in self.list_files():
882
1595
stem = get_conflicted_stem(path)
883
1596
if stem is None:
1053
1856
def _change_last_revision(self, new_revision):
1054
1857
"""Template method part of set_last_revision to perform the change.
1056
1859
This is used to allow WorkingTree3 instances to not affect branch
1057
1860
when their last revision is set.
1059
if new_revision is None:
1862
if _mod_revision.is_null(new_revision):
1060
1863
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])
1866
self.branch.generate_revision_history(new_revision)
1867
except errors.NoSuchRevision:
1868
# not present in the repo - dont try to set it deeper than the tip
1869
self.branch.set_revision_history([new_revision])
1872
def _write_basis_inventory(self, xml):
1873
"""Write the basis inventory XML to the basis-inventory file"""
1874
path = self._basis_inventory_name()
1876
self._transport.put_file(path, sio,
1877
mode=self.bzrdir._get_file_mode())
1879
def _create_basis_xml_from_inventory(self, revision_id, inventory):
1880
"""Create the text that will be saved in basis-inventory"""
1881
inventory.revision_id = revision_id
1882
return xml7.serializer_v7.write_inventory_to_string(inventory)
1071
1884
def _cache_basis_inventory(self, new_revision):
1072
1885
"""Cache new_revision as the basis inventory."""
1886
# TODO: this should allow the ready-to-use inventory to be passed in,
1887
# as commit already has that ready-to-use [while the format is the
1074
# this double handles the inventory - unpack and repack -
1890
# this double handles the inventory - unpack and repack -
1075
1891
# but is easier to understand. We can/should put a conditional
1076
1892
# in here based on whether the inventory is in the latest format
1077
1893
# - 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:
1895
# the fast path is to copy the raw xml from the repository. If the
1896
# xml contains 'revision_id="', then we assume the right
1897
# revision_id is set. We must check for this full string, because a
1898
# root node id can legitimately look like 'revision_id' but cannot
1900
xml = self.branch.repository.get_inventory_xml(new_revision)
1901
firstline = xml.split('\n', 1)[0]
1902
if (not 'revision_id="' in firstline or
1903
'format="7"' not in firstline):
1904
inv = self.branch.repository._serializer.read_inventory_from_string(
1906
xml = self._create_basis_xml_from_inventory(new_revision, inv)
1907
self._write_basis_inventory(xml)
1908
except (errors.NoSuchRevision, errors.RevisionNotPresent):
1088
1911
def read_basis_inventory(self):
1089
1912
"""Read the cached basis inventory."""
1090
1913
path = self._basis_inventory_name()
1091
return self._control_files.get_utf8(path).read()
1914
return self._transport.get_bytes(path)
1093
1916
@needs_read_lock
1094
1917
def read_working_inventory(self):
1095
"""Read the working inventory."""
1918
"""Read the working inventory.
1920
:raises errors.InventoryModified: read_working_inventory will fail
1921
when the current in memory inventory has been modified.
1923
# conceptually this should be an implementation detail of the tree.
1924
# XXX: Deprecate this.
1096
1925
# 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)
1927
if self._inventory_is_modified:
1928
raise errors.InventoryModified(self)
1929
result = self._deserialize(self._transport.get('inventory'))
1930
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.
1933
@needs_tree_write_lock
1934
def remove(self, files, verbose=False, to_file=None, keep_files=True,
1936
"""Remove nominated files from the working inventory.
1938
:files: File paths relative to the basedir.
1939
:keep_files: If true, the files will also be kept.
1940
:force: Delete files and directories, even if they are changed and
1941
even if the directories are not empty.
1118
## TODO: Normalize names
1119
## TODO: Remove nested loops; better scalability
1120
1943
if isinstance(files, basestring):
1121
1944
files = [files]
1123
inv = self.inventory
1125
# do this before any modifications
1949
unknown_nested_files=set()
1951
to_file = sys.stdout
1953
def recurse_directory_to_add_files(directory):
1954
# Recurse directory and add all files
1955
# so we can check if they have changed.
1956
for parent_info, file_infos in\
1957
self.walkdirs(directory):
1958
for relpath, basename, kind, lstat, fileid, kind in file_infos:
1959
# Is it versioned or ignored?
1960
if self.path2id(relpath) or self.is_ignored(relpath):
1961
# Add nested content for deletion.
1962
new_files.add(relpath)
1964
# Files which are not versioned and not ignored
1965
# should be treated as unknown.
1966
unknown_nested_files.add((relpath, None, kind))
1968
for filename in files:
1969
# Get file name into canonical form.
1970
abspath = self.abspath(filename)
1971
filename = self.relpath(abspath)
1972
if len(filename) > 0:
1973
new_files.add(filename)
1974
recurse_directory_to_add_files(filename)
1976
files = list(new_files)
1979
return # nothing to do
1981
# Sort needed to first handle directory content before the directory
1982
files.sort(reverse=True)
1984
# Bail out if we are going to delete files we shouldn't
1985
if not keep_files and not force:
1986
has_changed_files = len(unknown_nested_files) > 0
1987
if not has_changed_files:
1988
for (file_id, path, content_change, versioned, parent_id, name,
1989
kind, executable) in self.iter_changes(self.basis_tree(),
1990
include_unchanged=True, require_versioned=False,
1991
want_unversioned=True, specific_files=files):
1992
if versioned == (False, False):
1993
# The record is unknown ...
1994
if not self.is_ignored(path[1]):
1995
# ... but not ignored
1996
has_changed_files = True
1998
elif content_change and (kind[1] is not None):
1999
# Versioned and changed, but not deleted
2000
has_changed_files = True
2003
if has_changed_files:
2004
# Make delta show ALL applicable changes in error message.
2005
tree_delta = self.changes_from(self.basis_tree(),
2006
require_versioned=False, want_unversioned=True,
2007
specific_files=files)
2008
for unknown_file in unknown_nested_files:
2009
if unknown_file not in tree_delta.unversioned:
2010
tree_delta.unversioned.extend((unknown_file,))
2011
raise errors.BzrRemoveChangedFilesError(tree_delta)
2013
# Build inv_delta and delete files where applicable,
2014
# do this before any modifications to inventory.
1126
2015
for f in files:
1127
fid = inv.path2id(f)
2016
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
2019
message = "%s is not versioned." % (f,)
2022
# having removed it, it must be either ignored or unknown
2023
if self.is_ignored(f):
2027
# XXX: Really should be a more abstract reporter interface
2028
kind_ch = osutils.kind_marker(self.kind(fid))
2029
to_file.write(new_status + ' ' + f + kind_ch + '\n')
2031
inv_delta.append((f, None, fid, None))
2032
message = "removed %s" % (f,)
2035
abs_path = self.abspath(f)
2036
if osutils.lexists(abs_path):
2037
if (osutils.isdir(abs_path) and
2038
len(os.listdir(abs_path)) > 0):
2040
osutils.rmtree(abs_path)
2042
message = "%s is not an empty directory "\
2043
"and won't be deleted." % (f,)
2045
osutils.delete_any(abs_path)
2046
message = "deleted %s" % (f,)
2047
elif message is not None:
2048
# Only care if we haven't done anything yet.
2049
message = "%s does not exist." % (f,)
2051
# Print only one message (if any) per file.
2052
if message is not None:
2054
self.apply_inventory_delta(inv_delta)
2056
@needs_tree_write_lock
2057
def revert(self, filenames=None, old_tree=None, backups=True,
2058
pb=DummyProgress(), report_changes=False):
2059
from bzrlib.conflicts import resolve
2062
symbol_versioning.warn('Using [] to revert all files is deprecated'
2063
' as of bzr 0.91. Please use None (the default) instead.',
2064
DeprecationWarning, stacklevel=2)
1149
2065
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([])
2066
basis_tree = self.basis_tree()
2067
basis_tree.lock_read()
2068
old_tree = basis_tree
1156
resolve(self, filenames, ignore_misses=True)
2072
conflicts = transform.revert(self, old_tree, filenames, backups, pb,
2074
if filenames is None and len(self.get_parent_ids()) > 1:
2076
last_revision = self.last_revision()
2077
if last_revision != _mod_revision.NULL_REVISION:
2078
if basis_tree is None:
2079
basis_tree = self.basis_tree()
2080
basis_tree.lock_read()
2081
parent_trees.append((last_revision, basis_tree))
2082
self.set_parent_trees(parent_trees)
2085
resolve(self, filenames, ignore_misses=True, recursive=True)
2087
if basis_tree is not None:
1157
2089
return conflicts
2091
def revision_tree(self, revision_id):
2092
"""See Tree.revision_tree.
2094
WorkingTree can supply revision_trees for the basis revision only
2095
because there is only one cached inventory in the bzr directory.
2097
if revision_id == self.last_revision():
2099
xml = self.read_basis_inventory()
2100
except errors.NoSuchFile:
2104
inv = xml7.serializer_v7.read_inventory_from_string(xml)
2105
# dont use the repository revision_tree api because we want
2106
# to supply the inventory.
2107
if inv.revision_id == revision_id:
2108
return revisiontree.RevisionTree(self.branch.repository,
2110
except errors.BadInventoryFormat:
2112
# raise if there was no inventory, or if we read the wrong inventory.
2113
raise errors.NoSuchRevisionInTree(self, revision_id)
1159
2115
# XXX: This method should be deprecated in favour of taking in a proper
1160
2116
# new Inventory object.
2117
@needs_tree_write_lock
1162
2118
def set_inventory(self, new_inventory_list):
1163
2119
from bzrlib.inventory import (Inventory,
1164
2120
InventoryDirectory,
1168
2123
inv = Inventory(self.get_root_id())
1178
2133
elif kind == 'symlink':
1179
2134
inv.add(InventoryLink(file_id, name, parent))
1181
raise BzrError("unknown kind %r" % kind)
2136
raise errors.BzrError("unknown kind %r" % kind)
1182
2137
self._write_inventory(inv)
2139
@needs_tree_write_lock
1185
2140
def set_root_id(self, file_id):
1186
2141
"""Set the root id for this tree."""
1187
inv = self.read_working_inventory()
2145
'WorkingTree.set_root_id with fileid=None')
2146
file_id = osutils.safe_file_id(file_id)
2147
self._set_root_id(file_id)
2149
def _set_root_id(self, file_id):
2150
"""Set the root id for this tree, in a format specific manner.
2152
:param file_id: The file id to assign to the root. It must not be
2153
present in the current inventory or an error will occur. It must
2154
not be None, but rather a valid file id.
2156
inv = self._inventory
1188
2157
orig_root_id = inv.root.file_id
2158
# TODO: it might be nice to exit early if there was nothing
2159
# to do, saving us from trigger a sync on unlock.
2160
self._inventory_is_modified = True
2161
# we preserve the root inventory entry object, but
2162
# unlinkit from the byid index
1189
2163
del inv._byid[inv.root.file_id]
1190
2164
inv.root.file_id = file_id
2165
# and link it into the index with the new changed id.
1191
2166
inv._byid[inv.root.file_id] = inv.root
2167
# and finally update all children to reference the new id.
2168
# XXX: this should be safe to just look at the root.children
2169
# list, not the WHOLE INVENTORY.
1192
2170
for fid in inv:
1193
2171
entry = inv[fid]
1194
2172
if entry.parent_id == orig_root_id:
1195
2173
entry.parent_id = inv.root.file_id
1196
self._write_inventory(inv)
1198
2175
def unlock(self):
1199
2176
"""See Branch.unlock.
1201
2178
WorkingTree locking just uses the Branch locking facilities.
1202
2179
This is current because all working trees have an embedded branch
1203
2180
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
2181
between multiple working trees, i.e. via shared storage, then we
1205
2182
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()
2184
raise NotImplementedError(self.unlock)
2186
def update(self, change_reporter=None, possible_transports=None):
1232
2187
"""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.
2189
This will update the branch if its bound too, which means we have
2190
multiple trees involved:
2192
- The new basis tree of the master.
2193
- The old basis tree of the branch.
2194
- The old basis tree of the working tree.
2195
- The current working tree state.
2197
Pathologically, all three may be different, and non-ancestors of each
2198
other. Conceptually we want to:
2200
- Preserve the wt.basis->wt.state changes
2201
- Transform the wt.basis to the new master basis.
2202
- Apply a merge of the old branch basis to get any 'local' changes from
2204
- Restore the wt.basis->wt.state changes.
1246
2206
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()
2207
- Merge current state -> basis tree of the master w.r.t. the old tree
2209
- Do a 'normal' merge of the old branch basis if it is relevant.
2211
if self.branch.get_bound_location() is not None:
2213
update_branch = True
2215
self.lock_tree_write()
2216
update_branch = False
2219
old_tip = self.branch.update(possible_transports)
2222
return self._update_tree(old_tip, change_reporter)
2226
@needs_tree_write_lock
2227
def _update_tree(self, old_tip=None, change_reporter=None):
2228
"""Update a tree to the master branch.
2230
:param old_tip: if supplied, the previous tip revision the branch,
2231
before it was changed to the master branch's tip.
2233
# here if old_tip is not None, it is the old tip of the branch before
2234
# it was updated from the master branch. This should become a pending
2235
# merge in the working tree to preserve the user existing work. we
2236
# cant set that until we update the working trees last revision to be
2237
# one from the new branch, because it will just get absorbed by the
2238
# parent de-duplication logic.
2240
# We MUST save it even if an error occurs, because otherwise the users
2241
# local work is unreferenced and will appear to have been lost.
2245
last_rev = self.get_parent_ids()[0]
2247
last_rev = _mod_revision.NULL_REVISION
2248
if last_rev != _mod_revision.ensure_null(self.branch.last_revision()):
2249
# merge tree state up to new branch tip.
2250
basis = self.basis_tree()
1259
2253
to_tree = self.branch.basis_tree()
1260
result += merge_inner(self.branch,
2254
if basis.inventory.root is None:
2255
self.set_root_id(to_tree.get_root_id())
2257
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()
2262
change_reporter=change_reporter)
2265
# TODO - dedup parents list with things merged by pull ?
2266
# reuse the tree we've updated to to set the basis:
2267
parent_trees = [(self.branch.last_revision(), to_tree)]
2268
merges = self.get_parent_ids()[1:]
2269
# Ideally we ask the tree for the trees here, that way the working
2270
# tree can decide whether to give us the entire tree or give us a
2271
# lazy initialised tree. dirstate for instance will have the trees
2272
# in ram already, whereas a last-revision + basis-inventory tree
2273
# will not, but also does not need them when setting parents.
2274
for parent in merges:
2275
parent_trees.append(
2276
(parent, self.branch.repository.revision_tree(parent)))
2277
if (old_tip is not None and not _mod_revision.is_null(old_tip)):
2278
parent_trees.append(
2279
(old_tip, self.branch.repository.revision_tree(old_tip)))
2280
self.set_parent_trees(parent_trees)
2281
last_rev = parent_trees[0][0]
2283
# the working tree had the same last-revision as the master
2284
# branch did. We may still have pivot local work from the local
2285
# branch into old_tip:
2286
if (old_tip is not None and not _mod_revision.is_null(old_tip)):
2287
self.add_parent_tree_id(old_tip)
2288
if (old_tip is not None and not _mod_revision.is_null(old_tip)
2289
and old_tip != last_rev):
2290
# our last revision was not the prior branch last revision
2291
# and we have converted that last revision to a pending merge.
2292
# base is somewhere between the branch tip now
2293
# and the now pending merge
2295
# Since we just modified the working tree and inventory, flush out
2296
# the current state, before we modify it again.
2297
# TODO: jam 20070214 WorkingTree3 doesn't require this, dirstate
2298
# requires it only because TreeTransform directly munges the
2299
# inventory and calls tree._write_inventory(). Ultimately we
2300
# should be able to remove this extra flush.
2302
graph = self.branch.repository.get_graph()
2303
base_rev_id = graph.find_unique_lca(self.branch.last_revision(),
2305
base_tree = self.branch.repository.revision_tree(base_rev_id)
2306
other_tree = self.branch.repository.revision_tree(old_tip)
2307
result += merge.merge_inner(
2312
change_reporter=change_reporter)
2315
def _write_hashcache_if_dirty(self):
2316
"""Write out the hashcache if it is dirty."""
2317
if self._hashcache.needs_write:
2319
self._hashcache.write()
2321
if e.errno not in (errno.EPERM, errno.EACCES):
2323
# TODO: jam 20061219 Should this be a warning? A single line
2324
# warning might be sufficient to let the user know what
2326
mutter('Could not write hashcache for %s\nError: %s',
2327
self._hashcache.cache_file_name(), e)
2329
@needs_tree_write_lock
1288
2330
def _write_inventory(self, inv):
1289
2331
"""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')
2332
self._set_inventory(inv, dirty=True)
1297
2335
def set_conflicts(self, arg):
1298
raise UnsupportedOperation(self.set_conflicts, self)
2336
raise errors.UnsupportedOperation(self.set_conflicts, self)
2338
def add_conflicts(self, arg):
2339
raise errors.UnsupportedOperation(self.add_conflicts, self)
1300
2341
@needs_read_lock
1301
2342
def conflicts(self):
1302
conflicts = ConflictList()
2343
conflicts = _mod_conflicts.ConflictList()
1303
2344
for conflicted in self._iter_conflicts():
1306
2347
if file_kind(self.abspath(conflicted)) != "file":
1309
if e.errno == errno.ENOENT:
2349
except errors.NoSuchFile:
1313
2351
if text is True:
1314
2352
for suffix in ('.THIS', '.OTHER'):
1316
2354
kind = file_kind(self.abspath(conflicted+suffix))
1318
if e.errno == errno.ENOENT:
2357
except errors.NoSuchFile:
1326
2361
ctype = {True: 'text conflict', False: 'contents conflict'}[text]
1327
conflicts.append(Conflict.factory(ctype, path=conflicted,
2362
conflicts.append(_mod_conflicts.Conflict.factory(ctype,
1328
2364
file_id=self.path2id(conflicted)))
1329
2365
return conflicts
2367
def walkdirs(self, prefix=""):
2368
"""Walk the directories of this tree.
2370
returns a generator which yields items in the form:
2371
((curren_directory_path, fileid),
2372
[(file1_path, file1_name, file1_kind, (lstat), file1_id,
2375
This API returns a generator, which is only valid during the current
2376
tree transaction - within a single lock_read or lock_write duration.
2378
If the tree is not locked, it may cause an error to be raised,
2379
depending on the tree implementation.
2381
disk_top = self.abspath(prefix)
2382
if disk_top.endswith('/'):
2383
disk_top = disk_top[:-1]
2384
top_strip_len = len(disk_top) + 1
2385
inventory_iterator = self._walkdirs(prefix)
2386
disk_iterator = osutils.walkdirs(disk_top, prefix)
2388
current_disk = disk_iterator.next()
2389
disk_finished = False
2391
if not (e.errno == errno.ENOENT or
2392
(sys.platform == 'win32' and e.errno == ERROR_PATH_NOT_FOUND)):
2395
disk_finished = True
2397
current_inv = inventory_iterator.next()
2398
inv_finished = False
2399
except StopIteration:
2402
while not inv_finished or not disk_finished:
2404
((cur_disk_dir_relpath, cur_disk_dir_path_from_top),
2405
cur_disk_dir_content) = current_disk
2407
((cur_disk_dir_relpath, cur_disk_dir_path_from_top),
2408
cur_disk_dir_content) = ((None, None), None)
2409
if not disk_finished:
2410
# strip out .bzr dirs
2411
if (cur_disk_dir_path_from_top[top_strip_len:] == '' and
2412
len(cur_disk_dir_content) > 0):
2413
# osutils.walkdirs can be made nicer -
2414
# yield the path-from-prefix rather than the pathjoined
2416
bzrdir_loc = bisect_left(cur_disk_dir_content,
2418
if (bzrdir_loc < len(cur_disk_dir_content)
2419
and self.bzrdir.is_control_filename(
2420
cur_disk_dir_content[bzrdir_loc][0])):
2421
# we dont yield the contents of, or, .bzr itself.
2422
del cur_disk_dir_content[bzrdir_loc]
2424
# everything is unknown
2427
# everything is missing
2430
direction = cmp(current_inv[0][0], cur_disk_dir_relpath)
2432
# disk is before inventory - unknown
2433
dirblock = [(relpath, basename, kind, stat, None, None) for
2434
relpath, basename, kind, stat, top_path in
2435
cur_disk_dir_content]
2436
yield (cur_disk_dir_relpath, None), dirblock
2438
current_disk = disk_iterator.next()
2439
except StopIteration:
2440
disk_finished = True
2442
# inventory is before disk - missing.
2443
dirblock = [(relpath, basename, 'unknown', None, fileid, kind)
2444
for relpath, basename, dkind, stat, fileid, kind in
2446
yield (current_inv[0][0], current_inv[0][1]), dirblock
2448
current_inv = inventory_iterator.next()
2449
except StopIteration:
2452
# versioned present directory
2453
# merge the inventory and disk data together
2455
for relpath, subiterator in itertools.groupby(sorted(
2456
current_inv[1] + cur_disk_dir_content,
2457
key=operator.itemgetter(0)), operator.itemgetter(1)):
2458
path_elements = list(subiterator)
2459
if len(path_elements) == 2:
2460
inv_row, disk_row = path_elements
2461
# versioned, present file
2462
dirblock.append((inv_row[0],
2463
inv_row[1], disk_row[2],
2464
disk_row[3], inv_row[4],
2466
elif len(path_elements[0]) == 5:
2468
dirblock.append((path_elements[0][0],
2469
path_elements[0][1], path_elements[0][2],
2470
path_elements[0][3], None, None))
2471
elif len(path_elements[0]) == 6:
2472
# versioned, absent file.
2473
dirblock.append((path_elements[0][0],
2474
path_elements[0][1], 'unknown', None,
2475
path_elements[0][4], path_elements[0][5]))
2477
raise NotImplementedError('unreachable code')
2478
yield current_inv[0], dirblock
2480
current_inv = inventory_iterator.next()
2481
except StopIteration:
2484
current_disk = disk_iterator.next()
2485
except StopIteration:
2486
disk_finished = True
2488
def _walkdirs(self, prefix=""):
2489
"""Walk the directories of this tree.
2491
:prefix: is used as the directrory to start with.
2492
returns a generator which yields items in the form:
2493
((curren_directory_path, fileid),
2494
[(file1_path, file1_name, file1_kind, None, file1_id,
2497
_directory = 'directory'
2498
# get the root in the inventory
2499
inv = self.inventory
2500
top_id = inv.path2id(prefix)
2504
pending = [(prefix, '', _directory, None, top_id, None)]
2507
currentdir = pending.pop()
2508
# 0 - relpath, 1- basename, 2- kind, 3- stat, 4-id, 5-kind
2509
top_id = currentdir[4]
2511
relroot = currentdir[0] + '/'
2514
# FIXME: stash the node in pending
2516
if entry.kind == 'directory':
2517
for name, child in entry.sorted_children():
2518
dirblock.append((relroot + name, name, child.kind, None,
2519
child.file_id, child.kind
2521
yield (currentdir[0], entry.file_id), dirblock
2522
# push the user specified dirs from dirblock
2523
for dir in reversed(dirblock):
2524
if dir[2] == _directory:
2527
@needs_tree_write_lock
2528
def auto_resolve(self):
2529
"""Automatically resolve text conflicts according to contents.
2531
Only text conflicts are auto_resolvable. Files with no conflict markers
2532
are considered 'resolved', because bzr always puts conflict markers
2533
into files that have text conflicts. The corresponding .THIS .BASE and
2534
.OTHER files are deleted, as per 'resolve'.
2535
:return: a tuple of ConflictLists: (un_resolved, resolved).
2537
un_resolved = _mod_conflicts.ConflictList()
2538
resolved = _mod_conflicts.ConflictList()
2539
conflict_re = re.compile('^(<{7}|={7}|>{7})')
2540
for conflict in self.conflicts():
2541
if (conflict.typestring != 'text conflict' or
2542
self.kind(conflict.file_id) != 'file'):
2543
un_resolved.append(conflict)
2545
my_file = open(self.id2abspath(conflict.file_id), 'rb')
2547
for line in my_file:
2548
if conflict_re.search(line):
2549
un_resolved.append(conflict)
2552
resolved.append(conflict)
2555
resolved.remove_files(self)
2556
self.set_conflicts(un_resolved)
2557
return un_resolved, resolved
2560
def _check(self, references):
2561
"""Check the tree for consistency.
2563
:param references: A dict with keys matching the items returned by
2564
self._get_check_refs(), and values from looking those keys up in
2567
tree_basis = self.basis_tree()
2568
tree_basis.lock_read()
2570
repo_basis = references[('trees', self.last_revision())]
2571
if len(list(repo_basis.iter_changes(tree_basis))) > 0:
2572
raise errors.BzrCheckError(
2573
"Mismatched basis inventory content.")
2578
def _validate(self):
2579
"""Validate internal structures.
2581
This is meant mostly for the test suite. To give it a chance to detect
2582
corruption after actions have occurred. The default implementation is a
2585
:return: None. An exception should be raised if there is an error.
2589
def _get_rules_searcher(self, default_searcher):
2590
"""See Tree._get_rules_searcher."""
2591
if self._rules_searcher is None:
2592
self._rules_searcher = super(WorkingTree,
2593
self)._get_rules_searcher(default_searcher)
2594
return self._rules_searcher
2596
def get_shelf_manager(self):
2597
"""Return the ShelfManager for this WorkingTree."""
2598
from bzrlib.shelf import ShelfManager
2599
return ShelfManager(self, self._transport)
2602
class WorkingTree2(WorkingTree):
2603
"""This is the Format 2 working tree.
2605
This was the first weave based working tree.
2606
- uses os locks for locking.
2607
- uses the branch last-revision.
2610
def __init__(self, *args, **kwargs):
2611
super(WorkingTree2, self).__init__(*args, **kwargs)
2612
# WorkingTree2 has more of a constraint that self._inventory must
2613
# exist. Because this is an older format, we don't mind the overhead
2614
# caused by the extra computation here.
2616
# Newer WorkingTree's should only have self._inventory set when they
2618
if self._inventory is None:
2619
self.read_working_inventory()
2621
def _get_check_refs(self):
2622
"""Return the references needed to perform a check of this tree."""
2623
return [('trees', self.last_revision())]
2625
def lock_tree_write(self):
2626
"""See WorkingTree.lock_tree_write().
2628
In Format2 WorkingTrees we have a single lock for the branch and tree
2629
so lock_tree_write() degrades to lock_write().
2631
self.branch.lock_write()
2633
return self._control_files.lock_write()
2635
self.branch.unlock()
2639
# do non-implementation specific cleanup
2642
# we share control files:
2643
if self._control_files._lock_count == 3:
2644
# _inventory_is_modified is always False during a read lock.
2645
if self._inventory_is_modified:
2647
self._write_hashcache_if_dirty()
2649
# reverse order of locking.
2651
return self._control_files.unlock()
2653
self.branch.unlock()
1332
2656
class WorkingTree3(WorkingTree):
1333
2657
"""This is the Format 3 working tree.
added
removed
bzrlib/workingtree.py
