29
29
WorkingTree.open(dir).
32
MERGE_MODIFIED_HEADER_1 = "BZR merge-modified list format 1"
33
CONFLICT_HEADER_1 = "BZR conflict list format 1"
35
# TODO: Give the workingtree sole responsibility for the working inventory;
36
# remove the variable and references to it from the branch. This may require
37
# updating the commit code so as to update the inventory within the working
38
# copy, and making sure there's only one WorkingTree for any directory on disk.
39
# At the moment they may alias the inventory and have old copies of it in
40
# memory. (Now done? -- mbp 20060309)
42
from binascii import hexlify
44
from copy import deepcopy
33
45
from cStringIO import StringIO
37
from bzrlib.lazy_import import lazy_import
38
lazy_import(globals(), """
39
from bisect import bisect_left
51
conflicts as _mod_conflicts,
60
revision as _mod_revision,
70
from bzrlib.workingtree_4 import (
77
from bzrlib import symbol_versioning
55
from bzrlib import bzrdir, errors, ignores, osutils, urlutils
56
from bzrlib.atomicfile import AtomicFile
58
from bzrlib.conflicts import Conflict, ConflictList, CONFLICT_SUFFIXES
78
59
from bzrlib.decorators import needs_read_lock, needs_write_lock
79
from bzrlib.lock import LogicalLockResult
80
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
81
72
from bzrlib.lockdir import LockDir
82
import bzrlib.mutabletree
83
from bzrlib.mutabletree import needs_tree_write_lock
84
from bzrlib import osutils
73
from bzrlib.merge import merge_inner, transform_tree
85
74
from bzrlib.osutils import (
95
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,
96
100
from bzrlib.trace import mutter, note
101
from bzrlib.transform import build_tree
102
from bzrlib.transport import get_transport
97
103
from bzrlib.transport.local import LocalTransport
98
from bzrlib.revision import CURRENT_REVISION
99
from bzrlib.rio import RioReader, rio_file, Stanza
100
from bzrlib.symbol_versioning import (
102
DEPRECATED_PARAMETER,
106
MERGE_MODIFIED_HEADER_1 = "BZR merge-modified list format 1"
107
# TODO: Modifying the conflict objects or their type is currently nearly
108
# impossible as there is no clear relationship between the working tree format
109
# and the conflict list file format.
110
CONFLICT_HEADER_1 = "BZR conflict list format 1"
112
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')
115
161
class TreeEntry(object):
116
162
"""An entry that implements the minimum interface used by commands.
118
This needs further inspection, it may be better to have
164
This needs further inspection, it may be better to have
119
165
InventoryEntries without ids - though that seems wrong. For now,
120
166
this is a parallel hierarchy to InventoryEntry, and needs to become
121
167
one of several things: decorates to that hierarchy, children of, or
390
386
if osutils.lexists(self.abspath(path)):
393
def all_file_ids(self):
394
"""See Tree.iter_all_file_ids"""
395
return set(self.inventory)
397
389
def __repr__(self):
398
390
return "<%s of %s>" % (self.__class__.__name__,
399
391
getattr(self, 'basedir', None))
401
393
def abspath(self, filename):
402
394
return pathjoin(self.basedir, filename)
404
396
def basis_tree(self):
405
397
"""Return RevisionTree for the current last revision.
407
399
If the left most parent is a ghost then the returned tree will be an
408
empty tree - one obtained by calling
409
repository.revision_tree(NULL_REVISION).
400
empty tree - one obtained by calling repository.revision_tree(None).
412
revision_id = self.get_parent_ids()[0]
414
# no parents, return an empty revision tree.
415
# in the future this should return the tree for
416
# 'empty:' - the implicit root empty tree.
417
return self.branch.repository.revision_tree(
418
_mod_revision.NULL_REVISION)
420
return self.revision_tree(revision_id)
421
except errors.NoSuchRevision:
423
# No cached copy available, retrieve from the repository.
424
# FIXME? RBC 20060403 should we cache the inventory locally
402
revision_id = self.last_revision()
403
if revision_id is not None:
405
xml = self.read_basis_inventory()
406
inv = bzrlib.xml5.serializer_v5.read_inventory_from_string(xml)
407
inv.root.revision = revision_id
410
if inv is not None and inv.revision_id == revision_id:
411
return bzrlib.tree.RevisionTree(self.branch.repository, inv,
413
# FIXME? RBC 20060403 should we cache the inventory here ?
427
415
return self.branch.repository.revision_tree(revision_id)
428
except (errors.RevisionNotPresent, errors.NoSuchRevision):
416
except errors.RevisionNotPresent:
429
417
# the basis tree *may* be a ghost or a low level error may have
430
# occurred. If the revision is present, its a problem, if its not
418
# occured. If the revision is present, its a problem, if its not
432
420
if self.branch.repository.has_revision(revision_id):
434
422
# the basis tree is a ghost so return an empty tree.
435
return self.branch.repository.revision_tree(
436
_mod_revision.NULL_REVISION)
439
self._flush_ignore_list_cache()
423
return self.branch.repository.revision_tree(None)
426
@deprecated_method(zero_eight)
427
def create(branch, directory):
428
"""Create a workingtree for branch at directory.
430
If existing_directory already exists it must have a .bzr directory.
431
If it does not exist, it will be created.
433
This returns a new WorkingTree object for the new checkout.
435
TODO FIXME RBC 20060124 when we have checkout formats in place this
436
should accept an optional revisionid to checkout [and reject this if
437
checking out into the same dir as a pre-checkout-aware branch format.]
439
XXX: When BzrDir is present, these should be created through that
442
warnings.warn('delete WorkingTree.create', stacklevel=3)
443
transport = get_transport(directory)
444
if branch.bzrdir.root_transport.base == transport.base:
446
return branch.bzrdir.create_workingtree()
447
# different directory,
448
# create a branch reference
449
# and now a working tree.
450
raise NotImplementedError
453
@deprecated_method(zero_eight)
454
def create_standalone(directory):
455
"""Create a checkout and a branch and a repo at directory.
457
Directory must exist and be empty.
459
please use BzrDir.create_standalone_workingtree
461
return bzrdir.BzrDir.create_standalone_workingtree(directory)
441
463
def relpath(self, path):
442
464
"""Return the local path portion from a given path.
444
The path may be absolute or relative. If its a relative path it is
466
The path may be absolute or relative. If its a relative path it is
445
467
interpreted relative to the python current working directory.
447
return osutils.relpath(self.basedir, path)
469
return relpath(self.basedir, path)
449
471
def has_filename(self, filename):
450
472
return osutils.lexists(self.abspath(filename))
452
def get_file(self, file_id, path=None, filtered=True):
453
return self.get_file_with_stat(file_id, path, filtered=filtered)[0]
455
def get_file_with_stat(self, file_id, path=None, filtered=True,
457
"""See Tree.get_file_with_stat."""
459
path = self.id2path(file_id)
460
file_obj = self.get_file_byname(path, filtered=False)
461
stat_value = _fstat(file_obj.fileno())
462
if filtered and self.supports_content_filtering():
463
filters = self._content_filter_stack(path)
464
file_obj = filtered_input_file(file_obj, filters)
465
return (file_obj, stat_value)
467
def get_file_text(self, file_id, path=None, filtered=True):
468
my_file = self.get_file(file_id, path=path, filtered=filtered)
470
return my_file.read()
474
def get_file_byname(self, filename, filtered=True):
475
path = self.abspath(filename)
477
if filtered and self.supports_content_filtering():
478
filters = self._content_filter_stack(filename)
479
return filtered_input_file(f, filters)
483
def get_file_lines(self, file_id, path=None, filtered=True):
484
"""See Tree.get_file_lines()"""
485
file = self.get_file(file_id, path, filtered=filtered)
487
return file.readlines()
492
def annotate_iter(self, file_id, default_revision=CURRENT_REVISION):
493
"""See Tree.annotate_iter
495
This implementation will use the basis tree implementation if possible.
496
Lines not in the basis are attributed to CURRENT_REVISION
498
If there are pending merges, lines added by those merges will be
499
incorrectly attributed to CURRENT_REVISION (but after committing, the
500
attribution will be correct).
502
maybe_file_parent_keys = []
503
for parent_id in self.get_parent_ids():
505
parent_tree = self.revision_tree(parent_id)
506
except errors.NoSuchRevisionInTree:
507
parent_tree = self.branch.repository.revision_tree(parent_id)
508
parent_tree.lock_read()
510
if file_id not in parent_tree:
512
ie = parent_tree.inventory[file_id]
513
if ie.kind != 'file':
514
# Note: this is slightly unnecessary, because symlinks and
515
# directories have a "text" which is the empty text, and we
516
# know that won't mess up annotations. But it seems cleaner
518
parent_text_key = (file_id, ie.revision)
519
if parent_text_key not in maybe_file_parent_keys:
520
maybe_file_parent_keys.append(parent_text_key)
523
graph = _mod_graph.Graph(self.branch.repository.texts)
524
heads = graph.heads(maybe_file_parent_keys)
525
file_parent_keys = []
526
for key in maybe_file_parent_keys:
528
file_parent_keys.append(key)
530
# Now we have the parents of this content
531
annotator = self.branch.repository.texts.get_annotator()
532
text = self.get_file_text(file_id)
533
this_key =(file_id, default_revision)
534
annotator.add_special_text(this_key, file_parent_keys, text)
535
annotations = [(key[-1], line)
536
for key, line in annotator.annotate_flat(this_key)]
539
def _get_ancestors(self, default_revision):
540
ancestors = set([default_revision])
541
for parent_id in self.get_parent_ids():
542
ancestors.update(self.branch.repository.get_ancestry(
543
parent_id, topo_sorted=False))
474
def get_file(self, file_id):
475
return self.get_file_byname(self.id2path(file_id))
477
def get_file_text(self, file_id):
478
return self.get_file(file_id).read()
480
def get_file_byname(self, filename):
481
return file(self.abspath(filename), 'rb')
546
483
def get_parent_ids(self):
547
484
"""See Tree.get_parent_ids.
549
486
This implementation reads the pending merges list and last_revision
550
487
value and uses that to decide what the parents list should be.
552
last_rev = _mod_revision.ensure_null(self._last_revision())
553
if _mod_revision.NULL_REVISION == last_rev:
489
last_rev = self.last_revision()
556
493
parents = [last_rev]
558
merges_bytes = self._transport.get_bytes('pending-merges')
559
except errors.NoSuchFile:
495
merges_file = self._control_files.get_utf8('pending-merges')
562
for l in osutils.split_lines(merges_bytes):
563
revision_id = l.rstrip('\n')
564
parents.append(revision_id)
499
for l in merges_file.readlines():
500
parents.append(l.rstrip('\n'))
568
503
def get_root_id(self):
569
504
"""Return the id of this trees root"""
570
return self._inventory.root.file_id
505
inv = self.read_working_inventory()
506
return inv.root.file_id
572
508
def _get_store_filename(self, file_id):
573
509
## XXX: badly named; this is not in the store at all
574
510
return self.abspath(self.id2path(file_id))
577
def clone(self, to_bzrdir, revision_id=None):
513
def clone(self, to_bzrdir, revision_id=None, basis=None):
578
514
"""Duplicate this working tree into to_bzr, including all state.
580
516
Specifically modified files are kept as modified, but
581
517
ignored and unknown files are discarded.
583
519
If you want to make a new line of development, see bzrdir.sprout()
586
If not None, the cloned tree will have its last revision set to
587
revision, and difference between the source trees last revision
522
If not None, the cloned tree will have its last revision set to
523
revision, and and difference between the source trees last revision
588
524
and this one merged in.
527
If not None, a closer copy of a tree which may have some files in
528
common, and which file content should be preferentially copied from.
590
530
# assumes the target bzr dir format is compatible.
591
result = to_bzrdir.create_workingtree()
531
result = self._format.initialize(to_bzrdir)
592
532
self.copy_content_into(result, revision_id)
596
536
def copy_content_into(self, tree, revision_id=None):
597
537
"""Copy the current content and user files of this tree into tree."""
598
tree.set_root_id(self.get_root_id())
599
538
if revision_id is None:
600
merge.transform_tree(tree, self)
539
transform_tree(tree, self)
602
541
# TODO now merge from tree.last_revision to revision (to preserve
603
542
# user local changes)
604
merge.transform_tree(tree, self)
543
transform_tree(tree, self)
605
544
tree.set_parent_ids([revision_id])
547
def commit(self, message=None, revprops=None, *args, **kwargs):
548
# avoid circular imports
549
from bzrlib.commit import Commit
552
if not 'branch-nick' in revprops:
553
revprops['branch-nick'] = self.branch.nick
554
# args for wt.commit start at message from the Commit.commit method,
555
# but with branch a kwarg now, passing in args as is results in the
556
#message being used for the branch
557
args = (DEPRECATED_PARAMETER, message, ) + args
558
committed_id = Commit().commit( working_tree=self, revprops=revprops,
560
self._set_inventory(self.read_working_inventory())
607
563
def id2abspath(self, file_id):
608
564
return self.abspath(self.id2path(file_id))
610
566
def has_id(self, file_id):
611
567
# files that have been deleted are excluded
568
inv = self._inventory
613
569
if not inv.has_id(file_id):
615
571
path = inv.id2path(file_id)
623
579
__contains__ = has_id
625
581
def get_file_size(self, file_id):
626
"""See Tree.get_file_size"""
627
# XXX: this returns the on-disk size; it should probably return the
630
return os.path.getsize(self.id2abspath(file_id))
632
if e.errno != errno.ENOENT:
582
return os.path.getsize(self.id2abspath(file_id))
638
def get_file_sha1(self, file_id, path=None, stat_value=None):
585
def get_file_sha1(self, file_id, path=None):
640
587
path = self._inventory.id2path(file_id)
641
return self._hashcache.get_sha1(path, stat_value)
588
return self._hashcache.get_sha1(path)
643
590
def get_file_mtime(self, file_id, path=None):
645
path = self.inventory.id2path(file_id)
592
path = self._inventory.id2path(file_id)
646
593
return os.lstat(self.abspath(path)).st_mtime
648
def _is_executable_from_path_and_stat_from_basis(self, path, stat_result):
649
file_id = self.path2id(path)
651
# For unversioned files on win32, we just assume they are not
654
return self._inventory[file_id].executable
656
def _is_executable_from_path_and_stat_from_stat(self, path, stat_result):
657
mode = stat_result.st_mode
658
return bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode)
660
595
if not supports_executable():
661
596
def is_executable(self, file_id, path=None):
662
597
return self._inventory[file_id].executable
664
_is_executable_from_path_and_stat = \
665
_is_executable_from_path_and_stat_from_basis
667
599
def is_executable(self, file_id, path=None):
669
path = self.id2path(file_id)
601
path = self._inventory.id2path(file_id)
670
602
mode = os.lstat(self.abspath(path)).st_mode
671
603
return bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode)
673
_is_executable_from_path_and_stat = \
674
_is_executable_from_path_and_stat_from_stat
676
@needs_tree_write_lock
677
def _add(self, files, ids, kinds):
678
"""See MutableTree._add."""
606
def add(self, files, ids=None):
607
"""Make files versioned.
609
Note that the command line normally calls smart_add instead,
610
which can automatically recurse.
612
This adds the files to the inventory, so that they will be
613
recorded by the next commit.
616
List of paths to add, relative to the base of the tree.
619
If set, use these instead of automatically generated ids.
620
Must be the same length as the list of files, but may
621
contain None for ids that are to be autogenerated.
623
TODO: Perhaps have an option to add the ids even if the files do
626
TODO: Perhaps callback with the ids and paths as they're added.
679
628
# TODO: Re-adding a file that is removed in the working copy
680
629
# should probably put it back with the previous ID.
681
# the read and write working inventory should not occur in this
682
# function - they should be part of lock_write and unlock.
684
for f, file_id, kind in zip(files, ids, kinds):
630
if isinstance(files, basestring):
631
assert(ids is None or isinstance(ids, basestring))
637
ids = [None] * len(files)
639
assert(len(ids) == len(files))
641
inv = self.read_working_inventory()
642
for f,file_id in zip(files, ids):
643
if self.is_control_filename(f):
644
raise errors.ForbiddenControlFileError(filename=f)
649
raise BzrError("cannot add top-level %r" % f)
651
fullpath = normpath(self.abspath(f))
653
kind = file_kind(fullpath)
655
if e.errno == errno.ENOENT:
656
raise NoSuchFile(fullpath)
657
if not InventoryEntry.versionable_kind(kind):
658
raise errors.BadFileKindError(filename=f, kind=kind)
685
659
if file_id is None:
686
660
inv.add_path(f, kind=kind)
688
662
inv.add_path(f, kind=kind, file_id=file_id)
689
self._inventory_is_modified = True
691
@needs_tree_write_lock
692
def _gather_kinds(self, files, kinds):
693
"""See MutableTree._gather_kinds."""
694
for pos, f in enumerate(files):
695
if kinds[pos] is None:
696
fullpath = normpath(self.abspath(f))
698
kinds[pos] = file_kind(fullpath)
700
if e.errno == errno.ENOENT:
701
raise errors.NoSuchFile(fullpath)
664
self._write_inventory(inv)
703
666
@needs_write_lock
704
667
def add_parent_tree_id(self, revision_id, allow_leftmost_as_ghost=False):
753
711
self.set_parent_ids(parents, allow_leftmost_as_ghost=True)
755
def path_content_summary(self, path, _lstat=os.lstat,
756
_mapper=osutils.file_kind_from_stat_mode):
757
"""See Tree.path_content_summary."""
758
abspath = self.abspath(path)
760
stat_result = _lstat(abspath)
762
if getattr(e, 'errno', None) == errno.ENOENT:
764
return ('missing', None, None, None)
765
# propagate other errors
767
kind = _mapper(stat_result.st_mode)
769
return self._file_content_summary(path, stat_result)
770
elif kind == 'directory':
771
# perhaps it looks like a plain directory, but it's really a
773
if self._directory_is_tree_reference(path):
774
kind = 'tree-reference'
775
return kind, None, None, None
776
elif kind == 'symlink':
777
target = osutils.readlink(abspath)
778
return ('symlink', None, None, target)
780
return (kind, None, None, None)
782
def _file_content_summary(self, path, stat_result):
783
size = stat_result.st_size
784
executable = self._is_executable_from_path_and_stat(path, stat_result)
785
# try for a stat cache lookup
786
return ('file', size, executable, self._sha_from_stat(
789
def _check_parents_for_ghosts(self, revision_ids, allow_leftmost_as_ghost):
790
"""Common ghost checking functionality from set_parent_*.
792
This checks that the left hand-parent exists if there are any
795
if len(revision_ids) > 0:
796
leftmost_id = revision_ids[0]
797
if (not allow_leftmost_as_ghost and not
798
self.branch.repository.has_revision(leftmost_id)):
799
raise errors.GhostRevisionUnusableHere(leftmost_id)
801
def _set_merges_from_parent_ids(self, parent_ids):
802
merges = parent_ids[1:]
803
self._transport.put_bytes('pending-merges', '\n'.join(merges),
804
mode=self.bzrdir._get_file_mode())
806
def _filter_parent_ids_by_ancestry(self, revision_ids):
807
"""Check that all merged revisions are proper 'heads'.
809
This will always return the first revision_id, and any merged revisions
812
if len(revision_ids) == 0:
814
graph = self.branch.repository.get_graph()
815
heads = graph.heads(revision_ids)
816
new_revision_ids = revision_ids[:1]
817
for revision_id in revision_ids[1:]:
818
if revision_id in heads and revision_id not in new_revision_ids:
819
new_revision_ids.append(revision_id)
820
if new_revision_ids != revision_ids:
821
trace.mutter('requested to set revision_ids = %s,'
822
' but filtered to %s', revision_ids, new_revision_ids)
823
return new_revision_ids
825
@needs_tree_write_lock
714
def pending_merges(self):
715
"""Return a list of pending merges.
717
These are revisions that have been merged into the working
718
directory but not yet committed.
720
return self.get_parent_ids()[1:]
826
723
def set_parent_ids(self, revision_ids, allow_leftmost_as_ghost=False):
827
724
"""Set the parent ids to revision_ids.
829
726
See also set_parent_trees. This api will try to retrieve the tree data
830
727
for each element of revision_ids from the trees repository. If you have
831
728
tree data already available, it is more efficient to use
835
732
:param revision_ids: The revision_ids to set as the parent ids of this
836
733
working tree. Any of these may be ghosts.
838
self._check_parents_for_ghosts(revision_ids,
839
allow_leftmost_as_ghost=allow_leftmost_as_ghost)
840
for revision_id in revision_ids:
841
_mod_revision.check_not_reserved_id(revision_id)
843
revision_ids = self._filter_parent_ids_by_ancestry(revision_ids)
845
735
if len(revision_ids) > 0:
846
self.set_last_revision(revision_ids[0])
736
leftmost_id = revision_ids[0]
737
if (not allow_leftmost_as_ghost and not
738
self.branch.repository.has_revision(leftmost_id)):
739
raise errors.GhostRevisionUnusableHere(leftmost_id)
740
self.set_last_revision(leftmost_id)
848
self.set_last_revision(_mod_revision.NULL_REVISION)
850
self._set_merges_from_parent_ids(revision_ids)
852
@needs_tree_write_lock
742
self.set_last_revision(None)
743
merges = revision_ids[1:]
744
self._control_files.put_utf8('pending-merges', '\n'.join(merges))
853
747
def set_parent_trees(self, parents_list, allow_leftmost_as_ghost=False):
854
"""See MutableTree.set_parent_trees."""
855
parent_ids = [rev for (rev, tree) in parents_list]
856
for revision_id in parent_ids:
857
_mod_revision.check_not_reserved_id(revision_id)
748
"""Set the parents of the working tree.
859
self._check_parents_for_ghosts(parent_ids,
750
:param parents_list: A list of (revision_id, tree) tuples.
751
If tree is None, then that element is treated as an unreachable
752
parent tree - i.e. a ghost.
754
# parent trees are not used in current format trees, delegate to
756
self.set_parent_ids([rev for (rev, tree) in parents_list],
860
757
allow_leftmost_as_ghost=allow_leftmost_as_ghost)
862
parent_ids = self._filter_parent_ids_by_ancestry(parent_ids)
864
if len(parent_ids) == 0:
865
leftmost_parent_id = _mod_revision.NULL_REVISION
866
leftmost_parent_tree = None
868
leftmost_parent_id, leftmost_parent_tree = parents_list[0]
870
if self._change_last_revision(leftmost_parent_id):
871
if leftmost_parent_tree is None:
872
# If we don't have a tree, fall back to reading the
873
# parent tree from the repository.
874
self._cache_basis_inventory(leftmost_parent_id)
876
inv = leftmost_parent_tree.inventory
877
xml = self._create_basis_xml_from_inventory(
878
leftmost_parent_id, inv)
879
self._write_basis_inventory(xml)
880
self._set_merges_from_parent_ids(parent_ids)
882
@needs_tree_write_lock
883
760
def set_pending_merges(self, rev_list):
884
761
parents = self.get_parent_ids()
885
762
leftmost = parents[:1]
886
763
new_parents = leftmost + rev_list
887
764
self.set_parent_ids(new_parents)
889
@needs_tree_write_lock
890
767
def set_merge_modified(self, modified_hashes):
891
768
def iter_stanzas():
892
769
for file_id, hash in modified_hashes.iteritems():
893
yield Stanza(file_id=file_id.decode('utf8'), hash=hash)
770
yield Stanza(file_id=file_id, hash=hash)
894
771
self._put_rio('merge-hashes', iter_stanzas(), MERGE_MODIFIED_HEADER_1)
896
def _sha_from_stat(self, path, stat_result):
897
"""Get a sha digest from the tree's stat cache.
899
The default implementation assumes no stat cache is present.
901
:param path: The path.
902
:param stat_result: The stat result being looked up.
906
774
def _put_rio(self, filename, stanzas, header):
907
self._must_be_locked()
908
775
my_file = rio_file(stanzas, header)
909
self._transport.put_file(filename, my_file,
910
mode=self.bzrdir._get_file_mode())
912
@needs_write_lock # because merge pulls data into the branch.
913
def merge_from_branch(self, branch, to_revision=None, from_revision=None,
914
merge_type=None, force=False):
915
"""Merge from a branch into this working tree.
917
:param branch: The branch to merge from.
918
:param to_revision: If non-None, the merge will merge to to_revision,
919
but not beyond it. to_revision does not need to be in the history
920
of the branch when it is supplied. If None, to_revision defaults to
921
branch.last_revision().
923
from bzrlib.merge import Merger, Merge3Merger
924
merger = Merger(self.branch, this_tree=self)
925
# check that there are no local alterations
926
if not force and self.has_changes():
927
raise errors.UncommittedChanges(self)
928
if to_revision is None:
929
to_revision = _mod_revision.ensure_null(branch.last_revision())
930
merger.other_rev_id = to_revision
931
if _mod_revision.is_null(merger.other_rev_id):
932
raise errors.NoCommits(branch)
933
self.branch.fetch(branch, last_revision=merger.other_rev_id)
934
merger.other_basis = merger.other_rev_id
935
merger.other_tree = self.branch.repository.revision_tree(
937
merger.other_branch = branch
938
if from_revision is None:
941
merger.set_base_revision(from_revision, branch)
942
if merger.base_rev_id == merger.other_rev_id:
943
raise errors.PointlessMerge
944
merger.backup_files = False
945
if merge_type is None:
946
merger.merge_type = Merge3Merger
948
merger.merge_type = merge_type
949
merger.set_interesting_files(None)
950
merger.show_base = False
951
merger.reprocess = False
952
conflicts = merger.do_merge()
776
self._control_files.put(filename, my_file)
957
779
def merge_modified(self):
958
"""Return a dictionary of files modified by a merge.
960
The list is initialized by WorkingTree.set_merge_modified, which is
961
typically called after we make some automatic updates to the tree
964
This returns a map of file_id->sha1, containing only files which are
965
still in the working inventory and have that text hash.
968
hashfile = self._transport.get('merge-hashes')
969
except errors.NoSuchFile:
781
hashfile = self._control_files.get('merge-hashes')
974
if hashfile.next() != MERGE_MODIFIED_HEADER_1 + '\n':
975
raise errors.MergeModifiedFormatError()
976
except StopIteration:
977
raise errors.MergeModifiedFormatError()
978
for s in RioReader(hashfile):
979
# RioReader reads in Unicode, so convert file_ids back to utf8
980
file_id = osutils.safe_file_id(s.get("file_id"), warn=False)
981
if file_id not in self.inventory:
983
text_hash = s.get("hash")
984
if text_hash == self.get_file_sha1(file_id):
985
merge_hashes[file_id] = text_hash
991
def mkdir(self, path, file_id=None):
992
"""See MutableTree.mkdir()."""
994
file_id = generate_ids.gen_file_id(os.path.basename(path))
995
os.mkdir(self.abspath(path))
996
self.add(path, file_id, 'directory')
786
if hashfile.next() != MERGE_MODIFIED_HEADER_1 + '\n':
787
raise MergeModifiedFormatError()
788
except StopIteration:
789
raise MergeModifiedFormatError()
790
for s in RioReader(hashfile):
791
file_id = s.get("file_id")
792
if file_id not in self.inventory:
795
if hash == self.get_file_sha1(file_id):
796
merge_hashes[file_id] = hash
999
799
def get_symlink_target(self, file_id):
1000
abspath = self.id2abspath(file_id)
1001
target = osutils.readlink(abspath)
1005
def subsume(self, other_tree):
1006
def add_children(inventory, entry):
1007
for child_entry in entry.children.values():
1008
inventory._byid[child_entry.file_id] = child_entry
1009
if child_entry.kind == 'directory':
1010
add_children(inventory, child_entry)
1011
if other_tree.get_root_id() == self.get_root_id():
1012
raise errors.BadSubsumeSource(self, other_tree,
1013
'Trees have the same root')
1015
other_tree_path = self.relpath(other_tree.basedir)
1016
except errors.PathNotChild:
1017
raise errors.BadSubsumeSource(self, other_tree,
1018
'Tree is not contained by the other')
1019
new_root_parent = self.path2id(osutils.dirname(other_tree_path))
1020
if new_root_parent is None:
1021
raise errors.BadSubsumeSource(self, other_tree,
1022
'Parent directory is not versioned.')
1023
# We need to ensure that the result of a fetch will have a
1024
# versionedfile for the other_tree root, and only fetching into
1025
# RepositoryKnit2 guarantees that.
1026
if not self.branch.repository.supports_rich_root():
1027
raise errors.SubsumeTargetNeedsUpgrade(other_tree)
1028
other_tree.lock_tree_write()
1030
new_parents = other_tree.get_parent_ids()
1031
other_root = other_tree.inventory.root
1032
other_root.parent_id = new_root_parent
1033
other_root.name = osutils.basename(other_tree_path)
1034
self.inventory.add(other_root)
1035
add_children(self.inventory, other_root)
1036
self._write_inventory(self.inventory)
1037
# normally we don't want to fetch whole repositories, but i think
1038
# here we really do want to consolidate the whole thing.
1039
for parent_id in other_tree.get_parent_ids():
1040
self.branch.fetch(other_tree.branch, parent_id)
1041
self.add_parent_tree_id(parent_id)
1044
other_tree.bzrdir.retire_bzrdir()
1046
def _setup_directory_is_tree_reference(self):
1047
if self._branch.repository._format.supports_tree_reference:
1048
self._directory_is_tree_reference = \
1049
self._directory_may_be_tree_reference
1051
self._directory_is_tree_reference = \
1052
self._directory_is_never_tree_reference
1054
def _directory_is_never_tree_reference(self, relpath):
1057
def _directory_may_be_tree_reference(self, relpath):
1058
# as a special case, if a directory contains control files then
1059
# it's a tree reference, except that the root of the tree is not
1060
return relpath and osutils.isdir(self.abspath(relpath) + u"/.bzr")
1061
# TODO: We could ask all the control formats whether they
1062
# recognize this directory, but at the moment there's no cheap api
1063
# to do that. Since we probably can only nest bzr checkouts and
1064
# they always use this name it's ok for now. -- mbp 20060306
1066
# FIXME: There is an unhandled case here of a subdirectory
1067
# containing .bzr but not a branch; that will probably blow up
1068
# when you try to commit it. It might happen if there is a
1069
# checkout in a subdirectory. This can be avoided by not adding
1072
@needs_tree_write_lock
1073
def extract(self, file_id, format=None):
1074
"""Extract a subtree from this tree.
1076
A new branch will be created, relative to the path for this tree.
1080
segments = osutils.splitpath(path)
1081
transport = self.branch.bzrdir.root_transport
1082
for name in segments:
1083
transport = transport.clone(name)
1084
transport.ensure_base()
1087
sub_path = self.id2path(file_id)
1088
branch_transport = mkdirs(sub_path)
1090
format = self.bzrdir.cloning_metadir()
1091
branch_transport.ensure_base()
1092
branch_bzrdir = format.initialize_on_transport(branch_transport)
1094
repo = branch_bzrdir.find_repository()
1095
except errors.NoRepositoryPresent:
1096
repo = branch_bzrdir.create_repository()
1097
if not repo.supports_rich_root():
1098
raise errors.RootNotRich()
1099
new_branch = branch_bzrdir.create_branch()
1100
new_branch.pull(self.branch)
1101
for parent_id in self.get_parent_ids():
1102
new_branch.fetch(self.branch, parent_id)
1103
tree_transport = self.bzrdir.root_transport.clone(sub_path)
1104
if tree_transport.base != branch_transport.base:
1105
tree_bzrdir = format.initialize_on_transport(tree_transport)
1106
branch.BranchReferenceFormat().initialize(tree_bzrdir,
1107
target_branch=new_branch)
1109
tree_bzrdir = branch_bzrdir
1110
wt = tree_bzrdir.create_workingtree(_mod_revision.NULL_REVISION)
1111
wt.set_parent_ids(self.get_parent_ids())
1112
my_inv = self.inventory
1113
child_inv = inventory.Inventory(root_id=None)
1114
new_root = my_inv[file_id]
1115
my_inv.remove_recursive_id(file_id)
1116
new_root.parent_id = None
1117
child_inv.add(new_root)
1118
self._write_inventory(my_inv)
1119
wt._write_inventory(child_inv)
1122
def _serialize(self, inventory, out_file):
1123
xml5.serializer_v5.write_inventory(self._inventory, out_file,
1126
def _deserialize(selt, in_file):
1127
return xml5.serializer_v5.read_inventory(in_file)
1130
"""Write the in memory inventory to disk."""
1131
# TODO: Maybe this should only write on dirty ?
1132
if self._control_files._lock_mode != 'w':
1133
raise errors.NotWriteLocked(self)
1135
self._serialize(self._inventory, sio)
1137
self._transport.put_file('inventory', sio,
1138
mode=self.bzrdir._get_file_mode())
1139
self._inventory_is_modified = False
1141
def _kind(self, relpath):
1142
return osutils.file_kind(self.abspath(relpath))
1144
def list_files(self, include_root=False, from_dir=None, recursive=True):
1145
"""List all files as (path, class, kind, id, entry).
800
return os.readlink(self.id2abspath(file_id))
802
def file_class(self, filename):
803
if self.path2id(filename):
805
elif self.is_ignored(filename):
810
def list_files(self):
811
"""Recursively list all files as (path, class, kind, id, entry).
1147
813
Lists, but does not descend into unversioned directories.
1148
815
This does not include files that have been deleted in this
1149
tree. Skips the control directory.
1151
:param include_root: if True, return an entry for the root
1152
:param from_dir: start from this directory or None for the root
1153
:param recursive: whether to recurse into subdirectories or not
818
Skips the control directory.
1155
# list_files is an iterator, so @needs_read_lock doesn't work properly
1156
# with it. So callers should be careful to always read_lock the tree.
1157
if not self.is_locked():
1158
raise errors.ObjectNotLocked(self)
1160
inv = self.inventory
1161
if from_dir is None and include_root is True:
1162
yield ('', 'V', 'directory', inv.root.file_id, inv.root)
820
inv = self._inventory
1163
821
# Convert these into local objects to save lookup times
1164
822
pathjoin = osutils.pathjoin
1165
file_kind = self._kind
823
file_kind = osutils.file_kind
1167
825
# transport.base ends in a slash, we want the piece
1168
826
# between the last two slashes
1246
901
except KeyError:
1247
902
yield fp[1:], c, fk, None, TreeEntry()
1250
905
if fk != 'directory':
1253
# But do this child first if recursing down
1255
new_children = os.listdir(fap)
1257
new_children = collections.deque(new_children)
1258
stack.append((f_ie.file_id, fp, fap, new_children))
1259
# Break out of inner loop,
1260
# so that we start outer loop with child
908
# But do this child first
909
new_children = os.listdir(fap)
911
new_children = collections.deque(new_children)
912
stack.append((f_ie.file_id, fp, fap, new_children))
913
# Break out of inner loop, so that we start outer loop with child
1263
916
# if we finished all children, pop it off the stack
1266
@needs_tree_write_lock
1267
def move(self, from_paths, to_dir=None, after=False, **kwargs):
921
def move(self, from_paths, to_name):
1268
922
"""Rename files.
1270
to_dir must exist in the inventory.
1272
If to_dir exists and is a directory, the files are moved into
1273
it, keeping their old names.
1275
Note that to_dir is only the last component of the new name;
924
to_name must exist in the inventory.
926
If to_name exists and is a directory, the files are moved into
927
it, keeping their old names.
929
Note that to_name is only the last component of the new name;
1276
930
this doesn't change the directory.
1278
For each entry in from_paths the move mode will be determined
1281
The first mode moves the file in the filesystem and updates the
1282
inventory. The second mode only updates the inventory without
1283
touching the file on the filesystem. This is the new mode introduced
1286
move uses the second mode if 'after == True' and the target is not
1287
versioned but present in the working tree.
1289
move uses the second mode if 'after == False' and the source is
1290
versioned but no longer in the working tree, and the target is not
1291
versioned but present in the working tree.
1293
move uses the first mode if 'after == False' and the source is
1294
versioned and present in the working tree, and the target is not
1295
versioned and not present in the working tree.
1297
Everything else results in an error.
1299
932
This returns a list of (from_path, to_path) pairs for each
1300
933
entry that is moved.
1305
# check for deprecated use of signature
1307
to_dir = kwargs.get('to_name', None)
1309
raise TypeError('You must supply a target directory')
1311
symbol_versioning.warn('The parameter to_name was deprecated'
1312
' in version 0.13. Use to_dir instead',
1315
# check destination directory
1316
if isinstance(from_paths, basestring):
936
## TODO: Option to move IDs only
937
assert not isinstance(from_paths, basestring)
1318
938
inv = self.inventory
1319
to_abs = self.abspath(to_dir)
939
to_abs = self.abspath(to_name)
1320
940
if not isdir(to_abs):
1321
raise errors.BzrMoveFailedError('',to_dir,
1322
errors.NotADirectory(to_abs))
1323
if not self.has_filename(to_dir):
1324
raise errors.BzrMoveFailedError('',to_dir,
1325
errors.NotInWorkingDirectory(to_dir))
1326
to_dir_id = inv.path2id(to_dir)
1327
if to_dir_id is None:
1328
raise errors.BzrMoveFailedError('',to_dir,
1329
errors.NotVersionedError(path=str(to_dir)))
941
raise BzrError("destination %r is not a directory" % to_abs)
942
if not self.has_filename(to_name):
943
raise BzrError("destination %r not in working directory" % to_abs)
944
to_dir_id = inv.path2id(to_name)
945
if to_dir_id is None and to_name != '':
946
raise BzrError("destination %r is not a versioned directory" % to_name)
1331
947
to_dir_ie = inv[to_dir_id]
1332
948
if to_dir_ie.kind != 'directory':
1333
raise errors.BzrMoveFailedError('',to_dir,
1334
errors.NotADirectory(to_abs))
1336
# create rename entries and tuples
1337
for from_rel in from_paths:
1338
from_tail = splitpath(from_rel)[-1]
1339
from_id = inv.path2id(from_rel)
1341
raise errors.BzrMoveFailedError(from_rel,to_dir,
1342
errors.NotVersionedError(path=str(from_rel)))
1344
from_entry = inv[from_id]
1345
from_parent_id = from_entry.parent_id
1346
to_rel = pathjoin(to_dir, from_tail)
1347
rename_entry = WorkingTree._RenameEntry(from_rel=from_rel,
1349
from_tail=from_tail,
1350
from_parent_id=from_parent_id,
1351
to_rel=to_rel, to_tail=from_tail,
1352
to_parent_id=to_dir_id)
1353
rename_entries.append(rename_entry)
1354
rename_tuples.append((from_rel, to_rel))
1356
# determine which move mode to use. checks also for movability
1357
rename_entries = self._determine_mv_mode(rename_entries, after)
1359
original_modified = self._inventory_is_modified
949
raise BzrError("destination %r is not a directory" % to_abs)
951
to_idpath = inv.get_idpath(to_dir_id)
954
if not self.has_filename(f):
955
raise BzrError("%r does not exist in working tree" % f)
956
f_id = inv.path2id(f)
958
raise BzrError("%r is not versioned" % f)
959
name_tail = splitpath(f)[-1]
960
dest_path = pathjoin(to_name, name_tail)
961
if self.has_filename(dest_path):
962
raise BzrError("destination %r already exists" % dest_path)
963
if f_id in to_idpath:
964
raise BzrError("can't move %r to a subdirectory of itself" % f)
966
# OK, so there's a race here, it's possible that someone will
967
# create a file in this interval and then the rename might be
968
# left half-done. But we should have caught most problems.
969
orig_inv = deepcopy(self.inventory)
1362
self._inventory_is_modified = True
1363
self._move(rename_entries)
972
name_tail = splitpath(f)[-1]
973
dest_path = pathjoin(to_name, name_tail)
974
result.append((f, dest_path))
975
inv.rename(inv.path2id(f), to_dir_id, name_tail)
977
rename(self.abspath(f), self.abspath(dest_path))
979
raise BzrError("failed to rename %r to %r: %s" %
980
(f, dest_path, e[1]),
981
["rename rolled back"])
1365
983
# restore the inventory on error
1366
self._inventory_is_modified = original_modified
984
self._set_inventory(orig_inv)
1368
986
self._write_inventory(inv)
1369
return rename_tuples
1371
def _determine_mv_mode(self, rename_entries, after=False):
1372
"""Determines for each from-to pair if both inventory and working tree
1373
or only the inventory has to be changed.
1375
Also does basic plausability tests.
1377
inv = self.inventory
1379
for rename_entry in rename_entries:
1380
# store to local variables for easier reference
1381
from_rel = rename_entry.from_rel
1382
from_id = rename_entry.from_id
1383
to_rel = rename_entry.to_rel
1384
to_id = inv.path2id(to_rel)
1385
only_change_inv = False
1387
# check the inventory for source and destination
1389
raise errors.BzrMoveFailedError(from_rel,to_rel,
1390
errors.NotVersionedError(path=str(from_rel)))
1391
if to_id is not None:
1392
raise errors.BzrMoveFailedError(from_rel,to_rel,
1393
errors.AlreadyVersionedError(path=str(to_rel)))
1395
# try to determine the mode for rename (only change inv or change
1396
# inv and file system)
1398
if not self.has_filename(to_rel):
1399
raise errors.BzrMoveFailedError(from_id,to_rel,
1400
errors.NoSuchFile(path=str(to_rel),
1401
extra="New file has not been created yet"))
1402
only_change_inv = True
1403
elif not self.has_filename(from_rel) and self.has_filename(to_rel):
1404
only_change_inv = True
1405
elif self.has_filename(from_rel) and not self.has_filename(to_rel):
1406
only_change_inv = False
1407
elif (not self.case_sensitive
1408
and from_rel.lower() == to_rel.lower()
1409
and self.has_filename(from_rel)):
1410
only_change_inv = False
1412
# something is wrong, so lets determine what exactly
1413
if not self.has_filename(from_rel) and \
1414
not self.has_filename(to_rel):
1415
raise errors.BzrRenameFailedError(from_rel,to_rel,
1416
errors.PathsDoNotExist(paths=(str(from_rel),
1419
raise errors.RenameFailedFilesExist(from_rel, to_rel)
1420
rename_entry.only_change_inv = only_change_inv
1421
return rename_entries
1423
def _move(self, rename_entries):
1424
"""Moves a list of files.
1426
Depending on the value of the flag 'only_change_inv', the
1427
file will be moved on the file system or not.
1429
inv = self.inventory
1432
for entry in rename_entries:
1434
self._move_entry(entry)
1436
self._rollback_move(moved)
1440
def _rollback_move(self, moved):
1441
"""Try to rollback a previous move in case of an filesystem error."""
1442
inv = self.inventory
1445
self._move_entry(WorkingTree._RenameEntry(
1446
entry.to_rel, entry.from_id,
1447
entry.to_tail, entry.to_parent_id, entry.from_rel,
1448
entry.from_tail, entry.from_parent_id,
1449
entry.only_change_inv))
1450
except errors.BzrMoveFailedError, e:
1451
raise errors.BzrMoveFailedError( '', '', "Rollback failed."
1452
" The working tree is in an inconsistent state."
1453
" Please consider doing a 'bzr revert'."
1454
" Error message is: %s" % e)
1456
def _move_entry(self, entry):
1457
inv = self.inventory
1458
from_rel_abs = self.abspath(entry.from_rel)
1459
to_rel_abs = self.abspath(entry.to_rel)
1460
if from_rel_abs == to_rel_abs:
1461
raise errors.BzrMoveFailedError(entry.from_rel, entry.to_rel,
1462
"Source and target are identical.")
1464
if not entry.only_change_inv:
1466
osutils.rename(from_rel_abs, to_rel_abs)
1468
raise errors.BzrMoveFailedError(entry.from_rel,
1470
inv.rename(entry.from_id, entry.to_parent_id, entry.to_tail)
1472
@needs_tree_write_lock
1473
def rename_one(self, from_rel, to_rel, after=False):
990
def rename_one(self, from_rel, to_rel):
1474
991
"""Rename one file.
1476
993
This can change the directory or the filename or both.
1478
rename_one has several 'modes' to work. First, it can rename a physical
1479
file and change the file_id. That is the normal mode. Second, it can
1480
only change the file_id without touching any physical file. This is
1481
the new mode introduced in version 0.15.
1483
rename_one uses the second mode if 'after == True' and 'to_rel' is not
1484
versioned but present in the working tree.
1486
rename_one uses the second mode if 'after == False' and 'from_rel' is
1487
versioned but no longer in the working tree, and 'to_rel' is not
1488
versioned but present in the working tree.
1490
rename_one uses the first mode if 'after == False' and 'from_rel' is
1491
versioned and present in the working tree, and 'to_rel' is not
1492
versioned and not present in the working tree.
1494
Everything else results in an error.
1496
995
inv = self.inventory
1499
# create rename entries and tuples
1500
from_tail = splitpath(from_rel)[-1]
1501
from_id = inv.path2id(from_rel)
1503
# if file is missing in the inventory maybe it's in the basis_tree
1504
basis_tree = self.branch.basis_tree()
1505
from_id = basis_tree.path2id(from_rel)
1507
raise errors.BzrRenameFailedError(from_rel,to_rel,
1508
errors.NotVersionedError(path=str(from_rel)))
1509
# put entry back in the inventory so we can rename it
1510
from_entry = basis_tree.inventory[from_id].copy()
1513
from_entry = inv[from_id]
1514
from_parent_id = from_entry.parent_id
996
if not self.has_filename(from_rel):
997
raise BzrError("can't rename: old working file %r does not exist" % from_rel)
998
if self.has_filename(to_rel):
999
raise BzrError("can't rename: new working file %r already exists" % to_rel)
1001
file_id = inv.path2id(from_rel)
1003
raise BzrError("can't rename: old name %r is not versioned" % from_rel)
1005
entry = inv[file_id]
1006
from_parent = entry.parent_id
1007
from_name = entry.name
1009
if inv.path2id(to_rel):
1010
raise BzrError("can't rename: new name %r is already versioned" % to_rel)
1515
1012
to_dir, to_tail = os.path.split(to_rel)
1516
1013
to_dir_id = inv.path2id(to_dir)
1517
rename_entry = WorkingTree._RenameEntry(from_rel=from_rel,
1519
from_tail=from_tail,
1520
from_parent_id=from_parent_id,
1521
to_rel=to_rel, to_tail=to_tail,
1522
to_parent_id=to_dir_id)
1523
rename_entries.append(rename_entry)
1525
# determine which move mode to use. checks also for movability
1526
rename_entries = self._determine_mv_mode(rename_entries, after)
1528
# check if the target changed directory and if the target directory is
1530
if to_dir_id is None:
1531
raise errors.BzrMoveFailedError(from_rel,to_rel,
1532
errors.NotVersionedError(path=str(to_dir)))
1534
# all checks done. now we can continue with our actual work
1535
mutter('rename_one:\n'
1540
' to_dir_id {%s}\n',
1541
from_id, from_rel, to_rel, to_dir, to_dir_id)
1543
self._move(rename_entries)
1014
if to_dir_id is None and to_dir != '':
1015
raise BzrError("can't determine destination directory id for %r" % to_dir)
1017
mutter("rename_one:")
1018
mutter(" file_id {%s}" % file_id)
1019
mutter(" from_rel %r" % from_rel)
1020
mutter(" to_rel %r" % to_rel)
1021
mutter(" to_dir %r" % to_dir)
1022
mutter(" to_dir_id {%s}" % to_dir_id)
1024
inv.rename(file_id, to_dir_id, to_tail)
1026
from_abs = self.abspath(from_rel)
1027
to_abs = self.abspath(to_rel)
1029
rename(from_abs, to_abs)
1031
inv.rename(file_id, from_parent, from_name)
1032
raise BzrError("failed to rename %r to %r: %s"
1033
% (from_abs, to_abs, e[1]),
1034
["rename rolled back"])
1544
1035
self._write_inventory(inv)
1546
class _RenameEntry(object):
1547
def __init__(self, from_rel, from_id, from_tail, from_parent_id,
1548
to_rel, to_tail, to_parent_id, only_change_inv=False):
1549
self.from_rel = from_rel
1550
self.from_id = from_id
1551
self.from_tail = from_tail
1552
self.from_parent_id = from_parent_id
1553
self.to_rel = to_rel
1554
self.to_tail = to_tail
1555
self.to_parent_id = to_parent_id
1556
self.only_change_inv = only_change_inv
1558
1037
@needs_read_lock
1559
1038
def unknowns(self):
1560
1039
"""Return all unknown files.
1720
1212
if ignoreset is not None:
1721
1213
return ignoreset
1723
ignore_globs = set()
1215
ignore_globs = set(bzrlib.DEFAULT_IGNORE)
1724
1216
ignore_globs.update(ignores.get_runtime_ignores())
1725
1218
ignore_globs.update(ignores.get_user_ignores())
1726
1220
if self.has_filename(bzrlib.IGNORE_FILENAME):
1727
1221
f = self.get_file_byname(bzrlib.IGNORE_FILENAME)
1729
1223
ignore_globs.update(ignores.parse_ignore_file(f))
1732
1227
self._ignoreset = ignore_globs
1228
self._ignore_regex = self._combine_ignore_rules(ignore_globs)
1733
1229
return ignore_globs
1735
def _flush_ignore_list_cache(self):
1736
"""Resets the cached ignore list to force a cache rebuild."""
1737
self._ignoreset = None
1738
self._ignoreglobster = None
1231
def _get_ignore_rules_as_regex(self):
1232
"""Return a regex of the ignore rules and a mapping dict.
1234
:return: (ignore rules compiled regex, dictionary mapping rule group
1235
indices to original rule.)
1237
if getattr(self, '_ignoreset', None) is None:
1238
self.get_ignore_list()
1239
return self._ignore_regex
1740
1241
def is_ignored(self, filename):
1741
1242
r"""Check whether the filename matches an ignore pattern.
1743
1244
Patterns containing '/' or '\' need to match the whole path;
1744
others match against only the last component. Patterns starting
1745
with '!' are ignore exceptions. Exceptions take precedence
1746
over regular patterns and cause the filename to not be ignored.
1245
others match against only the last component.
1748
1247
If the file is ignored, returns the pattern which caused it to
1749
1248
be ignored, otherwise None. So this can simply be used as a
1750
1249
boolean if desired."""
1751
if getattr(self, '_ignoreglobster', None) is None:
1752
self._ignoreglobster = globbing.ExceptionGlobster(self.get_ignore_list())
1753
return self._ignoreglobster.match(filename)
1251
# TODO: Use '**' to match directories, and other extended
1252
# globbing stuff from cvs/rsync.
1254
# XXX: fnmatch is actually not quite what we want: it's only
1255
# approximately the same as real Unix fnmatch, and doesn't
1256
# treat dotfiles correctly and allows * to match /.
1257
# Eventually it should be replaced with something more
1260
rules = self._get_ignore_rules_as_regex()
1261
for regex, mapping in rules:
1262
match = regex.match(filename)
1263
if match is not None:
1264
# one or more of the groups in mapping will have a non-None
1266
groups = match.groups()
1267
rules = [mapping[group] for group in
1268
mapping if groups[group] is not None]
1755
1272
def kind(self, file_id):
1756
1273
return file_kind(self.id2abspath(file_id))
1758
def stored_kind(self, file_id):
1759
"""See Tree.stored_kind"""
1760
return self.inventory[file_id].kind
1762
def _comparison_data(self, entry, path):
1763
abspath = self.abspath(path)
1765
stat_value = os.lstat(abspath)
1767
if getattr(e, 'errno', None) == errno.ENOENT:
1774
mode = stat_value.st_mode
1775
kind = osutils.file_kind_from_stat_mode(mode)
1776
if not supports_executable():
1777
executable = entry is not None and entry.executable
1779
executable = bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode)
1780
return kind, executable, stat_value
1782
def _file_size(self, entry, stat_value):
1783
return stat_value.st_size
1785
1276
def last_revision(self):
1786
"""Return the last revision of the branch for this tree.
1788
This format tree does not support a separate marker for last-revision
1789
compared to the branch.
1791
See MutableTree.last_revision
1277
"""Return the last revision id of this working tree.
1279
In early branch formats this was == the branch last_revision,
1280
but that cannot be relied upon - for working tree operations,
1281
always use tree.last_revision().
1793
return self._last_revision()
1796
def _last_revision(self):
1797
"""helper for get_parent_ids."""
1798
return _mod_revision.ensure_null(self.branch.last_revision())
1283
return self.branch.last_revision()
1800
1285
def is_locked(self):
1801
1286
return self._control_files.is_locked()
1803
def _must_be_locked(self):
1804
if not self.is_locked():
1805
raise errors.ObjectNotLocked(self)
1807
1288
def lock_read(self):
1808
"""Lock the tree for reading.
1810
This also locks the branch, and can be unlocked via self.unlock().
1812
:return: A bzrlib.lock.LogicalLockResult.
1814
if not self.is_locked():
1816
self.branch.lock_read()
1818
self._control_files.lock_read()
1819
return LogicalLockResult(self.unlock)
1821
self.branch.unlock()
1824
def lock_tree_write(self):
1825
"""See MutableTree.lock_tree_write, and WorkingTree.unlock.
1827
:return: A bzrlib.lock.LogicalLockResult.
1829
if not self.is_locked():
1831
self.branch.lock_read()
1833
self._control_files.lock_write()
1834
return LogicalLockResult(self.unlock)
1289
"""See Branch.lock_read, and WorkingTree.unlock."""
1290
self.branch.lock_read()
1292
return self._control_files.lock_read()
1836
1294
self.branch.unlock()
1839
1297
def lock_write(self):
1840
"""See MutableTree.lock_write, and WorkingTree.unlock.
1842
:return: A bzrlib.lock.LogicalLockResult.
1844
if not self.is_locked():
1298
"""See Branch.lock_write, and WorkingTree.unlock."""
1846
1299
self.branch.lock_write()
1848
self._control_files.lock_write()
1849
return LogicalLockResult(self.unlock)
1301
return self._control_files.lock_write()
1851
1303
self.branch.unlock()
1889
1331
self.branch.set_revision_history([new_revision])
1892
def _write_basis_inventory(self, xml):
1893
"""Write the basis inventory XML to the basis-inventory file"""
1894
path = self._basis_inventory_name()
1896
self._transport.put_file(path, sio,
1897
mode=self.bzrdir._get_file_mode())
1899
def _create_basis_xml_from_inventory(self, revision_id, inventory):
1900
"""Create the text that will be saved in basis-inventory"""
1901
inventory.revision_id = revision_id
1902
return xml7.serializer_v7.write_inventory_to_string(inventory)
1904
1334
def _cache_basis_inventory(self, new_revision):
1905
1335
"""Cache new_revision as the basis inventory."""
1906
1336
# TODO: this should allow the ready-to-use inventory to be passed in,
1907
1337
# as commit already has that ready-to-use [while the format is the
1908
1338
# same, that is].
1910
# this double handles the inventory - unpack and repack -
1340
# this double handles the inventory - unpack and repack -
1911
1341
# but is easier to understand. We can/should put a conditional
1912
1342
# in here based on whether the inventory is in the latest format
1913
1343
# - perhaps we should repack all inventories on a repository
1915
1345
# the fast path is to copy the raw xml from the repository. If the
1916
# xml contains 'revision_id="', then we assume the right
1346
# xml contains 'revision_id="', then we assume the right
1917
1347
# revision_id is set. We must check for this full string, because a
1918
1348
# root node id can legitimately look like 'revision_id' but cannot
1919
1349
# contain a '"'.
1920
xml = self.branch.repository._get_inventory_xml(new_revision)
1921
firstline = xml.split('\n', 1)[0]
1922
if (not 'revision_id="' in firstline or
1923
'format="7"' not in firstline):
1924
inv = self.branch.repository._serializer.read_inventory_from_string(
1926
xml = self._create_basis_xml_from_inventory(new_revision, inv)
1927
self._write_basis_inventory(xml)
1350
xml = self.branch.repository.get_inventory_xml(new_revision)
1351
if not 'revision_id="' in xml.split('\n', 1)[0]:
1352
inv = self.branch.repository.deserialise_inventory(
1354
inv.revision_id = new_revision
1355
xml = bzrlib.xml5.serializer_v5.write_inventory_to_string(inv)
1356
assert isinstance(xml, str), 'serialised xml must be bytestring.'
1357
path = self._basis_inventory_name()
1359
self._control_files.put(path, sio)
1928
1360
except (errors.NoSuchRevision, errors.RevisionNotPresent):
1931
1363
def read_basis_inventory(self):
1932
1364
"""Read the cached basis inventory."""
1933
1365
path = self._basis_inventory_name()
1934
return self._transport.get_bytes(path)
1366
return self._control_files.get(path).read()
1936
1368
@needs_read_lock
1937
1369
def read_working_inventory(self):
1938
"""Read the working inventory.
1940
:raises errors.InventoryModified: read_working_inventory will fail
1941
when the current in memory inventory has been modified.
1943
# conceptually this should be an implementation detail of the tree.
1944
# XXX: Deprecate this.
1370
"""Read the working inventory."""
1945
1371
# ElementTree does its own conversion from UTF-8, so open in
1947
if self._inventory_is_modified:
1948
raise errors.InventoryModified(self)
1949
f = self._transport.get('inventory')
1951
result = self._deserialize(f)
1954
self._set_inventory(result, dirty=False)
1373
result = bzrlib.xml5.serializer_v5.read_inventory(
1374
self._control_files.get('inventory'))
1375
self._set_inventory(result)
1957
@needs_tree_write_lock
1958
def remove(self, files, verbose=False, to_file=None, keep_files=True,
1960
"""Remove nominated files from the working inventory.
1962
:files: File paths relative to the basedir.
1963
:keep_files: If true, the files will also be kept.
1964
:force: Delete files and directories, even if they are changed and
1965
even if the directories are not empty.
1379
def remove(self, files, verbose=False, to_file=None):
1380
"""Remove nominated files from the working inventory..
1382
This does not remove their text. This does not run on XXX on what? RBC
1384
TODO: Refuse to remove modified files unless --force is given?
1386
TODO: Do something useful with directories.
1388
TODO: Should this remove the text or not? Tough call; not
1389
removing may be useful and the user can just use use rm, and
1390
is the opposite of add. Removing it is consistent with most
1391
other tools. Maybe an option.
1393
## TODO: Normalize names
1394
## TODO: Remove nested loops; better scalability
1967
1395
if isinstance(files, basestring):
1968
1396
files = [files]
1973
unknown_nested_files=set()
1975
to_file = sys.stdout
1977
def recurse_directory_to_add_files(directory):
1978
# Recurse directory and add all files
1979
# so we can check if they have changed.
1980
for parent_info, file_infos in self.walkdirs(directory):
1981
for relpath, basename, kind, lstat, fileid, kind in file_infos:
1982
# Is it versioned or ignored?
1983
if self.path2id(relpath) or self.is_ignored(relpath):
1984
# Add nested content for deletion.
1985
new_files.add(relpath)
1987
# Files which are not versioned and not ignored
1988
# should be treated as unknown.
1989
unknown_nested_files.add((relpath, None, kind))
1991
for filename in files:
1992
# Get file name into canonical form.
1993
abspath = self.abspath(filename)
1994
filename = self.relpath(abspath)
1995
if len(filename) > 0:
1996
new_files.add(filename)
1997
recurse_directory_to_add_files(filename)
1999
files = list(new_files)
2002
return # nothing to do
2004
# Sort needed to first handle directory content before the directory
2005
files.sort(reverse=True)
2007
# Bail out if we are going to delete files we shouldn't
2008
if not keep_files and not force:
2009
has_changed_files = len(unknown_nested_files) > 0
2010
if not has_changed_files:
2011
for (file_id, path, content_change, versioned, parent_id, name,
2012
kind, executable) in self.iter_changes(self.basis_tree(),
2013
include_unchanged=True, require_versioned=False,
2014
want_unversioned=True, specific_files=files):
2015
if versioned == (False, False):
2016
# The record is unknown ...
2017
if not self.is_ignored(path[1]):
2018
# ... but not ignored
2019
has_changed_files = True
2021
elif (content_change and (kind[1] is not None) and
2022
osutils.is_inside_any(files, path[1])):
2023
# Versioned and changed, but not deleted, and still
2024
# in one of the dirs to be deleted.
2025
has_changed_files = True
2028
if has_changed_files:
2029
# Make delta show ALL applicable changes in error message.
2030
tree_delta = self.changes_from(self.basis_tree(),
2031
require_versioned=False, want_unversioned=True,
2032
specific_files=files)
2033
for unknown_file in unknown_nested_files:
2034
if unknown_file not in tree_delta.unversioned:
2035
tree_delta.unversioned.extend((unknown_file,))
2036
raise errors.BzrRemoveChangedFilesError(tree_delta)
2038
# Build inv_delta and delete files where applicable,
2039
# do this before any modifications to inventory.
1398
inv = self.inventory
1400
# do this before any modifications
2040
1401
for f in files:
2041
fid = self.path2id(f)
1402
fid = inv.path2id(f)
2044
message = "%s is not versioned." % (f,)
2047
# having removed it, it must be either ignored or unknown
2048
if self.is_ignored(f):
2052
# XXX: Really should be a more abstract reporter interface
2053
kind_ch = osutils.kind_marker(self.kind(fid))
2054
to_file.write(new_status + ' ' + f + kind_ch + '\n')
2056
inv_delta.append((f, None, fid, None))
2057
message = "removed %s" % (f,)
2060
abs_path = self.abspath(f)
2061
if osutils.lexists(abs_path):
2062
if (osutils.isdir(abs_path) and
2063
len(os.listdir(abs_path)) > 0):
2065
osutils.rmtree(abs_path)
2067
message = "%s is not an empty directory "\
2068
"and won't be deleted." % (f,)
2070
osutils.delete_any(abs_path)
2071
message = "deleted %s" % (f,)
2072
elif message is not None:
2073
# Only care if we haven't done anything yet.
2074
message = "%s does not exist." % (f,)
2076
# Print only one message (if any) per file.
2077
if message is not None:
2079
self.apply_inventory_delta(inv_delta)
2081
@needs_tree_write_lock
2082
def revert(self, filenames=None, old_tree=None, backups=True,
2083
pb=None, report_changes=False):
2084
from bzrlib.conflicts import resolve
2087
symbol_versioning.warn('Using [] to revert all files is deprecated'
2088
' as of bzr 0.91. Please use None (the default) instead.',
2089
DeprecationWarning, stacklevel=2)
1404
# TODO: Perhaps make this just a warning, and continue?
1405
# This tends to happen when
1406
raise NotVersionedError(path=f)
1408
# having remove it, it must be either ignored or unknown
1409
if self.is_ignored(f):
1413
show_status(new_status, inv[fid].kind, f, to_file=to_file)
1416
self._write_inventory(inv)
1419
def revert(self, filenames, old_tree=None, backups=True,
1420
pb=DummyProgress()):
1421
from transform import revert
1422
from conflicts import resolve
2090
1423
if old_tree is None:
2091
basis_tree = self.basis_tree()
2092
basis_tree.lock_read()
2093
old_tree = basis_tree
1424
old_tree = self.basis_tree()
1425
conflicts = revert(self, old_tree, filenames, backups, pb)
1426
if not len(filenames):
1427
self.set_parent_ids(self.get_parent_ids()[:1])
2097
conflicts = transform.revert(self, old_tree, filenames, backups, pb,
2099
if filenames is None and len(self.get_parent_ids()) > 1:
2101
last_revision = self.last_revision()
2102
if last_revision != _mod_revision.NULL_REVISION:
2103
if basis_tree is None:
2104
basis_tree = self.basis_tree()
2105
basis_tree.lock_read()
2106
parent_trees.append((last_revision, basis_tree))
2107
self.set_parent_trees(parent_trees)
2110
resolve(self, filenames, ignore_misses=True, recursive=True)
2112
if basis_tree is not None:
1430
resolve(self, filenames, ignore_misses=True)
2114
1431
return conflicts
2116
def revision_tree(self, revision_id):
2117
"""See Tree.revision_tree.
2119
WorkingTree can supply revision_trees for the basis revision only
2120
because there is only one cached inventory in the bzr directory.
2122
if revision_id == self.last_revision():
2124
xml = self.read_basis_inventory()
2125
except errors.NoSuchFile:
2129
inv = xml7.serializer_v7.read_inventory_from_string(xml)
2130
# dont use the repository revision_tree api because we want
2131
# to supply the inventory.
2132
if inv.revision_id == revision_id:
2133
return revisiontree.RevisionTree(self.branch.repository,
2135
except errors.BadInventoryFormat:
2137
# raise if there was no inventory, or if we read the wrong inventory.
2138
raise errors.NoSuchRevisionInTree(self, revision_id)
2140
1433
# XXX: This method should be deprecated in favour of taking in a proper
2141
1434
# new Inventory object.
2142
@needs_tree_write_lock
2143
1436
def set_inventory(self, new_inventory_list):
2144
1437
from bzrlib.inventory import (Inventory,
2145
1438
InventoryDirectory,
2148
1442
inv = Inventory(self.get_root_id())
2158
1452
elif kind == 'symlink':
2159
1453
inv.add(InventoryLink(file_id, name, parent))
2161
raise errors.BzrError("unknown kind %r" % kind)
1455
raise BzrError("unknown kind %r" % kind)
2162
1456
self._write_inventory(inv)
2164
@needs_tree_write_lock
2165
1459
def set_root_id(self, file_id):
2166
1460
"""Set the root id for this tree."""
2170
'WorkingTree.set_root_id with fileid=None')
2171
file_id = osutils.safe_file_id(file_id)
2172
self._set_root_id(file_id)
2174
def _set_root_id(self, file_id):
2175
"""Set the root id for this tree, in a format specific manner.
2177
:param file_id: The file id to assign to the root. It must not be
2178
present in the current inventory or an error will occur. It must
2179
not be None, but rather a valid file id.
2181
inv = self._inventory
1461
inv = self.read_working_inventory()
2182
1462
orig_root_id = inv.root.file_id
2183
# TODO: it might be nice to exit early if there was nothing
2184
# to do, saving us from trigger a sync on unlock.
2185
self._inventory_is_modified = True
2186
# we preserve the root inventory entry object, but
2187
# unlinkit from the byid index
2188
1463
del inv._byid[inv.root.file_id]
2189
1464
inv.root.file_id = file_id
2190
# and link it into the index with the new changed id.
2191
1465
inv._byid[inv.root.file_id] = inv.root
2192
# and finally update all children to reference the new id.
2193
# XXX: this should be safe to just look at the root.children
2194
# list, not the WHOLE INVENTORY.
2195
1466
for fid in inv:
2196
1467
entry = inv[fid]
2197
1468
if entry.parent_id == orig_root_id:
2198
1469
entry.parent_id = inv.root.file_id
1470
self._write_inventory(inv)
2200
1472
def unlock(self):
2201
1473
"""See Branch.unlock.
2203
1475
WorkingTree locking just uses the Branch locking facilities.
2204
1476
This is current because all working trees have an embedded branch
2205
1477
within them. IF in the future, we were to make branch data shareable
2206
between multiple working trees, i.e. via shared storage, then we
1478
between multiple working trees, i.e. via shared storage, then we
2207
1479
would probably want to lock both the local tree, and the branch.
2209
1481
raise NotImplementedError(self.unlock)
2213
def update(self, change_reporter=None, possible_transports=None,
2214
revision=None, old_tip=_marker):
2215
1485
"""Update a working tree along its branch.
2217
This will update the branch if its bound too, which means we have
2218
multiple trees involved:
2220
- The new basis tree of the master.
2221
- The old basis tree of the branch.
2222
- The old basis tree of the working tree.
2223
- The current working tree state.
2225
Pathologically, all three may be different, and non-ancestors of each
2226
other. Conceptually we want to:
2228
- Preserve the wt.basis->wt.state changes
2229
- Transform the wt.basis to the new master basis.
2230
- Apply a merge of the old branch basis to get any 'local' changes from
2232
- Restore the wt.basis->wt.state changes.
1487
This will update the branch if its bound too, which means we have multiple trees involved:
1488
The new basis tree of the master.
1489
The old basis tree of the branch.
1490
The old basis tree of the working tree.
1491
The current working tree state.
1492
pathologically all three may be different, and non ancestors of each other.
1493
Conceptually we want to:
1494
Preserve the wt.basis->wt.state changes
1495
Transform the wt.basis to the new master basis.
1496
Apply a merge of the old branch basis to get any 'local' changes from it into the tree.
1497
Restore the wt.basis->wt.state changes.
2234
1499
There isn't a single operation at the moment to do that, so we:
2235
- Merge current state -> basis tree of the master w.r.t. the old tree
2237
- Do a 'normal' merge of the old branch basis if it is relevant.
2239
:param revision: The target revision to update to. Must be in the
2241
:param old_tip: If branch.update() has already been run, the value it
2242
returned (old tip of the branch or None). _marker is used
2245
if self.branch.get_bound_location() is not None:
2247
update_branch = (old_tip is self._marker)
2249
self.lock_tree_write()
2250
update_branch = False
2253
old_tip = self.branch.update(possible_transports)
2255
if old_tip is self._marker:
2257
return self._update_tree(old_tip, change_reporter, revision)
2261
@needs_tree_write_lock
2262
def _update_tree(self, old_tip=None, change_reporter=None, revision=None):
2263
"""Update a tree to the master branch.
2265
:param old_tip: if supplied, the previous tip revision the branch,
2266
before it was changed to the master branch's tip.
1500
Merge current state -> basis tree of the master w.r.t. the old tree basis.
1501
Do a 'normal' merge of the old branch basis if it is relevant.
1503
old_tip = self.branch.update()
2268
1504
# here if old_tip is not None, it is the old tip of the branch before
2269
1505
# it was updated from the master branch. This should become a pending
2270
1506
# merge in the working tree to preserve the user existing work. we
2271
1507
# cant set that until we update the working trees last revision to be
2272
1508
# one from the new branch, because it will just get absorbed by the
2273
1509
# parent de-duplication logic.
2275
1511
# We MUST save it even if an error occurs, because otherwise the users
2276
1512
# local work is unreferenced and will appear to have been lost.
2280
last_rev = self.get_parent_ids()[0]
2282
last_rev = _mod_revision.NULL_REVISION
2283
if revision is None:
2284
revision = self.branch.last_revision()
2286
old_tip = old_tip or _mod_revision.NULL_REVISION
2288
if not _mod_revision.is_null(old_tip) and old_tip != last_rev:
2289
# the branch we are bound to was updated
2290
# merge those changes in first
2291
base_tree = self.basis_tree()
2292
other_tree = self.branch.repository.revision_tree(old_tip)
2293
nb_conflicts = merge.merge_inner(self.branch, other_tree,
2294
base_tree, this_tree=self,
2295
change_reporter=change_reporter)
2297
self.add_parent_tree((old_tip, other_tree))
2298
trace.note('Rerun update after fixing the conflicts.')
2301
if last_rev != _mod_revision.ensure_null(revision):
2302
# the working tree is up to date with the branch
2303
# we can merge the specified revision from master
2304
to_tree = self.branch.repository.revision_tree(revision)
2305
to_root_id = to_tree.get_root_id()
1515
if self.last_revision() != self.branch.last_revision():
1516
# merge tree state up to new branch tip.
2307
1517
basis = self.basis_tree()
2310
if (basis.inventory.root is None
2311
or basis.inventory.root.file_id != to_root_id):
2312
self.set_root_id(to_root_id)
2317
# determine the branch point
2318
graph = self.branch.repository.get_graph()
2319
base_rev_id = graph.find_unique_lca(self.branch.last_revision(),
2321
base_tree = self.branch.repository.revision_tree(base_rev_id)
2323
nb_conflicts = merge.merge_inner(self.branch, to_tree, base_tree,
2325
change_reporter=change_reporter)
2326
self.set_last_revision(revision)
1518
to_tree = self.branch.basis_tree()
1519
result += merge_inner(self.branch,
2327
1523
# TODO - dedup parents list with things merged by pull ?
2328
1524
# reuse the tree we've updated to to set the basis:
2329
parent_trees = [(revision, to_tree)]
1525
parent_trees = [(self.branch.last_revision(), to_tree)]
2330
1526
merges = self.get_parent_ids()[1:]
2331
1527
# Ideally we ask the tree for the trees here, that way the working
2332
# tree can decide whether to give us the entire tree or give us a
1528
# tree can decide whether to give us teh entire tree or give us a
2333
1529
# lazy initialised tree. dirstate for instance will have the trees
2334
1530
# in ram already, whereas a last-revision + basis-inventory tree
2335
1531
# will not, but also does not need them when setting parents.
2336
1532
for parent in merges:
2337
1533
parent_trees.append(
2338
1534
(parent, self.branch.repository.revision_tree(parent)))
2339
if not _mod_revision.is_null(old_tip):
1535
if old_tip is not None:
2340
1536
parent_trees.append(
2341
1537
(old_tip, self.branch.repository.revision_tree(old_tip)))
2342
1538
self.set_parent_trees(parent_trees)
2343
last_rev = parent_trees[0][0]
2346
def _write_hashcache_if_dirty(self):
2347
"""Write out the hashcache if it is dirty."""
2348
if self._hashcache.needs_write:
1540
# the working tree had the same last-revision as the master
1541
# branch did. We may still have pivot local work from the local
1542
# branch into old_tip:
1543
if old_tip is not None:
1544
self.add_parent_tree_id(old_tip)
1545
if old_tip and old_tip != self.last_revision():
1546
# our last revision was not the prior branch last revision
1547
# and we have converted that last revision to a pending merge.
1548
# base is somewhere between the branch tip now
1549
# and the now pending merge
1550
from bzrlib.revision import common_ancestor
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)
1552
base_rev_id = common_ancestor(self.branch.last_revision(),
1554
self.branch.repository)
1555
except errors.NoCommonAncestor:
1557
base_tree = self.branch.repository.revision_tree(base_rev_id)
1558
other_tree = self.branch.repository.revision_tree(old_tip)
1559
result += merge_inner(self.branch,
2360
@needs_tree_write_lock
2361
1566
def _write_inventory(self, inv):
2362
1567
"""Write inventory as the current inventory."""
2363
self._set_inventory(inv, dirty=True)
1569
bzrlib.xml5.serializer_v5.write_inventory(inv, sio)
1571
self._control_files.put('inventory', sio)
1572
self._set_inventory(inv)
1573
mutter('wrote working inventory')
2366
1575
def set_conflicts(self, arg):
2367
raise errors.UnsupportedOperation(self.set_conflicts, self)
1576
raise UnsupportedOperation(self.set_conflicts, self)
2369
1578
def add_conflicts(self, arg):
2370
raise errors.UnsupportedOperation(self.add_conflicts, self)
1579
raise UnsupportedOperation(self.add_conflicts, self)
2372
1581
@needs_read_lock
2373
1582
def conflicts(self):
2374
conflicts = _mod_conflicts.ConflictList()
1583
conflicts = ConflictList()
2375
1584
for conflicted in self._iter_conflicts():
2390
1599
if text == False:
2392
1601
ctype = {True: 'text conflict', False: 'contents conflict'}[text]
2393
conflicts.append(_mod_conflicts.Conflict.factory(ctype,
1602
conflicts.append(Conflict.factory(ctype, path=conflicted,
2395
1603
file_id=self.path2id(conflicted)))
2396
1604
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
1607
class WorkingTree2(WorkingTree):
2634
1608
"""This is the Format 2 working tree.
2636
This was the first weave based working tree.
1610
This was the first weave based working tree.
2637
1611
- uses os locks for locking.
2638
1612
- 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
:return: An object with an unlock method which will release the lock
2665
self.branch.lock_write()
2667
self._control_files.lock_write()
2670
self.branch.unlock()
2673
1615
def unlock(self):
2674
# do non-implementation specific cleanup
2677
1616
# we share control files:
2678
if self._control_files._lock_count == 3:
2679
# _inventory_is_modified is always False during a read lock.
2680
if self._inventory_is_modified:
2682
self._write_hashcache_if_dirty()
1617
if self._hashcache.needs_write and self._control_files._lock_count==3:
1618
self._hashcache.write()
2684
1619
# reverse order of locking.
2686
1621
return self._control_files.unlock()
2861
1779
def unregister_format(klass, format):
1780
assert klass._formats[format.get_format_string()] is format
2862
1781
del klass._formats[format.get_format_string()]
2865
1785
class WorkingTreeFormat2(WorkingTreeFormat):
2866
"""The second working tree format.
1786
"""The second working tree format.
2868
1788
This format modified the hash cache from the format 1 hash cache.
2871
upgrade_recommended = True
2873
1791
def get_format_description(self):
2874
1792
"""See WorkingTreeFormat.get_format_description()."""
2875
1793
return "Working tree format 2"
2877
def _stub_initialize_on_transport(self, transport, file_mode):
2878
"""Workaround: create control files for a remote working tree.
1795
def stub_initialize_remote(self, control_files):
1796
"""As a special workaround create critical control files for a remote working tree
2880
1798
This ensures that it can later be updated and dealt with locally,
2881
since BzrDirFormat6 and BzrDirFormat5 cannot represent dirs with
1799
since BzrDirFormat6 and BzrDirFormat5 cannot represent dirs with
2882
1800
no working tree. (See bug #43064).
2884
1802
sio = StringIO()
2885
inv = inventory.Inventory()
2886
xml5.serializer_v5.write_inventory(inv, sio, working=True)
1804
bzrlib.xml5.serializer_v5.write_inventory(inv, sio)
2888
transport.put_file('inventory', sio, file_mode)
2889
transport.put_bytes('pending-merges', '', file_mode)
2891
def initialize(self, a_bzrdir, revision_id=None, from_branch=None,
2892
accelerator_tree=None, hardlink=False):
1806
control_files.put('inventory', sio)
1808
control_files.put_utf8('pending-merges', '')
1811
def initialize(self, a_bzrdir, revision_id=None):
2893
1812
"""See WorkingTreeFormat.initialize()."""
2894
1813
if not isinstance(a_bzrdir.transport, LocalTransport):
2895
1814
raise errors.NotLocalUrl(a_bzrdir.transport.base)
2896
if from_branch is not None:
2897
branch = from_branch
2899
branch = a_bzrdir.open_branch()
2900
if revision_id is None:
2901
revision_id = _mod_revision.ensure_null(branch.last_revision())
2904
branch.generate_revision_history(revision_id)
2907
inv = inventory.Inventory()
1815
branch = a_bzrdir.open_branch()
1816
if revision_id is not None:
1819
revision_history = branch.revision_history()
1821
position = revision_history.index(revision_id)
1823
raise errors.NoSuchRevision(branch, revision_id)
1824
branch.set_revision_history(revision_history[:position + 1])
1827
revision = branch.last_revision()
2908
1829
wt = WorkingTree2(a_bzrdir.root_transport.local_abspath('.'),
2911
1832
_internal=True,
2913
1834
_bzrdir=a_bzrdir)
2914
basis_tree = branch.repository.revision_tree(revision_id)
2915
if basis_tree.inventory.root is not None:
2916
wt.set_root_id(basis_tree.get_root_id())
2917
# set the parent list and cache the basis tree.
2918
if _mod_revision.is_null(revision_id):
2921
parent_trees = [(revision_id, basis_tree)]
2922
wt.set_parent_trees(parent_trees)
2923
transform.build_tree(basis_tree, wt)
1835
wt._write_inventory(inv)
1836
wt.set_root_id(inv.root.file_id)
1837
basis_tree = branch.repository.revision_tree(revision)
1838
wt.set_parent_trees([(revision, basis_tree)])
1839
build_tree(basis_tree, wt)
2926
1842
def __init__(self):
3056
1942
raise NotImplementedError
3057
1943
if not isinstance(a_bzrdir.transport, LocalTransport):
3058
1944
raise errors.NotLocalUrl(a_bzrdir.transport.base)
3059
wt = self._open(a_bzrdir, self._open_control_files(a_bzrdir))
1945
return self._open(a_bzrdir, self._open_control_files(a_bzrdir))
3062
1947
def _open(self, a_bzrdir, control_files):
3063
1948
"""Open the tree itself.
3065
1950
:param a_bzrdir: the dir for the tree.
3066
1951
:param control_files: the control files for the tree.
3068
return self._tree_class(a_bzrdir.root_transport.local_abspath('.'),
3072
_control_files=control_files)
1953
return WorkingTree3(a_bzrdir.root_transport.local_abspath('.'),
1957
_control_files=control_files)
3074
1959
def __str__(self):
3075
1960
return self.get_format_string()
3078
__default_format = WorkingTreeFormat6()
1963
# formats which have no format string are not discoverable
1964
# and not independently creatable, so are not registered.
1965
__default_format = WorkingTreeFormat3()
3079
1966
WorkingTreeFormat.register_format(__default_format)
3080
WorkingTreeFormat.register_format(WorkingTreeFormat5())
3081
WorkingTreeFormat.register_format(WorkingTreeFormat4())
3082
WorkingTreeFormat.register_format(WorkingTreeFormat3())
3083
1967
WorkingTreeFormat.set_default_format(__default_format)
3084
# formats which have no format string are not discoverable
3085
# and not independently creatable, so are not registered.
3086
1968
_legacy_formats = [WorkingTreeFormat2(),
1972
class WorkingTreeTestProviderAdapter(object):
1973
"""A tool to generate a suite testing multiple workingtree formats at once.
1975
This is done by copying the test once for each transport and injecting
1976
the transport_server, transport_readonly_server, and workingtree_format
1977
classes into each copy. Each copy is also given a new id() to make it
1981
def __init__(self, transport_server, transport_readonly_server, formats):
1982
self._transport_server = transport_server
1983
self._transport_readonly_server = transport_readonly_server
1984
self._formats = formats
1986
def _clone_test(self, test, bzrdir_format, workingtree_format, variation):
1987
"""Clone test for adaption."""
1988
new_test = deepcopy(test)
1989
new_test.transport_server = self._transport_server
1990
new_test.transport_readonly_server = self._transport_readonly_server
1991
new_test.bzrdir_format = bzrdir_format
1992
new_test.workingtree_format = workingtree_format
1993
def make_new_test_id():
1994
new_id = "%s(%s)" % (test.id(), variation)
1995
return lambda: new_id
1996
new_test.id = make_new_test_id()
1999
def adapt(self, test):
2000
from bzrlib.tests import TestSuite
2001
result = TestSuite()
2002
for workingtree_format, bzrdir_format in self._formats:
2003
new_test = self._clone_test(
2006
workingtree_format, workingtree_format.__class__.__name__)
2007
result.addTest(new_test)
added
removed
bzrlib/workingtree.py
