269
368
def abspath(self, filename):
270
369
return pathjoin(self.basedir, filename)
272
def relpath(self, abs):
273
"""Return the local path portion from a given absolute path."""
274
return relpath(self.basedir, abs)
371
def basis_tree(self):
372
"""Return RevisionTree for the current last revision.
374
If the left most parent is a ghost then the returned tree will be an
375
empty tree - one obtained by calling repository.revision_tree(None).
378
revision_id = self.get_parent_ids()[0]
380
# no parents, return an empty revision tree.
381
# in the future this should return the tree for
382
# 'empty:' - the implicit root empty tree.
383
return self.branch.repository.revision_tree(None)
385
return self.revision_tree(revision_id)
386
except errors.NoSuchRevision:
388
# No cached copy available, retrieve from the repository.
389
# FIXME? RBC 20060403 should we cache the inventory locally
392
return self.branch.repository.revision_tree(revision_id)
393
except errors.RevisionNotPresent:
394
# the basis tree *may* be a ghost or a low level error may have
395
# occured. If the revision is present, its a problem, if its not
397
if self.branch.repository.has_revision(revision_id):
399
# the basis tree is a ghost so return an empty tree.
400
return self.branch.repository.revision_tree(None)
403
self._flush_ignore_list_cache()
406
@deprecated_method(zero_eight)
407
def create(branch, directory):
408
"""Create a workingtree for branch at directory.
410
If existing_directory already exists it must have a .bzr directory.
411
If it does not exist, it will be created.
413
This returns a new WorkingTree object for the new checkout.
415
TODO FIXME RBC 20060124 when we have checkout formats in place this
416
should accept an optional revisionid to checkout [and reject this if
417
checking out into the same dir as a pre-checkout-aware branch format.]
419
XXX: When BzrDir is present, these should be created through that
422
warnings.warn('delete WorkingTree.create', stacklevel=3)
423
transport = get_transport(directory)
424
if branch.bzrdir.root_transport.base == transport.base:
426
return branch.bzrdir.create_workingtree()
427
# different directory,
428
# create a branch reference
429
# and now a working tree.
430
raise NotImplementedError
433
@deprecated_method(zero_eight)
434
def create_standalone(directory):
435
"""Create a checkout and a branch and a repo at directory.
437
Directory must exist and be empty.
439
please use BzrDir.create_standalone_workingtree
441
return bzrdir.BzrDir.create_standalone_workingtree(directory)
443
def relpath(self, path):
444
"""Return the local path portion from a given path.
446
The path may be absolute or relative. If its a relative path it is
447
interpreted relative to the python current working directory.
449
return osutils.relpath(self.basedir, path)
276
451
def has_filename(self, filename):
277
return bzrlib.osutils.lexists(self.abspath(filename))
279
def get_file(self, file_id):
280
return self.get_file_byname(self.id2path(file_id))
452
return osutils.lexists(self.abspath(filename))
454
def get_file(self, file_id, path=None):
456
path = self.id2path(file_id)
457
return self.get_file_byname(path)
459
def get_file_text(self, file_id):
460
return self.get_file(file_id).read()
282
462
def get_file_byname(self, filename):
283
463
return file(self.abspath(filename), 'rb')
466
def annotate_iter(self, file_id, default_revision=CURRENT_REVISION):
467
"""See Tree.annotate_iter
469
This implementation will use the basis tree implementation if possible.
470
Lines not in the basis are attributed to CURRENT_REVISION
472
If there are pending merges, lines added by those merges will be
473
incorrectly attributed to CURRENT_REVISION (but after committing, the
474
attribution will be correct).
476
basis = self.basis_tree()
479
changes = self._iter_changes(basis, True, [self.id2path(file_id)],
480
require_versioned=True).next()
481
changed_content, kind = changes[2], changes[6]
482
if not changed_content:
483
return basis.annotate_iter(file_id)
487
if kind[0] != 'file':
490
old_lines = list(basis.annotate_iter(file_id))
492
for tree in self.branch.repository.revision_trees(
493
self.get_parent_ids()[1:]):
494
if file_id not in tree:
496
old.append(list(tree.annotate_iter(file_id)))
497
return annotate.reannotate(old, self.get_file(file_id).readlines(),
502
def _get_ancestors(self, default_revision):
503
ancestors = set([default_revision])
504
for parent_id in self.get_parent_ids():
505
ancestors.update(self.branch.repository.get_ancestry(
506
parent_id, topo_sorted=False))
509
def get_parent_ids(self):
510
"""See Tree.get_parent_ids.
512
This implementation reads the pending merges list and last_revision
513
value and uses that to decide what the parents list should be.
515
last_rev = _mod_revision.ensure_null(self._last_revision())
516
if _mod_revision.NULL_REVISION == last_rev:
521
merges_file = self._control_files.get('pending-merges')
522
except errors.NoSuchFile:
525
for l in merges_file.readlines():
526
revision_id = l.rstrip('\n')
527
parents.append(revision_id)
285
531
def get_root_id(self):
286
532
"""Return the id of this trees root"""
287
inv = self.read_working_inventory()
288
return inv.root.file_id
533
return self._inventory.root.file_id
290
535
def _get_store_filename(self, file_id):
291
536
## XXX: badly named; this is not in the store at all
292
537
return self.abspath(self.id2path(file_id))
295
def commit(self, *args, **kw):
296
from bzrlib.commit import Commit
297
Commit().commit(self.branch, *args, **kw)
298
self._set_inventory(self.read_working_inventory())
540
def clone(self, to_bzrdir, revision_id=None):
541
"""Duplicate this working tree into to_bzr, including all state.
543
Specifically modified files are kept as modified, but
544
ignored and unknown files are discarded.
546
If you want to make a new line of development, see bzrdir.sprout()
549
If not None, the cloned tree will have its last revision set to
550
revision, and and difference between the source trees last revision
551
and this one merged in.
553
# assumes the target bzr dir format is compatible.
554
result = self._format.initialize(to_bzrdir)
555
self.copy_content_into(result, revision_id)
559
def copy_content_into(self, tree, revision_id=None):
560
"""Copy the current content and user files of this tree into tree."""
561
tree.set_root_id(self.get_root_id())
562
if revision_id is None:
563
merge.transform_tree(tree, self)
565
# TODO now merge from tree.last_revision to revision (to preserve
566
# user local changes)
567
merge.transform_tree(tree, self)
568
tree.set_parent_ids([revision_id])
300
570
def id2abspath(self, file_id):
301
571
return self.abspath(self.id2path(file_id))
303
573
def has_id(self, file_id):
304
574
# files that have been deleted are excluded
305
inv = self._inventory
306
576
if not inv.has_id(file_id):
308
578
path = inv.id2path(file_id)
309
return bzrlib.osutils.lexists(self.abspath(path))
579
return osutils.lexists(self.abspath(path))
311
581
def has_or_had_id(self, file_id):
312
582
if file_id == self.inventory.root.file_id:
319
589
return os.path.getsize(self.id2abspath(file_id))
322
def get_file_sha1(self, file_id):
323
path = self._inventory.id2path(file_id)
324
return self._hashcache.get_sha1(path)
326
def is_executable(self, file_id):
592
def get_file_sha1(self, file_id, path=None, stat_value=None):
594
path = self._inventory.id2path(file_id)
595
return self._hashcache.get_sha1(path, stat_value)
597
def get_file_mtime(self, file_id, path=None):
599
path = self.inventory.id2path(file_id)
600
return os.lstat(self.abspath(path)).st_mtime
602
def _is_executable_from_path_and_stat_from_basis(self, path, stat_result):
603
file_id = self.path2id(path)
604
return self._inventory[file_id].executable
606
def _is_executable_from_path_and_stat_from_stat(self, path, stat_result):
607
mode = stat_result.st_mode
608
return bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode)
610
if not supports_executable():
611
def is_executable(self, file_id, path=None):
328
612
return self._inventory[file_id].executable
330
path = self._inventory.id2path(file_id)
614
_is_executable_from_path_and_stat = \
615
_is_executable_from_path_and_stat_from_basis
617
def is_executable(self, file_id, path=None):
619
path = self.id2path(file_id)
331
620
mode = os.lstat(self.abspath(path)).st_mode
332
return bool(stat.S_ISREG(mode) and stat.S_IEXEC&mode)
335
def add(self, files, ids=None):
336
"""Make files versioned.
338
Note that the command line normally calls smart_add instead,
339
which can automatically recurse.
341
This adds the files to the inventory, so that they will be
342
recorded by the next commit.
345
List of paths to add, relative to the base of the tree.
348
If set, use these instead of automatically generated ids.
349
Must be the same length as the list of files, but may
350
contain None for ids that are to be autogenerated.
352
TODO: Perhaps have an option to add the ids even if the files do
355
TODO: Perhaps callback with the ids and paths as they're added.
621
return bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode)
623
_is_executable_from_path_and_stat = \
624
_is_executable_from_path_and_stat_from_stat
626
@needs_tree_write_lock
627
def _add(self, files, ids, kinds):
628
"""See MutableTree._add."""
357
629
# TODO: Re-adding a file that is removed in the working copy
358
630
# should probably put it back with the previous ID.
359
if isinstance(files, basestring):
360
assert(ids is None or isinstance(ids, basestring))
366
ids = [None] * len(files)
368
assert(len(ids) == len(files))
370
inv = self.read_working_inventory()
371
for f,file_id in zip(files, ids):
372
if is_control_file(f):
373
raise BzrError("cannot add control file %s" % quotefn(f))
378
raise BzrError("cannot add top-level %r" % f)
380
fullpath = normpath(self.abspath(f))
383
kind = file_kind(fullpath)
385
# maybe something better?
386
raise BzrError('cannot add: not a regular file, symlink or directory: %s' % quotefn(f))
388
if not InventoryEntry.versionable_kind(kind):
389
raise BzrError('cannot add: not a versionable file ('
390
'i.e. regular file, symlink or directory): %s' % quotefn(f))
631
# the read and write working inventory should not occur in this
632
# function - they should be part of lock_write and unlock.
634
for f, file_id, kind in zip(files, ids, kinds):
635
assert kind is not None
392
636
if file_id is None:
393
file_id = gen_file_id(f)
394
inv.add_path(f, kind=kind, file_id=file_id)
637
inv.add_path(f, kind=kind)
639
inv.add_path(f, kind=kind, file_id=file_id)
640
self._inventory_is_modified = True
396
mutter("add file %s file_id:{%s} kind=%r" % (f, file_id, kind))
397
self._write_inventory(inv)
642
@needs_tree_write_lock
643
def _gather_kinds(self, files, kinds):
644
"""See MutableTree._gather_kinds."""
645
for pos, f in enumerate(files):
646
if kinds[pos] is None:
647
fullpath = normpath(self.abspath(f))
649
kinds[pos] = file_kind(fullpath)
651
if e.errno == errno.ENOENT:
652
raise errors.NoSuchFile(fullpath)
399
654
@needs_write_lock
655
def add_parent_tree_id(self, revision_id, allow_leftmost_as_ghost=False):
656
"""Add revision_id as a parent.
658
This is equivalent to retrieving the current list of parent ids
659
and setting the list to its value plus revision_id.
661
:param revision_id: The revision id to add to the parent list. It may
662
be a ghost revision as long as its not the first parent to be added,
663
or the allow_leftmost_as_ghost parameter is set True.
664
:param allow_leftmost_as_ghost: Allow the first parent to be a ghost.
666
parents = self.get_parent_ids() + [revision_id]
667
self.set_parent_ids(parents, allow_leftmost_as_ghost=len(parents) > 1
668
or allow_leftmost_as_ghost)
670
@needs_tree_write_lock
671
def add_parent_tree(self, parent_tuple, allow_leftmost_as_ghost=False):
672
"""Add revision_id, tree tuple as a parent.
674
This is equivalent to retrieving the current list of parent trees
675
and setting the list to its value plus parent_tuple. See also
676
add_parent_tree_id - if you only have a parent id available it will be
677
simpler to use that api. If you have the parent already available, using
678
this api is preferred.
680
:param parent_tuple: The (revision id, tree) to add to the parent list.
681
If the revision_id is a ghost, pass None for the tree.
682
:param allow_leftmost_as_ghost: Allow the first parent to be a ghost.
684
parent_ids = self.get_parent_ids() + [parent_tuple[0]]
685
if len(parent_ids) > 1:
686
# the leftmost may have already been a ghost, preserve that if it
688
allow_leftmost_as_ghost = True
689
self.set_parent_ids(parent_ids,
690
allow_leftmost_as_ghost=allow_leftmost_as_ghost)
692
@needs_tree_write_lock
400
693
def add_pending_merge(self, *revision_ids):
401
694
# TODO: Perhaps should check at this point that the
402
695
# history of the revision is actually present?
403
p = self.pending_merges()
696
parents = self.get_parent_ids()
405
698
for rev_id in revision_ids:
699
if rev_id in parents:
701
parents.append(rev_id)
411
self.set_pending_merges(p)
704
self.set_parent_ids(parents, allow_leftmost_as_ghost=True)
706
def path_content_summary(self, path, _lstat=os.lstat,
707
_mapper=osutils.file_kind_from_stat_mode):
708
"""See Tree.path_content_summary."""
709
abspath = self.abspath(path)
711
stat_result = _lstat(abspath)
713
if getattr(e, 'errno', None) == errno.ENOENT:
715
return ('missing', None, None, None)
716
# propagate other errors
718
kind = _mapper(stat_result.st_mode)
720
size = stat_result.st_size
721
# try for a stat cache lookup
722
executable = self._is_executable_from_path_and_stat(path, stat_result)
723
return (kind, size, executable, self._sha_from_stat(
725
elif kind == 'directory':
726
# perhaps it looks like a plain directory, but it's really a
728
if self._directory_is_tree_reference(path):
729
kind = 'tree-reference'
730
return kind, None, None, None
731
elif kind == 'symlink':
732
return ('symlink', None, None, os.readlink(abspath))
734
return (kind, None, None, None)
736
@deprecated_method(zero_eleven)
413
738
def pending_merges(self):
414
739
"""Return a list of pending merges.
416
741
These are revisions that have been merged into the working
417
742
directory but not yet committed.
419
cfn = self.branch._rel_controlfilename('pending-merges')
420
if not self.branch._transport.has(cfn):
423
for l in self.branch.controlfile('pending-merges', 'r').readlines():
424
p.append(l.rstrip('\n'))
744
As of 0.11 this is deprecated. Please see WorkingTree.get_parent_ids()
745
instead - which is available on all tree objects.
747
return self.get_parent_ids()[1:]
749
def _check_parents_for_ghosts(self, revision_ids, allow_leftmost_as_ghost):
750
"""Common ghost checking functionality from set_parent_*.
752
This checks that the left hand-parent exists if there are any
755
if len(revision_ids) > 0:
756
leftmost_id = revision_ids[0]
757
if (not allow_leftmost_as_ghost and not
758
self.branch.repository.has_revision(leftmost_id)):
759
raise errors.GhostRevisionUnusableHere(leftmost_id)
761
def _set_merges_from_parent_ids(self, parent_ids):
762
merges = parent_ids[1:]
763
self._control_files.put_bytes('pending-merges', '\n'.join(merges))
765
@needs_tree_write_lock
766
def set_parent_ids(self, revision_ids, allow_leftmost_as_ghost=False):
767
"""Set the parent ids to revision_ids.
769
See also set_parent_trees. This api will try to retrieve the tree data
770
for each element of revision_ids from the trees repository. If you have
771
tree data already available, it is more efficient to use
772
set_parent_trees rather than set_parent_ids. set_parent_ids is however
773
an easier API to use.
775
:param revision_ids: The revision_ids to set as the parent ids of this
776
working tree. Any of these may be ghosts.
778
self._check_parents_for_ghosts(revision_ids,
779
allow_leftmost_as_ghost=allow_leftmost_as_ghost)
780
for revision_id in revision_ids:
781
_mod_revision.check_not_reserved_id(revision_id)
783
if len(revision_ids) > 0:
784
self.set_last_revision(revision_ids[0])
786
self.set_last_revision(_mod_revision.NULL_REVISION)
788
self._set_merges_from_parent_ids(revision_ids)
790
@needs_tree_write_lock
791
def set_parent_trees(self, parents_list, allow_leftmost_as_ghost=False):
792
"""See MutableTree.set_parent_trees."""
793
parent_ids = [rev for (rev, tree) in parents_list]
794
for revision_id in parent_ids:
795
_mod_revision.check_not_reserved_id(revision_id)
797
self._check_parents_for_ghosts(parent_ids,
798
allow_leftmost_as_ghost=allow_leftmost_as_ghost)
800
if len(parent_ids) == 0:
801
leftmost_parent_id = _mod_revision.NULL_REVISION
802
leftmost_parent_tree = None
804
leftmost_parent_id, leftmost_parent_tree = parents_list[0]
806
if self._change_last_revision(leftmost_parent_id):
807
if leftmost_parent_tree is None:
808
# If we don't have a tree, fall back to reading the
809
# parent tree from the repository.
810
self._cache_basis_inventory(leftmost_parent_id)
812
inv = leftmost_parent_tree.inventory
813
xml = self._create_basis_xml_from_inventory(
814
leftmost_parent_id, inv)
815
self._write_basis_inventory(xml)
816
self._set_merges_from_parent_ids(parent_ids)
818
@needs_tree_write_lock
428
819
def set_pending_merges(self, rev_list):
429
self.branch.put_controlfile('pending-merges', '\n'.join(rev_list))
820
parents = self.get_parent_ids()
821
leftmost = parents[:1]
822
new_parents = leftmost + rev_list
823
self.set_parent_ids(new_parents)
825
@needs_tree_write_lock
826
def set_merge_modified(self, modified_hashes):
828
for file_id, hash in modified_hashes.iteritems():
829
yield Stanza(file_id=file_id.decode('utf8'), hash=hash)
830
self._put_rio('merge-hashes', iter_stanzas(), MERGE_MODIFIED_HEADER_1)
832
def _sha_from_stat(self, path, stat_result):
833
"""Get a sha digest from the tree's stat cache.
835
The default implementation assumes no stat cache is present.
837
:param path: The path.
838
:param stat_result: The stat result being looked up.
842
def _put_rio(self, filename, stanzas, header):
843
self._must_be_locked()
844
my_file = rio_file(stanzas, header)
845
self._control_files.put(filename, my_file)
847
@needs_write_lock # because merge pulls data into the branch.
848
def merge_from_branch(self, branch, to_revision=None, from_revision=None,
850
"""Merge from a branch into this working tree.
852
:param branch: The branch to merge from.
853
:param to_revision: If non-None, the merge will merge to to_revision,
854
but not beyond it. to_revision does not need to be in the history
855
of the branch when it is supplied. If None, to_revision defaults to
856
branch.last_revision().
858
from bzrlib.merge import Merger, Merge3Merger
859
pb = bzrlib.ui.ui_factory.nested_progress_bar()
861
merger = Merger(self.branch, this_tree=self, pb=pb)
862
merger.pp = ProgressPhase("Merge phase", 5, pb)
863
merger.pp.next_phase()
864
# check that there are no
866
merger.check_basis(check_clean=True, require_commits=False)
867
if to_revision is None:
868
to_revision = _mod_revision.ensure_null(branch.last_revision())
869
merger.other_rev_id = to_revision
870
if _mod_revision.is_null(merger.other_rev_id):
871
raise errors.NoCommits(branch)
872
self.branch.fetch(branch, last_revision=merger.other_rev_id)
873
merger.other_basis = merger.other_rev_id
874
merger.other_tree = self.branch.repository.revision_tree(
876
merger.other_branch = branch
877
merger.pp.next_phase()
878
if from_revision is None:
881
merger.set_base_revision(from_revision, branch)
882
if merger.base_rev_id == merger.other_rev_id:
883
raise errors.PointlessMerge
884
merger.backup_files = False
885
if merge_type is None:
886
merger.merge_type = Merge3Merger
888
merger.merge_type = merge_type
889
merger.set_interesting_files(None)
890
merger.show_base = False
891
merger.reprocess = False
892
conflicts = merger.do_merge()
899
def merge_modified(self):
900
"""Return a dictionary of files modified by a merge.
902
The list is initialized by WorkingTree.set_merge_modified, which is
903
typically called after we make some automatic updates to the tree
906
This returns a map of file_id->sha1, containing only files which are
907
still in the working inventory and have that text hash.
910
hashfile = self._control_files.get('merge-hashes')
911
except errors.NoSuchFile:
915
if hashfile.next() != MERGE_MODIFIED_HEADER_1 + '\n':
916
raise errors.MergeModifiedFormatError()
917
except StopIteration:
918
raise errors.MergeModifiedFormatError()
919
for s in RioReader(hashfile):
920
# RioReader reads in Unicode, so convert file_ids back to utf8
921
file_id = osutils.safe_file_id(s.get("file_id"), warn=False)
922
if file_id not in self.inventory:
924
text_hash = s.get("hash")
925
if text_hash == self.get_file_sha1(file_id):
926
merge_hashes[file_id] = text_hash
930
def mkdir(self, path, file_id=None):
931
"""See MutableTree.mkdir()."""
933
file_id = generate_ids.gen_file_id(os.path.basename(path))
934
os.mkdir(self.abspath(path))
935
self.add(path, file_id, 'directory')
431
938
def get_symlink_target(self, file_id):
432
939
return os.readlink(self.id2abspath(file_id))
434
def file_class(self, filename):
435
if self.path2id(filename):
437
elif self.is_ignored(filename):
443
def list_files(self):
444
"""Recursively list all files as (path, class, kind, id).
942
def subsume(self, other_tree):
943
def add_children(inventory, entry):
944
for child_entry in entry.children.values():
945
inventory._byid[child_entry.file_id] = child_entry
946
if child_entry.kind == 'directory':
947
add_children(inventory, child_entry)
948
if other_tree.get_root_id() == self.get_root_id():
949
raise errors.BadSubsumeSource(self, other_tree,
950
'Trees have the same root')
952
other_tree_path = self.relpath(other_tree.basedir)
953
except errors.PathNotChild:
954
raise errors.BadSubsumeSource(self, other_tree,
955
'Tree is not contained by the other')
956
new_root_parent = self.path2id(osutils.dirname(other_tree_path))
957
if new_root_parent is None:
958
raise errors.BadSubsumeSource(self, other_tree,
959
'Parent directory is not versioned.')
960
# We need to ensure that the result of a fetch will have a
961
# versionedfile for the other_tree root, and only fetching into
962
# RepositoryKnit2 guarantees that.
963
if not self.branch.repository.supports_rich_root():
964
raise errors.SubsumeTargetNeedsUpgrade(other_tree)
965
other_tree.lock_tree_write()
967
new_parents = other_tree.get_parent_ids()
968
other_root = other_tree.inventory.root
969
other_root.parent_id = new_root_parent
970
other_root.name = osutils.basename(other_tree_path)
971
self.inventory.add(other_root)
972
add_children(self.inventory, other_root)
973
self._write_inventory(self.inventory)
974
# normally we don't want to fetch whole repositories, but i think
975
# here we really do want to consolidate the whole thing.
976
for parent_id in other_tree.get_parent_ids():
977
self.branch.fetch(other_tree.branch, parent_id)
978
self.add_parent_tree_id(parent_id)
981
other_tree.bzrdir.retire_bzrdir()
983
def _directory_is_tree_reference(self, relpath):
984
# as a special case, if a directory contains control files then
985
# it's a tree reference, except that the root of the tree is not
986
return relpath and osutils.isdir(self.abspath(relpath) + u"/.bzr")
987
# TODO: We could ask all the control formats whether they
988
# recognize this directory, but at the moment there's no cheap api
989
# to do that. Since we probably can only nest bzr checkouts and
990
# they always use this name it's ok for now. -- mbp 20060306
992
# FIXME: There is an unhandled case here of a subdirectory
993
# containing .bzr but not a branch; that will probably blow up
994
# when you try to commit it. It might happen if there is a
995
# checkout in a subdirectory. This can be avoided by not adding
998
@needs_tree_write_lock
999
def extract(self, file_id, format=None):
1000
"""Extract a subtree from this tree.
1002
A new branch will be created, relative to the path for this tree.
1006
segments = osutils.splitpath(path)
1007
transport = self.branch.bzrdir.root_transport
1008
for name in segments:
1009
transport = transport.clone(name)
1010
transport.ensure_base()
1013
sub_path = self.id2path(file_id)
1014
branch_transport = mkdirs(sub_path)
1016
format = bzrdir.format_registry.make_bzrdir('dirstate-with-subtree')
1017
branch_transport.ensure_base()
1018
branch_bzrdir = format.initialize_on_transport(branch_transport)
1020
repo = branch_bzrdir.find_repository()
1021
except errors.NoRepositoryPresent:
1022
repo = branch_bzrdir.create_repository()
1023
assert repo.supports_rich_root()
1025
if not repo.supports_rich_root():
1026
raise errors.RootNotRich()
1027
new_branch = branch_bzrdir.create_branch()
1028
new_branch.pull(self.branch)
1029
for parent_id in self.get_parent_ids():
1030
new_branch.fetch(self.branch, parent_id)
1031
tree_transport = self.bzrdir.root_transport.clone(sub_path)
1032
if tree_transport.base != branch_transport.base:
1033
tree_bzrdir = format.initialize_on_transport(tree_transport)
1034
branch.BranchReferenceFormat().initialize(tree_bzrdir, new_branch)
1036
tree_bzrdir = branch_bzrdir
1037
wt = tree_bzrdir.create_workingtree(NULL_REVISION)
1038
wt.set_parent_ids(self.get_parent_ids())
1039
my_inv = self.inventory
1040
child_inv = Inventory(root_id=None)
1041
new_root = my_inv[file_id]
1042
my_inv.remove_recursive_id(file_id)
1043
new_root.parent_id = None
1044
child_inv.add(new_root)
1045
self._write_inventory(my_inv)
1046
wt._write_inventory(child_inv)
1049
def _serialize(self, inventory, out_file):
1050
xml5.serializer_v5.write_inventory(self._inventory, out_file,
1053
def _deserialize(selt, in_file):
1054
return xml5.serializer_v5.read_inventory(in_file)
1057
"""Write the in memory inventory to disk."""
1058
# TODO: Maybe this should only write on dirty ?
1059
if self._control_files._lock_mode != 'w':
1060
raise errors.NotWriteLocked(self)
1062
self._serialize(self._inventory, sio)
1064
self._control_files.put('inventory', sio)
1065
self._inventory_is_modified = False
1067
def _kind(self, relpath):
1068
return osutils.file_kind(self.abspath(relpath))
1070
def list_files(self, include_root=False):
1071
"""Recursively list all files as (path, class, kind, id, entry).
446
1073
Lists, but does not descend into unversioned directories.
451
1078
Skips the control directory.
453
inv = self._inventory
455
def descend(from_dir_relpath, from_dir_id, dp):
1080
# list_files is an iterator, so @needs_read_lock doesn't work properly
1081
# with it. So callers should be careful to always read_lock the tree.
1082
if not self.is_locked():
1083
raise errors.ObjectNotLocked(self)
1085
inv = self.inventory
1086
if include_root is True:
1087
yield ('', 'V', 'directory', inv.root.file_id, inv.root)
1088
# Convert these into local objects to save lookup times
1089
pathjoin = osutils.pathjoin
1090
file_kind = self._kind
1092
# transport.base ends in a slash, we want the piece
1093
# between the last two slashes
1094
transport_base_dir = self.bzrdir.transport.base.rsplit('/', 2)[1]
1096
fk_entries = {'directory':TreeDirectory, 'file':TreeFile, 'symlink':TreeLink}
1098
# directory file_id, relative path, absolute path, reverse sorted children
1099
children = os.listdir(self.basedir)
1101
# jam 20060527 The kernel sized tree seems equivalent whether we
1102
# use a deque and popleft to keep them sorted, or if we use a plain
1103
# list and just reverse() them.
1104
children = collections.deque(children)
1105
stack = [(inv.root.file_id, u'', self.basedir, children)]
1107
from_dir_id, from_dir_relpath, from_dir_abspath, children = stack[-1]
1110
f = children.popleft()
459
1111
## TODO: If we find a subdirectory with its own .bzr
460
1112
## directory, then that is a separate tree and we
461
1113
## should exclude it.
462
if bzrlib.BZRDIR == f:
1115
# the bzrdir for this tree
1116
if transport_base_dir == f:
466
fp = appendpath(from_dir_relpath, f)
1119
# we know that from_dir_relpath and from_dir_abspath never end in a slash
1120
# and 'f' doesn't begin with one, we can do a string op, rather
1121
# than the checks of pathjoin(), all relative paths will have an extra slash
1123
fp = from_dir_relpath + '/' + f
469
fap = appendpath(dp, f)
1126
fap = from_dir_abspath + '/' + f
471
1128
f_ie = inv.get_child(from_dir_id, f)
474
elif self.is_ignored(fp):
1131
elif self.is_ignored(fp[1:]):
1134
# we may not have found this file, because of a unicode issue
1135
f_norm, can_access = osutils.normalized_filename(f)
1136
if f == f_norm or not can_access:
1137
# No change, so treat this file normally
1140
# this file can be accessed by a normalized path
1141
# check again if it is versioned
1142
# these lines are repeated here for performance
1144
fp = from_dir_relpath + '/' + f
1145
fap = from_dir_abspath + '/' + f
1146
f_ie = inv.get_child(from_dir_id, f)
1149
elif self.is_ignored(fp[1:]):
479
1154
fk = file_kind(fap)
483
raise BzrCheckError("file %r entered as kind %r id %r, "
485
% (fap, f_ie.kind, f_ie.file_id, fk))
487
1156
# make a last minute entry
1158
yield fp[1:], c, fk, f_ie.file_id, f_ie
491
if fk == 'directory':
492
entry = TreeDirectory()
495
elif fk == 'symlink':
1161
yield fp[1:], c, fk, None, fk_entries[fk]()
1163
yield fp[1:], c, fk, None, TreeEntry()
500
yield fp, c, fk, (f_ie and f_ie.file_id), entry
502
1166
if fk != 'directory':
506
# don't descend unversioned directories
509
for ff in descend(fp, f_ie.file_id, fap):
512
for f in descend(u'', inv.root.file_id, self.basedir):
516
def move(self, from_paths, to_name):
1169
# But do this child first
1170
new_children = os.listdir(fap)
1172
new_children = collections.deque(new_children)
1173
stack.append((f_ie.file_id, fp, fap, new_children))
1174
# Break out of inner loop,
1175
# so that we start outer loop with child
1178
# if we finished all children, pop it off the stack
1181
@needs_tree_write_lock
1182
def move(self, from_paths, to_dir=None, after=False, **kwargs):
517
1183
"""Rename files.
519
to_name must exist in the inventory.
1185
to_dir must exist in the inventory.
521
If to_name exists and is a directory, the files are moved into
1187
If to_dir exists and is a directory, the files are moved into
522
1188
it, keeping their old names.
524
Note that to_name is only the last component of the new name;
1190
Note that to_dir is only the last component of the new name;
525
1191
this doesn't change the directory.
1193
For each entry in from_paths the move mode will be determined
1196
The first mode moves the file in the filesystem and updates the
1197
inventory. The second mode only updates the inventory without
1198
touching the file on the filesystem. This is the new mode introduced
1201
move uses the second mode if 'after == True' and the target is not
1202
versioned but present in the working tree.
1204
move uses the second mode if 'after == False' and the source is
1205
versioned but no longer in the working tree, and the target is not
1206
versioned but present in the working tree.
1208
move uses the first mode if 'after == False' and the source is
1209
versioned and present in the working tree, and the target is not
1210
versioned and not present in the working tree.
1212
Everything else results in an error.
527
1214
This returns a list of (from_path, to_path) pairs for each
528
1215
entry that is moved.
531
## TODO: Option to move IDs only
1220
# check for deprecated use of signature
1222
to_dir = kwargs.get('to_name', None)
1224
raise TypeError('You must supply a target directory')
1226
symbol_versioning.warn('The parameter to_name was deprecated'
1227
' in version 0.13. Use to_dir instead',
1230
# check destination directory
532
1231
assert not isinstance(from_paths, basestring)
533
1232
inv = self.inventory
534
to_abs = self.abspath(to_name)
1233
to_abs = self.abspath(to_dir)
535
1234
if not isdir(to_abs):
536
raise BzrError("destination %r is not a directory" % to_abs)
537
if not self.has_filename(to_name):
538
raise BzrError("destination %r not in working directory" % to_abs)
539
to_dir_id = inv.path2id(to_name)
540
if to_dir_id == None and to_name != '':
541
raise BzrError("destination %r is not a versioned directory" % to_name)
1235
raise errors.BzrMoveFailedError('',to_dir,
1236
errors.NotADirectory(to_abs))
1237
if not self.has_filename(to_dir):
1238
raise errors.BzrMoveFailedError('',to_dir,
1239
errors.NotInWorkingDirectory(to_dir))
1240
to_dir_id = inv.path2id(to_dir)
1241
if to_dir_id is None:
1242
raise errors.BzrMoveFailedError('',to_dir,
1243
errors.NotVersionedError(path=str(to_dir)))
542
1245
to_dir_ie = inv[to_dir_id]
543
if to_dir_ie.kind not in ('directory', 'root_directory'):
544
raise BzrError("destination %r is not a directory" % to_abs)
546
to_idpath = inv.get_idpath(to_dir_id)
549
if not self.has_filename(f):
550
raise BzrError("%r does not exist in working tree" % f)
551
f_id = inv.path2id(f)
553
raise BzrError("%r is not versioned" % f)
554
name_tail = splitpath(f)[-1]
555
dest_path = appendpath(to_name, name_tail)
556
if self.has_filename(dest_path):
557
raise BzrError("destination %r already exists" % dest_path)
558
if f_id in to_idpath:
559
raise BzrError("can't move %r to a subdirectory of itself" % f)
561
# OK, so there's a race here, it's possible that someone will
562
# create a file in this interval and then the rename might be
563
# left half-done. But we should have caught most problems.
564
orig_inv = deepcopy(self.inventory)
1246
if to_dir_ie.kind != 'directory':
1247
raise errors.BzrMoveFailedError('',to_dir,
1248
errors.NotADirectory(to_abs))
1250
# create rename entries and tuples
1251
for from_rel in from_paths:
1252
from_tail = splitpath(from_rel)[-1]
1253
from_id = inv.path2id(from_rel)
1255
raise errors.BzrMoveFailedError(from_rel,to_dir,
1256
errors.NotVersionedError(path=str(from_rel)))
1258
from_entry = inv[from_id]
1259
from_parent_id = from_entry.parent_id
1260
to_rel = pathjoin(to_dir, from_tail)
1261
rename_entry = WorkingTree._RenameEntry(from_rel=from_rel,
1263
from_tail=from_tail,
1264
from_parent_id=from_parent_id,
1265
to_rel=to_rel, to_tail=from_tail,
1266
to_parent_id=to_dir_id)
1267
rename_entries.append(rename_entry)
1268
rename_tuples.append((from_rel, to_rel))
1270
# determine which move mode to use. checks also for movability
1271
rename_entries = self._determine_mv_mode(rename_entries, after)
1273
original_modified = self._inventory_is_modified
567
name_tail = splitpath(f)[-1]
568
dest_path = appendpath(to_name, name_tail)
569
result.append((f, dest_path))
570
inv.rename(inv.path2id(f), to_dir_id, name_tail)
572
rename(self.abspath(f), self.abspath(dest_path))
574
raise BzrError("failed to rename %r to %r: %s" %
575
(f, dest_path, e[1]),
576
["rename rolled back"])
1276
self._inventory_is_modified = True
1277
self._move(rename_entries)
578
1279
# restore the inventory on error
579
self._set_inventory(orig_inv)
1280
self._inventory_is_modified = original_modified
581
1282
self._write_inventory(inv)
585
def rename_one(self, from_rel, to_rel):
1283
return rename_tuples
1285
def _determine_mv_mode(self, rename_entries, after=False):
1286
"""Determines for each from-to pair if both inventory and working tree
1287
or only the inventory has to be changed.
1289
Also does basic plausability tests.
1291
inv = self.inventory
1293
for rename_entry in rename_entries:
1294
# store to local variables for easier reference
1295
from_rel = rename_entry.from_rel
1296
from_id = rename_entry.from_id
1297
to_rel = rename_entry.to_rel
1298
to_id = inv.path2id(to_rel)
1299
only_change_inv = False
1301
# check the inventory for source and destination
1303
raise errors.BzrMoveFailedError(from_rel,to_rel,
1304
errors.NotVersionedError(path=str(from_rel)))
1305
if to_id is not None:
1306
raise errors.BzrMoveFailedError(from_rel,to_rel,
1307
errors.AlreadyVersionedError(path=str(to_rel)))
1309
# try to determine the mode for rename (only change inv or change
1310
# inv and file system)
1312
if not self.has_filename(to_rel):
1313
raise errors.BzrMoveFailedError(from_id,to_rel,
1314
errors.NoSuchFile(path=str(to_rel),
1315
extra="New file has not been created yet"))
1316
only_change_inv = True
1317
elif not self.has_filename(from_rel) and self.has_filename(to_rel):
1318
only_change_inv = True
1319
elif self.has_filename(from_rel) and not self.has_filename(to_rel):
1320
only_change_inv = False
1322
# something is wrong, so lets determine what exactly
1323
if not self.has_filename(from_rel) and \
1324
not self.has_filename(to_rel):
1325
raise errors.BzrRenameFailedError(from_rel,to_rel,
1326
errors.PathsDoNotExist(paths=(str(from_rel),
1329
raise errors.RenameFailedFilesExist(from_rel, to_rel,
1330
extra="(Use --after to update the Bazaar id)")
1331
rename_entry.only_change_inv = only_change_inv
1332
return rename_entries
1334
def _move(self, rename_entries):
1335
"""Moves a list of files.
1337
Depending on the value of the flag 'only_change_inv', the
1338
file will be moved on the file system or not.
1340
inv = self.inventory
1343
for entry in rename_entries:
1345
self._move_entry(entry)
1347
self._rollback_move(moved)
1351
def _rollback_move(self, moved):
1352
"""Try to rollback a previous move in case of an filesystem error."""
1353
inv = self.inventory
1356
self._move_entry(_RenameEntry(entry.to_rel, entry.from_id,
1357
entry.to_tail, entry.to_parent_id, entry.from_rel,
1358
entry.from_tail, entry.from_parent_id,
1359
entry.only_change_inv))
1360
except errors.BzrMoveFailedError, e:
1361
raise errors.BzrMoveFailedError( '', '', "Rollback failed."
1362
" The working tree is in an inconsistent state."
1363
" Please consider doing a 'bzr revert'."
1364
" Error message is: %s" % e)
1366
def _move_entry(self, entry):
1367
inv = self.inventory
1368
from_rel_abs = self.abspath(entry.from_rel)
1369
to_rel_abs = self.abspath(entry.to_rel)
1370
if from_rel_abs == to_rel_abs:
1371
raise errors.BzrMoveFailedError(entry.from_rel, entry.to_rel,
1372
"Source and target are identical.")
1374
if not entry.only_change_inv:
1376
osutils.rename(from_rel_abs, to_rel_abs)
1378
raise errors.BzrMoveFailedError(entry.from_rel,
1380
inv.rename(entry.from_id, entry.to_parent_id, entry.to_tail)
1382
@needs_tree_write_lock
1383
def rename_one(self, from_rel, to_rel, after=False):
586
1384
"""Rename one file.
588
1386
This can change the directory or the filename or both.
1388
rename_one has several 'modes' to work. First, it can rename a physical
1389
file and change the file_id. That is the normal mode. Second, it can
1390
only change the file_id without touching any physical file. This is
1391
the new mode introduced in version 0.15.
1393
rename_one uses the second mode if 'after == True' and 'to_rel' is not
1394
versioned but present in the working tree.
1396
rename_one uses the second mode if 'after == False' and 'from_rel' is
1397
versioned but no longer in the working tree, and 'to_rel' is not
1398
versioned but present in the working tree.
1400
rename_one uses the first mode if 'after == False' and 'from_rel' is
1401
versioned and present in the working tree, and 'to_rel' is not
1402
versioned and not present in the working tree.
1404
Everything else results in an error.
590
1406
inv = self.inventory
591
if not self.has_filename(from_rel):
592
raise BzrError("can't rename: old working file %r does not exist" % from_rel)
593
if self.has_filename(to_rel):
594
raise BzrError("can't rename: new working file %r already exists" % to_rel)
596
file_id = inv.path2id(from_rel)
598
raise BzrError("can't rename: old name %r is not versioned" % from_rel)
601
from_parent = entry.parent_id
602
from_name = entry.name
604
if inv.path2id(to_rel):
605
raise BzrError("can't rename: new name %r is already versioned" % to_rel)
1409
# create rename entries and tuples
1410
from_tail = splitpath(from_rel)[-1]
1411
from_id = inv.path2id(from_rel)
1413
raise errors.BzrRenameFailedError(from_rel,to_rel,
1414
errors.NotVersionedError(path=str(from_rel)))
1415
from_entry = inv[from_id]
1416
from_parent_id = from_entry.parent_id
607
1417
to_dir, to_tail = os.path.split(to_rel)
608
1418
to_dir_id = inv.path2id(to_dir)
609
if to_dir_id == None and to_dir != '':
610
raise BzrError("can't determine destination directory id for %r" % to_dir)
612
mutter("rename_one:")
613
mutter(" file_id {%s}" % file_id)
614
mutter(" from_rel %r" % from_rel)
615
mutter(" to_rel %r" % to_rel)
616
mutter(" to_dir %r" % to_dir)
617
mutter(" to_dir_id {%s}" % to_dir_id)
619
inv.rename(file_id, to_dir_id, to_tail)
621
from_abs = self.abspath(from_rel)
622
to_abs = self.abspath(to_rel)
624
rename(from_abs, to_abs)
626
inv.rename(file_id, from_parent, from_name)
627
raise BzrError("failed to rename %r to %r: %s"
628
% (from_abs, to_abs, e[1]),
629
["rename rolled back"])
1419
rename_entry = WorkingTree._RenameEntry(from_rel=from_rel,
1421
from_tail=from_tail,
1422
from_parent_id=from_parent_id,
1423
to_rel=to_rel, to_tail=to_tail,
1424
to_parent_id=to_dir_id)
1425
rename_entries.append(rename_entry)
1427
# determine which move mode to use. checks also for movability
1428
rename_entries = self._determine_mv_mode(rename_entries, after)
1430
# check if the target changed directory and if the target directory is
1432
if to_dir_id is None:
1433
raise errors.BzrMoveFailedError(from_rel,to_rel,
1434
errors.NotVersionedError(path=str(to_dir)))
1436
# all checks done. now we can continue with our actual work
1437
mutter('rename_one:\n'
1442
' to_dir_id {%s}\n',
1443
from_id, from_rel, to_rel, to_dir, to_dir_id)
1445
self._move(rename_entries)
630
1446
self._write_inventory(inv)
1448
class _RenameEntry(object):
1449
def __init__(self, from_rel, from_id, from_tail, from_parent_id,
1450
to_rel, to_tail, to_parent_id, only_change_inv=False):
1451
self.from_rel = from_rel
1452
self.from_id = from_id
1453
self.from_tail = from_tail
1454
self.from_parent_id = from_parent_id
1455
self.to_rel = to_rel
1456
self.to_tail = to_tail
1457
self.to_parent_id = to_parent_id
1458
self.only_change_inv = only_change_inv
632
1460
@needs_read_lock
633
1461
def unknowns(self):
634
1462
"""Return all unknown files.
636
1464
These are files in the working directory that are not versioned or
637
1465
control files or ignored.
639
>>> from bzrlib.branch import ScratchBranch
640
>>> b = ScratchBranch(files=['foo', 'foo~'])
641
>>> tree = WorkingTree(b.base, b)
642
>>> map(str, tree.unknowns())
645
>>> list(b.unknowns())
647
>>> tree.remove('foo')
648
>>> list(b.unknowns())
651
for subp in self.extras():
652
if not self.is_ignored(subp):
1467
# force the extras method to be fully executed before returning, to
1468
# prevent race conditions with the lock
1470
[subp for subp in self.extras() if not self.is_ignored(subp)])
1472
@needs_tree_write_lock
1473
def unversion(self, file_ids):
1474
"""Remove the file ids in file_ids from the current versioned set.
1476
When a file_id is unversioned, all of its children are automatically
1479
:param file_ids: The file ids to stop versioning.
1480
:raises: NoSuchId if any fileid is not currently versioned.
1482
for file_id in file_ids:
1483
if self._inventory.has_id(file_id):
1484
self._inventory.remove_recursive_id(file_id)
1486
raise errors.NoSuchId(self, file_id)
1488
# in the future this should just set a dirty bit to wait for the
1489
# final unlock. However, until all methods of workingtree start
1490
# with the current in -memory inventory rather than triggering
1491
# a read, it is more complex - we need to teach read_inventory
1492
# to know when to read, and when to not read first... and possibly
1493
# to save first when the in memory one may be corrupted.
1494
# so for now, we just only write it if it is indeed dirty.
1496
self._write_inventory(self._inventory)
1498
@deprecated_method(zero_eight)
655
1499
def iter_conflicts(self):
1500
"""List all files in the tree that have text or content conflicts.
1501
DEPRECATED. Use conflicts instead."""
1502
return self._iter_conflicts()
1504
def _iter_conflicts(self):
656
1505
conflicted = set()
657
for path in (s[0] for s in self.list_files()):
1506
for info in self.list_files():
658
1508
stem = get_conflicted_stem(path)
659
1509
if stem is None:
744
1651
If the file is ignored, returns the pattern which caused it to
745
1652
be ignored, otherwise None. So this can simply be used as a
746
1653
boolean if desired."""
748
# TODO: Use '**' to match directories, and other extended
749
# globbing stuff from cvs/rsync.
751
# XXX: fnmatch is actually not quite what we want: it's only
752
# approximately the same as real Unix fnmatch, and doesn't
753
# treat dotfiles correctly and allows * to match /.
754
# Eventually it should be replaced with something more
757
for pat in self.get_ignore_list():
758
if '/' in pat or '\\' in pat:
760
# as a special case, you can put ./ at the start of a
761
# pattern; this is good to match in the top-level
764
if (pat[:2] == './') or (pat[:2] == '.\\'):
768
if fnmatch.fnmatchcase(filename, newpat):
771
if fnmatch.fnmatchcase(splitpath(filename)[-1], pat):
1654
if getattr(self, '_ignoreglobster', None) is None:
1655
self._ignoreglobster = globbing.Globster(self.get_ignore_list())
1656
return self._ignoreglobster.match(filename)
776
1658
def kind(self, file_id):
777
1659
return file_kind(self.id2abspath(file_id))
1661
def _comparison_data(self, entry, path):
1662
abspath = self.abspath(path)
1664
stat_value = os.lstat(abspath)
1666
if getattr(e, 'errno', None) == errno.ENOENT:
1673
mode = stat_value.st_mode
1674
kind = osutils.file_kind_from_stat_mode(mode)
1675
if not supports_executable():
1676
executable = entry is not None and entry.executable
1678
executable = bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode)
1679
return kind, executable, stat_value
1681
def _file_size(self, entry, stat_value):
1682
return stat_value.st_size
1684
def last_revision(self):
1685
"""Return the last revision of the branch for this tree.
1687
This format tree does not support a separate marker for last-revision
1688
compared to the branch.
1690
See MutableTree.last_revision
1692
return self._last_revision()
1695
def _last_revision(self):
1696
"""helper for get_parent_ids."""
1697
return _mod_revision.ensure_null(self.branch.last_revision())
1699
def is_locked(self):
1700
return self._control_files.is_locked()
1702
def _must_be_locked(self):
1703
if not self.is_locked():
1704
raise errors.ObjectNotLocked(self)
779
1706
def lock_read(self):
780
1707
"""See Branch.lock_read, and WorkingTree.unlock."""
781
return self.branch.lock_read()
1708
if not self.is_locked():
1710
self.branch.lock_read()
1712
return self._control_files.lock_read()
1714
self.branch.unlock()
1717
def lock_tree_write(self):
1718
"""See MutableTree.lock_tree_write, and WorkingTree.unlock."""
1719
if not self.is_locked():
1721
self.branch.lock_read()
1723
return self._control_files.lock_write()
1725
self.branch.unlock()
783
1728
def lock_write(self):
784
"""See Branch.lock_write, and WorkingTree.unlock."""
785
return self.branch.lock_write()
787
def _basis_inventory_name(self, revision_id):
788
return 'basis-inventory.%s' % revision_id
790
def set_last_revision(self, new_revision, old_revision=None):
793
path = self._basis_inventory_name(old_revision)
794
path = self.branch._rel_controlfilename(path)
795
self.branch._transport.delete(path)
799
xml = self.branch.get_inventory_xml(new_revision)
800
path = self._basis_inventory_name(new_revision)
801
self.branch.put_controlfile(path, xml)
802
except WeaveRevisionNotPresent:
1729
"""See MutableTree.lock_write, and WorkingTree.unlock."""
1730
if not self.is_locked():
1732
self.branch.lock_write()
1734
return self._control_files.lock_write()
1736
self.branch.unlock()
1739
def get_physical_lock_status(self):
1740
return self._control_files.get_physical_lock_status()
1742
def _basis_inventory_name(self):
1743
return 'basis-inventory-cache'
1745
def _reset_data(self):
1746
"""Reset transient data that cannot be revalidated."""
1747
self._inventory_is_modified = False
1748
result = self._deserialize(self._control_files.get('inventory'))
1749
self._set_inventory(result, dirty=False)
1751
@needs_tree_write_lock
1752
def set_last_revision(self, new_revision):
1753
"""Change the last revision in the working tree."""
1754
if self._change_last_revision(new_revision):
1755
self._cache_basis_inventory(new_revision)
1757
def _change_last_revision(self, new_revision):
1758
"""Template method part of set_last_revision to perform the change.
1760
This is used to allow WorkingTree3 instances to not affect branch
1761
when their last revision is set.
1763
if _mod_revision.is_null(new_revision):
1764
self.branch.set_revision_history([])
1767
self.branch.generate_revision_history(new_revision)
1768
except errors.NoSuchRevision:
1769
# not present in the repo - dont try to set it deeper than the tip
1770
self.branch.set_revision_history([new_revision])
1773
def _write_basis_inventory(self, xml):
1774
"""Write the basis inventory XML to the basis-inventory file"""
1775
assert isinstance(xml, str), 'serialised xml must be bytestring.'
1776
path = self._basis_inventory_name()
1778
self._control_files.put(path, sio)
1780
def _create_basis_xml_from_inventory(self, revision_id, inventory):
1781
"""Create the text that will be saved in basis-inventory"""
1782
inventory.revision_id = revision_id
1783
return xml7.serializer_v7.write_inventory_to_string(inventory)
1785
def _cache_basis_inventory(self, new_revision):
1786
"""Cache new_revision as the basis inventory."""
1787
# TODO: this should allow the ready-to-use inventory to be passed in,
1788
# as commit already has that ready-to-use [while the format is the
1791
# this double handles the inventory - unpack and repack -
1792
# but is easier to understand. We can/should put a conditional
1793
# in here based on whether the inventory is in the latest format
1794
# - perhaps we should repack all inventories on a repository
1796
# the fast path is to copy the raw xml from the repository. If the
1797
# xml contains 'revision_id="', then we assume the right
1798
# revision_id is set. We must check for this full string, because a
1799
# root node id can legitimately look like 'revision_id' but cannot
1801
xml = self.branch.repository.get_inventory_xml(new_revision)
1802
firstline = xml.split('\n', 1)[0]
1803
if (not 'revision_id="' in firstline or
1804
'format="7"' not in firstline):
1805
inv = self.branch.repository.deserialise_inventory(
1807
xml = self._create_basis_xml_from_inventory(new_revision, inv)
1808
self._write_basis_inventory(xml)
1809
except (errors.NoSuchRevision, errors.RevisionNotPresent):
805
def read_basis_inventory(self, revision_id):
1812
def read_basis_inventory(self):
806
1813
"""Read the cached basis inventory."""
807
path = self._basis_inventory_name(revision_id)
808
return self.branch.controlfile(path, 'r').read()
1814
path = self._basis_inventory_name()
1815
return self._control_files.get(path).read()
810
1817
@needs_read_lock
811
1818
def read_working_inventory(self):
812
"""Read the working inventory."""
1819
"""Read the working inventory.
1821
:raises errors.InventoryModified: read_working_inventory will fail
1822
when the current in memory inventory has been modified.
1824
# conceptually this should be an implementation detail of the tree.
1825
# XXX: Deprecate this.
813
1826
# ElementTree does its own conversion from UTF-8, so open in
815
f = self.branch.controlfile('inventory', 'rb')
816
return bzrlib.xml5.serializer_v5.read_inventory(f)
819
def remove(self, files, verbose=False):
820
"""Remove nominated files from the working inventory..
822
This does not remove their text. This does not run on XXX on what? RBC
824
TODO: Refuse to remove modified files unless --force is given?
826
TODO: Do something useful with directories.
828
TODO: Should this remove the text or not? Tough call; not
829
removing may be useful and the user can just use use rm, and
830
is the opposite of add. Removing it is consistent with most
831
other tools. Maybe an option.
1828
if self._inventory_is_modified:
1829
raise errors.InventoryModified(self)
1830
result = self._deserialize(self._control_files.get('inventory'))
1831
self._set_inventory(result, dirty=False)
1834
@needs_tree_write_lock
1835
def remove(self, files, verbose=False, to_file=None, keep_files=True,
1837
"""Remove nominated files from the working inventory.
1839
:files: File paths relative to the basedir.
1840
:keep_files: If true, the files will also be kept.
1841
:force: Delete files and directories, even if they are changed and
1842
even if the directories are not empty.
833
## TODO: Normalize names
834
## TODO: Remove nested loops; better scalability
835
1844
if isinstance(files, basestring):
840
# do this before any modifications
1850
unknown_nested_files=set()
1852
def recurse_directory_to_add_files(directory):
1853
# Recurse directory and add all files
1854
# so we can check if they have changed.
1855
for parent_info, file_infos in\
1856
osutils.walkdirs(self.abspath(directory),
1858
for relpath, basename, kind, lstat, abspath in file_infos:
1859
# Is it versioned or ignored?
1860
if self.path2id(relpath) or self.is_ignored(relpath):
1861
# Add nested content for deletion.
1862
new_files.add(relpath)
1864
# Files which are not versioned and not ignored
1865
# should be treated as unknown.
1866
unknown_nested_files.add((relpath, None, kind))
1868
for filename in files:
1869
# Get file name into canonical form.
1870
abspath = self.abspath(filename)
1871
filename = self.relpath(abspath)
1872
if len(filename) > 0:
1873
new_files.add(filename)
1874
if osutils.isdir(abspath):
1875
recurse_directory_to_add_files(filename)
1877
files = list(new_files)
1880
return # nothing to do
1882
# Sort needed to first handle directory content before the directory
1883
files.sort(reverse=True)
1885
# Bail out if we are going to delete files we shouldn't
1886
if not keep_files and not force:
1887
has_changed_files = len(unknown_nested_files) > 0
1888
if not has_changed_files:
1889
for (file_id, path, content_change, versioned, parent_id, name,
1890
kind, executable) in self._iter_changes(self.basis_tree(),
1891
include_unchanged=True, require_versioned=False,
1892
want_unversioned=True, specific_files=files):
1893
# Check if it's an unknown (but not ignored) OR
1894
# changed (but not deleted) :
1895
if not self.is_ignored(path[1]) and (
1896
versioned == (False, False) or
1897
content_change and kind[1] != None):
1898
has_changed_files = True
1901
if has_changed_files:
1902
# Make delta show ALL applicable changes in error message.
1903
tree_delta = self.changes_from(self.basis_tree(),
1904
require_versioned=False, want_unversioned=True,
1905
specific_files=files)
1906
for unknown_file in unknown_nested_files:
1907
if unknown_file not in tree_delta.unversioned:
1908
tree_delta.unversioned.extend((unknown_file,))
1909
raise errors.BzrRemoveChangedFilesError(tree_delta)
1911
# Build inv_delta and delete files where applicaple,
1912
# do this before any modifications to inventory.
1914
fid = self.path2id(f)
844
# TODO: Perhaps make this just a warning, and continue?
845
# This tends to happen when
846
raise NotVersionedError(path=f)
847
mutter("remove inventory entry %s {%s}", quotefn(f), fid)
849
# having remove it, it must be either ignored or unknown
850
if self.is_ignored(f):
854
show_status(new_status, inv[fid].kind, quotefn(f))
857
self._write_inventory(inv)
860
def revert(self, filenames, old_tree=None, backups=True):
861
from bzrlib.merge import merge_inner
1917
message = "%s is not versioned." % (f,)
1920
# having removed it, it must be either ignored or unknown
1921
if self.is_ignored(f):
1925
textui.show_status(new_status, self.kind(fid), f,
1928
inv_delta.append((f, None, fid, None))
1929
message = "removed %s" % (f,)
1932
abs_path = self.abspath(f)
1933
if osutils.lexists(abs_path):
1934
if (osutils.isdir(abs_path) and
1935
len(os.listdir(abs_path)) > 0):
1937
osutils.rmtree(abs_path)
1939
message = "%s is not an empty directory "\
1940
"and won't be deleted." % (f,)
1942
osutils.delete_any(abs_path)
1943
message = "deleted %s" % (f,)
1944
elif message is not None:
1945
# Only care if we haven't done anything yet.
1946
message = "%s does not exist." % (f,)
1948
# Print only one message (if any) per file.
1949
if message is not None:
1951
self.apply_inventory_delta(inv_delta)
1953
@needs_tree_write_lock
1954
def revert(self, filenames=None, old_tree=None, backups=True,
1955
pb=DummyProgress(), report_changes=False):
1956
from bzrlib.conflicts import resolve
1959
symbol_versioning.warn('Using [] to revert all files is deprecated'
1960
' as of bzr 0.91. Please use None (the default) instead.',
1961
DeprecationWarning, stacklevel=2)
862
1962
if old_tree is None:
863
old_tree = self.branch.basis_tree()
864
merge_inner(self.branch, old_tree,
865
self, ignore_zero=True,
866
backup_files=backups,
867
interesting_files=filenames)
868
if not len(filenames):
869
self.set_pending_merges([])
1963
basis_tree = self.basis_tree()
1964
basis_tree.lock_read()
1965
old_tree = basis_tree
1969
conflicts = transform.revert(self, old_tree, filenames, backups, pb,
1971
if filenames is None and len(self.get_parent_ids()) > 1:
1973
last_revision = self.last_revision()
1974
if last_revision != NULL_REVISION:
1975
if basis_tree is None:
1976
basis_tree = self.basis_tree()
1977
basis_tree.lock_read()
1978
parent_trees.append((last_revision, basis_tree))
1979
self.set_parent_trees(parent_trees)
1982
resolve(self, filenames, ignore_misses=True)
1984
if basis_tree is not None:
1988
def revision_tree(self, revision_id):
1989
"""See Tree.revision_tree.
1991
WorkingTree can supply revision_trees for the basis revision only
1992
because there is only one cached inventory in the bzr directory.
1994
if revision_id == self.last_revision():
1996
xml = self.read_basis_inventory()
1997
except errors.NoSuchFile:
2001
inv = xml7.serializer_v7.read_inventory_from_string(xml)
2002
# dont use the repository revision_tree api because we want
2003
# to supply the inventory.
2004
if inv.revision_id == revision_id:
2005
return revisiontree.RevisionTree(self.branch.repository,
2007
except errors.BadInventoryFormat:
2009
# raise if there was no inventory, or if we read the wrong inventory.
2010
raise errors.NoSuchRevisionInTree(self, revision_id)
2012
# XXX: This method should be deprecated in favour of taking in a proper
2013
# new Inventory object.
2014
@needs_tree_write_lock
872
2015
def set_inventory(self, new_inventory_list):
873
2016
from bzrlib.inventory import (Inventory,
874
2017
InventoryDirectory,
914
2083
between multiple working trees, i.e. via shared storage, then we
915
2084
would probably want to lock both the local tree, and the branch.
2086
raise NotImplementedError(self.unlock)
2088
def update(self, change_reporter=None, possible_transports=None):
2089
"""Update a working tree along its branch.
2091
This will update the branch if its bound too, which means we have
2092
multiple trees involved:
2094
- The new basis tree of the master.
2095
- The old basis tree of the branch.
2096
- The old basis tree of the working tree.
2097
- The current working tree state.
2099
Pathologically, all three may be different, and non-ancestors of each
2100
other. Conceptually we want to:
2102
- Preserve the wt.basis->wt.state changes
2103
- Transform the wt.basis to the new master basis.
2104
- Apply a merge of the old branch basis to get any 'local' changes from
2106
- Restore the wt.basis->wt.state changes.
2108
There isn't a single operation at the moment to do that, so we:
2109
- Merge current state -> basis tree of the master w.r.t. the old tree
2111
- Do a 'normal' merge of the old branch basis if it is relevant.
2113
if self.branch.get_master_branch(possible_transports) is not None:
2115
update_branch = True
2117
self.lock_tree_write()
2118
update_branch = False
2121
old_tip = self.branch.update(possible_transports)
2124
return self._update_tree(old_tip, change_reporter)
2128
@needs_tree_write_lock
2129
def _update_tree(self, old_tip=None, change_reporter=None):
2130
"""Update a tree to the master branch.
2132
:param old_tip: if supplied, the previous tip revision the branch,
2133
before it was changed to the master branch's tip.
2135
# here if old_tip is not None, it is the old tip of the branch before
2136
# it was updated from the master branch. This should become a pending
2137
# merge in the working tree to preserve the user existing work. we
2138
# cant set that until we update the working trees last revision to be
2139
# one from the new branch, because it will just get absorbed by the
2140
# parent de-duplication logic.
2142
# We MUST save it even if an error occurs, because otherwise the users
2143
# local work is unreferenced and will appear to have been lost.
2147
last_rev = self.get_parent_ids()[0]
2149
last_rev = _mod_revision.NULL_REVISION
2150
if last_rev != _mod_revision.ensure_null(self.branch.last_revision()):
2151
# merge tree state up to new branch tip.
2152
basis = self.basis_tree()
2155
to_tree = self.branch.basis_tree()
2156
if basis.inventory.root is None:
2157
self.set_root_id(to_tree.inventory.root.file_id)
2159
result += merge.merge_inner(
2164
change_reporter=change_reporter)
2167
# TODO - dedup parents list with things merged by pull ?
2168
# reuse the tree we've updated to to set the basis:
2169
parent_trees = [(self.branch.last_revision(), to_tree)]
2170
merges = self.get_parent_ids()[1:]
2171
# Ideally we ask the tree for the trees here, that way the working
2172
# tree can decide whether to give us teh entire tree or give us a
2173
# lazy initialised tree. dirstate for instance will have the trees
2174
# in ram already, whereas a last-revision + basis-inventory tree
2175
# will not, but also does not need them when setting parents.
2176
for parent in merges:
2177
parent_trees.append(
2178
(parent, self.branch.repository.revision_tree(parent)))
2179
if (old_tip is not None and not _mod_revision.is_null(old_tip)):
2180
parent_trees.append(
2181
(old_tip, self.branch.repository.revision_tree(old_tip)))
2182
self.set_parent_trees(parent_trees)
2183
last_rev = parent_trees[0][0]
2185
# the working tree had the same last-revision as the master
2186
# branch did. We may still have pivot local work from the local
2187
# branch into old_tip:
2188
if (old_tip is not None and not _mod_revision.is_null(old_tip)):
2189
self.add_parent_tree_id(old_tip)
2190
if (old_tip is not None and not _mod_revision.is_null(old_tip)
2191
and old_tip != last_rev):
2192
# our last revision was not the prior branch last revision
2193
# and we have converted that last revision to a pending merge.
2194
# base is somewhere between the branch tip now
2195
# and the now pending merge
2197
# Since we just modified the working tree and inventory, flush out
2198
# the current state, before we modify it again.
2199
# TODO: jam 20070214 WorkingTree3 doesn't require this, dirstate
2200
# requires it only because TreeTransform directly munges the
2201
# inventory and calls tree._write_inventory(). Ultimately we
2202
# should be able to remove this extra flush.
2204
graph = self.branch.repository.get_graph()
2205
base_rev_id = graph.find_unique_lca(self.branch.last_revision(),
2207
base_tree = self.branch.repository.revision_tree(base_rev_id)
2208
other_tree = self.branch.repository.revision_tree(old_tip)
2209
result += merge.merge_inner(
2214
change_reporter=change_reporter)
2217
def _write_hashcache_if_dirty(self):
2218
"""Write out the hashcache if it is dirty."""
917
2219
if self._hashcache.needs_write:
918
self._hashcache.write()
919
return self.branch.unlock()
2221
self._hashcache.write()
2223
if e.errno not in (errno.EPERM, errno.EACCES):
2225
# TODO: jam 20061219 Should this be a warning? A single line
2226
# warning might be sufficient to let the user know what
2228
mutter('Could not write hashcache for %s\nError: %s',
2229
self._hashcache.cache_file_name(), e)
2231
@needs_tree_write_lock
922
2232
def _write_inventory(self, inv):
923
2233
"""Write inventory as the current inventory."""
924
from cStringIO import StringIO
925
from bzrlib.atomicfile import AtomicFile
927
bzrlib.xml5.serializer_v5.write_inventory(inv, sio)
929
f = AtomicFile(self.branch.controlfilename('inventory'))
935
self._set_inventory(inv)
936
mutter('wrote working inventory')
939
CONFLICT_SUFFIXES = ('.THIS', '.BASE', '.OTHER')
2234
self._set_inventory(inv, dirty=True)
2237
def set_conflicts(self, arg):
2238
raise errors.UnsupportedOperation(self.set_conflicts, self)
2240
def add_conflicts(self, arg):
2241
raise errors.UnsupportedOperation(self.add_conflicts, self)
2244
def conflicts(self):
2245
conflicts = _mod_conflicts.ConflictList()
2246
for conflicted in self._iter_conflicts():
2249
if file_kind(self.abspath(conflicted)) != "file":
2251
except errors.NoSuchFile:
2254
for suffix in ('.THIS', '.OTHER'):
2256
kind = file_kind(self.abspath(conflicted+suffix))
2259
except errors.NoSuchFile:
2263
ctype = {True: 'text conflict', False: 'contents conflict'}[text]
2264
conflicts.append(_mod_conflicts.Conflict.factory(ctype,
2266
file_id=self.path2id(conflicted)))
2269
def walkdirs(self, prefix=""):
2270
"""Walk the directories of this tree.
2272
returns a generator which yields items in the form:
2273
((curren_directory_path, fileid),
2274
[(file1_path, file1_name, file1_kind, (lstat), file1_id,
2277
This API returns a generator, which is only valid during the current
2278
tree transaction - within a single lock_read or lock_write duration.
2280
If the tree is not locked, it may cause an error to be raised,
2281
depending on the tree implementation.
2283
disk_top = self.abspath(prefix)
2284
if disk_top.endswith('/'):
2285
disk_top = disk_top[:-1]
2286
top_strip_len = len(disk_top) + 1
2287
inventory_iterator = self._walkdirs(prefix)
2288
disk_iterator = osutils.walkdirs(disk_top, prefix)
2290
current_disk = disk_iterator.next()
2291
disk_finished = False
2293
if not (e.errno == errno.ENOENT or
2294
(sys.platform == 'win32' and e.errno == ERROR_PATH_NOT_FOUND)):
2297
disk_finished = True
2299
current_inv = inventory_iterator.next()
2300
inv_finished = False
2301
except StopIteration:
2304
while not inv_finished or not disk_finished:
2305
if not disk_finished:
2306
# strip out .bzr dirs
2307
if current_disk[0][1][top_strip_len:] == '':
2308
# osutils.walkdirs can be made nicer -
2309
# yield the path-from-prefix rather than the pathjoined
2311
bzrdir_loc = bisect_left(current_disk[1], ('.bzr', '.bzr'))
2312
if current_disk[1][bzrdir_loc][0] == '.bzr':
2313
# we dont yield the contents of, or, .bzr itself.
2314
del current_disk[1][bzrdir_loc]
2316
# everything is unknown
2319
# everything is missing
2322
direction = cmp(current_inv[0][0], current_disk[0][0])
2324
# disk is before inventory - unknown
2325
dirblock = [(relpath, basename, kind, stat, None, None) for
2326
relpath, basename, kind, stat, top_path in current_disk[1]]
2327
yield (current_disk[0][0], None), dirblock
2329
current_disk = disk_iterator.next()
2330
except StopIteration:
2331
disk_finished = True
2333
# inventory is before disk - missing.
2334
dirblock = [(relpath, basename, 'unknown', None, fileid, kind)
2335
for relpath, basename, dkind, stat, fileid, kind in
2337
yield (current_inv[0][0], current_inv[0][1]), dirblock
2339
current_inv = inventory_iterator.next()
2340
except StopIteration:
2343
# versioned present directory
2344
# merge the inventory and disk data together
2346
for relpath, subiterator in itertools.groupby(sorted(
2347
current_inv[1] + current_disk[1], key=operator.itemgetter(0)), operator.itemgetter(1)):
2348
path_elements = list(subiterator)
2349
if len(path_elements) == 2:
2350
inv_row, disk_row = path_elements
2351
# versioned, present file
2352
dirblock.append((inv_row[0],
2353
inv_row[1], disk_row[2],
2354
disk_row[3], inv_row[4],
2356
elif len(path_elements[0]) == 5:
2358
dirblock.append((path_elements[0][0],
2359
path_elements[0][1], path_elements[0][2],
2360
path_elements[0][3], None, None))
2361
elif len(path_elements[0]) == 6:
2362
# versioned, absent file.
2363
dirblock.append((path_elements[0][0],
2364
path_elements[0][1], 'unknown', None,
2365
path_elements[0][4], path_elements[0][5]))
2367
raise NotImplementedError('unreachable code')
2368
yield current_inv[0], dirblock
2370
current_inv = inventory_iterator.next()
2371
except StopIteration:
2374
current_disk = disk_iterator.next()
2375
except StopIteration:
2376
disk_finished = True
2378
def _walkdirs(self, prefix=""):
2379
"""Walk the directories of this tree.
2381
:prefix: is used as the directrory to start with.
2382
returns a generator which yields items in the form:
2383
((curren_directory_path, fileid),
2384
[(file1_path, file1_name, file1_kind, None, file1_id,
2387
_directory = 'directory'
2388
# get the root in the inventory
2389
inv = self.inventory
2390
top_id = inv.path2id(prefix)
2394
pending = [(prefix, '', _directory, None, top_id, None)]
2397
currentdir = pending.pop()
2398
# 0 - relpath, 1- basename, 2- kind, 3- stat, 4-id, 5-kind
2399
top_id = currentdir[4]
2401
relroot = currentdir[0] + '/'
2404
# FIXME: stash the node in pending
2406
for name, child in entry.sorted_children():
2407
dirblock.append((relroot + name, name, child.kind, None,
2408
child.file_id, child.kind
2410
yield (currentdir[0], entry.file_id), dirblock
2411
# push the user specified dirs from dirblock
2412
for dir in reversed(dirblock):
2413
if dir[2] == _directory:
2416
@needs_tree_write_lock
2417
def auto_resolve(self):
2418
"""Automatically resolve text conflicts according to contents.
2420
Only text conflicts are auto_resolvable. Files with no conflict markers
2421
are considered 'resolved', because bzr always puts conflict markers
2422
into files that have text conflicts. The corresponding .THIS .BASE and
2423
.OTHER files are deleted, as per 'resolve'.
2424
:return: a tuple of ConflictLists: (un_resolved, resolved).
2426
un_resolved = _mod_conflicts.ConflictList()
2427
resolved = _mod_conflicts.ConflictList()
2428
conflict_re = re.compile('^(<{7}|={7}|>{7})')
2429
for conflict in self.conflicts():
2430
if (conflict.typestring != 'text conflict' or
2431
self.kind(conflict.file_id) != 'file'):
2432
un_resolved.append(conflict)
2434
my_file = open(self.id2abspath(conflict.file_id), 'rb')
2436
for line in my_file:
2437
if conflict_re.search(line):
2438
un_resolved.append(conflict)
2441
resolved.append(conflict)
2444
resolved.remove_files(self)
2445
self.set_conflicts(un_resolved)
2446
return un_resolved, resolved
2448
def _validate(self):
2449
"""Validate internal structures.
2451
This is meant mostly for the test suite. To give it a chance to detect
2452
corruption after actions have occurred. The default implementation is a
2455
:return: None. An exception should be raised if there is an error.
2460
class WorkingTree2(WorkingTree):
2461
"""This is the Format 2 working tree.
2463
This was the first weave based working tree.
2464
- uses os locks for locking.
2465
- uses the branch last-revision.
2468
def __init__(self, *args, **kwargs):
2469
super(WorkingTree2, self).__init__(*args, **kwargs)
2470
# WorkingTree2 has more of a constraint that self._inventory must
2471
# exist. Because this is an older format, we don't mind the overhead
2472
# caused by the extra computation here.
2474
# Newer WorkingTree's should only have self._inventory set when they
2476
if self._inventory is None:
2477
self.read_working_inventory()
2479
def lock_tree_write(self):
2480
"""See WorkingTree.lock_tree_write().
2482
In Format2 WorkingTrees we have a single lock for the branch and tree
2483
so lock_tree_write() degrades to lock_write().
2485
self.branch.lock_write()
2487
return self._control_files.lock_write()
2489
self.branch.unlock()
2493
# do non-implementation specific cleanup
2496
# we share control files:
2497
if self._control_files._lock_count == 3:
2498
# _inventory_is_modified is always False during a read lock.
2499
if self._inventory_is_modified:
2501
self._write_hashcache_if_dirty()
2503
# reverse order of locking.
2505
return self._control_files.unlock()
2507
self.branch.unlock()
2510
class WorkingTree3(WorkingTree):
2511
"""This is the Format 3 working tree.
2513
This differs from the base WorkingTree by:
2514
- having its own file lock
2515
- having its own last-revision property.
2517
This is new in bzr 0.8
2521
def _last_revision(self):
2522
"""See Mutable.last_revision."""
2524
return self._control_files.get('last-revision').read()
2525
except errors.NoSuchFile:
2526
return _mod_revision.NULL_REVISION
2528
def _change_last_revision(self, revision_id):
2529
"""See WorkingTree._change_last_revision."""
2530
if revision_id is None or revision_id == NULL_REVISION:
2532
self._control_files._transport.delete('last-revision')
2533
except errors.NoSuchFile:
2537
self._control_files.put_bytes('last-revision', revision_id)
2540
@needs_tree_write_lock
2541
def set_conflicts(self, conflicts):
2542
self._put_rio('conflicts', conflicts.to_stanzas(),
2545
@needs_tree_write_lock
2546
def add_conflicts(self, new_conflicts):
2547
conflict_set = set(self.conflicts())
2548
conflict_set.update(set(list(new_conflicts)))
2549
self.set_conflicts(_mod_conflicts.ConflictList(sorted(conflict_set,
2550
key=_mod_conflicts.Conflict.sort_key)))
2553
def conflicts(self):
2555
confile = self._control_files.get('conflicts')
2556
except errors.NoSuchFile:
2557
return _mod_conflicts.ConflictList()
2559
if confile.next() != CONFLICT_HEADER_1 + '\n':
2560
raise errors.ConflictFormatError()
2561
except StopIteration:
2562
raise errors.ConflictFormatError()
2563
return _mod_conflicts.ConflictList.from_stanzas(RioReader(confile))
2566
# do non-implementation specific cleanup
2568
if self._control_files._lock_count == 1:
2569
# _inventory_is_modified is always False during a read lock.
2570
if self._inventory_is_modified:
2572
self._write_hashcache_if_dirty()
2573
# reverse order of locking.
2575
return self._control_files.unlock()
2577
self.branch.unlock()
940
2580
def get_conflicted_stem(path):
941
for suffix in CONFLICT_SUFFIXES:
2581
for suffix in _mod_conflicts.CONFLICT_SUFFIXES:
942
2582
if path.endswith(suffix):
943
2583
return path[:-len(suffix)]
2586
@deprecated_function(zero_eight)
2587
def is_control_file(filename):
2588
"""See WorkingTree.is_control_filename(filename)."""
2589
## FIXME: better check
2590
filename = normpath(filename)
2591
while filename != '':
2592
head, tail = os.path.split(filename)
2593
## mutter('check %r for control file' % ((head, tail),))
2596
if filename == head:
2602
class WorkingTreeFormat(object):
2603
"""An encapsulation of the initialization and open routines for a format.
2605
Formats provide three things:
2606
* An initialization routine,
2610
Formats are placed in an dict by their format string for reference
2611
during workingtree opening. Its not required that these be instances, they
2612
can be classes themselves with class methods - it simply depends on
2613
whether state is needed for a given format or not.
2615
Once a format is deprecated, just deprecate the initialize and open
2616
methods on the format class. Do not deprecate the object, as the
2617
object will be created every time regardless.
2620
_default_format = None
2621
"""The default format used for new trees."""
2624
"""The known formats."""
2626
requires_rich_root = False
2628
upgrade_recommended = False
2631
def find_format(klass, a_bzrdir):
2632
"""Return the format for the working tree object in a_bzrdir."""
2634
transport = a_bzrdir.get_workingtree_transport(None)
2635
format_string = transport.get("format").read()
2636
return klass._formats[format_string]
2637
except errors.NoSuchFile:
2638
raise errors.NoWorkingTree(base=transport.base)
2640
raise errors.UnknownFormatError(format=format_string)
2642
def __eq__(self, other):
2643
return self.__class__ is other.__class__
2645
def __ne__(self, other):
2646
return not (self == other)
2649
def get_default_format(klass):
2650
"""Return the current default format."""
2651
return klass._default_format
2653
def get_format_string(self):
2654
"""Return the ASCII format string that identifies this format."""
2655
raise NotImplementedError(self.get_format_string)
2657
def get_format_description(self):
2658
"""Return the short description for this format."""
2659
raise NotImplementedError(self.get_format_description)
2661
def is_supported(self):
2662
"""Is this format supported?
2664
Supported formats can be initialized and opened.
2665
Unsupported formats may not support initialization or committing or
2666
some other features depending on the reason for not being supported.
2671
def register_format(klass, format):
2672
klass._formats[format.get_format_string()] = format
2675
def set_default_format(klass, format):
2676
klass._default_format = format
2679
def unregister_format(klass, format):
2680
assert klass._formats[format.get_format_string()] is format
2681
del klass._formats[format.get_format_string()]
2684
class WorkingTreeFormat2(WorkingTreeFormat):
2685
"""The second working tree format.
2687
This format modified the hash cache from the format 1 hash cache.
2690
upgrade_recommended = True
2692
def get_format_description(self):
2693
"""See WorkingTreeFormat.get_format_description()."""
2694
return "Working tree format 2"
2696
def stub_initialize_remote(self, control_files):
2697
"""As a special workaround create critical control files for a remote working tree
2699
This ensures that it can later be updated and dealt with locally,
2700
since BzrDirFormat6 and BzrDirFormat5 cannot represent dirs with
2701
no working tree. (See bug #43064).
2705
xml5.serializer_v5.write_inventory(inv, sio, working=True)
2707
control_files.put('inventory', sio)
2709
control_files.put_bytes('pending-merges', '')
2712
def initialize(self, a_bzrdir, revision_id=None):
2713
"""See WorkingTreeFormat.initialize()."""
2714
if not isinstance(a_bzrdir.transport, LocalTransport):
2715
raise errors.NotLocalUrl(a_bzrdir.transport.base)
2716
branch = a_bzrdir.open_branch()
2717
if revision_id is None:
2718
revision_id = _mod_revision.ensure_null(branch.last_revision())
2721
branch.generate_revision_history(revision_id)
2725
wt = WorkingTree2(a_bzrdir.root_transport.local_abspath('.'),
2731
basis_tree = branch.repository.revision_tree(revision_id)
2732
if basis_tree.inventory.root is not None:
2733
wt.set_root_id(basis_tree.inventory.root.file_id)
2734
# set the parent list and cache the basis tree.
2735
if _mod_revision.is_null(revision_id):
2738
parent_trees = [(revision_id, basis_tree)]
2739
wt.set_parent_trees(parent_trees)
2740
transform.build_tree(basis_tree, wt)
2744
super(WorkingTreeFormat2, self).__init__()
2745
self._matchingbzrdir = bzrdir.BzrDirFormat6()
2747
def open(self, a_bzrdir, _found=False):
2748
"""Return the WorkingTree object for a_bzrdir
2750
_found is a private parameter, do not use it. It is used to indicate
2751
if format probing has already been done.
2754
# we are being called directly and must probe.
2755
raise NotImplementedError
2756
if not isinstance(a_bzrdir.transport, LocalTransport):
2757
raise errors.NotLocalUrl(a_bzrdir.transport.base)
2758
wt = WorkingTree2(a_bzrdir.root_transport.local_abspath('.'),
2764
class WorkingTreeFormat3(WorkingTreeFormat):
2765
"""The second working tree format updated to record a format marker.
2768
- exists within a metadir controlling .bzr
2769
- includes an explicit version marker for the workingtree control
2770
files, separate from the BzrDir format
2771
- modifies the hash cache format
2773
- uses a LockDir to guard access for writes.
2776
upgrade_recommended = True
2778
def get_format_string(self):
2779
"""See WorkingTreeFormat.get_format_string()."""
2780
return "Bazaar-NG Working Tree format 3"
2782
def get_format_description(self):
2783
"""See WorkingTreeFormat.get_format_description()."""
2784
return "Working tree format 3"
2786
_lock_file_name = 'lock'
2787
_lock_class = LockDir
2789
_tree_class = WorkingTree3
2791
def __get_matchingbzrdir(self):
2792
return bzrdir.BzrDirMetaFormat1()
2794
_matchingbzrdir = property(__get_matchingbzrdir)
2796
def _open_control_files(self, a_bzrdir):
2797
transport = a_bzrdir.get_workingtree_transport(None)
2798
return LockableFiles(transport, self._lock_file_name,
2801
def initialize(self, a_bzrdir, revision_id=None):
2802
"""See WorkingTreeFormat.initialize().
2804
revision_id allows creating a working tree at a different
2805
revision than the branch is at.
2807
if not isinstance(a_bzrdir.transport, LocalTransport):
2808
raise errors.NotLocalUrl(a_bzrdir.transport.base)
2809
transport = a_bzrdir.get_workingtree_transport(self)
2810
control_files = self._open_control_files(a_bzrdir)
2811
control_files.create_lock()
2812
control_files.lock_write()
2813
control_files.put_utf8('format', self.get_format_string())
2814
branch = a_bzrdir.open_branch()
2815
if revision_id is None:
2816
revision_id = _mod_revision.ensure_null(branch.last_revision())
2817
# WorkingTree3 can handle an inventory which has a unique root id.
2818
# as of bzr 0.12. However, bzr 0.11 and earlier fail to handle
2819
# those trees. And because there isn't a format bump inbetween, we
2820
# are maintaining compatibility with older clients.
2821
# inv = Inventory(root_id=gen_root_id())
2822
inv = self._initial_inventory()
2823
wt = self._tree_class(a_bzrdir.root_transport.local_abspath('.'),
2829
_control_files=control_files)
2830
wt.lock_tree_write()
2832
basis_tree = branch.repository.revision_tree(revision_id)
2833
# only set an explicit root id if there is one to set.
2834
if basis_tree.inventory.root is not None:
2835
wt.set_root_id(basis_tree.inventory.root.file_id)
2836
if revision_id == NULL_REVISION:
2837
wt.set_parent_trees([])
2839
wt.set_parent_trees([(revision_id, basis_tree)])
2840
transform.build_tree(basis_tree, wt)
2842
# Unlock in this order so that the unlock-triggers-flush in
2843
# WorkingTree is given a chance to fire.
2844
control_files.unlock()
2848
def _initial_inventory(self):
2852
super(WorkingTreeFormat3, self).__init__()
2854
def open(self, a_bzrdir, _found=False):
2855
"""Return the WorkingTree object for a_bzrdir
2857
_found is a private parameter, do not use it. It is used to indicate
2858
if format probing has already been done.
2861
# we are being called directly and must probe.
2862
raise NotImplementedError
2863
if not isinstance(a_bzrdir.transport, LocalTransport):
2864
raise errors.NotLocalUrl(a_bzrdir.transport.base)
2865
wt = self._open(a_bzrdir, self._open_control_files(a_bzrdir))
2868
def _open(self, a_bzrdir, control_files):
2869
"""Open the tree itself.
2871
:param a_bzrdir: the dir for the tree.
2872
:param control_files: the control files for the tree.
2874
return self._tree_class(a_bzrdir.root_transport.local_abspath('.'),
2878
_control_files=control_files)
2881
return self.get_format_string()
2884
__default_format = WorkingTreeFormat4()
2885
WorkingTreeFormat.register_format(__default_format)
2886
WorkingTreeFormat.register_format(WorkingTreeFormat3())
2887
WorkingTreeFormat.set_default_format(__default_format)
2888
# formats which have no format string are not discoverable
2889
# and not independently creatable, so are not registered.
2890
_legacy_formats = [WorkingTreeFormat2(),
added
removed
bzrlib/workingtree.py
