36
39
# At the moment they may alias the inventory and have old copies of it in
37
40
# memory. (Now done? -- mbp 20060309)
42
from binascii import hexlify
44
from copy import deepcopy
39
45
from cStringIO import StringIO
43
from bzrlib.lazy_import import lazy_import
44
lazy_import(globals(), """
45
from bisect import bisect_left
57
conflicts as _mod_conflicts,
66
revision as _mod_revision,
55
from bzrlib import bzrdir, errors, ignores, osutils, urlutils
56
from bzrlib.atomicfile import AtomicFile
75
57
import bzrlib.branch
76
from bzrlib.transport import get_transport
77
from bzrlib.workingtree_4 import (
84
from bzrlib import symbol_versioning
58
from bzrlib.conflicts import Conflict, ConflictList, CONFLICT_SUFFIXES
85
59
from bzrlib.decorators import needs_read_lock, needs_write_lock
86
from bzrlib.lockable_files import LockableFiles
60
from bzrlib.errors import (BzrCheckError,
63
WeaveRevisionNotPresent,
67
MergeModifiedFormatError,
70
from bzrlib.inventory import InventoryEntry, Inventory
71
from bzrlib.lockable_files import LockableFiles, TransportLock
87
72
from bzrlib.lockdir import LockDir
88
import bzrlib.mutabletree
89
from bzrlib.mutabletree import needs_tree_write_lock
90
from bzrlib import osutils
73
from bzrlib.merge import merge_inner, transform_tree
91
74
from bzrlib.osutils import (
101
from bzrlib.filters import filtered_input_file
91
from bzrlib.progress import DummyProgress, ProgressPhase
92
from bzrlib.revision import NULL_REVISION
93
from bzrlib.rio import RioReader, rio_file, Stanza
94
from bzrlib.symbol_versioning import (deprecated_passed,
102
100
from bzrlib.trace import mutter, note
101
from bzrlib.transform import build_tree
102
from bzrlib.transport import get_transport
103
103
from bzrlib.transport.local import LocalTransport
104
from bzrlib.progress import DummyProgress, ProgressPhase
105
from bzrlib.revision import CURRENT_REVISION
106
from bzrlib.rio import RioReader, rio_file, Stanza
107
from bzrlib.symbol_versioning import (
109
DEPRECATED_PARAMETER,
113
MERGE_MODIFIED_HEADER_1 = "BZR merge-modified list format 1"
114
# TODO: Modifying the conflict objects or their type is currently nearly
115
# impossible as there is no clear relationship between the working tree format
116
# and the conflict list file format.
117
CONFLICT_HEADER_1 = "BZR conflict list format 1"
119
ERROR_PATH_NOT_FOUND = 3 # WindowsError errno code, equivalent to ENOENT
104
from bzrlib.textui import show_status
110
# the regex removes any weird characters; we don't escape them
111
# but rather just pull them out
112
_gen_file_id_re = re.compile(r'[^\w.]')
113
_gen_id_suffix = None
117
def _next_id_suffix():
118
"""Create a new file id suffix that is reasonably unique.
120
On the first call we combine the current time with 64 bits of randomness
121
to give a highly probably globally unique number. Then each call in the same
122
process adds 1 to a serial number we append to that unique value.
124
# XXX TODO: change bzrlib.add.smart_add to call workingtree.add() rather
125
# than having to move the id randomness out of the inner loop like this.
126
# XXX TODO: for the global randomness this uses we should add the thread-id
127
# before the serial #.
128
global _gen_id_suffix, _gen_id_serial
129
if _gen_id_suffix is None:
130
_gen_id_suffix = "-%s-%s-" % (compact_date(time()), rand_chars(16))
132
return _gen_id_suffix + str(_gen_id_serial)
135
def gen_file_id(name):
136
"""Return new file id for the basename 'name'.
138
The uniqueness is supplied from _next_id_suffix.
140
# The real randomness is in the _next_id_suffix, the
141
# rest of the identifier is just to be nice.
143
# 1) Remove non-ascii word characters to keep the ids portable
144
# 2) squash to lowercase, so the file id doesn't have to
145
# be escaped (case insensitive filesystems would bork for ids
146
# that only differred in case without escaping).
147
# 3) truncate the filename to 20 chars. Long filenames also bork on some
149
# 4) Removing starting '.' characters to prevent the file ids from
150
# being considered hidden.
151
ascii_word_only = _gen_file_id_re.sub('', name.lower())
152
short_no_dots = ascii_word_only.lstrip('.')[:20]
153
return short_no_dots + _next_id_suffix()
157
"""Return a new tree-root file id."""
158
return gen_file_id('TREE_ROOT')
122
161
class TreeEntry(object):
123
162
"""An entry that implements the minimum interface used by commands.
125
This needs further inspection, it may be better to have
164
This needs further inspection, it may be better to have
126
165
InventoryEntries without ids - though that seems wrong. For now,
127
166
this is a parallel hierarchy to InventoryEntry, and needs to become
128
167
one of several things: decorates to that hierarchy, children of, or
385
385
if osutils.lexists(self.abspath(path)):
388
def all_file_ids(self):
389
"""See Tree.iter_all_file_ids"""
390
return set(self.inventory)
392
388
def __repr__(self):
393
389
return "<%s of %s>" % (self.__class__.__name__,
394
390
getattr(self, 'basedir', None))
396
392
def abspath(self, filename):
397
393
return pathjoin(self.basedir, filename)
399
395
def basis_tree(self):
400
"""Return RevisionTree for the current last revision.
402
If the left most parent is a ghost then the returned tree will be an
403
empty tree - one obtained by calling
404
repository.revision_tree(NULL_REVISION).
407
revision_id = self.get_parent_ids()[0]
409
# no parents, return an empty revision tree.
410
# in the future this should return the tree for
411
# 'empty:' - the implicit root empty tree.
412
return self.branch.repository.revision_tree(
413
_mod_revision.NULL_REVISION)
415
return self.revision_tree(revision_id)
416
except errors.NoSuchRevision:
418
# No cached copy available, retrieve from the repository.
419
# FIXME? RBC 20060403 should we cache the inventory locally
422
return self.branch.repository.revision_tree(revision_id)
423
except (errors.RevisionNotPresent, errors.NoSuchRevision):
424
# the basis tree *may* be a ghost or a low level error may have
425
# occurred. If the revision is present, its a problem, if its not
427
if self.branch.repository.has_revision(revision_id):
429
# the basis tree is a ghost so return an empty tree.
430
return self.branch.repository.revision_tree(
431
_mod_revision.NULL_REVISION)
434
self._flush_ignore_list_cache()
396
"""Return RevisionTree for the current last revision."""
397
revision_id = self.last_revision()
398
if revision_id is not None:
400
xml = self.read_basis_inventory()
401
inv = bzrlib.xml5.serializer_v5.read_inventory_from_string(xml)
404
if inv is not None and inv.revision_id == revision_id:
405
return bzrlib.tree.RevisionTree(self.branch.repository, inv,
407
# FIXME? RBC 20060403 should we cache the inventory here ?
408
return self.branch.repository.revision_tree(revision_id)
411
@deprecated_method(zero_eight)
412
def create(branch, directory):
413
"""Create a workingtree for branch at directory.
415
If existing_directory already exists it must have a .bzr directory.
416
If it does not exist, it will be created.
418
This returns a new WorkingTree object for the new checkout.
420
TODO FIXME RBC 20060124 when we have checkout formats in place this
421
should accept an optional revisionid to checkout [and reject this if
422
checking out into the same dir as a pre-checkout-aware branch format.]
424
XXX: When BzrDir is present, these should be created through that
427
warnings.warn('delete WorkingTree.create', stacklevel=3)
428
transport = get_transport(directory)
429
if branch.bzrdir.root_transport.base == transport.base:
431
return branch.bzrdir.create_workingtree()
432
# different directory,
433
# create a branch reference
434
# and now a working tree.
435
raise NotImplementedError
438
@deprecated_method(zero_eight)
439
def create_standalone(directory):
440
"""Create a checkout and a branch and a repo at directory.
442
Directory must exist and be empty.
444
please use BzrDir.create_standalone_workingtree
446
return bzrdir.BzrDir.create_standalone_workingtree(directory)
436
448
def relpath(self, path):
437
449
"""Return the local path portion from a given path.
439
The path may be absolute or relative. If its a relative path it is
451
The path may be absolute or relative. If its a relative path it is
440
452
interpreted relative to the python current working directory.
442
return osutils.relpath(self.basedir, path)
454
return relpath(self.basedir, path)
444
456
def has_filename(self, filename):
445
457
return osutils.lexists(self.abspath(filename))
447
def get_file(self, file_id, path=None, filtered=True):
448
return self.get_file_with_stat(file_id, path, filtered=filtered)[0]
450
def get_file_with_stat(self, file_id, path=None, filtered=True,
452
"""See Tree.get_file_with_stat."""
454
path = self.id2path(file_id)
455
file_obj = self.get_file_byname(path, filtered=False)
456
stat_value = _fstat(file_obj.fileno())
457
if filtered and self.supports_content_filtering():
458
filters = self._content_filter_stack(path)
459
file_obj = filtered_input_file(file_obj, filters)
460
return (file_obj, stat_value)
462
def get_file_text(self, file_id, path=None, filtered=True):
463
return self.get_file(file_id, path=path, filtered=filtered).read()
465
def get_file_byname(self, filename, filtered=True):
466
path = self.abspath(filename)
468
if filtered and self.supports_content_filtering():
469
filters = self._content_filter_stack(filename)
470
return filtered_input_file(f, filters)
474
def get_file_lines(self, file_id, path=None, filtered=True):
475
"""See Tree.get_file_lines()"""
476
file = self.get_file(file_id, path, filtered=filtered)
478
return file.readlines()
483
def annotate_iter(self, file_id, default_revision=CURRENT_REVISION):
484
"""See Tree.annotate_iter
486
This implementation will use the basis tree implementation if possible.
487
Lines not in the basis are attributed to CURRENT_REVISION
489
If there are pending merges, lines added by those merges will be
490
incorrectly attributed to CURRENT_REVISION (but after committing, the
491
attribution will be correct).
493
maybe_file_parent_keys = []
494
for parent_id in self.get_parent_ids():
496
parent_tree = self.revision_tree(parent_id)
497
except errors.NoSuchRevisionInTree:
498
parent_tree = self.branch.repository.revision_tree(parent_id)
499
parent_tree.lock_read()
501
if file_id not in parent_tree:
503
ie = parent_tree.inventory[file_id]
504
if ie.kind != 'file':
505
# Note: this is slightly unnecessary, because symlinks and
506
# directories have a "text" which is the empty text, and we
507
# know that won't mess up annotations. But it seems cleaner
509
parent_text_key = (file_id, ie.revision)
510
if parent_text_key not in maybe_file_parent_keys:
511
maybe_file_parent_keys.append(parent_text_key)
514
graph = _mod_graph.Graph(self.branch.repository.texts)
515
heads = graph.heads(maybe_file_parent_keys)
516
file_parent_keys = []
517
for key in maybe_file_parent_keys:
519
file_parent_keys.append(key)
521
# Now we have the parents of this content
522
annotator = self.branch.repository.texts.get_annotator()
523
text = self.get_file(file_id).read()
524
this_key =(file_id, default_revision)
525
annotator.add_special_text(this_key, file_parent_keys, text)
526
annotations = [(key[-1], line)
527
for key, line in annotator.annotate_flat(this_key)]
530
def _get_ancestors(self, default_revision):
531
ancestors = set([default_revision])
532
for parent_id in self.get_parent_ids():
533
ancestors.update(self.branch.repository.get_ancestry(
534
parent_id, topo_sorted=False))
459
def get_file(self, file_id):
460
return self.get_file_byname(self.id2path(file_id))
462
def get_file_text(self, file_id):
463
return self.get_file(file_id).read()
465
def get_file_byname(self, filename):
466
return file(self.abspath(filename), 'rb')
537
468
def get_parent_ids(self):
538
469
"""See Tree.get_parent_ids.
540
471
This implementation reads the pending merges list and last_revision
541
472
value and uses that to decide what the parents list should be.
543
last_rev = _mod_revision.ensure_null(self._last_revision())
544
if _mod_revision.NULL_REVISION == last_rev:
474
last_rev = self.last_revision()
547
478
parents = [last_rev]
549
merges_bytes = self._transport.get_bytes('pending-merges')
550
except errors.NoSuchFile:
553
for l in osutils.split_lines(merges_bytes):
554
revision_id = l.rstrip('\n')
555
parents.append(revision_id)
479
other_parents = self.pending_merges()
480
return parents + other_parents
559
482
def get_root_id(self):
560
483
"""Return the id of this trees root"""
561
return self._inventory.root.file_id
484
inv = self.read_working_inventory()
485
return inv.root.file_id
563
487
def _get_store_filename(self, file_id):
564
488
## XXX: badly named; this is not in the store at all
565
489
return self.abspath(self.id2path(file_id))
568
def clone(self, to_bzrdir, revision_id=None):
492
def clone(self, to_bzrdir, revision_id=None, basis=None):
569
493
"""Duplicate this working tree into to_bzr, including all state.
571
495
Specifically modified files are kept as modified, but
572
496
ignored and unknown files are discarded.
574
498
If you want to make a new line of development, see bzrdir.sprout()
577
If not None, the cloned tree will have its last revision set to
578
revision, and difference between the source trees last revision
501
If not None, the cloned tree will have its last revision set to
502
revision, and and difference between the source trees last revision
579
503
and this one merged in.
506
If not None, a closer copy of a tree which may have some files in
507
common, and which file content should be preferentially copied from.
581
509
# assumes the target bzr dir format is compatible.
582
result = to_bzrdir.create_workingtree()
510
result = self._format.initialize(to_bzrdir)
583
511
self.copy_content_into(result, revision_id)
587
515
def copy_content_into(self, tree, revision_id=None):
588
516
"""Copy the current content and user files of this tree into tree."""
589
tree.set_root_id(self.get_root_id())
590
517
if revision_id is None:
591
merge.transform_tree(tree, self)
518
transform_tree(tree, self)
593
# TODO now merge from tree.last_revision to revision (to preserve
594
# user local changes)
595
merge.transform_tree(tree, self)
596
tree.set_parent_ids([revision_id])
520
# TODO now merge from tree.last_revision to revision
521
transform_tree(tree, self)
522
tree.set_last_revision(revision_id)
525
def commit(self, message=None, revprops=None, *args, **kwargs):
526
# avoid circular imports
527
from bzrlib.commit import Commit
530
if not 'branch-nick' in revprops:
531
revprops['branch-nick'] = self.branch.nick
532
# args for wt.commit start at message from the Commit.commit method,
533
# but with branch a kwarg now, passing in args as is results in the
534
#message being used for the branch
535
args = (DEPRECATED_PARAMETER, message, ) + args
536
committed_id = Commit().commit( working_tree=self, revprops=revprops,
538
self._set_inventory(self.read_working_inventory())
598
541
def id2abspath(self, file_id):
599
542
return self.abspath(self.id2path(file_id))
601
544
def has_id(self, file_id):
602
545
# files that have been deleted are excluded
546
inv = self._inventory
604
547
if not inv.has_id(file_id):
606
549
path = inv.id2path(file_id)
614
557
__contains__ = has_id
616
559
def get_file_size(self, file_id):
617
"""See Tree.get_file_size"""
618
# XXX: this returns the on-disk size; it should probably return the
621
return os.path.getsize(self.id2abspath(file_id))
623
if e.errno != errno.ENOENT:
560
return os.path.getsize(self.id2abspath(file_id))
629
def get_file_sha1(self, file_id, path=None, stat_value=None):
563
def get_file_sha1(self, file_id, path=None):
631
565
path = self._inventory.id2path(file_id)
632
return self._hashcache.get_sha1(path, stat_value)
566
return self._hashcache.get_sha1(path)
634
568
def get_file_mtime(self, file_id, path=None):
636
path = self.inventory.id2path(file_id)
570
path = self._inventory.id2path(file_id)
637
571
return os.lstat(self.abspath(path)).st_mtime
639
def _is_executable_from_path_and_stat_from_basis(self, path, stat_result):
640
file_id = self.path2id(path)
642
# For unversioned files on win32, we just assume they are not
645
return self._inventory[file_id].executable
647
def _is_executable_from_path_and_stat_from_stat(self, path, stat_result):
648
mode = stat_result.st_mode
649
return bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode)
651
573
if not supports_executable():
652
574
def is_executable(self, file_id, path=None):
653
575
return self._inventory[file_id].executable
655
_is_executable_from_path_and_stat = \
656
_is_executable_from_path_and_stat_from_basis
658
577
def is_executable(self, file_id, path=None):
660
path = self.id2path(file_id)
579
path = self._inventory.id2path(file_id)
661
580
mode = os.lstat(self.abspath(path)).st_mode
662
581
return bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode)
664
_is_executable_from_path_and_stat = \
665
_is_executable_from_path_and_stat_from_stat
667
@needs_tree_write_lock
668
def _add(self, files, ids, kinds):
669
"""See MutableTree._add."""
584
def add(self, files, ids=None):
585
"""Make files versioned.
587
Note that the command line normally calls smart_add instead,
588
which can automatically recurse.
590
This adds the files to the inventory, so that they will be
591
recorded by the next commit.
594
List of paths to add, relative to the base of the tree.
597
If set, use these instead of automatically generated ids.
598
Must be the same length as the list of files, but may
599
contain None for ids that are to be autogenerated.
601
TODO: Perhaps have an option to add the ids even if the files do
604
TODO: Perhaps callback with the ids and paths as they're added.
670
606
# TODO: Re-adding a file that is removed in the working copy
671
607
# should probably put it back with the previous ID.
672
# the read and write working inventory should not occur in this
673
# function - they should be part of lock_write and unlock.
675
for f, file_id, kind in zip(files, ids, kinds):
608
if isinstance(files, basestring):
609
assert(ids is None or isinstance(ids, basestring))
615
ids = [None] * len(files)
617
assert(len(ids) == len(files))
619
inv = self.read_working_inventory()
620
for f,file_id in zip(files, ids):
621
if self.is_control_filename(f):
622
raise errors.ForbiddenControlFileError(filename=f)
627
raise BzrError("cannot add top-level %r" % f)
629
fullpath = normpath(self.abspath(f))
631
kind = file_kind(fullpath)
633
if e.errno == errno.ENOENT:
634
raise NoSuchFile(fullpath)
635
if not InventoryEntry.versionable_kind(kind):
636
raise errors.BadFileKindError(filename=f, kind=kind)
676
637
if file_id is None:
677
638
inv.add_path(f, kind=kind)
679
640
inv.add_path(f, kind=kind, file_id=file_id)
680
self._inventory_is_modified = True
682
@needs_tree_write_lock
683
def _gather_kinds(self, files, kinds):
684
"""See MutableTree._gather_kinds."""
685
for pos, f in enumerate(files):
686
if kinds[pos] is None:
687
fullpath = normpath(self.abspath(f))
689
kinds[pos] = file_kind(fullpath)
691
if e.errno == errno.ENOENT:
692
raise errors.NoSuchFile(fullpath)
642
self._write_inventory(inv)
694
644
@needs_write_lock
695
def add_parent_tree_id(self, revision_id, allow_leftmost_as_ghost=False):
696
"""Add revision_id as a parent.
698
This is equivalent to retrieving the current list of parent ids
699
and setting the list to its value plus revision_id.
701
:param revision_id: The revision id to add to the parent list. It may
702
be a ghost revision as long as its not the first parent to be added,
703
or the allow_leftmost_as_ghost parameter is set True.
704
:param allow_leftmost_as_ghost: Allow the first parent to be a ghost.
706
parents = self.get_parent_ids() + [revision_id]
707
self.set_parent_ids(parents, allow_leftmost_as_ghost=len(parents) > 1
708
or allow_leftmost_as_ghost)
710
@needs_tree_write_lock
711
def add_parent_tree(self, parent_tuple, allow_leftmost_as_ghost=False):
712
"""Add revision_id, tree tuple as a parent.
714
This is equivalent to retrieving the current list of parent trees
715
and setting the list to its value plus parent_tuple. See also
716
add_parent_tree_id - if you only have a parent id available it will be
717
simpler to use that api. If you have the parent already available, using
718
this api is preferred.
720
:param parent_tuple: The (revision id, tree) to add to the parent list.
721
If the revision_id is a ghost, pass None for the tree.
722
:param allow_leftmost_as_ghost: Allow the first parent to be a ghost.
724
parent_ids = self.get_parent_ids() + [parent_tuple[0]]
725
if len(parent_ids) > 1:
726
# the leftmost may have already been a ghost, preserve that if it
728
allow_leftmost_as_ghost = True
729
self.set_parent_ids(parent_ids,
730
allow_leftmost_as_ghost=allow_leftmost_as_ghost)
732
@needs_tree_write_lock
733
645
def add_pending_merge(self, *revision_ids):
734
646
# TODO: Perhaps should check at this point that the
735
647
# history of the revision is actually present?
736
parents = self.get_parent_ids()
648
p = self.pending_merges()
738
650
for rev_id in revision_ids:
739
if rev_id in parents:
741
parents.append(rev_id)
744
self.set_parent_ids(parents, allow_leftmost_as_ghost=True)
746
def path_content_summary(self, path, _lstat=os.lstat,
747
_mapper=osutils.file_kind_from_stat_mode):
748
"""See Tree.path_content_summary."""
749
abspath = self.abspath(path)
656
self.set_pending_merges(p)
659
def pending_merges(self):
660
"""Return a list of pending merges.
662
These are revisions that have been merged into the working
663
directory but not yet committed.
751
stat_result = _lstat(abspath)
753
if getattr(e, 'errno', None) == errno.ENOENT:
755
return ('missing', None, None, None)
756
# propagate other errors
758
kind = _mapper(stat_result.st_mode)
760
return self._file_content_summary(path, stat_result)
761
elif kind == 'directory':
762
# perhaps it looks like a plain directory, but it's really a
764
if self._directory_is_tree_reference(path):
765
kind = 'tree-reference'
766
return kind, None, None, None
767
elif kind == 'symlink':
768
target = osutils.readlink(abspath)
769
return ('symlink', None, None, target)
771
return (kind, None, None, None)
773
def _file_content_summary(self, path, stat_result):
774
size = stat_result.st_size
775
executable = self._is_executable_from_path_and_stat(path, stat_result)
776
# try for a stat cache lookup
777
return ('file', size, executable, self._sha_from_stat(
780
def _check_parents_for_ghosts(self, revision_ids, allow_leftmost_as_ghost):
781
"""Common ghost checking functionality from set_parent_*.
783
This checks that the left hand-parent exists if there are any
786
if len(revision_ids) > 0:
787
leftmost_id = revision_ids[0]
788
if (not allow_leftmost_as_ghost and not
789
self.branch.repository.has_revision(leftmost_id)):
790
raise errors.GhostRevisionUnusableHere(leftmost_id)
792
def _set_merges_from_parent_ids(self, parent_ids):
793
merges = parent_ids[1:]
794
self._transport.put_bytes('pending-merges', '\n'.join(merges),
795
mode=self.bzrdir._get_file_mode())
797
def _filter_parent_ids_by_ancestry(self, revision_ids):
798
"""Check that all merged revisions are proper 'heads'.
800
This will always return the first revision_id, and any merged revisions
803
if len(revision_ids) == 0:
805
graph = self.branch.repository.get_graph()
806
heads = graph.heads(revision_ids)
807
new_revision_ids = revision_ids[:1]
808
for revision_id in revision_ids[1:]:
809
if revision_id in heads and revision_id not in new_revision_ids:
810
new_revision_ids.append(revision_id)
811
if new_revision_ids != revision_ids:
812
trace.mutter('requested to set revision_ids = %s,'
813
' but filtered to %s', revision_ids, new_revision_ids)
814
return new_revision_ids
816
@needs_tree_write_lock
817
def set_parent_ids(self, revision_ids, allow_leftmost_as_ghost=False):
818
"""Set the parent ids to revision_ids.
820
See also set_parent_trees. This api will try to retrieve the tree data
821
for each element of revision_ids from the trees repository. If you have
822
tree data already available, it is more efficient to use
823
set_parent_trees rather than set_parent_ids. set_parent_ids is however
824
an easier API to use.
826
:param revision_ids: The revision_ids to set as the parent ids of this
827
working tree. Any of these may be ghosts.
829
self._check_parents_for_ghosts(revision_ids,
830
allow_leftmost_as_ghost=allow_leftmost_as_ghost)
831
for revision_id in revision_ids:
832
_mod_revision.check_not_reserved_id(revision_id)
834
revision_ids = self._filter_parent_ids_by_ancestry(revision_ids)
836
if len(revision_ids) > 0:
837
self.set_last_revision(revision_ids[0])
839
self.set_last_revision(_mod_revision.NULL_REVISION)
841
self._set_merges_from_parent_ids(revision_ids)
843
@needs_tree_write_lock
844
def set_parent_trees(self, parents_list, allow_leftmost_as_ghost=False):
845
"""See MutableTree.set_parent_trees."""
846
parent_ids = [rev for (rev, tree) in parents_list]
847
for revision_id in parent_ids:
848
_mod_revision.check_not_reserved_id(revision_id)
850
self._check_parents_for_ghosts(parent_ids,
851
allow_leftmost_as_ghost=allow_leftmost_as_ghost)
853
parent_ids = self._filter_parent_ids_by_ancestry(parent_ids)
855
if len(parent_ids) == 0:
856
leftmost_parent_id = _mod_revision.NULL_REVISION
857
leftmost_parent_tree = None
859
leftmost_parent_id, leftmost_parent_tree = parents_list[0]
861
if self._change_last_revision(leftmost_parent_id):
862
if leftmost_parent_tree is None:
863
# If we don't have a tree, fall back to reading the
864
# parent tree from the repository.
865
self._cache_basis_inventory(leftmost_parent_id)
867
inv = leftmost_parent_tree.inventory
868
xml = self._create_basis_xml_from_inventory(
869
leftmost_parent_id, inv)
870
self._write_basis_inventory(xml)
871
self._set_merges_from_parent_ids(parent_ids)
873
@needs_tree_write_lock
666
merges_file = self._control_files.get_utf8('pending-merges')
670
for l in merges_file.readlines():
671
p.append(l.rstrip('\n'))
874
675
def set_pending_merges(self, rev_list):
875
parents = self.get_parent_ids()
876
leftmost = parents[:1]
877
new_parents = leftmost + rev_list
878
self.set_parent_ids(new_parents)
676
self._control_files.put_utf8('pending-merges', '\n'.join(rev_list))
880
@needs_tree_write_lock
881
679
def set_merge_modified(self, modified_hashes):
882
680
def iter_stanzas():
883
681
for file_id, hash in modified_hashes.iteritems():
884
yield Stanza(file_id=file_id.decode('utf8'), hash=hash)
682
yield Stanza(file_id=file_id, hash=hash)
885
683
self._put_rio('merge-hashes', iter_stanzas(), MERGE_MODIFIED_HEADER_1)
887
def _sha_from_stat(self, path, stat_result):
888
"""Get a sha digest from the tree's stat cache.
890
The default implementation assumes no stat cache is present.
892
:param path: The path.
893
:param stat_result: The stat result being looked up.
897
686
def _put_rio(self, filename, stanzas, header):
898
self._must_be_locked()
899
687
my_file = rio_file(stanzas, header)
900
self._transport.put_file(filename, my_file,
901
mode=self.bzrdir._get_file_mode())
903
@needs_write_lock # because merge pulls data into the branch.
904
def merge_from_branch(self, branch, to_revision=None, from_revision=None,
905
merge_type=None, force=False):
906
"""Merge from a branch into this working tree.
908
:param branch: The branch to merge from.
909
:param to_revision: If non-None, the merge will merge to to_revision,
910
but not beyond it. to_revision does not need to be in the history
911
of the branch when it is supplied. If None, to_revision defaults to
912
branch.last_revision().
914
from bzrlib.merge import Merger, Merge3Merger
915
pb = ui.ui_factory.nested_progress_bar()
917
merger = Merger(self.branch, this_tree=self, pb=pb)
918
merger.pp = ProgressPhase("Merge phase", 5, pb)
919
merger.pp.next_phase()
920
# check that there are no local alterations
921
if not force and self.has_changes():
922
raise errors.UncommittedChanges(self)
923
if to_revision is None:
924
to_revision = _mod_revision.ensure_null(branch.last_revision())
925
merger.other_rev_id = to_revision
926
if _mod_revision.is_null(merger.other_rev_id):
927
raise errors.NoCommits(branch)
928
self.branch.fetch(branch, last_revision=merger.other_rev_id)
929
merger.other_basis = merger.other_rev_id
930
merger.other_tree = self.branch.repository.revision_tree(
932
merger.other_branch = branch
933
merger.pp.next_phase()
934
if from_revision is None:
937
merger.set_base_revision(from_revision, branch)
938
if merger.base_rev_id == merger.other_rev_id:
939
raise errors.PointlessMerge
940
merger.backup_files = False
941
if merge_type is None:
942
merger.merge_type = Merge3Merger
944
merger.merge_type = merge_type
945
merger.set_interesting_files(None)
946
merger.show_base = False
947
merger.reprocess = False
948
conflicts = merger.do_merge()
688
self._control_files.put(filename, my_file)
955
691
def merge_modified(self):
956
"""Return a dictionary of files modified by a merge.
958
The list is initialized by WorkingTree.set_merge_modified, which is
959
typically called after we make some automatic updates to the tree
962
This returns a map of file_id->sha1, containing only files which are
963
still in the working inventory and have that text hash.
966
hashfile = self._transport.get('merge-hashes')
967
except errors.NoSuchFile:
693
hashfile = self._control_files.get('merge-hashes')
972
if hashfile.next() != MERGE_MODIFIED_HEADER_1 + '\n':
973
raise errors.MergeModifiedFormatError()
974
except StopIteration:
975
raise errors.MergeModifiedFormatError()
976
for s in RioReader(hashfile):
977
# RioReader reads in Unicode, so convert file_ids back to utf8
978
file_id = osutils.safe_file_id(s.get("file_id"), warn=False)
979
if file_id not in self.inventory:
981
text_hash = s.get("hash")
982
if text_hash == self.get_file_sha1(file_id):
983
merge_hashes[file_id] = text_hash
989
def mkdir(self, path, file_id=None):
990
"""See MutableTree.mkdir()."""
992
file_id = generate_ids.gen_file_id(os.path.basename(path))
993
os.mkdir(self.abspath(path))
994
self.add(path, file_id, 'directory')
698
if hashfile.next() != MERGE_MODIFIED_HEADER_1 + '\n':
699
raise MergeModifiedFormatError()
700
except StopIteration:
701
raise MergeModifiedFormatError()
702
for s in RioReader(hashfile):
703
file_id = s.get("file_id")
704
if file_id not in self.inventory:
707
if hash == self.get_file_sha1(file_id):
708
merge_hashes[file_id] = hash
997
711
def get_symlink_target(self, file_id):
998
abspath = self.id2abspath(file_id)
999
target = osutils.readlink(abspath)
1003
def subsume(self, other_tree):
1004
def add_children(inventory, entry):
1005
for child_entry in entry.children.values():
1006
inventory._byid[child_entry.file_id] = child_entry
1007
if child_entry.kind == 'directory':
1008
add_children(inventory, child_entry)
1009
if other_tree.get_root_id() == self.get_root_id():
1010
raise errors.BadSubsumeSource(self, other_tree,
1011
'Trees have the same root')
1013
other_tree_path = self.relpath(other_tree.basedir)
1014
except errors.PathNotChild:
1015
raise errors.BadSubsumeSource(self, other_tree,
1016
'Tree is not contained by the other')
1017
new_root_parent = self.path2id(osutils.dirname(other_tree_path))
1018
if new_root_parent is None:
1019
raise errors.BadSubsumeSource(self, other_tree,
1020
'Parent directory is not versioned.')
1021
# We need to ensure that the result of a fetch will have a
1022
# versionedfile for the other_tree root, and only fetching into
1023
# RepositoryKnit2 guarantees that.
1024
if not self.branch.repository.supports_rich_root():
1025
raise errors.SubsumeTargetNeedsUpgrade(other_tree)
1026
other_tree.lock_tree_write()
1028
new_parents = other_tree.get_parent_ids()
1029
other_root = other_tree.inventory.root
1030
other_root.parent_id = new_root_parent
1031
other_root.name = osutils.basename(other_tree_path)
1032
self.inventory.add(other_root)
1033
add_children(self.inventory, other_root)
1034
self._write_inventory(self.inventory)
1035
# normally we don't want to fetch whole repositories, but i think
1036
# here we really do want to consolidate the whole thing.
1037
for parent_id in other_tree.get_parent_ids():
1038
self.branch.fetch(other_tree.branch, parent_id)
1039
self.add_parent_tree_id(parent_id)
1042
other_tree.bzrdir.retire_bzrdir()
1044
def _setup_directory_is_tree_reference(self):
1045
if self._branch.repository._format.supports_tree_reference:
1046
self._directory_is_tree_reference = \
1047
self._directory_may_be_tree_reference
1049
self._directory_is_tree_reference = \
1050
self._directory_is_never_tree_reference
1052
def _directory_is_never_tree_reference(self, relpath):
1055
def _directory_may_be_tree_reference(self, relpath):
1056
# as a special case, if a directory contains control files then
1057
# it's a tree reference, except that the root of the tree is not
1058
return relpath and osutils.isdir(self.abspath(relpath) + u"/.bzr")
1059
# TODO: We could ask all the control formats whether they
1060
# recognize this directory, but at the moment there's no cheap api
1061
# to do that. Since we probably can only nest bzr checkouts and
1062
# they always use this name it's ok for now. -- mbp 20060306
1064
# FIXME: There is an unhandled case here of a subdirectory
1065
# containing .bzr but not a branch; that will probably blow up
1066
# when you try to commit it. It might happen if there is a
1067
# checkout in a subdirectory. This can be avoided by not adding
1070
@needs_tree_write_lock
1071
def extract(self, file_id, format=None):
1072
"""Extract a subtree from this tree.
1074
A new branch will be created, relative to the path for this tree.
1078
segments = osutils.splitpath(path)
1079
transport = self.branch.bzrdir.root_transport
1080
for name in segments:
1081
transport = transport.clone(name)
1082
transport.ensure_base()
1085
sub_path = self.id2path(file_id)
1086
branch_transport = mkdirs(sub_path)
1088
format = self.bzrdir.cloning_metadir()
1089
branch_transport.ensure_base()
1090
branch_bzrdir = format.initialize_on_transport(branch_transport)
1092
repo = branch_bzrdir.find_repository()
1093
except errors.NoRepositoryPresent:
1094
repo = branch_bzrdir.create_repository()
1095
if not repo.supports_rich_root():
1096
raise errors.RootNotRich()
1097
new_branch = branch_bzrdir.create_branch()
1098
new_branch.pull(self.branch)
1099
for parent_id in self.get_parent_ids():
1100
new_branch.fetch(self.branch, parent_id)
1101
tree_transport = self.bzrdir.root_transport.clone(sub_path)
1102
if tree_transport.base != branch_transport.base:
1103
tree_bzrdir = format.initialize_on_transport(tree_transport)
1104
branch.BranchReferenceFormat().initialize(tree_bzrdir, new_branch)
1106
tree_bzrdir = branch_bzrdir
1107
wt = tree_bzrdir.create_workingtree(_mod_revision.NULL_REVISION)
1108
wt.set_parent_ids(self.get_parent_ids())
1109
my_inv = self.inventory
1110
child_inv = inventory.Inventory(root_id=None)
1111
new_root = my_inv[file_id]
1112
my_inv.remove_recursive_id(file_id)
1113
new_root.parent_id = None
1114
child_inv.add(new_root)
1115
self._write_inventory(my_inv)
1116
wt._write_inventory(child_inv)
1119
def _serialize(self, inventory, out_file):
1120
xml5.serializer_v5.write_inventory(self._inventory, out_file,
1123
def _deserialize(selt, in_file):
1124
return xml5.serializer_v5.read_inventory(in_file)
1127
"""Write the in memory inventory to disk."""
1128
# TODO: Maybe this should only write on dirty ?
1129
if self._control_files._lock_mode != 'w':
1130
raise errors.NotWriteLocked(self)
1132
self._serialize(self._inventory, sio)
1134
self._transport.put_file('inventory', sio,
1135
mode=self.bzrdir._get_file_mode())
1136
self._inventory_is_modified = False
1138
def _kind(self, relpath):
1139
return osutils.file_kind(self.abspath(relpath))
1141
def list_files(self, include_root=False, from_dir=None, recursive=True):
1142
"""List all files as (path, class, kind, id, entry).
712
return os.readlink(self.id2abspath(file_id))
714
def file_class(self, filename):
715
if self.path2id(filename):
717
elif self.is_ignored(filename):
722
def list_files(self):
723
"""Recursively list all files as (path, class, kind, id, entry).
1144
725
Lists, but does not descend into unversioned directories.
1145
727
This does not include files that have been deleted in this
1146
tree. Skips the control directory.
1148
:param include_root: if True, do not return an entry for the root
1149
:param from_dir: start from this directory or None for the root
1150
:param recursive: whether to recurse into subdirectories or not
730
Skips the control directory.
1152
# list_files is an iterator, so @needs_read_lock doesn't work properly
1153
# with it. So callers should be careful to always read_lock the tree.
1154
if not self.is_locked():
1155
raise errors.ObjectNotLocked(self)
1157
inv = self.inventory
1158
if from_dir is None and include_root is True:
1159
yield ('', 'V', 'directory', inv.root.file_id, inv.root)
732
inv = self._inventory
1160
733
# Convert these into local objects to save lookup times
1161
734
pathjoin = osutils.pathjoin
1162
file_kind = self._kind
735
file_kind = osutils.file_kind
1164
737
# transport.base ends in a slash, we want the piece
1165
738
# between the last two slashes
1243
813
except KeyError:
1244
814
yield fp[1:], c, fk, None, TreeEntry()
1247
817
if fk != 'directory':
1250
# But do this child first if recursing down
1252
new_children = os.listdir(fap)
1254
new_children = collections.deque(new_children)
1255
stack.append((f_ie.file_id, fp, fap, new_children))
1256
# Break out of inner loop,
1257
# so that we start outer loop with child
820
# But do this child first
821
new_children = os.listdir(fap)
823
new_children = collections.deque(new_children)
824
stack.append((f_ie.file_id, fp, fap, new_children))
825
# Break out of inner loop, so that we start outer loop with child
1260
828
# if we finished all children, pop it off the stack
1263
@needs_tree_write_lock
1264
def move(self, from_paths, to_dir=None, after=False, **kwargs):
833
def move(self, from_paths, to_name):
1265
834
"""Rename files.
1267
to_dir must exist in the inventory.
1269
If to_dir exists and is a directory, the files are moved into
1270
it, keeping their old names.
1272
Note that to_dir is only the last component of the new name;
836
to_name must exist in the inventory.
838
If to_name exists and is a directory, the files are moved into
839
it, keeping their old names.
841
Note that to_name is only the last component of the new name;
1273
842
this doesn't change the directory.
1275
For each entry in from_paths the move mode will be determined
1278
The first mode moves the file in the filesystem and updates the
1279
inventory. The second mode only updates the inventory without
1280
touching the file on the filesystem. This is the new mode introduced
1283
move uses the second mode if 'after == True' and the target is not
1284
versioned but present in the working tree.
1286
move uses the second mode if 'after == False' and the source is
1287
versioned but no longer in the working tree, and the target is not
1288
versioned but present in the working tree.
1290
move uses the first mode if 'after == False' and the source is
1291
versioned and present in the working tree, and the target is not
1292
versioned and not present in the working tree.
1294
Everything else results in an error.
1296
844
This returns a list of (from_path, to_path) pairs for each
1297
845
entry that is moved.
1302
# check for deprecated use of signature
1304
to_dir = kwargs.get('to_name', None)
1306
raise TypeError('You must supply a target directory')
1308
symbol_versioning.warn('The parameter to_name was deprecated'
1309
' in version 0.13. Use to_dir instead',
1312
# check destination directory
1313
if isinstance(from_paths, basestring):
848
## TODO: Option to move IDs only
849
assert not isinstance(from_paths, basestring)
1315
850
inv = self.inventory
1316
to_abs = self.abspath(to_dir)
851
to_abs = self.abspath(to_name)
1317
852
if not isdir(to_abs):
1318
raise errors.BzrMoveFailedError('',to_dir,
1319
errors.NotADirectory(to_abs))
1320
if not self.has_filename(to_dir):
1321
raise errors.BzrMoveFailedError('',to_dir,
1322
errors.NotInWorkingDirectory(to_dir))
1323
to_dir_id = inv.path2id(to_dir)
1324
if to_dir_id is None:
1325
raise errors.BzrMoveFailedError('',to_dir,
1326
errors.NotVersionedError(path=str(to_dir)))
853
raise BzrError("destination %r is not a directory" % to_abs)
854
if not self.has_filename(to_name):
855
raise BzrError("destination %r not in working directory" % to_abs)
856
to_dir_id = inv.path2id(to_name)
857
if to_dir_id == None and to_name != '':
858
raise BzrError("destination %r is not a versioned directory" % to_name)
1328
859
to_dir_ie = inv[to_dir_id]
1329
if to_dir_ie.kind != 'directory':
1330
raise errors.BzrMoveFailedError('',to_dir,
1331
errors.NotADirectory(to_abs))
1333
# create rename entries and tuples
1334
for from_rel in from_paths:
1335
from_tail = splitpath(from_rel)[-1]
1336
from_id = inv.path2id(from_rel)
1338
raise errors.BzrMoveFailedError(from_rel,to_dir,
1339
errors.NotVersionedError(path=str(from_rel)))
1341
from_entry = inv[from_id]
1342
from_parent_id = from_entry.parent_id
1343
to_rel = pathjoin(to_dir, from_tail)
1344
rename_entry = WorkingTree._RenameEntry(from_rel=from_rel,
1346
from_tail=from_tail,
1347
from_parent_id=from_parent_id,
1348
to_rel=to_rel, to_tail=from_tail,
1349
to_parent_id=to_dir_id)
1350
rename_entries.append(rename_entry)
1351
rename_tuples.append((from_rel, to_rel))
1353
# determine which move mode to use. checks also for movability
1354
rename_entries = self._determine_mv_mode(rename_entries, after)
1356
original_modified = self._inventory_is_modified
860
if to_dir_ie.kind not in ('directory', 'root_directory'):
861
raise BzrError("destination %r is not a directory" % to_abs)
863
to_idpath = inv.get_idpath(to_dir_id)
866
if not self.has_filename(f):
867
raise BzrError("%r does not exist in working tree" % f)
868
f_id = inv.path2id(f)
870
raise BzrError("%r is not versioned" % f)
871
name_tail = splitpath(f)[-1]
872
dest_path = pathjoin(to_name, name_tail)
873
if self.has_filename(dest_path):
874
raise BzrError("destination %r already exists" % dest_path)
875
if f_id in to_idpath:
876
raise BzrError("can't move %r to a subdirectory of itself" % f)
878
# OK, so there's a race here, it's possible that someone will
879
# create a file in this interval and then the rename might be
880
# left half-done. But we should have caught most problems.
881
orig_inv = deepcopy(self.inventory)
1359
self._inventory_is_modified = True
1360
self._move(rename_entries)
884
name_tail = splitpath(f)[-1]
885
dest_path = pathjoin(to_name, name_tail)
886
result.append((f, dest_path))
887
inv.rename(inv.path2id(f), to_dir_id, name_tail)
889
rename(self.abspath(f), self.abspath(dest_path))
891
raise BzrError("failed to rename %r to %r: %s" %
892
(f, dest_path, e[1]),
893
["rename rolled back"])
1362
895
# restore the inventory on error
1363
self._inventory_is_modified = original_modified
896
self._set_inventory(orig_inv)
1365
898
self._write_inventory(inv)
1366
return rename_tuples
1368
def _determine_mv_mode(self, rename_entries, after=False):
1369
"""Determines for each from-to pair if both inventory and working tree
1370
or only the inventory has to be changed.
1372
Also does basic plausability tests.
1374
inv = self.inventory
1376
for rename_entry in rename_entries:
1377
# store to local variables for easier reference
1378
from_rel = rename_entry.from_rel
1379
from_id = rename_entry.from_id
1380
to_rel = rename_entry.to_rel
1381
to_id = inv.path2id(to_rel)
1382
only_change_inv = False
1384
# check the inventory for source and destination
1386
raise errors.BzrMoveFailedError(from_rel,to_rel,
1387
errors.NotVersionedError(path=str(from_rel)))
1388
if to_id is not None:
1389
raise errors.BzrMoveFailedError(from_rel,to_rel,
1390
errors.AlreadyVersionedError(path=str(to_rel)))
1392
# try to determine the mode for rename (only change inv or change
1393
# inv and file system)
1395
if not self.has_filename(to_rel):
1396
raise errors.BzrMoveFailedError(from_id,to_rel,
1397
errors.NoSuchFile(path=str(to_rel),
1398
extra="New file has not been created yet"))
1399
only_change_inv = True
1400
elif not self.has_filename(from_rel) and self.has_filename(to_rel):
1401
only_change_inv = True
1402
elif self.has_filename(from_rel) and not self.has_filename(to_rel):
1403
only_change_inv = False
1404
elif (not self.case_sensitive
1405
and from_rel.lower() == to_rel.lower()
1406
and self.has_filename(from_rel)):
1407
only_change_inv = False
1409
# something is wrong, so lets determine what exactly
1410
if not self.has_filename(from_rel) and \
1411
not self.has_filename(to_rel):
1412
raise errors.BzrRenameFailedError(from_rel,to_rel,
1413
errors.PathsDoNotExist(paths=(str(from_rel),
1416
raise errors.RenameFailedFilesExist(from_rel, to_rel)
1417
rename_entry.only_change_inv = only_change_inv
1418
return rename_entries
1420
def _move(self, rename_entries):
1421
"""Moves a list of files.
1423
Depending on the value of the flag 'only_change_inv', the
1424
file will be moved on the file system or not.
1426
inv = self.inventory
1429
for entry in rename_entries:
1431
self._move_entry(entry)
1433
self._rollback_move(moved)
1437
def _rollback_move(self, moved):
1438
"""Try to rollback a previous move in case of an filesystem error."""
1439
inv = self.inventory
1442
self._move_entry(WorkingTree._RenameEntry(
1443
entry.to_rel, entry.from_id,
1444
entry.to_tail, entry.to_parent_id, entry.from_rel,
1445
entry.from_tail, entry.from_parent_id,
1446
entry.only_change_inv))
1447
except errors.BzrMoveFailedError, e:
1448
raise errors.BzrMoveFailedError( '', '', "Rollback failed."
1449
" The working tree is in an inconsistent state."
1450
" Please consider doing a 'bzr revert'."
1451
" Error message is: %s" % e)
1453
def _move_entry(self, entry):
1454
inv = self.inventory
1455
from_rel_abs = self.abspath(entry.from_rel)
1456
to_rel_abs = self.abspath(entry.to_rel)
1457
if from_rel_abs == to_rel_abs:
1458
raise errors.BzrMoveFailedError(entry.from_rel, entry.to_rel,
1459
"Source and target are identical.")
1461
if not entry.only_change_inv:
1463
osutils.rename(from_rel_abs, to_rel_abs)
1465
raise errors.BzrMoveFailedError(entry.from_rel,
1467
inv.rename(entry.from_id, entry.to_parent_id, entry.to_tail)
1469
@needs_tree_write_lock
1470
def rename_one(self, from_rel, to_rel, after=False):
902
def rename_one(self, from_rel, to_rel):
1471
903
"""Rename one file.
1473
905
This can change the directory or the filename or both.
1475
rename_one has several 'modes' to work. First, it can rename a physical
1476
file and change the file_id. That is the normal mode. Second, it can
1477
only change the file_id without touching any physical file. This is
1478
the new mode introduced in version 0.15.
1480
rename_one uses the second mode if 'after == True' and 'to_rel' is not
1481
versioned but present in the working tree.
1483
rename_one uses the second mode if 'after == False' and 'from_rel' is
1484
versioned but no longer in the working tree, and 'to_rel' is not
1485
versioned but present in the working tree.
1487
rename_one uses the first mode if 'after == False' and 'from_rel' is
1488
versioned and present in the working tree, and 'to_rel' is not
1489
versioned and not present in the working tree.
1491
Everything else results in an error.
1493
907
inv = self.inventory
1496
# create rename entries and tuples
1497
from_tail = splitpath(from_rel)[-1]
1498
from_id = inv.path2id(from_rel)
1500
# if file is missing in the inventory maybe it's in the basis_tree
1501
basis_tree = self.branch.basis_tree()
1502
from_id = basis_tree.path2id(from_rel)
1504
raise errors.BzrRenameFailedError(from_rel,to_rel,
1505
errors.NotVersionedError(path=str(from_rel)))
1506
# put entry back in the inventory so we can rename it
1507
from_entry = basis_tree.inventory[from_id].copy()
1510
from_entry = inv[from_id]
1511
from_parent_id = from_entry.parent_id
908
if not self.has_filename(from_rel):
909
raise BzrError("can't rename: old working file %r does not exist" % from_rel)
910
if self.has_filename(to_rel):
911
raise BzrError("can't rename: new working file %r already exists" % to_rel)
913
file_id = inv.path2id(from_rel)
915
raise BzrError("can't rename: old name %r is not versioned" % from_rel)
918
from_parent = entry.parent_id
919
from_name = entry.name
921
if inv.path2id(to_rel):
922
raise BzrError("can't rename: new name %r is already versioned" % to_rel)
1512
924
to_dir, to_tail = os.path.split(to_rel)
1513
925
to_dir_id = inv.path2id(to_dir)
1514
rename_entry = WorkingTree._RenameEntry(from_rel=from_rel,
1516
from_tail=from_tail,
1517
from_parent_id=from_parent_id,
1518
to_rel=to_rel, to_tail=to_tail,
1519
to_parent_id=to_dir_id)
1520
rename_entries.append(rename_entry)
1522
# determine which move mode to use. checks also for movability
1523
rename_entries = self._determine_mv_mode(rename_entries, after)
1525
# check if the target changed directory and if the target directory is
1527
if to_dir_id is None:
1528
raise errors.BzrMoveFailedError(from_rel,to_rel,
1529
errors.NotVersionedError(path=str(to_dir)))
1531
# all checks done. now we can continue with our actual work
1532
mutter('rename_one:\n'
1537
' to_dir_id {%s}\n',
1538
from_id, from_rel, to_rel, to_dir, to_dir_id)
1540
self._move(rename_entries)
926
if to_dir_id == None and to_dir != '':
927
raise BzrError("can't determine destination directory id for %r" % to_dir)
929
mutter("rename_one:")
930
mutter(" file_id {%s}" % file_id)
931
mutter(" from_rel %r" % from_rel)
932
mutter(" to_rel %r" % to_rel)
933
mutter(" to_dir %r" % to_dir)
934
mutter(" to_dir_id {%s}" % to_dir_id)
936
inv.rename(file_id, to_dir_id, to_tail)
938
from_abs = self.abspath(from_rel)
939
to_abs = self.abspath(to_rel)
941
rename(from_abs, to_abs)
943
inv.rename(file_id, from_parent, from_name)
944
raise BzrError("failed to rename %r to %r: %s"
945
% (from_abs, to_abs, e[1]),
946
["rename rolled back"])
1541
947
self._write_inventory(inv)
1543
class _RenameEntry(object):
1544
def __init__(self, from_rel, from_id, from_tail, from_parent_id,
1545
to_rel, to_tail, to_parent_id, only_change_inv=False):
1546
self.from_rel = from_rel
1547
self.from_id = from_id
1548
self.from_tail = from_tail
1549
self.from_parent_id = from_parent_id
1550
self.to_rel = to_rel
1551
self.to_tail = to_tail
1552
self.to_parent_id = to_parent_id
1553
self.only_change_inv = only_change_inv
1555
949
@needs_read_lock
1556
950
def unknowns(self):
1557
951
"""Return all unknown files.
1866
1218
def _change_last_revision(self, new_revision):
1867
1219
"""Template method part of set_last_revision to perform the change.
1869
1221
This is used to allow WorkingTree3 instances to not affect branch
1870
1222
when their last revision is set.
1872
if _mod_revision.is_null(new_revision):
1224
if new_revision is None:
1873
1225
self.branch.set_revision_history([])
1227
# current format is locked in with the branch
1228
revision_history = self.branch.revision_history()
1876
self.branch.generate_revision_history(new_revision)
1877
except errors.NoSuchRevision:
1878
# not present in the repo - dont try to set it deeper than the tip
1879
self.branch.set_revision_history([new_revision])
1230
position = revision_history.index(new_revision)
1232
raise errors.NoSuchRevision(self.branch, new_revision)
1233
self.branch.set_revision_history(revision_history[:position + 1])
1882
def _write_basis_inventory(self, xml):
1883
"""Write the basis inventory XML to the basis-inventory file"""
1884
path = self._basis_inventory_name()
1886
self._transport.put_file(path, sio,
1887
mode=self.bzrdir._get_file_mode())
1889
def _create_basis_xml_from_inventory(self, revision_id, inventory):
1890
"""Create the text that will be saved in basis-inventory"""
1891
inventory.revision_id = revision_id
1892
return xml7.serializer_v7.write_inventory_to_string(inventory)
1894
1236
def _cache_basis_inventory(self, new_revision):
1895
1237
"""Cache new_revision as the basis inventory."""
1896
1238
# TODO: this should allow the ready-to-use inventory to be passed in,
1897
1239
# as commit already has that ready-to-use [while the format is the
1898
1240
# same, that is].
1900
# this double handles the inventory - unpack and repack -
1242
# this double handles the inventory - unpack and repack -
1901
1243
# but is easier to understand. We can/should put a conditional
1902
1244
# in here based on whether the inventory is in the latest format
1903
1245
# - perhaps we should repack all inventories on a repository
1905
1247
# the fast path is to copy the raw xml from the repository. If the
1906
# xml contains 'revision_id="', then we assume the right
1248
# xml contains 'revision_id="', then we assume the right
1907
1249
# revision_id is set. We must check for this full string, because a
1908
1250
# root node id can legitimately look like 'revision_id' but cannot
1909
1251
# contain a '"'.
1910
xml = self.branch.repository._get_inventory_xml(new_revision)
1911
firstline = xml.split('\n', 1)[0]
1912
if (not 'revision_id="' in firstline or
1913
'format="7"' not in firstline):
1914
inv = self.branch.repository._serializer.read_inventory_from_string(
1916
xml = self._create_basis_xml_from_inventory(new_revision, inv)
1917
self._write_basis_inventory(xml)
1918
except (errors.NoSuchRevision, errors.RevisionNotPresent):
1252
xml = self.branch.repository.get_inventory_xml(new_revision)
1253
if not 'revision_id="' in xml.split('\n', 1)[0]:
1254
inv = self.branch.repository.deserialise_inventory(
1256
inv.revision_id = new_revision
1257
xml = bzrlib.xml5.serializer_v5.write_inventory_to_string(inv)
1258
assert isinstance(xml, str), 'serialised xml must be bytestring.'
1259
path = self._basis_inventory_name()
1261
self._control_files.put(path, sio)
1262
except WeaveRevisionNotPresent:
1921
1265
def read_basis_inventory(self):
1922
1266
"""Read the cached basis inventory."""
1923
1267
path = self._basis_inventory_name()
1924
return self._transport.get_bytes(path)
1268
return self._control_files.get(path).read()
1926
1270
@needs_read_lock
1927
1271
def read_working_inventory(self):
1928
"""Read the working inventory.
1930
:raises errors.InventoryModified: read_working_inventory will fail
1931
when the current in memory inventory has been modified.
1933
# conceptually this should be an implementation detail of the tree.
1934
# XXX: Deprecate this.
1272
"""Read the working inventory."""
1935
1273
# ElementTree does its own conversion from UTF-8, so open in
1937
if self._inventory_is_modified:
1938
raise errors.InventoryModified(self)
1939
f = self._transport.get('inventory')
1941
result = self._deserialize(f)
1944
self._set_inventory(result, dirty=False)
1275
result = bzrlib.xml5.serializer_v5.read_inventory(
1276
self._control_files.get('inventory'))
1277
self._set_inventory(result)
1947
@needs_tree_write_lock
1948
def remove(self, files, verbose=False, to_file=None, keep_files=True,
1950
"""Remove nominated files from the working inventory.
1952
:files: File paths relative to the basedir.
1953
:keep_files: If true, the files will also be kept.
1954
:force: Delete files and directories, even if they are changed and
1955
even if the directories are not empty.
1281
def remove(self, files, verbose=False, to_file=None):
1282
"""Remove nominated files from the working inventory..
1284
This does not remove their text. This does not run on XXX on what? RBC
1286
TODO: Refuse to remove modified files unless --force is given?
1288
TODO: Do something useful with directories.
1290
TODO: Should this remove the text or not? Tough call; not
1291
removing may be useful and the user can just use use rm, and
1292
is the opposite of add. Removing it is consistent with most
1293
other tools. Maybe an option.
1295
## TODO: Normalize names
1296
## TODO: Remove nested loops; better scalability
1957
1297
if isinstance(files, basestring):
1958
1298
files = [files]
1963
unknown_nested_files=set()
1965
to_file = sys.stdout
1967
def recurse_directory_to_add_files(directory):
1968
# Recurse directory and add all files
1969
# so we can check if they have changed.
1970
for parent_info, file_infos in\
1971
self.walkdirs(directory):
1972
for relpath, basename, kind, lstat, fileid, kind in file_infos:
1973
# Is it versioned or ignored?
1974
if self.path2id(relpath) or self.is_ignored(relpath):
1975
# Add nested content for deletion.
1976
new_files.add(relpath)
1978
# Files which are not versioned and not ignored
1979
# should be treated as unknown.
1980
unknown_nested_files.add((relpath, None, kind))
1982
for filename in files:
1983
# Get file name into canonical form.
1984
abspath = self.abspath(filename)
1985
filename = self.relpath(abspath)
1986
if len(filename) > 0:
1987
new_files.add(filename)
1988
recurse_directory_to_add_files(filename)
1990
files = list(new_files)
1993
return # nothing to do
1995
# Sort needed to first handle directory content before the directory
1996
files.sort(reverse=True)
1998
# Bail out if we are going to delete files we shouldn't
1999
if not keep_files and not force:
2000
has_changed_files = len(unknown_nested_files) > 0
2001
if not has_changed_files:
2002
for (file_id, path, content_change, versioned, parent_id, name,
2003
kind, executable) in self.iter_changes(self.basis_tree(),
2004
include_unchanged=True, require_versioned=False,
2005
want_unversioned=True, specific_files=files):
2006
if versioned == (False, False):
2007
# The record is unknown ...
2008
if not self.is_ignored(path[1]):
2009
# ... but not ignored
2010
has_changed_files = True
2012
elif content_change and (kind[1] is not None):
2013
# Versioned and changed, but not deleted
2014
has_changed_files = True
2017
if has_changed_files:
2018
# Make delta show ALL applicable changes in error message.
2019
tree_delta = self.changes_from(self.basis_tree(),
2020
require_versioned=False, want_unversioned=True,
2021
specific_files=files)
2022
for unknown_file in unknown_nested_files:
2023
if unknown_file not in tree_delta.unversioned:
2024
tree_delta.unversioned.extend((unknown_file,))
2025
raise errors.BzrRemoveChangedFilesError(tree_delta)
2027
# Build inv_delta and delete files where applicable,
2028
# do this before any modifications to inventory.
1300
inv = self.inventory
1302
# do this before any modifications
2029
1303
for f in files:
2030
fid = self.path2id(f)
1304
fid = inv.path2id(f)
2033
message = "%s is not versioned." % (f,)
2036
# having removed it, it must be either ignored or unknown
2037
if self.is_ignored(f):
2041
# XXX: Really should be a more abstract reporter interface
2042
kind_ch = osutils.kind_marker(self.kind(fid))
2043
to_file.write(new_status + ' ' + f + kind_ch + '\n')
2045
inv_delta.append((f, None, fid, None))
2046
message = "removed %s" % (f,)
2049
abs_path = self.abspath(f)
2050
if osutils.lexists(abs_path):
2051
if (osutils.isdir(abs_path) and
2052
len(os.listdir(abs_path)) > 0):
2054
osutils.rmtree(abs_path)
2056
message = "%s is not an empty directory "\
2057
"and won't be deleted." % (f,)
2059
osutils.delete_any(abs_path)
2060
message = "deleted %s" % (f,)
2061
elif message is not None:
2062
# Only care if we haven't done anything yet.
2063
message = "%s does not exist." % (f,)
2065
# Print only one message (if any) per file.
2066
if message is not None:
2068
self.apply_inventory_delta(inv_delta)
2070
@needs_tree_write_lock
2071
def revert(self, filenames=None, old_tree=None, backups=True,
2072
pb=DummyProgress(), report_changes=False):
2073
from bzrlib.conflicts import resolve
2076
symbol_versioning.warn('Using [] to revert all files is deprecated'
2077
' as of bzr 0.91. Please use None (the default) instead.',
2078
DeprecationWarning, stacklevel=2)
1306
# TODO: Perhaps make this just a warning, and continue?
1307
# This tends to happen when
1308
raise NotVersionedError(path=f)
1310
# having remove it, it must be either ignored or unknown
1311
if self.is_ignored(f):
1315
show_status(new_status, inv[fid].kind, f, to_file=to_file)
1318
self._write_inventory(inv)
1321
def revert(self, filenames, old_tree=None, backups=True,
1322
pb=DummyProgress()):
1323
from transform import revert
1324
from conflicts import resolve
2079
1325
if old_tree is None:
2080
basis_tree = self.basis_tree()
2081
basis_tree.lock_read()
2082
old_tree = basis_tree
1326
old_tree = self.basis_tree()
1327
conflicts = revert(self, old_tree, filenames, backups, pb)
1328
if not len(filenames):
1329
self.set_pending_merges([])
2086
conflicts = transform.revert(self, old_tree, filenames, backups, pb,
2088
if filenames is None and len(self.get_parent_ids()) > 1:
2090
last_revision = self.last_revision()
2091
if last_revision != _mod_revision.NULL_REVISION:
2092
if basis_tree is None:
2093
basis_tree = self.basis_tree()
2094
basis_tree.lock_read()
2095
parent_trees.append((last_revision, basis_tree))
2096
self.set_parent_trees(parent_trees)
2099
resolve(self, filenames, ignore_misses=True, recursive=True)
2101
if basis_tree is not None:
1332
resolve(self, filenames, ignore_misses=True)
2103
1333
return conflicts
2105
def revision_tree(self, revision_id):
2106
"""See Tree.revision_tree.
2108
WorkingTree can supply revision_trees for the basis revision only
2109
because there is only one cached inventory in the bzr directory.
2111
if revision_id == self.last_revision():
2113
xml = self.read_basis_inventory()
2114
except errors.NoSuchFile:
2118
inv = xml7.serializer_v7.read_inventory_from_string(xml)
2119
# dont use the repository revision_tree api because we want
2120
# to supply the inventory.
2121
if inv.revision_id == revision_id:
2122
return revisiontree.RevisionTree(self.branch.repository,
2124
except errors.BadInventoryFormat:
2126
# raise if there was no inventory, or if we read the wrong inventory.
2127
raise errors.NoSuchRevisionInTree(self, revision_id)
2129
1335
# XXX: This method should be deprecated in favour of taking in a proper
2130
1336
# new Inventory object.
2131
@needs_tree_write_lock
2132
1338
def set_inventory(self, new_inventory_list):
2133
1339
from bzrlib.inventory import (Inventory,
2134
1340
InventoryDirectory,
2137
1344
inv = Inventory(self.get_root_id())
2147
1354
elif kind == 'symlink':
2148
1355
inv.add(InventoryLink(file_id, name, parent))
2150
raise errors.BzrError("unknown kind %r" % kind)
1357
raise BzrError("unknown kind %r" % kind)
2151
1358
self._write_inventory(inv)
2153
@needs_tree_write_lock
2154
1361
def set_root_id(self, file_id):
2155
1362
"""Set the root id for this tree."""
2159
'WorkingTree.set_root_id with fileid=None')
2160
file_id = osutils.safe_file_id(file_id)
2161
self._set_root_id(file_id)
2163
def _set_root_id(self, file_id):
2164
"""Set the root id for this tree, in a format specific manner.
2166
:param file_id: The file id to assign to the root. It must not be
2167
present in the current inventory or an error will occur. It must
2168
not be None, but rather a valid file id.
2170
inv = self._inventory
1363
inv = self.read_working_inventory()
2171
1364
orig_root_id = inv.root.file_id
2172
# TODO: it might be nice to exit early if there was nothing
2173
# to do, saving us from trigger a sync on unlock.
2174
self._inventory_is_modified = True
2175
# we preserve the root inventory entry object, but
2176
# unlinkit from the byid index
2177
1365
del inv._byid[inv.root.file_id]
2178
1366
inv.root.file_id = file_id
2179
# and link it into the index with the new changed id.
2180
1367
inv._byid[inv.root.file_id] = inv.root
2181
# and finally update all children to reference the new id.
2182
# XXX: this should be safe to just look at the root.children
2183
# list, not the WHOLE INVENTORY.
2184
1368
for fid in inv:
2185
1369
entry = inv[fid]
2186
1370
if entry.parent_id == orig_root_id:
2187
1371
entry.parent_id = inv.root.file_id
1372
self._write_inventory(inv)
2189
1374
def unlock(self):
2190
1375
"""See Branch.unlock.
2192
1377
WorkingTree locking just uses the Branch locking facilities.
2193
1378
This is current because all working trees have an embedded branch
2194
1379
within them. IF in the future, we were to make branch data shareable
2195
between multiple working trees, i.e. via shared storage, then we
1380
between multiple working trees, i.e. via shared storage, then we
2196
1381
would probably want to lock both the local tree, and the branch.
2198
1383
raise NotImplementedError(self.unlock)
2202
def update(self, change_reporter=None, possible_transports=None,
2203
revision=None, old_tip=_marker):
2204
1387
"""Update a working tree along its branch.
2206
This will update the branch if its bound too, which means we have
2207
multiple trees involved:
2209
- The new basis tree of the master.
2210
- The old basis tree of the branch.
2211
- The old basis tree of the working tree.
2212
- The current working tree state.
2214
Pathologically, all three may be different, and non-ancestors of each
2215
other. Conceptually we want to:
2217
- Preserve the wt.basis->wt.state changes
2218
- Transform the wt.basis to the new master basis.
2219
- Apply a merge of the old branch basis to get any 'local' changes from
2221
- Restore the wt.basis->wt.state changes.
1389
This will update the branch if its bound too, which means we have multiple trees involved:
1390
The new basis tree of the master.
1391
The old basis tree of the branch.
1392
The old basis tree of the working tree.
1393
The current working tree state.
1394
pathologically all three may be different, and non ancestors of each other.
1395
Conceptually we want to:
1396
Preserve the wt.basis->wt.state changes
1397
Transform the wt.basis to the new master basis.
1398
Apply a merge of the old branch basis to get any 'local' changes from it into the tree.
1399
Restore the wt.basis->wt.state changes.
2223
1401
There isn't a single operation at the moment to do that, so we:
2224
- Merge current state -> basis tree of the master w.r.t. the old tree
2226
- Do a 'normal' merge of the old branch basis if it is relevant.
2228
:param revision: The target revision to update to. Must be in the
2230
:param old_tip: If branch.update() has already been run, the value it
2231
returned (old tip of the branch or None). _marker is used
2234
if self.branch.get_bound_location() is not None:
2236
update_branch = (old_tip is self._marker)
2238
self.lock_tree_write()
2239
update_branch = False
2242
old_tip = self.branch.update(possible_transports)
2244
if old_tip is self._marker:
2246
return self._update_tree(old_tip, change_reporter, revision)
2250
@needs_tree_write_lock
2251
def _update_tree(self, old_tip=None, change_reporter=None, revision=None):
2252
"""Update a tree to the master branch.
2254
:param old_tip: if supplied, the previous tip revision the branch,
2255
before it was changed to the master branch's tip.
2257
# here if old_tip is not None, it is the old tip of the branch before
2258
# it was updated from the master branch. This should become a pending
2259
# merge in the working tree to preserve the user existing work. we
2260
# cant set that until we update the working trees last revision to be
2261
# one from the new branch, because it will just get absorbed by the
2262
# parent de-duplication logic.
2264
# We MUST save it even if an error occurs, because otherwise the users
2265
# local work is unreferenced and will appear to have been lost.
2269
last_rev = self.get_parent_ids()[0]
2271
last_rev = _mod_revision.NULL_REVISION
2272
if revision is None:
2273
revision = self.branch.last_revision()
2275
if revision not in self.branch.revision_history():
2276
raise errors.NoSuchRevision(self.branch, revision)
2277
if last_rev != _mod_revision.ensure_null(revision):
2278
# merge tree state up to specified revision.
2279
basis = self.basis_tree()
2282
to_tree = self.branch.repository.revision_tree(revision)
2283
to_root_id = to_tree.get_root_id()
2284
if (basis.inventory.root is None
2285
or basis.inventory.root.file_id != to_root_id):
2286
self.set_root_id(to_root_id)
2288
result += merge.merge_inner(
1402
Merge current state -> basis tree of the master w.r.t. the old tree basis.
1403
Do a 'normal' merge of the old branch basis if it is relevant.
1405
old_tip = self.branch.update()
1406
if old_tip is not None:
1407
self.add_pending_merge(old_tip)
1408
self.branch.lock_read()
1411
if self.last_revision() != self.branch.last_revision():
1412
# merge tree state up to new branch tip.
1413
basis = self.basis_tree()
1414
to_tree = self.branch.basis_tree()
1415
result += merge_inner(self.branch,
2293
change_reporter=change_reporter)
2294
self.set_last_revision(revision)
2297
# TODO - dedup parents list with things merged by pull ?
2298
# reuse the tree we've updated to to set the basis:
2299
parent_trees = [(revision, to_tree)]
2300
merges = self.get_parent_ids()[1:]
2301
# Ideally we ask the tree for the trees here, that way the working
2302
# tree can decide whether to give us the entire tree or give us a
2303
# lazy initialised tree. dirstate for instance will have the trees
2304
# in ram already, whereas a last-revision + basis-inventory tree
2305
# will not, but also does not need them when setting parents.
2306
for parent in merges:
2307
parent_trees.append(
2308
(parent, self.branch.repository.revision_tree(parent)))
2309
if (old_tip is not None and not _mod_revision.is_null(old_tip)):
2310
parent_trees.append(
2311
(old_tip, self.branch.repository.revision_tree(old_tip)))
2312
self.set_parent_trees(parent_trees)
2313
last_rev = parent_trees[0][0]
2315
# the working tree had the same last-revision as the master
2316
# branch did. We may still have pivot local work from the local
2317
# branch into old_tip:
2318
if (old_tip is not None and not _mod_revision.is_null(old_tip)):
2319
self.add_parent_tree_id(old_tip)
2320
if (old_tip is not None and not _mod_revision.is_null(old_tip)
2321
and old_tip != last_rev):
2322
# our last revision was not the prior branch last revision
2323
# and we have converted that last revision to a pending merge.
2324
# base is somewhere between the branch tip now
2325
# and the now pending merge
2327
# Since we just modified the working tree and inventory, flush out
2328
# the current state, before we modify it again.
2329
# TODO: jam 20070214 WorkingTree3 doesn't require this, dirstate
2330
# requires it only because TreeTransform directly munges the
2331
# inventory and calls tree._write_inventory(). Ultimately we
2332
# should be able to remove this extra flush.
2334
graph = self.branch.repository.get_graph()
2335
base_rev_id = graph.find_unique_lca(revision, old_tip)
2336
base_tree = self.branch.repository.revision_tree(base_rev_id)
2337
other_tree = self.branch.repository.revision_tree(old_tip)
2338
result += merge.merge_inner(
2343
change_reporter=change_reporter)
2346
def _write_hashcache_if_dirty(self):
2347
"""Write out the hashcache if it is dirty."""
2348
if self._hashcache.needs_write:
2350
self._hashcache.write()
2352
if e.errno not in (errno.EPERM, errno.EACCES):
2354
# TODO: jam 20061219 Should this be a warning? A single line
2355
# warning might be sufficient to let the user know what
2357
mutter('Could not write hashcache for %s\nError: %s',
2358
self._hashcache.cache_file_name(), e)
2360
@needs_tree_write_lock
1419
self.set_last_revision(self.branch.last_revision())
1420
if old_tip and old_tip != self.last_revision():
1421
# our last revision was not the prior branch last revision
1422
# and we have converted that last revision to a pending merge.
1423
# base is somewhere between the branch tip now
1424
# and the now pending merge
1425
from bzrlib.revision import common_ancestor
1427
base_rev_id = common_ancestor(self.branch.last_revision(),
1429
self.branch.repository)
1430
except errors.NoCommonAncestor:
1432
base_tree = self.branch.repository.revision_tree(base_rev_id)
1433
other_tree = self.branch.repository.revision_tree(old_tip)
1434
result += merge_inner(self.branch,
1440
self.branch.unlock()
2361
1443
def _write_inventory(self, inv):
2362
1444
"""Write inventory as the current inventory."""
2363
self._set_inventory(inv, dirty=True)
1446
bzrlib.xml5.serializer_v5.write_inventory(inv, sio)
1448
self._control_files.put('inventory', sio)
1449
self._set_inventory(inv)
1450
mutter('wrote working inventory')
2366
1452
def set_conflicts(self, arg):
2367
raise errors.UnsupportedOperation(self.set_conflicts, self)
1453
raise UnsupportedOperation(self.set_conflicts, self)
2369
1455
def add_conflicts(self, arg):
2370
raise errors.UnsupportedOperation(self.add_conflicts, self)
1456
raise UnsupportedOperation(self.add_conflicts, self)
2372
1458
@needs_read_lock
2373
1459
def conflicts(self):
2374
conflicts = _mod_conflicts.ConflictList()
1460
conflicts = ConflictList()
2375
1461
for conflicted in self._iter_conflicts():
2390
1476
if text == False:
2392
1478
ctype = {True: 'text conflict', False: 'contents conflict'}[text]
2393
conflicts.append(_mod_conflicts.Conflict.factory(ctype,
1479
conflicts.append(Conflict.factory(ctype, path=conflicted,
2395
1480
file_id=self.path2id(conflicted)))
2396
1481
return conflicts
2398
def walkdirs(self, prefix=""):
2399
"""Walk the directories of this tree.
2401
returns a generator which yields items in the form:
2402
((curren_directory_path, fileid),
2403
[(file1_path, file1_name, file1_kind, (lstat), file1_id,
2406
This API returns a generator, which is only valid during the current
2407
tree transaction - within a single lock_read or lock_write duration.
2409
If the tree is not locked, it may cause an error to be raised,
2410
depending on the tree implementation.
2412
disk_top = self.abspath(prefix)
2413
if disk_top.endswith('/'):
2414
disk_top = disk_top[:-1]
2415
top_strip_len = len(disk_top) + 1
2416
inventory_iterator = self._walkdirs(prefix)
2417
disk_iterator = osutils.walkdirs(disk_top, prefix)
2419
current_disk = disk_iterator.next()
2420
disk_finished = False
2422
if not (e.errno == errno.ENOENT or
2423
(sys.platform == 'win32' and e.errno == ERROR_PATH_NOT_FOUND)):
2426
disk_finished = True
2428
current_inv = inventory_iterator.next()
2429
inv_finished = False
2430
except StopIteration:
2433
while not inv_finished or not disk_finished:
2435
((cur_disk_dir_relpath, cur_disk_dir_path_from_top),
2436
cur_disk_dir_content) = current_disk
2438
((cur_disk_dir_relpath, cur_disk_dir_path_from_top),
2439
cur_disk_dir_content) = ((None, None), None)
2440
if not disk_finished:
2441
# strip out .bzr dirs
2442
if (cur_disk_dir_path_from_top[top_strip_len:] == '' and
2443
len(cur_disk_dir_content) > 0):
2444
# osutils.walkdirs can be made nicer -
2445
# yield the path-from-prefix rather than the pathjoined
2447
bzrdir_loc = bisect_left(cur_disk_dir_content,
2449
if (bzrdir_loc < len(cur_disk_dir_content)
2450
and self.bzrdir.is_control_filename(
2451
cur_disk_dir_content[bzrdir_loc][0])):
2452
# we dont yield the contents of, or, .bzr itself.
2453
del cur_disk_dir_content[bzrdir_loc]
2455
# everything is unknown
2458
# everything is missing
2461
direction = cmp(current_inv[0][0], cur_disk_dir_relpath)
2463
# disk is before inventory - unknown
2464
dirblock = [(relpath, basename, kind, stat, None, None) for
2465
relpath, basename, kind, stat, top_path in
2466
cur_disk_dir_content]
2467
yield (cur_disk_dir_relpath, None), dirblock
2469
current_disk = disk_iterator.next()
2470
except StopIteration:
2471
disk_finished = True
2473
# inventory is before disk - missing.
2474
dirblock = [(relpath, basename, 'unknown', None, fileid, kind)
2475
for relpath, basename, dkind, stat, fileid, kind in
2477
yield (current_inv[0][0], current_inv[0][1]), dirblock
2479
current_inv = inventory_iterator.next()
2480
except StopIteration:
2483
# versioned present directory
2484
# merge the inventory and disk data together
2486
for relpath, subiterator in itertools.groupby(sorted(
2487
current_inv[1] + cur_disk_dir_content,
2488
key=operator.itemgetter(0)), operator.itemgetter(1)):
2489
path_elements = list(subiterator)
2490
if len(path_elements) == 2:
2491
inv_row, disk_row = path_elements
2492
# versioned, present file
2493
dirblock.append((inv_row[0],
2494
inv_row[1], disk_row[2],
2495
disk_row[3], inv_row[4],
2497
elif len(path_elements[0]) == 5:
2499
dirblock.append((path_elements[0][0],
2500
path_elements[0][1], path_elements[0][2],
2501
path_elements[0][3], None, None))
2502
elif len(path_elements[0]) == 6:
2503
# versioned, absent file.
2504
dirblock.append((path_elements[0][0],
2505
path_elements[0][1], 'unknown', None,
2506
path_elements[0][4], path_elements[0][5]))
2508
raise NotImplementedError('unreachable code')
2509
yield current_inv[0], dirblock
2511
current_inv = inventory_iterator.next()
2512
except StopIteration:
2515
current_disk = disk_iterator.next()
2516
except StopIteration:
2517
disk_finished = True
2519
def _walkdirs(self, prefix=""):
2520
"""Walk the directories of this tree.
2522
:prefix: is used as the directrory to start with.
2523
returns a generator which yields items in the form:
2524
((curren_directory_path, fileid),
2525
[(file1_path, file1_name, file1_kind, None, file1_id,
2528
_directory = 'directory'
2529
# get the root in the inventory
2530
inv = self.inventory
2531
top_id = inv.path2id(prefix)
2535
pending = [(prefix, '', _directory, None, top_id, None)]
2538
currentdir = pending.pop()
2539
# 0 - relpath, 1- basename, 2- kind, 3- stat, 4-id, 5-kind
2540
top_id = currentdir[4]
2542
relroot = currentdir[0] + '/'
2545
# FIXME: stash the node in pending
2547
if entry.kind == 'directory':
2548
for name, child in entry.sorted_children():
2549
dirblock.append((relroot + name, name, child.kind, None,
2550
child.file_id, child.kind
2552
yield (currentdir[0], entry.file_id), dirblock
2553
# push the user specified dirs from dirblock
2554
for dir in reversed(dirblock):
2555
if dir[2] == _directory:
2558
@needs_tree_write_lock
2559
def auto_resolve(self):
2560
"""Automatically resolve text conflicts according to contents.
2562
Only text conflicts are auto_resolvable. Files with no conflict markers
2563
are considered 'resolved', because bzr always puts conflict markers
2564
into files that have text conflicts. The corresponding .THIS .BASE and
2565
.OTHER files are deleted, as per 'resolve'.
2566
:return: a tuple of ConflictLists: (un_resolved, resolved).
2568
un_resolved = _mod_conflicts.ConflictList()
2569
resolved = _mod_conflicts.ConflictList()
2570
conflict_re = re.compile('^(<{7}|={7}|>{7})')
2571
for conflict in self.conflicts():
2572
if (conflict.typestring != 'text conflict' or
2573
self.kind(conflict.file_id) != 'file'):
2574
un_resolved.append(conflict)
2576
my_file = open(self.id2abspath(conflict.file_id), 'rb')
2578
for line in my_file:
2579
if conflict_re.search(line):
2580
un_resolved.append(conflict)
2583
resolved.append(conflict)
2586
resolved.remove_files(self)
2587
self.set_conflicts(un_resolved)
2588
return un_resolved, resolved
2591
def _check(self, references):
2592
"""Check the tree for consistency.
2594
:param references: A dict with keys matching the items returned by
2595
self._get_check_refs(), and values from looking those keys up in
2598
tree_basis = self.basis_tree()
2599
tree_basis.lock_read()
2601
repo_basis = references[('trees', self.last_revision())]
2602
if len(list(repo_basis.iter_changes(tree_basis))) > 0:
2603
raise errors.BzrCheckError(
2604
"Mismatched basis inventory content.")
2609
def _validate(self):
2610
"""Validate internal structures.
2612
This is meant mostly for the test suite. To give it a chance to detect
2613
corruption after actions have occurred. The default implementation is a
2616
:return: None. An exception should be raised if there is an error.
2620
def _get_rules_searcher(self, default_searcher):
2621
"""See Tree._get_rules_searcher."""
2622
if self._rules_searcher is None:
2623
self._rules_searcher = super(WorkingTree,
2624
self)._get_rules_searcher(default_searcher)
2625
return self._rules_searcher
2627
def get_shelf_manager(self):
2628
"""Return the ShelfManager for this WorkingTree."""
2629
from bzrlib.shelf import ShelfManager
2630
return ShelfManager(self, self._transport)
2633
1484
class WorkingTree2(WorkingTree):
2634
1485
"""This is the Format 2 working tree.
2636
This was the first weave based working tree.
1487
This was the first weave based working tree.
2637
1488
- uses os locks for locking.
2638
1489
- uses the branch last-revision.
2641
def __init__(self, *args, **kwargs):
2642
super(WorkingTree2, self).__init__(*args, **kwargs)
2643
# WorkingTree2 has more of a constraint that self._inventory must
2644
# exist. Because this is an older format, we don't mind the overhead
2645
# caused by the extra computation here.
2647
# Newer WorkingTree's should only have self._inventory set when they
2649
if self._inventory is None:
2650
self.read_working_inventory()
2652
def _get_check_refs(self):
2653
"""Return the references needed to perform a check of this tree."""
2654
return [('trees', self.last_revision())]
2656
def lock_tree_write(self):
2657
"""See WorkingTree.lock_tree_write().
2659
In Format2 WorkingTrees we have a single lock for the branch and tree
2660
so lock_tree_write() degrades to lock_write().
2662
self.branch.lock_write()
2664
return self._control_files.lock_write()
2666
self.branch.unlock()
2669
1492
def unlock(self):
2670
# do non-implementation specific cleanup
2673
1493
# we share control files:
2674
if self._control_files._lock_count == 3:
2675
# _inventory_is_modified is always False during a read lock.
2676
if self._inventory_is_modified:
2678
self._write_hashcache_if_dirty()
1494
if self._hashcache.needs_write and self._control_files._lock_count==3:
1495
self._hashcache.write()
2680
1496
# reverse order of locking.
2682
1498
return self._control_files.unlock()
added
removed
bzrlib/workingtree.py
