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,
55
from bzrlib import bzrdir, errors, ignores, osutils, urlutils
56
from bzrlib.atomicfile import AtomicFile
69
57
import bzrlib.branch
70
from bzrlib.transport import get_transport
71
from bzrlib.workingtree_4 import (
78
from bzrlib import symbol_versioning
58
from bzrlib.conflicts import Conflict, ConflictList, CONFLICT_SUFFIXES
79
59
from bzrlib.decorators import needs_read_lock, needs_write_lock
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
101
from bzrlib.trace import mutter, note
102
from bzrlib.transform import build_tree
103
from bzrlib.transport import get_transport
97
104
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
105
from bzrlib.textui import show_status
111
# the regex removes any weird characters; we don't escape them
112
# but rather just pull them out
113
_gen_file_id_re = re.compile(r'[^\w.]')
114
_gen_id_suffix = None
118
def _next_id_suffix():
119
"""Create a new file id suffix that is reasonably unique.
121
On the first call we combine the current time with 64 bits of randomness
122
to give a highly probably globally unique number. Then each call in the same
123
process adds 1 to a serial number we append to that unique value.
125
# XXX TODO: change bzrlib.add.smart_add to call workingtree.add() rather
126
# than having to move the id randomness out of the inner loop like this.
127
# XXX TODO: for the global randomness this uses we should add the thread-id
128
# before the serial #.
129
global _gen_id_suffix, _gen_id_serial
130
if _gen_id_suffix is None:
131
_gen_id_suffix = "-%s-%s-" % (compact_date(time()), rand_chars(16))
133
return _gen_id_suffix + str(_gen_id_serial)
136
def gen_file_id(name):
137
"""Return new file id for the basename 'name'.
139
The uniqueness is supplied from _next_id_suffix.
141
# The real randomness is in the _next_id_suffix, the
142
# rest of the identifier is just to be nice.
144
# 1) Remove non-ascii word characters to keep the ids portable
145
# 2) squash to lowercase, so the file id doesn't have to
146
# be escaped (case insensitive filesystems would bork for ids
147
# that only differred in case without escaping).
148
# 3) truncate the filename to 20 chars. Long filenames also bork on some
150
# 4) Removing starting '.' characters to prevent the file ids from
151
# being considered hidden.
152
ascii_word_only = _gen_file_id_re.sub('', name.lower())
153
short_no_dots = ascii_word_only.lstrip('.')[:20]
154
return short_no_dots + _next_id_suffix()
158
"""Return a new tree-root file id."""
159
return gen_file_id('TREE_ROOT')
162
def needs_tree_write_lock(unbound):
163
"""Decorate unbound to take out and release a tree_write lock."""
164
def tree_write_locked(self, *args, **kwargs):
165
self.lock_tree_write()
167
return unbound(self, *args, **kwargs)
170
tree_write_locked.__doc__ = unbound.__doc__
171
tree_write_locked.__name__ = unbound.__name__
172
return tree_write_locked
115
175
class TreeEntry(object):
116
176
"""An entry that implements the minimum interface used by commands.
118
This needs further inspection, it may be better to have
178
This needs further inspection, it may be better to have
119
179
InventoryEntries without ids - though that seems wrong. For now,
120
180
this is a parallel hierarchy to InventoryEntry, and needs to become
121
181
one of several things: decorates to that hierarchy, children of, or
411
419
# no parents, return an empty revision tree.
412
420
# in the future this should return the tree for
413
421
# 'empty:' - the implicit root empty tree.
414
return self.branch.repository.revision_tree(
415
_mod_revision.NULL_REVISION)
417
return self.revision_tree(revision_id)
418
except errors.NoSuchRevision:
422
return self.branch.repository.revision_tree(None)
425
xml = self.read_basis_inventory()
426
inv = bzrlib.xml6.serializer_v6.read_inventory_from_string(xml)
427
if inv is not None and inv.revision_id == revision_id:
428
return bzrlib.tree.RevisionTree(self.branch.repository,
430
except (NoSuchFile, errors.BadInventoryFormat):
420
432
# No cached copy available, retrieve from the repository.
421
433
# FIXME? RBC 20060403 should we cache the inventory locally
422
434
# at this point ?
424
436
return self.branch.repository.revision_tree(revision_id)
425
except (errors.RevisionNotPresent, errors.NoSuchRevision):
437
except errors.RevisionNotPresent:
426
438
# the basis tree *may* be a ghost or a low level error may have
427
# occurred. If the revision is present, its a problem, if its not
439
# occured. If the revision is present, its a problem, if its not
429
441
if self.branch.repository.has_revision(revision_id):
431
443
# the basis tree is a ghost so return an empty tree.
432
return self.branch.repository.revision_tree(
433
_mod_revision.NULL_REVISION)
436
self._flush_ignore_list_cache()
444
return self.branch.repository.revision_tree(None)
447
@deprecated_method(zero_eight)
448
def create(branch, directory):
449
"""Create a workingtree for branch at directory.
451
If existing_directory already exists it must have a .bzr directory.
452
If it does not exist, it will be created.
454
This returns a new WorkingTree object for the new checkout.
456
TODO FIXME RBC 20060124 when we have checkout formats in place this
457
should accept an optional revisionid to checkout [and reject this if
458
checking out into the same dir as a pre-checkout-aware branch format.]
460
XXX: When BzrDir is present, these should be created through that
463
warnings.warn('delete WorkingTree.create', stacklevel=3)
464
transport = get_transport(directory)
465
if branch.bzrdir.root_transport.base == transport.base:
467
return branch.bzrdir.create_workingtree()
468
# different directory,
469
# create a branch reference
470
# and now a working tree.
471
raise NotImplementedError
474
@deprecated_method(zero_eight)
475
def create_standalone(directory):
476
"""Create a checkout and a branch and a repo at directory.
478
Directory must exist and be empty.
480
please use BzrDir.create_standalone_workingtree
482
return bzrdir.BzrDir.create_standalone_workingtree(directory)
438
484
def relpath(self, path):
439
485
"""Return the local path portion from a given path.
441
The path may be absolute or relative. If its a relative path it is
487
The path may be absolute or relative. If its a relative path it is
442
488
interpreted relative to the python current working directory.
444
return osutils.relpath(self.basedir, path)
490
return relpath(self.basedir, path)
446
492
def has_filename(self, filename):
447
493
return osutils.lexists(self.abspath(filename))
449
def get_file(self, file_id, path=None, filtered=True):
450
return self.get_file_with_stat(file_id, path, filtered=filtered)[0]
452
def get_file_with_stat(self, file_id, path=None, filtered=True,
454
"""See Tree.get_file_with_stat."""
456
path = self.id2path(file_id)
457
file_obj = self.get_file_byname(path, filtered=False)
458
stat_value = _fstat(file_obj.fileno())
459
if filtered and self.supports_content_filtering():
460
filters = self._content_filter_stack(path)
461
file_obj = filtered_input_file(file_obj, filters)
462
return (file_obj, stat_value)
464
def get_file_text(self, file_id, path=None, filtered=True):
465
return self.get_file(file_id, path=path, filtered=filtered).read()
467
def get_file_byname(self, filename, filtered=True):
468
path = self.abspath(filename)
470
if filtered and self.supports_content_filtering():
471
filters = self._content_filter_stack(filename)
472
return filtered_input_file(f, filters)
476
def get_file_lines(self, file_id, path=None, filtered=True):
477
"""See Tree.get_file_lines()"""
478
file = self.get_file(file_id, path, filtered=filtered)
480
return file.readlines()
485
def annotate_iter(self, file_id, default_revision=CURRENT_REVISION):
486
"""See Tree.annotate_iter
488
This implementation will use the basis tree implementation if possible.
489
Lines not in the basis are attributed to CURRENT_REVISION
491
If there are pending merges, lines added by those merges will be
492
incorrectly attributed to CURRENT_REVISION (but after committing, the
493
attribution will be correct).
495
maybe_file_parent_keys = []
496
for parent_id in self.get_parent_ids():
498
parent_tree = self.revision_tree(parent_id)
499
except errors.NoSuchRevisionInTree:
500
parent_tree = self.branch.repository.revision_tree(parent_id)
501
parent_tree.lock_read()
503
if file_id not in parent_tree:
505
ie = parent_tree.inventory[file_id]
506
if ie.kind != 'file':
507
# Note: this is slightly unnecessary, because symlinks and
508
# directories have a "text" which is the empty text, and we
509
# know that won't mess up annotations. But it seems cleaner
511
parent_text_key = (file_id, ie.revision)
512
if parent_text_key not in maybe_file_parent_keys:
513
maybe_file_parent_keys.append(parent_text_key)
516
graph = _mod_graph.Graph(self.branch.repository.texts)
517
heads = graph.heads(maybe_file_parent_keys)
518
file_parent_keys = []
519
for key in maybe_file_parent_keys:
521
file_parent_keys.append(key)
523
# Now we have the parents of this content
524
annotator = self.branch.repository.texts.get_annotator()
525
text = self.get_file(file_id).read()
526
this_key =(file_id, default_revision)
527
annotator.add_special_text(this_key, file_parent_keys, text)
528
annotations = [(key[-1], line)
529
for key, line in annotator.annotate_flat(this_key)]
532
def _get_ancestors(self, default_revision):
533
ancestors = set([default_revision])
534
for parent_id in self.get_parent_ids():
535
ancestors.update(self.branch.repository.get_ancestry(
536
parent_id, topo_sorted=False))
495
def get_file(self, file_id):
496
return self.get_file_byname(self.id2path(file_id))
498
def get_file_text(self, file_id):
499
return self.get_file(file_id).read()
501
def get_file_byname(self, filename):
502
return file(self.abspath(filename), 'rb')
539
504
def get_parent_ids(self):
540
505
"""See Tree.get_parent_ids.
542
507
This implementation reads the pending merges list and last_revision
543
508
value and uses that to decide what the parents list should be.
545
last_rev = _mod_revision.ensure_null(self._last_revision())
546
if _mod_revision.NULL_REVISION == last_rev:
510
last_rev = self._last_revision()
549
514
parents = [last_rev]
551
merges_bytes = self._transport.get_bytes('pending-merges')
552
except errors.NoSuchFile:
516
merges_file = self._control_files.get_utf8('pending-merges')
555
for l in osutils.split_lines(merges_bytes):
556
revision_id = l.rstrip('\n')
557
parents.append(revision_id)
520
for l in merges_file.readlines():
521
parents.append(l.rstrip('\n'))
561
524
def get_root_id(self):
562
525
"""Return the id of this trees root"""
563
return self._inventory.root.file_id
526
inv = self.read_working_inventory()
527
return inv.root.file_id
565
529
def _get_store_filename(self, file_id):
566
530
## XXX: badly named; this is not in the store at all
567
531
return self.abspath(self.id2path(file_id))
570
def clone(self, to_bzrdir, revision_id=None):
534
def clone(self, to_bzrdir, revision_id=None, basis=None):
571
535
"""Duplicate this working tree into to_bzr, including all state.
573
537
Specifically modified files are kept as modified, but
574
538
ignored and unknown files are discarded.
576
540
If you want to make a new line of development, see bzrdir.sprout()
579
If not None, the cloned tree will have its last revision set to
580
revision, and difference between the source trees last revision
543
If not None, the cloned tree will have its last revision set to
544
revision, and and difference between the source trees last revision
581
545
and this one merged in.
548
If not None, a closer copy of a tree which may have some files in
549
common, and which file content should be preferentially copied from.
583
551
# assumes the target bzr dir format is compatible.
584
result = to_bzrdir.create_workingtree()
552
result = self._format.initialize(to_bzrdir)
585
553
self.copy_content_into(result, revision_id)
589
557
def copy_content_into(self, tree, revision_id=None):
590
558
"""Copy the current content and user files of this tree into tree."""
591
tree.set_root_id(self.get_root_id())
592
559
if revision_id is None:
593
merge.transform_tree(tree, self)
560
transform_tree(tree, self)
595
562
# TODO now merge from tree.last_revision to revision (to preserve
596
563
# user local changes)
597
merge.transform_tree(tree, self)
564
transform_tree(tree, self)
598
565
tree.set_parent_ids([revision_id])
568
def commit(self, message=None, revprops=None, *args, **kwargs):
569
# avoid circular imports
570
from bzrlib.commit import Commit
573
if not 'branch-nick' in revprops:
574
revprops['branch-nick'] = self.branch.nick
575
# args for wt.commit start at message from the Commit.commit method,
576
# but with branch a kwarg now, passing in args as is results in the
577
#message being used for the branch
578
args = (DEPRECATED_PARAMETER, message, ) + args
579
committed_id = Commit().commit( working_tree=self, revprops=revprops,
600
583
def id2abspath(self, file_id):
601
584
return self.abspath(self.id2path(file_id))
603
586
def has_id(self, file_id):
604
587
# files that have been deleted are excluded
588
inv = self._inventory
606
589
if not inv.has_id(file_id):
608
591
path = inv.id2path(file_id)
616
599
__contains__ = has_id
618
601
def get_file_size(self, file_id):
619
"""See Tree.get_file_size"""
620
# XXX: this returns the on-disk size; it should probably return the
623
return os.path.getsize(self.id2abspath(file_id))
625
if e.errno != errno.ENOENT:
602
return os.path.getsize(self.id2abspath(file_id))
631
def get_file_sha1(self, file_id, path=None, stat_value=None):
605
def get_file_sha1(self, file_id, path=None):
633
607
path = self._inventory.id2path(file_id)
634
return self._hashcache.get_sha1(path, stat_value)
608
return self._hashcache.get_sha1(path)
636
610
def get_file_mtime(self, file_id, path=None):
638
path = self.inventory.id2path(file_id)
612
path = self._inventory.id2path(file_id)
639
613
return os.lstat(self.abspath(path)).st_mtime
641
def _is_executable_from_path_and_stat_from_basis(self, path, stat_result):
642
file_id = self.path2id(path)
644
# For unversioned files on win32, we just assume they are not
647
return self._inventory[file_id].executable
649
def _is_executable_from_path_and_stat_from_stat(self, path, stat_result):
650
mode = stat_result.st_mode
651
return bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode)
653
615
if not supports_executable():
654
616
def is_executable(self, file_id, path=None):
655
617
return self._inventory[file_id].executable
657
_is_executable_from_path_and_stat = \
658
_is_executable_from_path_and_stat_from_basis
660
619
def is_executable(self, file_id, path=None):
662
path = self.id2path(file_id)
621
path = self._inventory.id2path(file_id)
663
622
mode = os.lstat(self.abspath(path)).st_mode
664
623
return bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode)
666
_is_executable_from_path_and_stat = \
667
_is_executable_from_path_and_stat_from_stat
669
625
@needs_tree_write_lock
670
def _add(self, files, ids, kinds):
671
"""See MutableTree._add."""
626
def add(self, files, ids=None):
627
"""Make files versioned.
629
Note that the command line normally calls smart_add instead,
630
which can automatically recurse.
632
This adds the files to the inventory, so that they will be
633
recorded by the next commit.
636
List of paths to add, relative to the base of the tree.
639
If set, use these instead of automatically generated ids.
640
Must be the same length as the list of files, but may
641
contain None for ids that are to be autogenerated.
643
TODO: Perhaps have an option to add the ids even if the files do
646
TODO: Perhaps callback with the ids and paths as they're added.
672
648
# TODO: Re-adding a file that is removed in the working copy
673
649
# should probably put it back with the previous ID.
674
# the read and write working inventory should not occur in this
675
# function - they should be part of lock_write and unlock.
677
for f, file_id, kind in zip(files, ids, kinds):
650
if isinstance(files, basestring):
651
assert(ids is None or isinstance(ids, basestring))
657
ids = [None] * len(files)
659
assert(len(ids) == len(files))
661
inv = self.read_working_inventory()
662
for f,file_id in zip(files, ids):
663
if self.is_control_filename(f):
664
raise errors.ForbiddenControlFileError(filename=f)
669
raise BzrError("cannot add top-level %r" % f)
671
fullpath = normpath(self.abspath(f))
673
kind = file_kind(fullpath)
675
if e.errno == errno.ENOENT:
676
raise NoSuchFile(fullpath)
677
if not InventoryEntry.versionable_kind(kind):
678
raise errors.BadFileKindError(filename=f, kind=kind)
678
679
if file_id is None:
679
680
inv.add_path(f, kind=kind)
681
682
inv.add_path(f, kind=kind, file_id=file_id)
682
self._inventory_is_modified = True
684
self._write_inventory(inv)
684
686
@needs_tree_write_lock
685
def _gather_kinds(self, files, kinds):
686
"""See MutableTree._gather_kinds."""
687
for pos, f in enumerate(files):
688
if kinds[pos] is None:
689
fullpath = normpath(self.abspath(f))
691
kinds[pos] = file_kind(fullpath)
693
if e.errno == errno.ENOENT:
694
raise errors.NoSuchFile(fullpath)
697
687
def add_parent_tree_id(self, revision_id, allow_leftmost_as_ghost=False):
698
688
"""Add revision_id as a parent.
746
736
self.set_parent_ids(parents, allow_leftmost_as_ghost=True)
748
def path_content_summary(self, path, _lstat=os.lstat,
749
_mapper=osutils.file_kind_from_stat_mode):
750
"""See Tree.path_content_summary."""
751
abspath = self.abspath(path)
753
stat_result = _lstat(abspath)
755
if getattr(e, 'errno', None) == errno.ENOENT:
757
return ('missing', None, None, None)
758
# propagate other errors
760
kind = _mapper(stat_result.st_mode)
762
return self._file_content_summary(path, stat_result)
763
elif kind == 'directory':
764
# perhaps it looks like a plain directory, but it's really a
766
if self._directory_is_tree_reference(path):
767
kind = 'tree-reference'
768
return kind, None, None, None
769
elif kind == 'symlink':
770
target = osutils.readlink(abspath)
771
return ('symlink', None, None, target)
773
return (kind, None, None, None)
775
def _file_content_summary(self, path, stat_result):
776
size = stat_result.st_size
777
executable = self._is_executable_from_path_and_stat(path, stat_result)
778
# try for a stat cache lookup
779
return ('file', size, executable, self._sha_from_stat(
782
def _check_parents_for_ghosts(self, revision_ids, allow_leftmost_as_ghost):
783
"""Common ghost checking functionality from set_parent_*.
785
This checks that the left hand-parent exists if there are any
788
if len(revision_ids) > 0:
789
leftmost_id = revision_ids[0]
790
if (not allow_leftmost_as_ghost and not
791
self.branch.repository.has_revision(leftmost_id)):
792
raise errors.GhostRevisionUnusableHere(leftmost_id)
794
def _set_merges_from_parent_ids(self, parent_ids):
795
merges = parent_ids[1:]
796
self._transport.put_bytes('pending-merges', '\n'.join(merges),
797
mode=self.bzrdir._get_file_mode())
799
def _filter_parent_ids_by_ancestry(self, revision_ids):
800
"""Check that all merged revisions are proper 'heads'.
802
This will always return the first revision_id, and any merged revisions
805
if len(revision_ids) == 0:
807
graph = self.branch.repository.get_graph()
808
heads = graph.heads(revision_ids)
809
new_revision_ids = revision_ids[:1]
810
for revision_id in revision_ids[1:]:
811
if revision_id in heads and revision_id not in new_revision_ids:
812
new_revision_ids.append(revision_id)
813
if new_revision_ids != revision_ids:
814
trace.mutter('requested to set revision_ids = %s,'
815
' but filtered to %s', revision_ids, new_revision_ids)
816
return new_revision_ids
738
@deprecated_method(zero_eleven)
740
def pending_merges(self):
741
"""Return a list of pending merges.
743
These are revisions that have been merged into the working
744
directory but not yet committed.
746
As of 0.11 this is deprecated. Please see WorkingTree.get_parent_ids()
747
instead - which is available on all tree objects.
749
return self.get_parent_ids()[1:]
818
751
@needs_tree_write_lock
819
752
def set_parent_ids(self, revision_ids, allow_leftmost_as_ghost=False):
820
753
"""Set the parent ids to revision_ids.
822
755
See also set_parent_trees. This api will try to retrieve the tree data
823
756
for each element of revision_ids from the trees repository. If you have
824
757
tree data already available, it is more efficient to use
883
796
def set_merge_modified(self, modified_hashes):
884
797
def iter_stanzas():
885
798
for file_id, hash in modified_hashes.iteritems():
886
yield Stanza(file_id=file_id.decode('utf8'), hash=hash)
799
yield Stanza(file_id=file_id, hash=hash)
887
800
self._put_rio('merge-hashes', iter_stanzas(), MERGE_MODIFIED_HEADER_1)
889
def _sha_from_stat(self, path, stat_result):
890
"""Get a sha digest from the tree's stat cache.
892
The default implementation assumes no stat cache is present.
894
:param path: The path.
895
:param stat_result: The stat result being looked up.
802
@needs_tree_write_lock
899
803
def _put_rio(self, filename, stanzas, header):
900
self._must_be_locked()
901
804
my_file = rio_file(stanzas, header)
902
self._transport.put_file(filename, my_file,
903
mode=self.bzrdir._get_file_mode())
805
self._control_files.put(filename, my_file)
905
807
@needs_write_lock # because merge pulls data into the branch.
906
def merge_from_branch(self, branch, to_revision=None, from_revision=None,
907
merge_type=None, force=False):
808
def merge_from_branch(self, branch, to_revision=None):
908
809
"""Merge from a branch into this working tree.
910
811
:param branch: The branch to merge from.
911
:param to_revision: If non-None, the merge will merge to to_revision,
912
but not beyond it. to_revision does not need to be in the history
913
of the branch when it is supplied. If None, to_revision defaults to
812
:param to_revision: If non-None, the merge will merge to to_revision, but
813
not beyond it. to_revision does not need to be in the history of
814
the branch when it is supplied. If None, to_revision defaults to
914
815
branch.last_revision().
916
817
from bzrlib.merge import Merger, Merge3Merger
917
merger = Merger(self.branch, this_tree=self)
918
# check that there are no local alterations
919
if not force and self.has_changes():
920
raise errors.UncommittedChanges(self)
921
if to_revision is None:
922
to_revision = _mod_revision.ensure_null(branch.last_revision())
923
merger.other_rev_id = to_revision
924
if _mod_revision.is_null(merger.other_rev_id):
925
raise errors.NoCommits(branch)
926
self.branch.fetch(branch, last_revision=merger.other_rev_id)
927
merger.other_basis = merger.other_rev_id
928
merger.other_tree = self.branch.repository.revision_tree(
930
merger.other_branch = branch
931
if from_revision is None:
818
pb = bzrlib.ui.ui_factory.nested_progress_bar()
820
merger = Merger(self.branch, this_tree=self, pb=pb)
821
merger.pp = ProgressPhase("Merge phase", 5, pb)
822
merger.pp.next_phase()
823
# check that there are no
825
merger.check_basis(check_clean=True, require_commits=False)
826
if to_revision is None:
827
to_revision = branch.last_revision()
828
merger.other_rev_id = to_revision
829
if merger.other_rev_id is None:
830
raise error.NoCommits(branch)
831
self.branch.fetch(branch, last_revision=merger.other_rev_id)
832
merger.other_basis = merger.other_rev_id
833
merger.other_tree = self.branch.repository.revision_tree(
835
merger.pp.next_phase()
932
836
merger.find_base()
934
merger.set_base_revision(from_revision, branch)
935
if merger.base_rev_id == merger.other_rev_id:
936
raise errors.PointlessMerge
937
merger.backup_files = False
938
if merge_type is None:
837
if merger.base_rev_id == merger.other_rev_id:
838
raise errors.PointlessMerge
839
merger.backup_files = False
939
840
merger.merge_type = Merge3Merger
941
merger.merge_type = merge_type
942
merger.set_interesting_files(None)
943
merger.show_base = False
944
merger.reprocess = False
945
conflicts = merger.do_merge()
841
merger.set_interesting_files(None)
842
merger.show_base = False
843
merger.reprocess = False
844
conflicts = merger.do_merge()
950
851
def merge_modified(self):
951
"""Return a dictionary of files modified by a merge.
953
The list is initialized by WorkingTree.set_merge_modified, which is
954
typically called after we make some automatic updates to the tree
957
This returns a map of file_id->sha1, containing only files which are
958
still in the working inventory and have that text hash.
961
hashfile = self._transport.get('merge-hashes')
962
except errors.NoSuchFile:
853
hashfile = self._control_files.get('merge-hashes')
967
if hashfile.next() != MERGE_MODIFIED_HEADER_1 + '\n':
968
raise errors.MergeModifiedFormatError()
969
except StopIteration:
970
raise errors.MergeModifiedFormatError()
971
for s in RioReader(hashfile):
972
# RioReader reads in Unicode, so convert file_ids back to utf8
973
file_id = osutils.safe_file_id(s.get("file_id"), warn=False)
974
if file_id not in self.inventory:
976
text_hash = s.get("hash")
977
if text_hash == self.get_file_sha1(file_id):
978
merge_hashes[file_id] = text_hash
984
def mkdir(self, path, file_id=None):
985
"""See MutableTree.mkdir()."""
987
file_id = generate_ids.gen_file_id(os.path.basename(path))
988
os.mkdir(self.abspath(path))
989
self.add(path, file_id, 'directory')
858
if hashfile.next() != MERGE_MODIFIED_HEADER_1 + '\n':
859
raise MergeModifiedFormatError()
860
except StopIteration:
861
raise MergeModifiedFormatError()
862
for s in RioReader(hashfile):
863
file_id = s.get("file_id")
864
if file_id not in self.inventory:
867
if hash == self.get_file_sha1(file_id):
868
merge_hashes[file_id] = hash
992
871
def get_symlink_target(self, file_id):
993
abspath = self.id2abspath(file_id)
994
target = osutils.readlink(abspath)
998
def subsume(self, other_tree):
999
def add_children(inventory, entry):
1000
for child_entry in entry.children.values():
1001
inventory._byid[child_entry.file_id] = child_entry
1002
if child_entry.kind == 'directory':
1003
add_children(inventory, child_entry)
1004
if other_tree.get_root_id() == self.get_root_id():
1005
raise errors.BadSubsumeSource(self, other_tree,
1006
'Trees have the same root')
1008
other_tree_path = self.relpath(other_tree.basedir)
1009
except errors.PathNotChild:
1010
raise errors.BadSubsumeSource(self, other_tree,
1011
'Tree is not contained by the other')
1012
new_root_parent = self.path2id(osutils.dirname(other_tree_path))
1013
if new_root_parent is None:
1014
raise errors.BadSubsumeSource(self, other_tree,
1015
'Parent directory is not versioned.')
1016
# We need to ensure that the result of a fetch will have a
1017
# versionedfile for the other_tree root, and only fetching into
1018
# RepositoryKnit2 guarantees that.
1019
if not self.branch.repository.supports_rich_root():
1020
raise errors.SubsumeTargetNeedsUpgrade(other_tree)
1021
other_tree.lock_tree_write()
1023
new_parents = other_tree.get_parent_ids()
1024
other_root = other_tree.inventory.root
1025
other_root.parent_id = new_root_parent
1026
other_root.name = osutils.basename(other_tree_path)
1027
self.inventory.add(other_root)
1028
add_children(self.inventory, other_root)
1029
self._write_inventory(self.inventory)
1030
# normally we don't want to fetch whole repositories, but i think
1031
# here we really do want to consolidate the whole thing.
1032
for parent_id in other_tree.get_parent_ids():
1033
self.branch.fetch(other_tree.branch, parent_id)
1034
self.add_parent_tree_id(parent_id)
1037
other_tree.bzrdir.retire_bzrdir()
1039
def _setup_directory_is_tree_reference(self):
1040
if self._branch.repository._format.supports_tree_reference:
1041
self._directory_is_tree_reference = \
1042
self._directory_may_be_tree_reference
1044
self._directory_is_tree_reference = \
1045
self._directory_is_never_tree_reference
1047
def _directory_is_never_tree_reference(self, relpath):
1050
def _directory_may_be_tree_reference(self, relpath):
1051
# as a special case, if a directory contains control files then
1052
# it's a tree reference, except that the root of the tree is not
1053
return relpath and osutils.isdir(self.abspath(relpath) + u"/.bzr")
1054
# TODO: We could ask all the control formats whether they
1055
# recognize this directory, but at the moment there's no cheap api
1056
# to do that. Since we probably can only nest bzr checkouts and
1057
# they always use this name it's ok for now. -- mbp 20060306
1059
# FIXME: There is an unhandled case here of a subdirectory
1060
# containing .bzr but not a branch; that will probably blow up
1061
# when you try to commit it. It might happen if there is a
1062
# checkout in a subdirectory. This can be avoided by not adding
1065
@needs_tree_write_lock
1066
def extract(self, file_id, format=None):
1067
"""Extract a subtree from this tree.
1069
A new branch will be created, relative to the path for this tree.
1073
segments = osutils.splitpath(path)
1074
transport = self.branch.bzrdir.root_transport
1075
for name in segments:
1076
transport = transport.clone(name)
1077
transport.ensure_base()
1080
sub_path = self.id2path(file_id)
1081
branch_transport = mkdirs(sub_path)
1083
format = self.bzrdir.cloning_metadir()
1084
branch_transport.ensure_base()
1085
branch_bzrdir = format.initialize_on_transport(branch_transport)
1087
repo = branch_bzrdir.find_repository()
1088
except errors.NoRepositoryPresent:
1089
repo = branch_bzrdir.create_repository()
1090
if not repo.supports_rich_root():
1091
raise errors.RootNotRich()
1092
new_branch = branch_bzrdir.create_branch()
1093
new_branch.pull(self.branch)
1094
for parent_id in self.get_parent_ids():
1095
new_branch.fetch(self.branch, parent_id)
1096
tree_transport = self.bzrdir.root_transport.clone(sub_path)
1097
if tree_transport.base != branch_transport.base:
1098
tree_bzrdir = format.initialize_on_transport(tree_transport)
1099
branch.BranchReferenceFormat().initialize(tree_bzrdir,
1100
target_branch=new_branch)
1102
tree_bzrdir = branch_bzrdir
1103
wt = tree_bzrdir.create_workingtree(_mod_revision.NULL_REVISION)
1104
wt.set_parent_ids(self.get_parent_ids())
1105
my_inv = self.inventory
1106
child_inv = inventory.Inventory(root_id=None)
1107
new_root = my_inv[file_id]
1108
my_inv.remove_recursive_id(file_id)
1109
new_root.parent_id = None
1110
child_inv.add(new_root)
1111
self._write_inventory(my_inv)
1112
wt._write_inventory(child_inv)
1115
def _serialize(self, inventory, out_file):
1116
xml5.serializer_v5.write_inventory(self._inventory, out_file,
1119
def _deserialize(selt, in_file):
1120
return xml5.serializer_v5.read_inventory(in_file)
1123
"""Write the in memory inventory to disk."""
1124
# TODO: Maybe this should only write on dirty ?
1125
if self._control_files._lock_mode != 'w':
1126
raise errors.NotWriteLocked(self)
1128
self._serialize(self._inventory, sio)
1130
self._transport.put_file('inventory', sio,
1131
mode=self.bzrdir._get_file_mode())
1132
self._inventory_is_modified = False
1134
def _kind(self, relpath):
1135
return osutils.file_kind(self.abspath(relpath))
1137
def list_files(self, include_root=False, from_dir=None, recursive=True):
1138
"""List all files as (path, class, kind, id, entry).
872
return os.readlink(self.id2abspath(file_id))
874
def file_class(self, filename):
875
if self.path2id(filename):
877
elif self.is_ignored(filename):
882
def list_files(self):
883
"""Recursively list all files as (path, class, kind, id, entry).
1140
885
Lists, but does not descend into unversioned directories.
1141
887
This does not include files that have been deleted in this
1142
tree. Skips the control directory.
1144
:param include_root: if True, return an entry for the root
1145
:param from_dir: start from this directory or None for the root
1146
:param recursive: whether to recurse into subdirectories or not
890
Skips the control directory.
1148
# list_files is an iterator, so @needs_read_lock doesn't work properly
1149
# with it. So callers should be careful to always read_lock the tree.
1150
if not self.is_locked():
1151
raise errors.ObjectNotLocked(self)
1153
inv = self.inventory
1154
if from_dir is None and include_root is True:
1155
yield ('', 'V', 'directory', inv.root.file_id, inv.root)
892
inv = self._inventory
1156
893
# Convert these into local objects to save lookup times
1157
894
pathjoin = osutils.pathjoin
1158
file_kind = self._kind
895
file_kind = osutils.file_kind
1160
897
# transport.base ends in a slash, we want the piece
1161
898
# between the last two slashes
1239
973
except KeyError:
1240
974
yield fp[1:], c, fk, None, TreeEntry()
1243
977
if fk != 'directory':
1246
# But do this child first if recursing down
1248
new_children = os.listdir(fap)
1250
new_children = collections.deque(new_children)
1251
stack.append((f_ie.file_id, fp, fap, new_children))
1252
# Break out of inner loop,
1253
# so that we start outer loop with child
980
# But do this child first
981
new_children = os.listdir(fap)
983
new_children = collections.deque(new_children)
984
stack.append((f_ie.file_id, fp, fap, new_children))
985
# Break out of inner loop, so that we start outer loop with child
1256
988
# if we finished all children, pop it off the stack
1259
991
@needs_tree_write_lock
1260
def move(self, from_paths, to_dir=None, after=False, **kwargs):
992
def move(self, from_paths, to_name):
1261
993
"""Rename files.
1263
to_dir must exist in the inventory.
1265
If to_dir exists and is a directory, the files are moved into
1266
it, keeping their old names.
1268
Note that to_dir is only the last component of the new name;
995
to_name must exist in the inventory.
997
If to_name exists and is a directory, the files are moved into
998
it, keeping their old names.
1000
Note that to_name is only the last component of the new name;
1269
1001
this doesn't change the directory.
1271
For each entry in from_paths the move mode will be determined
1274
The first mode moves the file in the filesystem and updates the
1275
inventory. The second mode only updates the inventory without
1276
touching the file on the filesystem. This is the new mode introduced
1279
move uses the second mode if 'after == True' and the target is not
1280
versioned but present in the working tree.
1282
move uses the second mode if 'after == False' and the source is
1283
versioned but no longer in the working tree, and the target is not
1284
versioned but present in the working tree.
1286
move uses the first mode if 'after == False' and the source is
1287
versioned and present in the working tree, and the target is not
1288
versioned and not present in the working tree.
1290
Everything else results in an error.
1292
1003
This returns a list of (from_path, to_path) pairs for each
1293
1004
entry that is moved.
1298
# check for deprecated use of signature
1300
to_dir = kwargs.get('to_name', None)
1302
raise TypeError('You must supply a target directory')
1304
symbol_versioning.warn('The parameter to_name was deprecated'
1305
' in version 0.13. Use to_dir instead',
1308
# check destination directory
1309
if isinstance(from_paths, basestring):
1007
## TODO: Option to move IDs only
1008
assert not isinstance(from_paths, basestring)
1311
1009
inv = self.inventory
1312
to_abs = self.abspath(to_dir)
1010
to_abs = self.abspath(to_name)
1313
1011
if not isdir(to_abs):
1314
raise errors.BzrMoveFailedError('',to_dir,
1315
errors.NotADirectory(to_abs))
1316
if not self.has_filename(to_dir):
1317
raise errors.BzrMoveFailedError('',to_dir,
1318
errors.NotInWorkingDirectory(to_dir))
1319
to_dir_id = inv.path2id(to_dir)
1320
if to_dir_id is None:
1321
raise errors.BzrMoveFailedError('',to_dir,
1322
errors.NotVersionedError(path=str(to_dir)))
1012
raise BzrError("destination %r is not a directory" % to_abs)
1013
if not self.has_filename(to_name):
1014
raise BzrError("destination %r not in working directory" % to_abs)
1015
to_dir_id = inv.path2id(to_name)
1016
if to_dir_id is None and to_name != '':
1017
raise BzrError("destination %r is not a versioned directory" % to_name)
1324
1018
to_dir_ie = inv[to_dir_id]
1325
1019
if to_dir_ie.kind != 'directory':
1326
raise errors.BzrMoveFailedError('',to_dir,
1327
errors.NotADirectory(to_abs))
1329
# create rename entries and tuples
1330
for from_rel in from_paths:
1331
from_tail = splitpath(from_rel)[-1]
1332
from_id = inv.path2id(from_rel)
1334
raise errors.BzrMoveFailedError(from_rel,to_dir,
1335
errors.NotVersionedError(path=str(from_rel)))
1337
from_entry = inv[from_id]
1338
from_parent_id = from_entry.parent_id
1339
to_rel = pathjoin(to_dir, from_tail)
1340
rename_entry = WorkingTree._RenameEntry(from_rel=from_rel,
1342
from_tail=from_tail,
1343
from_parent_id=from_parent_id,
1344
to_rel=to_rel, to_tail=from_tail,
1345
to_parent_id=to_dir_id)
1346
rename_entries.append(rename_entry)
1347
rename_tuples.append((from_rel, to_rel))
1349
# determine which move mode to use. checks also for movability
1350
rename_entries = self._determine_mv_mode(rename_entries, after)
1352
original_modified = self._inventory_is_modified
1020
raise BzrError("destination %r is not a directory" % to_abs)
1022
to_idpath = inv.get_idpath(to_dir_id)
1024
for f in from_paths:
1025
if not self.has_filename(f):
1026
raise BzrError("%r does not exist in working tree" % f)
1027
f_id = inv.path2id(f)
1029
raise BzrError("%r is not versioned" % f)
1030
name_tail = splitpath(f)[-1]
1031
dest_path = pathjoin(to_name, name_tail)
1032
if self.has_filename(dest_path):
1033
raise BzrError("destination %r already exists" % dest_path)
1034
if f_id in to_idpath:
1035
raise BzrError("can't move %r to a subdirectory of itself" % f)
1037
# OK, so there's a race here, it's possible that someone will
1038
# create a file in this interval and then the rename might be
1039
# left half-done. But we should have caught most problems.
1040
orig_inv = deepcopy(self.inventory)
1355
self._inventory_is_modified = True
1356
self._move(rename_entries)
1042
for f in from_paths:
1043
name_tail = splitpath(f)[-1]
1044
dest_path = pathjoin(to_name, name_tail)
1045
result.append((f, dest_path))
1046
inv.rename(inv.path2id(f), to_dir_id, name_tail)
1048
rename(self.abspath(f), self.abspath(dest_path))
1050
raise BzrError("failed to rename %r to %r: %s" %
1051
(f, dest_path, e[1]),
1052
["rename rolled back"])
1358
1054
# restore the inventory on error
1359
self._inventory_is_modified = original_modified
1055
self._set_inventory(orig_inv)
1361
1057
self._write_inventory(inv)
1362
return rename_tuples
1364
def _determine_mv_mode(self, rename_entries, after=False):
1365
"""Determines for each from-to pair if both inventory and working tree
1366
or only the inventory has to be changed.
1368
Also does basic plausability tests.
1370
inv = self.inventory
1372
for rename_entry in rename_entries:
1373
# store to local variables for easier reference
1374
from_rel = rename_entry.from_rel
1375
from_id = rename_entry.from_id
1376
to_rel = rename_entry.to_rel
1377
to_id = inv.path2id(to_rel)
1378
only_change_inv = False
1380
# check the inventory for source and destination
1382
raise errors.BzrMoveFailedError(from_rel,to_rel,
1383
errors.NotVersionedError(path=str(from_rel)))
1384
if to_id is not None:
1385
raise errors.BzrMoveFailedError(from_rel,to_rel,
1386
errors.AlreadyVersionedError(path=str(to_rel)))
1388
# try to determine the mode for rename (only change inv or change
1389
# inv and file system)
1391
if not self.has_filename(to_rel):
1392
raise errors.BzrMoveFailedError(from_id,to_rel,
1393
errors.NoSuchFile(path=str(to_rel),
1394
extra="New file has not been created yet"))
1395
only_change_inv = True
1396
elif not self.has_filename(from_rel) and self.has_filename(to_rel):
1397
only_change_inv = True
1398
elif self.has_filename(from_rel) and not self.has_filename(to_rel):
1399
only_change_inv = False
1400
elif (not self.case_sensitive
1401
and from_rel.lower() == to_rel.lower()
1402
and self.has_filename(from_rel)):
1403
only_change_inv = False
1405
# something is wrong, so lets determine what exactly
1406
if not self.has_filename(from_rel) and \
1407
not self.has_filename(to_rel):
1408
raise errors.BzrRenameFailedError(from_rel,to_rel,
1409
errors.PathsDoNotExist(paths=(str(from_rel),
1412
raise errors.RenameFailedFilesExist(from_rel, to_rel)
1413
rename_entry.only_change_inv = only_change_inv
1414
return rename_entries
1416
def _move(self, rename_entries):
1417
"""Moves a list of files.
1419
Depending on the value of the flag 'only_change_inv', the
1420
file will be moved on the file system or not.
1422
inv = self.inventory
1425
for entry in rename_entries:
1427
self._move_entry(entry)
1429
self._rollback_move(moved)
1433
def _rollback_move(self, moved):
1434
"""Try to rollback a previous move in case of an filesystem error."""
1435
inv = self.inventory
1438
self._move_entry(WorkingTree._RenameEntry(
1439
entry.to_rel, entry.from_id,
1440
entry.to_tail, entry.to_parent_id, entry.from_rel,
1441
entry.from_tail, entry.from_parent_id,
1442
entry.only_change_inv))
1443
except errors.BzrMoveFailedError, e:
1444
raise errors.BzrMoveFailedError( '', '', "Rollback failed."
1445
" The working tree is in an inconsistent state."
1446
" Please consider doing a 'bzr revert'."
1447
" Error message is: %s" % e)
1449
def _move_entry(self, entry):
1450
inv = self.inventory
1451
from_rel_abs = self.abspath(entry.from_rel)
1452
to_rel_abs = self.abspath(entry.to_rel)
1453
if from_rel_abs == to_rel_abs:
1454
raise errors.BzrMoveFailedError(entry.from_rel, entry.to_rel,
1455
"Source and target are identical.")
1457
if not entry.only_change_inv:
1459
osutils.rename(from_rel_abs, to_rel_abs)
1461
raise errors.BzrMoveFailedError(entry.from_rel,
1463
inv.rename(entry.from_id, entry.to_parent_id, entry.to_tail)
1465
1060
@needs_tree_write_lock
1466
def rename_one(self, from_rel, to_rel, after=False):
1061
def rename_one(self, from_rel, to_rel):
1467
1062
"""Rename one file.
1469
1064
This can change the directory or the filename or both.
1471
rename_one has several 'modes' to work. First, it can rename a physical
1472
file and change the file_id. That is the normal mode. Second, it can
1473
only change the file_id without touching any physical file. This is
1474
the new mode introduced in version 0.15.
1476
rename_one uses the second mode if 'after == True' and 'to_rel' is not
1477
versioned but present in the working tree.
1479
rename_one uses the second mode if 'after == False' and 'from_rel' is
1480
versioned but no longer in the working tree, and 'to_rel' is not
1481
versioned but present in the working tree.
1483
rename_one uses the first mode if 'after == False' and 'from_rel' is
1484
versioned and present in the working tree, and 'to_rel' is not
1485
versioned and not present in the working tree.
1487
Everything else results in an error.
1489
1066
inv = self.inventory
1492
# create rename entries and tuples
1493
from_tail = splitpath(from_rel)[-1]
1494
from_id = inv.path2id(from_rel)
1496
# if file is missing in the inventory maybe it's in the basis_tree
1497
basis_tree = self.branch.basis_tree()
1498
from_id = basis_tree.path2id(from_rel)
1500
raise errors.BzrRenameFailedError(from_rel,to_rel,
1501
errors.NotVersionedError(path=str(from_rel)))
1502
# put entry back in the inventory so we can rename it
1503
from_entry = basis_tree.inventory[from_id].copy()
1506
from_entry = inv[from_id]
1507
from_parent_id = from_entry.parent_id
1067
if not self.has_filename(from_rel):
1068
raise BzrError("can't rename: old working file %r does not exist" % from_rel)
1069
if self.has_filename(to_rel):
1070
raise BzrError("can't rename: new working file %r already exists" % to_rel)
1072
file_id = inv.path2id(from_rel)
1074
raise BzrError("can't rename: old name %r is not versioned" % from_rel)
1076
entry = inv[file_id]
1077
from_parent = entry.parent_id
1078
from_name = entry.name
1080
if inv.path2id(to_rel):
1081
raise BzrError("can't rename: new name %r is already versioned" % to_rel)
1508
1083
to_dir, to_tail = os.path.split(to_rel)
1509
1084
to_dir_id = inv.path2id(to_dir)
1510
rename_entry = WorkingTree._RenameEntry(from_rel=from_rel,
1512
from_tail=from_tail,
1513
from_parent_id=from_parent_id,
1514
to_rel=to_rel, to_tail=to_tail,
1515
to_parent_id=to_dir_id)
1516
rename_entries.append(rename_entry)
1518
# determine which move mode to use. checks also for movability
1519
rename_entries = self._determine_mv_mode(rename_entries, after)
1521
# check if the target changed directory and if the target directory is
1523
if to_dir_id is None:
1524
raise errors.BzrMoveFailedError(from_rel,to_rel,
1525
errors.NotVersionedError(path=str(to_dir)))
1527
# all checks done. now we can continue with our actual work
1528
mutter('rename_one:\n'
1533
' to_dir_id {%s}\n',
1534
from_id, from_rel, to_rel, to_dir, to_dir_id)
1536
self._move(rename_entries)
1085
if to_dir_id is None and to_dir != '':
1086
raise BzrError("can't determine destination directory id for %r" % to_dir)
1088
mutter("rename_one:")
1089
mutter(" file_id {%s}" % file_id)
1090
mutter(" from_rel %r" % from_rel)
1091
mutter(" to_rel %r" % to_rel)
1092
mutter(" to_dir %r" % to_dir)
1093
mutter(" to_dir_id {%s}" % to_dir_id)
1095
inv.rename(file_id, to_dir_id, to_tail)
1097
from_abs = self.abspath(from_rel)
1098
to_abs = self.abspath(to_rel)
1100
rename(from_abs, to_abs)
1102
inv.rename(file_id, from_parent, from_name)
1103
raise BzrError("failed to rename %r to %r: %s"
1104
% (from_abs, to_abs, e[1]),
1105
["rename rolled back"])
1537
1106
self._write_inventory(inv)
1539
class _RenameEntry(object):
1540
def __init__(self, from_rel, from_id, from_tail, from_parent_id,
1541
to_rel, to_tail, to_parent_id, only_change_inv=False):
1542
self.from_rel = from_rel
1543
self.from_id = from_id
1544
self.from_tail = from_tail
1545
self.from_parent_id = from_parent_id
1546
self.to_rel = to_rel
1547
self.to_tail = to_tail
1548
self.to_parent_id = to_parent_id
1549
self.only_change_inv = only_change_inv
1551
1108
@needs_read_lock
1552
1109
def unknowns(self):
1553
1110
"""Return all unknown files.
1713
1309
if ignoreset is not None:
1714
1310
return ignoreset
1716
ignore_globs = set()
1312
ignore_globs = set(bzrlib.DEFAULT_IGNORE)
1717
1313
ignore_globs.update(ignores.get_runtime_ignores())
1718
1315
ignore_globs.update(ignores.get_user_ignores())
1719
1317
if self.has_filename(bzrlib.IGNORE_FILENAME):
1720
1318
f = self.get_file_byname(bzrlib.IGNORE_FILENAME)
1722
1320
ignore_globs.update(ignores.parse_ignore_file(f))
1725
1324
self._ignoreset = ignore_globs
1325
self._ignore_regex = self._combine_ignore_rules(ignore_globs)
1726
1326
return ignore_globs
1728
def _flush_ignore_list_cache(self):
1729
"""Resets the cached ignore list to force a cache rebuild."""
1730
self._ignoreset = None
1731
self._ignoreglobster = None
1328
def _get_ignore_rules_as_regex(self):
1329
"""Return a regex of the ignore rules and a mapping dict.
1331
:return: (ignore rules compiled regex, dictionary mapping rule group
1332
indices to original rule.)
1334
if getattr(self, '_ignoreset', None) is None:
1335
self.get_ignore_list()
1336
return self._ignore_regex
1733
1338
def is_ignored(self, filename):
1734
1339
r"""Check whether the filename matches an ignore pattern.
1736
1341
Patterns containing '/' or '\' need to match the whole path;
1737
others match against only the last component. Patterns starting
1738
with '!' are ignore exceptions. Exceptions take precedence
1739
over regular patterns and cause the filename to not be ignored.
1342
others match against only the last component.
1741
1344
If the file is ignored, returns the pattern which caused it to
1742
1345
be ignored, otherwise None. So this can simply be used as a
1743
1346
boolean if desired."""
1744
if getattr(self, '_ignoreglobster', None) is None:
1745
self._ignoreglobster = globbing.ExceptionGlobster(self.get_ignore_list())
1746
return self._ignoreglobster.match(filename)
1348
# TODO: Use '**' to match directories, and other extended
1349
# globbing stuff from cvs/rsync.
1351
# XXX: fnmatch is actually not quite what we want: it's only
1352
# approximately the same as real Unix fnmatch, and doesn't
1353
# treat dotfiles correctly and allows * to match /.
1354
# Eventually it should be replaced with something more
1357
rules = self._get_ignore_rules_as_regex()
1358
for regex, mapping in rules:
1359
match = regex.match(filename)
1360
if match is not None:
1361
# one or more of the groups in mapping will have a non-None
1363
groups = match.groups()
1364
rules = [mapping[group] for group in
1365
mapping if groups[group] is not None]
1748
1369
def kind(self, file_id):
1749
1370
return file_kind(self.id2abspath(file_id))
1751
def stored_kind(self, file_id):
1752
"""See Tree.stored_kind"""
1753
return self.inventory[file_id].kind
1755
def _comparison_data(self, entry, path):
1756
abspath = self.abspath(path)
1758
stat_value = os.lstat(abspath)
1760
if getattr(e, 'errno', None) == errno.ENOENT:
1767
mode = stat_value.st_mode
1768
kind = osutils.file_kind_from_stat_mode(mode)
1769
if not supports_executable():
1770
executable = entry is not None and entry.executable
1772
executable = bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode)
1773
return kind, executable, stat_value
1775
def _file_size(self, entry, stat_value):
1776
return stat_value.st_size
1778
1372
def last_revision(self):
1779
"""Return the last revision of the branch for this tree.
1781
This format tree does not support a separate marker for last-revision
1782
compared to the branch.
1784
See MutableTree.last_revision
1373
"""Return the last revision id of this working tree.
1375
In early branch formats this was the same as the branch last_revision,
1376
but that cannot be relied upon - for working tree operations,
1377
always use tree.last_revision(). This returns the left most parent id,
1378
or None if there are no parents.
1380
This was deprecated as of 0.11. Please use get_parent_ids instead.
1786
1382
return self._last_revision()
1788
1384
@needs_read_lock
1789
1385
def _last_revision(self):
1790
1386
"""helper for get_parent_ids."""
1791
return _mod_revision.ensure_null(self.branch.last_revision())
1387
return self.branch.last_revision()
1793
1389
def is_locked(self):
1794
1390
return self._control_files.is_locked()
1796
def _must_be_locked(self):
1797
if not self.is_locked():
1798
raise errors.ObjectNotLocked(self)
1800
1392
def lock_read(self):
1801
1393
"""See Branch.lock_read, and WorkingTree.unlock."""
1802
if not self.is_locked():
1804
1394
self.branch.lock_read()
1806
1396
return self._control_files.lock_read()
1868
1451
self.branch.set_revision_history([new_revision])
1871
def _write_basis_inventory(self, xml):
1872
"""Write the basis inventory XML to the basis-inventory file"""
1873
path = self._basis_inventory_name()
1875
self._transport.put_file(path, sio,
1876
mode=self.bzrdir._get_file_mode())
1878
def _create_basis_xml_from_inventory(self, revision_id, inventory):
1879
"""Create the text that will be saved in basis-inventory"""
1880
inventory.revision_id = revision_id
1881
return xml7.serializer_v7.write_inventory_to_string(inventory)
1883
1454
def _cache_basis_inventory(self, new_revision):
1884
1455
"""Cache new_revision as the basis inventory."""
1885
1456
# TODO: this should allow the ready-to-use inventory to be passed in,
1886
1457
# as commit already has that ready-to-use [while the format is the
1887
1458
# same, that is].
1889
# this double handles the inventory - unpack and repack -
1460
# this double handles the inventory - unpack and repack -
1890
1461
# but is easier to understand. We can/should put a conditional
1891
1462
# in here based on whether the inventory is in the latest format
1892
1463
# - perhaps we should repack all inventories on a repository
1894
1465
# the fast path is to copy the raw xml from the repository. If the
1895
# xml contains 'revision_id="', then we assume the right
1466
# xml contains 'revision_id="', then we assume the right
1896
1467
# revision_id is set. We must check for this full string, because a
1897
1468
# root node id can legitimately look like 'revision_id' but cannot
1898
1469
# contain a '"'.
1899
xml = self.branch.repository._get_inventory_xml(new_revision)
1470
xml = self.branch.repository.get_inventory_xml(new_revision)
1900
1471
firstline = xml.split('\n', 1)[0]
1901
if (not 'revision_id="' in firstline or
1902
'format="7"' not in firstline):
1903
inv = self.branch.repository._serializer.read_inventory_from_string(
1905
xml = self._create_basis_xml_from_inventory(new_revision, inv)
1906
self._write_basis_inventory(xml)
1472
if (not 'revision_id="' in firstline or
1473
'format="6"' not in firstline):
1474
inv = self.branch.repository.deserialise_inventory(
1476
inv.revision_id = new_revision
1477
xml = bzrlib.xml6.serializer_v6.write_inventory_to_string(inv)
1478
assert isinstance(xml, str), 'serialised xml must be bytestring.'
1479
path = self._basis_inventory_name()
1481
self._control_files.put(path, sio)
1907
1482
except (errors.NoSuchRevision, errors.RevisionNotPresent):
1910
1485
def read_basis_inventory(self):
1911
1486
"""Read the cached basis inventory."""
1912
1487
path = self._basis_inventory_name()
1913
return self._transport.get_bytes(path)
1488
return self._control_files.get(path).read()
1915
1490
@needs_read_lock
1916
1491
def read_working_inventory(self):
1917
"""Read the working inventory.
1919
:raises errors.InventoryModified: read_working_inventory will fail
1920
when the current in memory inventory has been modified.
1922
# conceptually this should be an implementation detail of the tree.
1923
# XXX: Deprecate this.
1492
"""Read the working inventory."""
1924
1493
# ElementTree does its own conversion from UTF-8, so open in
1926
if self._inventory_is_modified:
1927
raise errors.InventoryModified(self)
1928
f = self._transport.get('inventory')
1930
result = self._deserialize(f)
1933
self._set_inventory(result, dirty=False)
1495
result = bzrlib.xml5.serializer_v5.read_inventory(
1496
self._control_files.get('inventory'))
1497
self._set_inventory(result)
1936
1500
@needs_tree_write_lock
1937
def remove(self, files, verbose=False, to_file=None, keep_files=True,
1939
"""Remove nominated files from the working inventory.
1941
:files: File paths relative to the basedir.
1942
:keep_files: If true, the files will also be kept.
1943
:force: Delete files and directories, even if they are changed and
1944
even if the directories are not empty.
1501
def remove(self, files, verbose=False, to_file=None):
1502
"""Remove nominated files from the working inventory..
1504
This does not remove their text. This does not run on XXX on what? RBC
1506
TODO: Refuse to remove modified files unless --force is given?
1508
TODO: Do something useful with directories.
1510
TODO: Should this remove the text or not? Tough call; not
1511
removing may be useful and the user can just use use rm, and
1512
is the opposite of add. Removing it is consistent with most
1513
other tools. Maybe an option.
1515
## TODO: Normalize names
1516
## TODO: Remove nested loops; better scalability
1946
1517
if isinstance(files, basestring):
1947
1518
files = [files]
1952
unknown_nested_files=set()
1954
to_file = sys.stdout
1956
def recurse_directory_to_add_files(directory):
1957
# Recurse directory and add all files
1958
# so we can check if they have changed.
1959
for parent_info, file_infos in\
1960
self.walkdirs(directory):
1961
for relpath, basename, kind, lstat, fileid, kind in file_infos:
1962
# Is it versioned or ignored?
1963
if self.path2id(relpath) or self.is_ignored(relpath):
1964
# Add nested content for deletion.
1965
new_files.add(relpath)
1967
# Files which are not versioned and not ignored
1968
# should be treated as unknown.
1969
unknown_nested_files.add((relpath, None, kind))
1971
for filename in files:
1972
# Get file name into canonical form.
1973
abspath = self.abspath(filename)
1974
filename = self.relpath(abspath)
1975
if len(filename) > 0:
1976
new_files.add(filename)
1977
recurse_directory_to_add_files(filename)
1979
files = list(new_files)
1982
return # nothing to do
1984
# Sort needed to first handle directory content before the directory
1985
files.sort(reverse=True)
1987
# Bail out if we are going to delete files we shouldn't
1988
if not keep_files and not force:
1989
has_changed_files = len(unknown_nested_files) > 0
1990
if not has_changed_files:
1991
for (file_id, path, content_change, versioned, parent_id, name,
1992
kind, executable) in self.iter_changes(self.basis_tree(),
1993
include_unchanged=True, require_versioned=False,
1994
want_unversioned=True, specific_files=files):
1995
if versioned == (False, False):
1996
# The record is unknown ...
1997
if not self.is_ignored(path[1]):
1998
# ... but not ignored
1999
has_changed_files = True
2001
elif content_change and (kind[1] is not None):
2002
# Versioned and changed, but not deleted
2003
has_changed_files = True
2006
if has_changed_files:
2007
# Make delta show ALL applicable changes in error message.
2008
tree_delta = self.changes_from(self.basis_tree(),
2009
require_versioned=False, want_unversioned=True,
2010
specific_files=files)
2011
for unknown_file in unknown_nested_files:
2012
if unknown_file not in tree_delta.unversioned:
2013
tree_delta.unversioned.extend((unknown_file,))
2014
raise errors.BzrRemoveChangedFilesError(tree_delta)
2016
# Build inv_delta and delete files where applicable,
2017
# do this before any modifications to inventory.
1520
inv = self.inventory
1522
# do this before any modifications
2018
1523
for f in files:
2019
fid = self.path2id(f)
1524
fid = inv.path2id(f)
2022
message = "%s is not versioned." % (f,)
2025
# having removed it, it must be either ignored or unknown
2026
if self.is_ignored(f):
2030
# XXX: Really should be a more abstract reporter interface
2031
kind_ch = osutils.kind_marker(self.kind(fid))
2032
to_file.write(new_status + ' ' + f + kind_ch + '\n')
2034
inv_delta.append((f, None, fid, None))
2035
message = "removed %s" % (f,)
2038
abs_path = self.abspath(f)
2039
if osutils.lexists(abs_path):
2040
if (osutils.isdir(abs_path) and
2041
len(os.listdir(abs_path)) > 0):
2043
osutils.rmtree(abs_path)
2045
message = "%s is not an empty directory "\
2046
"and won't be deleted." % (f,)
2048
osutils.delete_any(abs_path)
2049
message = "deleted %s" % (f,)
2050
elif message is not None:
2051
# Only care if we haven't done anything yet.
2052
message = "%s does not exist." % (f,)
2054
# Print only one message (if any) per file.
2055
if message is not None:
2057
self.apply_inventory_delta(inv_delta)
1526
# TODO: Perhaps make this just a warning, and continue?
1527
# This tends to happen when
1528
raise NotVersionedError(path=f)
1530
# having remove it, it must be either ignored or unknown
1531
if self.is_ignored(f):
1535
show_status(new_status, inv[fid].kind, f, to_file=to_file)
1538
self._write_inventory(inv)
2059
1540
@needs_tree_write_lock
2060
def revert(self, filenames=None, old_tree=None, backups=True,
2061
pb=None, report_changes=False):
2062
from bzrlib.conflicts import resolve
2065
symbol_versioning.warn('Using [] to revert all files is deprecated'
2066
' as of bzr 0.91. Please use None (the default) instead.',
2067
DeprecationWarning, stacklevel=2)
1541
def revert(self, filenames, old_tree=None, backups=True,
1542
pb=DummyProgress()):
1543
from transform import revert
1544
from conflicts import resolve
2068
1545
if old_tree is None:
2069
basis_tree = self.basis_tree()
2070
basis_tree.lock_read()
2071
old_tree = basis_tree
1546
old_tree = self.basis_tree()
1547
conflicts = revert(self, old_tree, filenames, backups, pb)
1548
if not len(filenames):
1549
self.set_parent_ids(self.get_parent_ids()[:1])
2075
conflicts = transform.revert(self, old_tree, filenames, backups, pb,
2077
if filenames is None and len(self.get_parent_ids()) > 1:
2079
last_revision = self.last_revision()
2080
if last_revision != _mod_revision.NULL_REVISION:
2081
if basis_tree is None:
2082
basis_tree = self.basis_tree()
2083
basis_tree.lock_read()
2084
parent_trees.append((last_revision, basis_tree))
2085
self.set_parent_trees(parent_trees)
2088
resolve(self, filenames, ignore_misses=True, recursive=True)
2090
if basis_tree is not None:
1552
resolve(self, filenames, ignore_misses=True)
2092
1553
return conflicts
2094
def revision_tree(self, revision_id):
2095
"""See Tree.revision_tree.
2097
WorkingTree can supply revision_trees for the basis revision only
2098
because there is only one cached inventory in the bzr directory.
2100
if revision_id == self.last_revision():
2102
xml = self.read_basis_inventory()
2103
except errors.NoSuchFile:
2107
inv = xml7.serializer_v7.read_inventory_from_string(xml)
2108
# dont use the repository revision_tree api because we want
2109
# to supply the inventory.
2110
if inv.revision_id == revision_id:
2111
return revisiontree.RevisionTree(self.branch.repository,
2113
except errors.BadInventoryFormat:
2115
# raise if there was no inventory, or if we read the wrong inventory.
2116
raise errors.NoSuchRevisionInTree(self, revision_id)
2118
1555
# XXX: This method should be deprecated in favour of taking in a proper
2119
1556
# new Inventory object.
2120
1557
@needs_tree_write_lock
2121
1558
def set_inventory(self, new_inventory_list):
2122
1559
from bzrlib.inventory import (Inventory,
2123
1560
InventoryDirectory,
2126
1564
inv = Inventory(self.get_root_id())
2136
1574
elif kind == 'symlink':
2137
1575
inv.add(InventoryLink(file_id, name, parent))
2139
raise errors.BzrError("unknown kind %r" % kind)
1577
raise BzrError("unknown kind %r" % kind)
2140
1578
self._write_inventory(inv)
2142
1580
@needs_tree_write_lock
2143
1581
def set_root_id(self, file_id):
2144
1582
"""Set the root id for this tree."""
2148
'WorkingTree.set_root_id with fileid=None')
2149
file_id = osutils.safe_file_id(file_id)
2150
self._set_root_id(file_id)
2152
def _set_root_id(self, file_id):
2153
"""Set the root id for this tree, in a format specific manner.
2155
:param file_id: The file id to assign to the root. It must not be
2156
present in the current inventory or an error will occur. It must
2157
not be None, but rather a valid file id.
2159
inv = self._inventory
1583
inv = self.read_working_inventory()
2160
1584
orig_root_id = inv.root.file_id
2161
# TODO: it might be nice to exit early if there was nothing
2162
# to do, saving us from trigger a sync on unlock.
2163
self._inventory_is_modified = True
2164
# we preserve the root inventory entry object, but
2165
# unlinkit from the byid index
2166
1585
del inv._byid[inv.root.file_id]
2167
1586
inv.root.file_id = file_id
2168
# and link it into the index with the new changed id.
2169
1587
inv._byid[inv.root.file_id] = inv.root
2170
# and finally update all children to reference the new id.
2171
# XXX: this should be safe to just look at the root.children
2172
# list, not the WHOLE INVENTORY.
2173
1588
for fid in inv:
2174
1589
entry = inv[fid]
2175
1590
if entry.parent_id == orig_root_id:
2176
1591
entry.parent_id = inv.root.file_id
1592
self._write_inventory(inv)
2178
1594
def unlock(self):
2179
1595
"""See Branch.unlock.
2181
1597
WorkingTree locking just uses the Branch locking facilities.
2182
1598
This is current because all working trees have an embedded branch
2183
1599
within them. IF in the future, we were to make branch data shareable
2184
between multiple working trees, i.e. via shared storage, then we
1600
between multiple working trees, i.e. via shared storage, then we
2185
1601
would probably want to lock both the local tree, and the branch.
2187
1603
raise NotImplementedError(self.unlock)
2191
def update(self, change_reporter=None, possible_transports=None,
2192
revision=None, old_tip=_marker):
2193
1607
"""Update a working tree along its branch.
2195
This will update the branch if its bound too, which means we have
2196
multiple trees involved:
2198
- The new basis tree of the master.
2199
- The old basis tree of the branch.
2200
- The old basis tree of the working tree.
2201
- The current working tree state.
2203
Pathologically, all three may be different, and non-ancestors of each
2204
other. Conceptually we want to:
2206
- Preserve the wt.basis->wt.state changes
2207
- Transform the wt.basis to the new master basis.
2208
- Apply a merge of the old branch basis to get any 'local' changes from
2210
- Restore the wt.basis->wt.state changes.
1609
This will update the branch if its bound too, which means we have multiple trees involved:
1610
The new basis tree of the master.
1611
The old basis tree of the branch.
1612
The old basis tree of the working tree.
1613
The current working tree state.
1614
pathologically all three may be different, and non ancestors of each other.
1615
Conceptually we want to:
1616
Preserve the wt.basis->wt.state changes
1617
Transform the wt.basis to the new master basis.
1618
Apply a merge of the old branch basis to get any 'local' changes from it into the tree.
1619
Restore the wt.basis->wt.state changes.
2212
1621
There isn't a single operation at the moment to do that, so we:
2213
- Merge current state -> basis tree of the master w.r.t. the old tree
2215
- Do a 'normal' merge of the old branch basis if it is relevant.
2217
:param revision: The target revision to update to. Must be in the
2219
:param old_tip: If branch.update() has already been run, the value it
2220
returned (old tip of the branch or None). _marker is used
2223
if self.branch.get_bound_location() is not None:
2225
update_branch = (old_tip is self._marker)
2227
self.lock_tree_write()
2228
update_branch = False
2231
old_tip = self.branch.update(possible_transports)
2233
if old_tip is self._marker:
2235
return self._update_tree(old_tip, change_reporter, revision)
2239
@needs_tree_write_lock
2240
def _update_tree(self, old_tip=None, change_reporter=None, revision=None):
2241
"""Update a tree to the master branch.
2243
:param old_tip: if supplied, the previous tip revision the branch,
2244
before it was changed to the master branch's tip.
1622
Merge current state -> basis tree of the master w.r.t. the old tree basis.
1623
Do a 'normal' merge of the old branch basis if it is relevant.
1625
old_tip = self.branch.update()
2246
1626
# here if old_tip is not None, it is the old tip of the branch before
2247
1627
# it was updated from the master branch. This should become a pending
2248
1628
# merge in the working tree to preserve the user existing work. we
2249
1629
# cant set that until we update the working trees last revision to be
2250
1630
# one from the new branch, because it will just get absorbed by the
2251
1631
# parent de-duplication logic.
2253
1633
# We MUST save it even if an error occurs, because otherwise the users
2254
1634
# local work is unreferenced and will appear to have been lost.
2258
1638
last_rev = self.get_parent_ids()[0]
2259
1639
except IndexError:
2260
last_rev = _mod_revision.NULL_REVISION
2261
if revision is None:
2262
revision = self.branch.last_revision()
2264
old_tip = old_tip or _mod_revision.NULL_REVISION
2266
if not _mod_revision.is_null(old_tip) and old_tip != last_rev:
2267
# the branch we are bound to was updated
2268
# merge those changes in first
2269
base_tree = self.basis_tree()
2270
other_tree = self.branch.repository.revision_tree(old_tip)
2271
nb_conflicts = merge.merge_inner(self.branch, other_tree,
2272
base_tree, this_tree=self,
2273
change_reporter=change_reporter)
2275
self.add_parent_tree((old_tip, other_tree))
2276
trace.note('Rerun update after fixing the conflicts.')
2279
if last_rev != _mod_revision.ensure_null(revision):
2280
# the working tree is up to date with the branch
2281
# we can merge the specified revision from master
2282
to_tree = self.branch.repository.revision_tree(revision)
2283
to_root_id = to_tree.get_root_id()
1641
if last_rev != self.branch.last_revision():
1642
# merge tree state up to new branch tip.
2285
1643
basis = self.basis_tree()
2288
if (basis.inventory.root is None
2289
or basis.inventory.root.file_id != to_root_id):
2290
self.set_root_id(to_root_id)
2295
# determine the branch point
2296
graph = self.branch.repository.get_graph()
2297
base_rev_id = graph.find_unique_lca(self.branch.last_revision(),
2299
base_tree = self.branch.repository.revision_tree(base_rev_id)
2301
nb_conflicts = merge.merge_inner(self.branch, to_tree, base_tree,
2303
change_reporter=change_reporter)
2304
self.set_last_revision(revision)
1644
to_tree = self.branch.basis_tree()
1645
result += merge_inner(self.branch,
2305
1649
# TODO - dedup parents list with things merged by pull ?
2306
1650
# reuse the tree we've updated to to set the basis:
2307
parent_trees = [(revision, to_tree)]
1651
parent_trees = [(self.branch.last_revision(), to_tree)]
2308
1652
merges = self.get_parent_ids()[1:]
2309
1653
# Ideally we ask the tree for the trees here, that way the working
2310
# tree can decide whether to give us the entire tree or give us a
1654
# tree can decide whether to give us teh entire tree or give us a
2311
1655
# lazy initialised tree. dirstate for instance will have the trees
2312
1656
# in ram already, whereas a last-revision + basis-inventory tree
2313
1657
# will not, but also does not need them when setting parents.
2314
1658
for parent in merges:
2315
1659
parent_trees.append(
2316
1660
(parent, self.branch.repository.revision_tree(parent)))
2317
if not _mod_revision.is_null(old_tip):
1661
if old_tip is not None:
2318
1662
parent_trees.append(
2319
1663
(old_tip, self.branch.repository.revision_tree(old_tip)))
2320
1664
self.set_parent_trees(parent_trees)
2321
1665
last_rev = parent_trees[0][0]
2324
def _write_hashcache_if_dirty(self):
2325
"""Write out the hashcache if it is dirty."""
2326
if self._hashcache.needs_write:
1667
# the working tree had the same last-revision as the master
1668
# branch did. We may still have pivot local work from the local
1669
# branch into old_tip:
1670
if old_tip is not None:
1671
self.add_parent_tree_id(old_tip)
1672
if old_tip and old_tip != last_rev:
1673
# our last revision was not the prior branch last revision
1674
# and we have converted that last revision to a pending merge.
1675
# base is somewhere between the branch tip now
1676
# and the now pending merge
1677
from bzrlib.revision import common_ancestor
2328
self._hashcache.write()
2330
if e.errno not in (errno.EPERM, errno.EACCES):
2332
# TODO: jam 20061219 Should this be a warning? A single line
2333
# warning might be sufficient to let the user know what
2335
mutter('Could not write hashcache for %s\nError: %s',
2336
self._hashcache.cache_file_name(), e)
1679
base_rev_id = common_ancestor(self.branch.last_revision(),
1681
self.branch.repository)
1682
except errors.NoCommonAncestor:
1684
base_tree = self.branch.repository.revision_tree(base_rev_id)
1685
other_tree = self.branch.repository.revision_tree(old_tip)
1686
result += merge_inner(self.branch,
2338
1692
@needs_tree_write_lock
2339
1693
def _write_inventory(self, inv):
2340
1694
"""Write inventory as the current inventory."""
2341
self._set_inventory(inv, dirty=True)
1696
bzrlib.xml5.serializer_v5.write_inventory(inv, sio)
1698
self._control_files.put('inventory', sio)
1699
self._set_inventory(inv)
1700
mutter('wrote working inventory')
2344
1702
def set_conflicts(self, arg):
2345
raise errors.UnsupportedOperation(self.set_conflicts, self)
1703
raise UnsupportedOperation(self.set_conflicts, self)
2347
1705
def add_conflicts(self, arg):
2348
raise errors.UnsupportedOperation(self.add_conflicts, self)
1706
raise UnsupportedOperation(self.add_conflicts, self)
2350
1708
@needs_read_lock
2351
1709
def conflicts(self):
2352
conflicts = _mod_conflicts.ConflictList()
1710
conflicts = ConflictList()
2353
1711
for conflicted in self._iter_conflicts():
2368
1726
if text == False:
2370
1728
ctype = {True: 'text conflict', False: 'contents conflict'}[text]
2371
conflicts.append(_mod_conflicts.Conflict.factory(ctype,
1729
conflicts.append(Conflict.factory(ctype, path=conflicted,
2373
1730
file_id=self.path2id(conflicted)))
2374
1731
return conflicts
2376
def walkdirs(self, prefix=""):
2377
"""Walk the directories of this tree.
2379
returns a generator which yields items in the form:
2380
((curren_directory_path, fileid),
2381
[(file1_path, file1_name, file1_kind, (lstat), file1_id,
2384
This API returns a generator, which is only valid during the current
2385
tree transaction - within a single lock_read or lock_write duration.
2387
If the tree is not locked, it may cause an error to be raised,
2388
depending on the tree implementation.
2390
disk_top = self.abspath(prefix)
2391
if disk_top.endswith('/'):
2392
disk_top = disk_top[:-1]
2393
top_strip_len = len(disk_top) + 1
2394
inventory_iterator = self._walkdirs(prefix)
2395
disk_iterator = osutils.walkdirs(disk_top, prefix)
2397
current_disk = disk_iterator.next()
2398
disk_finished = False
2400
if not (e.errno == errno.ENOENT or
2401
(sys.platform == 'win32' and e.errno == ERROR_PATH_NOT_FOUND)):
2404
disk_finished = True
2406
current_inv = inventory_iterator.next()
2407
inv_finished = False
2408
except StopIteration:
2411
while not inv_finished or not disk_finished:
2413
((cur_disk_dir_relpath, cur_disk_dir_path_from_top),
2414
cur_disk_dir_content) = current_disk
2416
((cur_disk_dir_relpath, cur_disk_dir_path_from_top),
2417
cur_disk_dir_content) = ((None, None), None)
2418
if not disk_finished:
2419
# strip out .bzr dirs
2420
if (cur_disk_dir_path_from_top[top_strip_len:] == '' and
2421
len(cur_disk_dir_content) > 0):
2422
# osutils.walkdirs can be made nicer -
2423
# yield the path-from-prefix rather than the pathjoined
2425
bzrdir_loc = bisect_left(cur_disk_dir_content,
2427
if (bzrdir_loc < len(cur_disk_dir_content)
2428
and self.bzrdir.is_control_filename(
2429
cur_disk_dir_content[bzrdir_loc][0])):
2430
# we dont yield the contents of, or, .bzr itself.
2431
del cur_disk_dir_content[bzrdir_loc]
2433
# everything is unknown
2436
# everything is missing
2439
direction = cmp(current_inv[0][0], cur_disk_dir_relpath)
2441
# disk is before inventory - unknown
2442
dirblock = [(relpath, basename, kind, stat, None, None) for
2443
relpath, basename, kind, stat, top_path in
2444
cur_disk_dir_content]
2445
yield (cur_disk_dir_relpath, None), dirblock
2447
current_disk = disk_iterator.next()
2448
except StopIteration:
2449
disk_finished = True
2451
# inventory is before disk - missing.
2452
dirblock = [(relpath, basename, 'unknown', None, fileid, kind)
2453
for relpath, basename, dkind, stat, fileid, kind in
2455
yield (current_inv[0][0], current_inv[0][1]), dirblock
2457
current_inv = inventory_iterator.next()
2458
except StopIteration:
2461
# versioned present directory
2462
# merge the inventory and disk data together
2464
for relpath, subiterator in itertools.groupby(sorted(
2465
current_inv[1] + cur_disk_dir_content,
2466
key=operator.itemgetter(0)), operator.itemgetter(1)):
2467
path_elements = list(subiterator)
2468
if len(path_elements) == 2:
2469
inv_row, disk_row = path_elements
2470
# versioned, present file
2471
dirblock.append((inv_row[0],
2472
inv_row[1], disk_row[2],
2473
disk_row[3], inv_row[4],
2475
elif len(path_elements[0]) == 5:
2477
dirblock.append((path_elements[0][0],
2478
path_elements[0][1], path_elements[0][2],
2479
path_elements[0][3], None, None))
2480
elif len(path_elements[0]) == 6:
2481
# versioned, absent file.
2482
dirblock.append((path_elements[0][0],
2483
path_elements[0][1], 'unknown', None,
2484
path_elements[0][4], path_elements[0][5]))
2486
raise NotImplementedError('unreachable code')
2487
yield current_inv[0], dirblock
2489
current_inv = inventory_iterator.next()
2490
except StopIteration:
2493
current_disk = disk_iterator.next()
2494
except StopIteration:
2495
disk_finished = True
2497
def _walkdirs(self, prefix=""):
2498
"""Walk the directories of this tree.
2500
:prefix: is used as the directrory to start with.
2501
returns a generator which yields items in the form:
2502
((curren_directory_path, fileid),
2503
[(file1_path, file1_name, file1_kind, None, file1_id,
2506
_directory = 'directory'
2507
# get the root in the inventory
2508
inv = self.inventory
2509
top_id = inv.path2id(prefix)
2513
pending = [(prefix, '', _directory, None, top_id, None)]
2516
currentdir = pending.pop()
2517
# 0 - relpath, 1- basename, 2- kind, 3- stat, 4-id, 5-kind
2518
top_id = currentdir[4]
2520
relroot = currentdir[0] + '/'
2523
# FIXME: stash the node in pending
2525
if entry.kind == 'directory':
2526
for name, child in entry.sorted_children():
2527
dirblock.append((relroot + name, name, child.kind, None,
2528
child.file_id, child.kind
2530
yield (currentdir[0], entry.file_id), dirblock
2531
# push the user specified dirs from dirblock
2532
for dir in reversed(dirblock):
2533
if dir[2] == _directory:
2536
@needs_tree_write_lock
2537
def auto_resolve(self):
2538
"""Automatically resolve text conflicts according to contents.
2540
Only text conflicts are auto_resolvable. Files with no conflict markers
2541
are considered 'resolved', because bzr always puts conflict markers
2542
into files that have text conflicts. The corresponding .THIS .BASE and
2543
.OTHER files are deleted, as per 'resolve'.
2544
:return: a tuple of ConflictLists: (un_resolved, resolved).
2546
un_resolved = _mod_conflicts.ConflictList()
2547
resolved = _mod_conflicts.ConflictList()
2548
conflict_re = re.compile('^(<{7}|={7}|>{7})')
2549
for conflict in self.conflicts():
2550
if (conflict.typestring != 'text conflict' or
2551
self.kind(conflict.file_id) != 'file'):
2552
un_resolved.append(conflict)
2554
my_file = open(self.id2abspath(conflict.file_id), 'rb')
2556
for line in my_file:
2557
if conflict_re.search(line):
2558
un_resolved.append(conflict)
2561
resolved.append(conflict)
2564
resolved.remove_files(self)
2565
self.set_conflicts(un_resolved)
2566
return un_resolved, resolved
2569
def _check(self, references):
2570
"""Check the tree for consistency.
2572
:param references: A dict with keys matching the items returned by
2573
self._get_check_refs(), and values from looking those keys up in
2576
tree_basis = self.basis_tree()
2577
tree_basis.lock_read()
2579
repo_basis = references[('trees', self.last_revision())]
2580
if len(list(repo_basis.iter_changes(tree_basis))) > 0:
2581
raise errors.BzrCheckError(
2582
"Mismatched basis inventory content.")
2587
def _validate(self):
2588
"""Validate internal structures.
2590
This is meant mostly for the test suite. To give it a chance to detect
2591
corruption after actions have occurred. The default implementation is a
2594
:return: None. An exception should be raised if there is an error.
2598
def _get_rules_searcher(self, default_searcher):
2599
"""See Tree._get_rules_searcher."""
2600
if self._rules_searcher is None:
2601
self._rules_searcher = super(WorkingTree,
2602
self)._get_rules_searcher(default_searcher)
2603
return self._rules_searcher
2605
def get_shelf_manager(self):
2606
"""Return the ShelfManager for this WorkingTree."""
2607
from bzrlib.shelf import ShelfManager
2608
return ShelfManager(self, self._transport)
2611
1734
class WorkingTree2(WorkingTree):
2612
1735
"""This is the Format 2 working tree.
2614
This was the first weave based working tree.
1737
This was the first weave based working tree.
2615
1738
- uses os locks for locking.
2616
1739
- uses the branch last-revision.
2619
def __init__(self, *args, **kwargs):
2620
super(WorkingTree2, self).__init__(*args, **kwargs)
2621
# WorkingTree2 has more of a constraint that self._inventory must
2622
# exist. Because this is an older format, we don't mind the overhead
2623
# caused by the extra computation here.
2625
# Newer WorkingTree's should only have self._inventory set when they
2627
if self._inventory is None:
2628
self.read_working_inventory()
2630
def _get_check_refs(self):
2631
"""Return the references needed to perform a check of this tree."""
2632
return [('trees', self.last_revision())]
2634
1742
def lock_tree_write(self):
2635
1743
"""See WorkingTree.lock_tree_write().
2835
1919
def unregister_format(klass, format):
1920
assert klass._formats[format.get_format_string()] is format
2836
1921
del klass._formats[format.get_format_string()]
2839
1925
class WorkingTreeFormat2(WorkingTreeFormat):
2840
"""The second working tree format.
1926
"""The second working tree format.
2842
1928
This format modified the hash cache from the format 1 hash cache.
2845
upgrade_recommended = True
2847
1931
def get_format_description(self):
2848
1932
"""See WorkingTreeFormat.get_format_description()."""
2849
1933
return "Working tree format 2"
2851
def _stub_initialize_on_transport(self, transport, file_mode):
2852
"""Workaround: create control files for a remote working tree.
1935
def stub_initialize_remote(self, control_files):
1936
"""As a special workaround create critical control files for a remote working tree
2854
1938
This ensures that it can later be updated and dealt with locally,
2855
since BzrDirFormat6 and BzrDirFormat5 cannot represent dirs with
1939
since BzrDirFormat6 and BzrDirFormat5 cannot represent dirs with
2856
1940
no working tree. (See bug #43064).
2858
1942
sio = StringIO()
2859
inv = inventory.Inventory()
2860
xml5.serializer_v5.write_inventory(inv, sio, working=True)
1944
bzrlib.xml5.serializer_v5.write_inventory(inv, sio)
2862
transport.put_file('inventory', sio, file_mode)
2863
transport.put_bytes('pending-merges', '', file_mode)
2865
def initialize(self, a_bzrdir, revision_id=None, from_branch=None,
2866
accelerator_tree=None, hardlink=False):
1946
control_files.put('inventory', sio)
1948
control_files.put_utf8('pending-merges', '')
1951
def initialize(self, a_bzrdir, revision_id=None):
2867
1952
"""See WorkingTreeFormat.initialize()."""
2868
1953
if not isinstance(a_bzrdir.transport, LocalTransport):
2869
1954
raise errors.NotLocalUrl(a_bzrdir.transport.base)
2870
if from_branch is not None:
2871
branch = from_branch
2873
branch = a_bzrdir.open_branch()
2874
if revision_id is None:
2875
revision_id = _mod_revision.ensure_null(branch.last_revision())
2878
branch.generate_revision_history(revision_id)
2881
inv = inventory.Inventory()
1955
branch = a_bzrdir.open_branch()
1956
if revision_id is not None:
1959
revision_history = branch.revision_history()
1961
position = revision_history.index(revision_id)
1963
raise errors.NoSuchRevision(branch, revision_id)
1964
branch.set_revision_history(revision_history[:position + 1])
1967
revision = branch.last_revision()
2882
1969
wt = WorkingTree2(a_bzrdir.root_transport.local_abspath('.'),
2885
1972
_internal=True,
2887
1974
_bzrdir=a_bzrdir)
2888
basis_tree = branch.repository.revision_tree(revision_id)
2889
if basis_tree.inventory.root is not None:
2890
wt.set_root_id(basis_tree.get_root_id())
2891
# set the parent list and cache the basis tree.
2892
if _mod_revision.is_null(revision_id):
2895
parent_trees = [(revision_id, basis_tree)]
2896
wt.set_parent_trees(parent_trees)
2897
transform.build_tree(basis_tree, wt)
1975
wt._write_inventory(inv)
1976
wt.set_root_id(inv.root.file_id)
1977
basis_tree = branch.repository.revision_tree(revision)
1978
wt.set_parent_trees([(revision, basis_tree)])
1979
build_tree(basis_tree, wt)
2900
1982
def __init__(self):
3030
2082
raise NotImplementedError
3031
2083
if not isinstance(a_bzrdir.transport, LocalTransport):
3032
2084
raise errors.NotLocalUrl(a_bzrdir.transport.base)
3033
wt = self._open(a_bzrdir, self._open_control_files(a_bzrdir))
2085
return self._open(a_bzrdir, self._open_control_files(a_bzrdir))
3036
2087
def _open(self, a_bzrdir, control_files):
3037
2088
"""Open the tree itself.
3039
2090
:param a_bzrdir: the dir for the tree.
3040
2091
:param control_files: the control files for the tree.
3042
return self._tree_class(a_bzrdir.root_transport.local_abspath('.'),
3046
_control_files=control_files)
2093
return WorkingTree3(a_bzrdir.root_transport.local_abspath('.'),
2097
_control_files=control_files)
3048
2099
def __str__(self):
3049
2100
return self.get_format_string()
3052
__default_format = WorkingTreeFormat6()
2103
# formats which have no format string are not discoverable
2104
# and not independently creatable, so are not registered.
2105
__default_format = WorkingTreeFormat3()
3053
2106
WorkingTreeFormat.register_format(__default_format)
3054
WorkingTreeFormat.register_format(WorkingTreeFormat5())
3055
WorkingTreeFormat.register_format(WorkingTreeFormat4())
3056
WorkingTreeFormat.register_format(WorkingTreeFormat3())
3057
2107
WorkingTreeFormat.set_default_format(__default_format)
3058
# formats which have no format string are not discoverable
3059
# and not independently creatable, so are not registered.
3060
2108
_legacy_formats = [WorkingTreeFormat2(),
2112
class WorkingTreeTestProviderAdapter(object):
2113
"""A tool to generate a suite testing multiple workingtree formats at once.
2115
This is done by copying the test once for each transport and injecting
2116
the transport_server, transport_readonly_server, and workingtree_format
2117
classes into each copy. Each copy is also given a new id() to make it
2121
def __init__(self, transport_server, transport_readonly_server, formats):
2122
self._transport_server = transport_server
2123
self._transport_readonly_server = transport_readonly_server
2124
self._formats = formats
2126
def _clone_test(self, test, bzrdir_format, workingtree_format, variation):
2127
"""Clone test for adaption."""
2128
new_test = deepcopy(test)
2129
new_test.transport_server = self._transport_server
2130
new_test.transport_readonly_server = self._transport_readonly_server
2131
new_test.bzrdir_format = bzrdir_format
2132
new_test.workingtree_format = workingtree_format
2133
def make_new_test_id():
2134
new_id = "%s(%s)" % (test.id(), variation)
2135
return lambda: new_id
2136
new_test.id = make_new_test_id()
2139
def adapt(self, test):
2140
from bzrlib.tests import TestSuite
2141
result = TestSuite()
2142
for workingtree_format, bzrdir_format in self._formats:
2143
new_test = self._clone_test(
2146
workingtree_format, workingtree_format.__class__.__name__)
2147
result.addTest(new_test)
added
removed
bzrlib/workingtree.py
