39
36
# At the moment they may alias the inventory and have old copies of it in
40
37
# memory. (Now done? -- mbp 20060309)
42
from binascii import hexlify
39
from cStringIO import StringIO
43
from bzrlib.lazy_import import lazy_import
44
lazy_import(globals(), """
45
from bisect import bisect_left
44
from copy import deepcopy
45
from cStringIO import StringIO
55
from bzrlib import bzrdir, errors, ignores, osutils, urlutils
56
from bzrlib.atomicfile import AtomicFile
57
conflicts as _mod_conflicts,
66
revision as _mod_revision,
57
75
import bzrlib.branch
58
from bzrlib.conflicts import Conflict, ConflictList, CONFLICT_SUFFIXES
76
from bzrlib.transport import get_transport
77
from bzrlib.workingtree_4 import (
84
from bzrlib import symbol_versioning
59
85
from bzrlib.decorators import needs_read_lock, needs_write_lock
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
86
from bzrlib.lockable_files import LockableFiles
72
87
from bzrlib.lockdir import LockDir
73
from bzrlib.merge import merge_inner, transform_tree
88
import bzrlib.mutabletree
89
from bzrlib.mutabletree import needs_tree_write_lock
90
from bzrlib import osutils
74
91
from bzrlib.osutils import (
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,
101
from bzrlib.filters import filtered_input_file
101
102
from bzrlib.trace import mutter, note
102
from bzrlib.transform import build_tree
103
from bzrlib.transport import get_transport
104
103
from bzrlib.transport.local import LocalTransport
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
104
from bzrlib.progress import ProgressPhase
105
from bzrlib.revision import CURRENT_REVISION
106
from bzrlib.rio import RioReader, rio_file, Stanza
107
from bzrlib.symbol_versioning import (
109
DEPRECATED_PARAMETER,
113
MERGE_MODIFIED_HEADER_1 = "BZR merge-modified list format 1"
114
# TODO: Modifying the conflict objects or their type is currently nearly
115
# impossible as there is no clear relationship between the working tree format
116
# and the conflict list file format.
117
CONFLICT_HEADER_1 = "BZR conflict list format 1"
119
ERROR_PATH_NOT_FOUND = 3 # WindowsError errno code, equivalent to ENOENT
175
122
class TreeEntry(object):
176
123
"""An entry that implements the minimum interface used by commands.
178
This needs further inspection, it may be better to have
125
This needs further inspection, it may be better to have
179
126
InventoryEntries without ids - though that seems wrong. For now,
180
127
this is a parallel hierarchy to InventoryEntry, and needs to become
181
128
one of several things: decorates to that hierarchy, children of, or
419
409
# no parents, return an empty revision tree.
420
410
# in the future this should return the tree for
421
411
# 'empty:' - the implicit root empty tree.
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):
412
return self.branch.repository.revision_tree(
413
_mod_revision.NULL_REVISION)
415
return self.revision_tree(revision_id)
416
except errors.NoSuchRevision:
432
418
# No cached copy available, retrieve from the repository.
433
419
# FIXME? RBC 20060403 should we cache the inventory locally
434
420
# at this point ?
436
422
return self.branch.repository.revision_tree(revision_id)
437
except errors.RevisionNotPresent:
423
except (errors.RevisionNotPresent, errors.NoSuchRevision):
438
424
# the basis tree *may* be a ghost or a low level error may have
439
# occured. If the revision is present, its a problem, if its not
425
# occurred. If the revision is present, its a problem, if its not
441
427
if self.branch.repository.has_revision(revision_id):
443
429
# the basis tree is a ghost so return an empty tree.
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)
430
return self.branch.repository.revision_tree(
431
_mod_revision.NULL_REVISION)
434
self._flush_ignore_list_cache()
484
436
def relpath(self, path):
485
437
"""Return the local path portion from a given path.
487
The path may be absolute or relative. If its a relative path it is
439
The path may be absolute or relative. If its a relative path it is
488
440
interpreted relative to the python current working directory.
490
return relpath(self.basedir, path)
442
return osutils.relpath(self.basedir, path)
492
444
def has_filename(self, filename):
493
445
return osutils.lexists(self.abspath(filename))
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')
447
def get_file(self, file_id, path=None, filtered=True):
448
return self.get_file_with_stat(file_id, path, filtered=filtered)[0]
450
def get_file_with_stat(self, file_id, path=None, filtered=True,
452
"""See Tree.get_file_with_stat."""
454
path = self.id2path(file_id)
455
file_obj = self.get_file_byname(path, filtered=False)
456
stat_value = _fstat(file_obj.fileno())
457
if filtered and self.supports_content_filtering():
458
filters = self._content_filter_stack(path)
459
file_obj = filtered_input_file(file_obj, filters)
460
return (file_obj, stat_value)
462
def get_file_text(self, file_id, path=None, filtered=True):
463
return self.get_file(file_id, path=path, filtered=filtered).read()
465
def get_file_byname(self, filename, filtered=True):
466
path = self.abspath(filename)
468
if filtered and self.supports_content_filtering():
469
filters = self._content_filter_stack(filename)
470
return filtered_input_file(f, filters)
474
def get_file_lines(self, file_id, path=None, filtered=True):
475
"""See Tree.get_file_lines()"""
476
file = self.get_file(file_id, path, filtered=filtered)
478
return file.readlines()
483
def annotate_iter(self, file_id, default_revision=CURRENT_REVISION):
484
"""See Tree.annotate_iter
486
This implementation will use the basis tree implementation if possible.
487
Lines not in the basis are attributed to CURRENT_REVISION
489
If there are pending merges, lines added by those merges will be
490
incorrectly attributed to CURRENT_REVISION (but after committing, the
491
attribution will be correct).
493
maybe_file_parent_keys = []
494
for parent_id in self.get_parent_ids():
496
parent_tree = self.revision_tree(parent_id)
497
except errors.NoSuchRevisionInTree:
498
parent_tree = self.branch.repository.revision_tree(parent_id)
499
parent_tree.lock_read()
501
if file_id not in parent_tree:
503
ie = parent_tree.inventory[file_id]
504
if ie.kind != 'file':
505
# Note: this is slightly unnecessary, because symlinks and
506
# directories have a "text" which is the empty text, and we
507
# know that won't mess up annotations. But it seems cleaner
509
parent_text_key = (file_id, ie.revision)
510
if parent_text_key not in maybe_file_parent_keys:
511
maybe_file_parent_keys.append(parent_text_key)
514
graph = _mod_graph.Graph(self.branch.repository.texts)
515
heads = graph.heads(maybe_file_parent_keys)
516
file_parent_keys = []
517
for key in maybe_file_parent_keys:
519
file_parent_keys.append(key)
521
# Now we have the parents of this content
522
annotator = self.branch.repository.texts.get_annotator()
523
text = self.get_file(file_id).read()
524
this_key =(file_id, default_revision)
525
annotator.add_special_text(this_key, file_parent_keys, text)
526
annotations = [(key[-1], line)
527
for key, line in annotator.annotate_flat(this_key)]
530
def _get_ancestors(self, default_revision):
531
ancestors = set([default_revision])
532
for parent_id in self.get_parent_ids():
533
ancestors.update(self.branch.repository.get_ancestry(
534
parent_id, topo_sorted=False))
504
537
def get_parent_ids(self):
505
538
"""See Tree.get_parent_ids.
507
540
This implementation reads the pending merges list and last_revision
508
541
value and uses that to decide what the parents list should be.
510
last_rev = self._last_revision()
543
last_rev = _mod_revision.ensure_null(self._last_revision())
544
if _mod_revision.NULL_REVISION == last_rev:
514
547
parents = [last_rev]
516
merges_file = self._control_files.get_utf8('pending-merges')
549
merges_bytes = self._transport.get_bytes('pending-merges')
550
except errors.NoSuchFile:
520
for l in merges_file.readlines():
521
parents.append(l.rstrip('\n'))
553
for l in osutils.split_lines(merges_bytes):
554
revision_id = l.rstrip('\n')
555
parents.append(revision_id)
524
559
def get_root_id(self):
525
560
"""Return the id of this trees root"""
526
inv = self.read_working_inventory()
527
return inv.root.file_id
561
return self._inventory.root.file_id
529
563
def _get_store_filename(self, file_id):
530
564
## XXX: badly named; this is not in the store at all
531
565
return self.abspath(self.id2path(file_id))
534
def clone(self, to_bzrdir, revision_id=None, basis=None):
568
def clone(self, to_bzrdir, revision_id=None):
535
569
"""Duplicate this working tree into to_bzr, including all state.
537
571
Specifically modified files are kept as modified, but
538
572
ignored and unknown files are discarded.
540
574
If you want to make a new line of development, see bzrdir.sprout()
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
577
If not None, the cloned tree will have its last revision set to
578
revision, and difference between the source trees last revision
545
579
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.
551
581
# assumes the target bzr dir format is compatible.
552
result = self._format.initialize(to_bzrdir)
582
result = to_bzrdir.create_workingtree()
553
583
self.copy_content_into(result, revision_id)
557
587
def copy_content_into(self, tree, revision_id=None):
558
588
"""Copy the current content and user files of this tree into tree."""
589
tree.set_root_id(self.get_root_id())
559
590
if revision_id is None:
560
transform_tree(tree, self)
591
merge.transform_tree(tree, self)
562
593
# TODO now merge from tree.last_revision to revision (to preserve
563
594
# user local changes)
564
transform_tree(tree, self)
595
merge.transform_tree(tree, self)
565
596
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,
583
598
def id2abspath(self, file_id):
584
599
return self.abspath(self.id2path(file_id))
586
601
def has_id(self, file_id):
587
602
# files that have been deleted are excluded
588
inv = self._inventory
589
604
if not inv.has_id(file_id):
591
606
path = inv.id2path(file_id)
599
614
__contains__ = has_id
601
616
def get_file_size(self, file_id):
602
return os.path.getsize(self.id2abspath(file_id))
617
"""See Tree.get_file_size"""
618
# XXX: this returns the on-disk size; it should probably return the
621
return os.path.getsize(self.id2abspath(file_id))
623
if e.errno != errno.ENOENT:
605
def get_file_sha1(self, file_id, path=None):
629
def get_file_sha1(self, file_id, path=None, stat_value=None):
607
631
path = self._inventory.id2path(file_id)
608
return self._hashcache.get_sha1(path)
632
return self._hashcache.get_sha1(path, stat_value)
610
634
def get_file_mtime(self, file_id, path=None):
612
path = self._inventory.id2path(file_id)
636
path = self.inventory.id2path(file_id)
613
637
return os.lstat(self.abspath(path)).st_mtime
639
def _is_executable_from_path_and_stat_from_basis(self, path, stat_result):
640
file_id = self.path2id(path)
642
# For unversioned files on win32, we just assume they are not
645
return self._inventory[file_id].executable
647
def _is_executable_from_path_and_stat_from_stat(self, path, stat_result):
648
mode = stat_result.st_mode
649
return bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode)
615
651
if not supports_executable():
616
652
def is_executable(self, file_id, path=None):
617
653
return self._inventory[file_id].executable
655
_is_executable_from_path_and_stat = \
656
_is_executable_from_path_and_stat_from_basis
619
658
def is_executable(self, file_id, path=None):
621
path = self._inventory.id2path(file_id)
660
path = self.id2path(file_id)
622
661
mode = os.lstat(self.abspath(path)).st_mode
623
662
return bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode)
664
_is_executable_from_path_and_stat = \
665
_is_executable_from_path_and_stat_from_stat
625
667
@needs_tree_write_lock
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.
668
def _add(self, files, ids, kinds):
669
"""See MutableTree._add."""
648
670
# TODO: Re-adding a file that is removed in the working copy
649
671
# should probably put it back with the previous ID.
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)
672
# the read and write working inventory should not occur in this
673
# function - they should be part of lock_write and unlock.
675
for f, file_id, kind in zip(files, ids, kinds):
679
676
if file_id is None:
680
677
inv.add_path(f, kind=kind)
682
679
inv.add_path(f, kind=kind, file_id=file_id)
684
self._write_inventory(inv)
680
self._inventory_is_modified = True
686
682
@needs_tree_write_lock
683
def _gather_kinds(self, files, kinds):
684
"""See MutableTree._gather_kinds."""
685
for pos, f in enumerate(files):
686
if kinds[pos] is None:
687
fullpath = normpath(self.abspath(f))
689
kinds[pos] = file_kind(fullpath)
691
if e.errno == errno.ENOENT:
692
raise errors.NoSuchFile(fullpath)
687
695
def add_parent_tree_id(self, revision_id, allow_leftmost_as_ghost=False):
688
696
"""Add revision_id as a parent.
736
744
self.set_parent_ids(parents, allow_leftmost_as_ghost=True)
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:]
746
def path_content_summary(self, path, _lstat=os.lstat,
747
_mapper=osutils.file_kind_from_stat_mode):
748
"""See Tree.path_content_summary."""
749
abspath = self.abspath(path)
751
stat_result = _lstat(abspath)
753
if getattr(e, 'errno', None) == errno.ENOENT:
755
return ('missing', None, None, None)
756
# propagate other errors
758
kind = _mapper(stat_result.st_mode)
760
return self._file_content_summary(path, stat_result)
761
elif kind == 'directory':
762
# perhaps it looks like a plain directory, but it's really a
764
if self._directory_is_tree_reference(path):
765
kind = 'tree-reference'
766
return kind, None, None, None
767
elif kind == 'symlink':
768
target = osutils.readlink(abspath)
769
return ('symlink', None, None, target)
771
return (kind, None, None, None)
773
def _file_content_summary(self, path, stat_result):
774
size = stat_result.st_size
775
executable = self._is_executable_from_path_and_stat(path, stat_result)
776
# try for a stat cache lookup
777
return ('file', size, executable, self._sha_from_stat(
780
def _check_parents_for_ghosts(self, revision_ids, allow_leftmost_as_ghost):
781
"""Common ghost checking functionality from set_parent_*.
783
This checks that the left hand-parent exists if there are any
786
if len(revision_ids) > 0:
787
leftmost_id = revision_ids[0]
788
if (not allow_leftmost_as_ghost and not
789
self.branch.repository.has_revision(leftmost_id)):
790
raise errors.GhostRevisionUnusableHere(leftmost_id)
792
def _set_merges_from_parent_ids(self, parent_ids):
793
merges = parent_ids[1:]
794
self._transport.put_bytes('pending-merges', '\n'.join(merges),
795
mode=self.bzrdir._get_file_mode())
797
def _filter_parent_ids_by_ancestry(self, revision_ids):
798
"""Check that all merged revisions are proper 'heads'.
800
This will always return the first revision_id, and any merged revisions
803
if len(revision_ids) == 0:
805
graph = self.branch.repository.get_graph()
806
heads = graph.heads(revision_ids)
807
new_revision_ids = revision_ids[:1]
808
for revision_id in revision_ids[1:]:
809
if revision_id in heads and revision_id not in new_revision_ids:
810
new_revision_ids.append(revision_id)
811
if new_revision_ids != revision_ids:
812
trace.mutter('requested to set revision_ids = %s,'
813
' but filtered to %s', revision_ids, new_revision_ids)
814
return new_revision_ids
751
816
@needs_tree_write_lock
752
817
def set_parent_ids(self, revision_ids, allow_leftmost_as_ghost=False):
753
818
"""Set the parent ids to revision_ids.
755
820
See also set_parent_trees. This api will try to retrieve the tree data
756
821
for each element of revision_ids from the trees repository. If you have
757
822
tree data already available, it is more efficient to use
796
881
def set_merge_modified(self, modified_hashes):
797
882
def iter_stanzas():
798
883
for file_id, hash in modified_hashes.iteritems():
799
yield Stanza(file_id=file_id, hash=hash)
884
yield Stanza(file_id=file_id.decode('utf8'), hash=hash)
800
885
self._put_rio('merge-hashes', iter_stanzas(), MERGE_MODIFIED_HEADER_1)
802
@needs_tree_write_lock
887
def _sha_from_stat(self, path, stat_result):
888
"""Get a sha digest from the tree's stat cache.
890
The default implementation assumes no stat cache is present.
892
:param path: The path.
893
:param stat_result: The stat result being looked up.
803
897
def _put_rio(self, filename, stanzas, header):
898
self._must_be_locked()
804
899
my_file = rio_file(stanzas, header)
805
self._control_files.put(filename, my_file)
900
self._transport.put_file(filename, my_file,
901
mode=self.bzrdir._get_file_mode())
807
903
@needs_write_lock # because merge pulls data into the branch.
808
def merge_from_branch(self, branch, to_revision=None):
904
def merge_from_branch(self, branch, to_revision=None, from_revision=None,
905
merge_type=None, force=False):
809
906
"""Merge from a branch into this working tree.
811
908
:param branch: The branch to merge from.
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
909
:param to_revision: If non-None, the merge will merge to to_revision,
910
but not beyond it. to_revision does not need to be in the history
911
of the branch when it is supplied. If None, to_revision defaults to
815
912
branch.last_revision().
817
914
from bzrlib.merge import Merger, Merge3Merger
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()
915
merger = Merger(self.branch, this_tree=self)
916
# check that there are no local alterations
917
if not force and self.has_changes():
918
raise errors.UncommittedChanges(self)
919
if to_revision is None:
920
to_revision = _mod_revision.ensure_null(branch.last_revision())
921
merger.other_rev_id = to_revision
922
if _mod_revision.is_null(merger.other_rev_id):
923
raise errors.NoCommits(branch)
924
self.branch.fetch(branch, last_revision=merger.other_rev_id)
925
merger.other_basis = merger.other_rev_id
926
merger.other_tree = self.branch.repository.revision_tree(
928
merger.other_branch = branch
929
if from_revision is None:
836
930
merger.find_base()
837
if merger.base_rev_id == merger.other_rev_id:
838
raise errors.PointlessMerge
839
merger.backup_files = False
932
merger.set_base_revision(from_revision, branch)
933
if merger.base_rev_id == merger.other_rev_id:
934
raise errors.PointlessMerge
935
merger.backup_files = False
936
if merge_type is None:
840
937
merger.merge_type = Merge3Merger
841
merger.set_interesting_files(None)
842
merger.show_base = False
843
merger.reprocess = False
844
conflicts = merger.do_merge()
939
merger.merge_type = merge_type
940
merger.set_interesting_files(None)
941
merger.show_base = False
942
merger.reprocess = False
943
conflicts = merger.do_merge()
851
948
def merge_modified(self):
949
"""Return a dictionary of files modified by a merge.
951
The list is initialized by WorkingTree.set_merge_modified, which is
952
typically called after we make some automatic updates to the tree
955
This returns a map of file_id->sha1, containing only files which are
956
still in the working inventory and have that text hash.
853
hashfile = self._control_files.get('merge-hashes')
959
hashfile = self._transport.get('merge-hashes')
960
except errors.NoSuchFile:
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
965
if hashfile.next() != MERGE_MODIFIED_HEADER_1 + '\n':
966
raise errors.MergeModifiedFormatError()
967
except StopIteration:
968
raise errors.MergeModifiedFormatError()
969
for s in RioReader(hashfile):
970
# RioReader reads in Unicode, so convert file_ids back to utf8
971
file_id = osutils.safe_file_id(s.get("file_id"), warn=False)
972
if file_id not in self.inventory:
974
text_hash = s.get("hash")
975
if text_hash == self.get_file_sha1(file_id):
976
merge_hashes[file_id] = text_hash
982
def mkdir(self, path, file_id=None):
983
"""See MutableTree.mkdir()."""
985
file_id = generate_ids.gen_file_id(os.path.basename(path))
986
os.mkdir(self.abspath(path))
987
self.add(path, file_id, 'directory')
871
990
def get_symlink_target(self, file_id):
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).
991
abspath = self.id2abspath(file_id)
992
target = osutils.readlink(abspath)
996
def subsume(self, other_tree):
997
def add_children(inventory, entry):
998
for child_entry in entry.children.values():
999
inventory._byid[child_entry.file_id] = child_entry
1000
if child_entry.kind == 'directory':
1001
add_children(inventory, child_entry)
1002
if other_tree.get_root_id() == self.get_root_id():
1003
raise errors.BadSubsumeSource(self, other_tree,
1004
'Trees have the same root')
1006
other_tree_path = self.relpath(other_tree.basedir)
1007
except errors.PathNotChild:
1008
raise errors.BadSubsumeSource(self, other_tree,
1009
'Tree is not contained by the other')
1010
new_root_parent = self.path2id(osutils.dirname(other_tree_path))
1011
if new_root_parent is None:
1012
raise errors.BadSubsumeSource(self, other_tree,
1013
'Parent directory is not versioned.')
1014
# We need to ensure that the result of a fetch will have a
1015
# versionedfile for the other_tree root, and only fetching into
1016
# RepositoryKnit2 guarantees that.
1017
if not self.branch.repository.supports_rich_root():
1018
raise errors.SubsumeTargetNeedsUpgrade(other_tree)
1019
other_tree.lock_tree_write()
1021
new_parents = other_tree.get_parent_ids()
1022
other_root = other_tree.inventory.root
1023
other_root.parent_id = new_root_parent
1024
other_root.name = osutils.basename(other_tree_path)
1025
self.inventory.add(other_root)
1026
add_children(self.inventory, other_root)
1027
self._write_inventory(self.inventory)
1028
# normally we don't want to fetch whole repositories, but i think
1029
# here we really do want to consolidate the whole thing.
1030
for parent_id in other_tree.get_parent_ids():
1031
self.branch.fetch(other_tree.branch, parent_id)
1032
self.add_parent_tree_id(parent_id)
1035
other_tree.bzrdir.retire_bzrdir()
1037
def _setup_directory_is_tree_reference(self):
1038
if self._branch.repository._format.supports_tree_reference:
1039
self._directory_is_tree_reference = \
1040
self._directory_may_be_tree_reference
1042
self._directory_is_tree_reference = \
1043
self._directory_is_never_tree_reference
1045
def _directory_is_never_tree_reference(self, relpath):
1048
def _directory_may_be_tree_reference(self, relpath):
1049
# as a special case, if a directory contains control files then
1050
# it's a tree reference, except that the root of the tree is not
1051
return relpath and osutils.isdir(self.abspath(relpath) + u"/.bzr")
1052
# TODO: We could ask all the control formats whether they
1053
# recognize this directory, but at the moment there's no cheap api
1054
# to do that. Since we probably can only nest bzr checkouts and
1055
# they always use this name it's ok for now. -- mbp 20060306
1057
# FIXME: There is an unhandled case here of a subdirectory
1058
# containing .bzr but not a branch; that will probably blow up
1059
# when you try to commit it. It might happen if there is a
1060
# checkout in a subdirectory. This can be avoided by not adding
1063
@needs_tree_write_lock
1064
def extract(self, file_id, format=None):
1065
"""Extract a subtree from this tree.
1067
A new branch will be created, relative to the path for this tree.
1071
segments = osutils.splitpath(path)
1072
transport = self.branch.bzrdir.root_transport
1073
for name in segments:
1074
transport = transport.clone(name)
1075
transport.ensure_base()
1078
sub_path = self.id2path(file_id)
1079
branch_transport = mkdirs(sub_path)
1081
format = self.bzrdir.cloning_metadir()
1082
branch_transport.ensure_base()
1083
branch_bzrdir = format.initialize_on_transport(branch_transport)
1085
repo = branch_bzrdir.find_repository()
1086
except errors.NoRepositoryPresent:
1087
repo = branch_bzrdir.create_repository()
1088
if not repo.supports_rich_root():
1089
raise errors.RootNotRich()
1090
new_branch = branch_bzrdir.create_branch()
1091
new_branch.pull(self.branch)
1092
for parent_id in self.get_parent_ids():
1093
new_branch.fetch(self.branch, parent_id)
1094
tree_transport = self.bzrdir.root_transport.clone(sub_path)
1095
if tree_transport.base != branch_transport.base:
1096
tree_bzrdir = format.initialize_on_transport(tree_transport)
1097
branch.BranchReferenceFormat().initialize(tree_bzrdir,
1098
target_branch=new_branch)
1100
tree_bzrdir = branch_bzrdir
1101
wt = tree_bzrdir.create_workingtree(_mod_revision.NULL_REVISION)
1102
wt.set_parent_ids(self.get_parent_ids())
1103
my_inv = self.inventory
1104
child_inv = inventory.Inventory(root_id=None)
1105
new_root = my_inv[file_id]
1106
my_inv.remove_recursive_id(file_id)
1107
new_root.parent_id = None
1108
child_inv.add(new_root)
1109
self._write_inventory(my_inv)
1110
wt._write_inventory(child_inv)
1113
def _serialize(self, inventory, out_file):
1114
xml5.serializer_v5.write_inventory(self._inventory, out_file,
1117
def _deserialize(selt, in_file):
1118
return xml5.serializer_v5.read_inventory(in_file)
1121
"""Write the in memory inventory to disk."""
1122
# TODO: Maybe this should only write on dirty ?
1123
if self._control_files._lock_mode != 'w':
1124
raise errors.NotWriteLocked(self)
1126
self._serialize(self._inventory, sio)
1128
self._transport.put_file('inventory', sio,
1129
mode=self.bzrdir._get_file_mode())
1130
self._inventory_is_modified = False
1132
def _kind(self, relpath):
1133
return osutils.file_kind(self.abspath(relpath))
1135
def list_files(self, include_root=False, from_dir=None, recursive=True):
1136
"""List all files as (path, class, kind, id, entry).
885
1138
Lists, but does not descend into unversioned directories.
887
1139
This does not include files that have been deleted in this
1140
tree. Skips the control directory.
890
Skips the control directory.
1142
:param include_root: if True, return an entry for the root
1143
:param from_dir: start from this directory or None for the root
1144
:param recursive: whether to recurse into subdirectories or not
892
inv = self._inventory
1146
# list_files is an iterator, so @needs_read_lock doesn't work properly
1147
# with it. So callers should be careful to always read_lock the tree.
1148
if not self.is_locked():
1149
raise errors.ObjectNotLocked(self)
1151
inv = self.inventory
1152
if from_dir is None and include_root is True:
1153
yield ('', 'V', 'directory', inv.root.file_id, inv.root)
893
1154
# Convert these into local objects to save lookup times
894
1155
pathjoin = osutils.pathjoin
895
file_kind = osutils.file_kind
1156
file_kind = self._kind
897
1158
# transport.base ends in a slash, we want the piece
898
1159
# between the last two slashes
973
1237
except KeyError:
974
1238
yield fp[1:], c, fk, None, TreeEntry()
977
1241
if fk != 'directory':
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
1244
# But do this child first if recursing down
1246
new_children = os.listdir(fap)
1248
new_children = collections.deque(new_children)
1249
stack.append((f_ie.file_id, fp, fap, new_children))
1250
# Break out of inner loop,
1251
# so that we start outer loop with child
988
1254
# if we finished all children, pop it off the stack
991
1257
@needs_tree_write_lock
992
def move(self, from_paths, to_name):
1258
def move(self, from_paths, to_dir=None, after=False, **kwargs):
993
1259
"""Rename files.
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;
1261
to_dir must exist in the inventory.
1263
If to_dir exists and is a directory, the files are moved into
1264
it, keeping their old names.
1266
Note that to_dir is only the last component of the new name;
1001
1267
this doesn't change the directory.
1269
For each entry in from_paths the move mode will be determined
1272
The first mode moves the file in the filesystem and updates the
1273
inventory. The second mode only updates the inventory without
1274
touching the file on the filesystem. This is the new mode introduced
1277
move uses the second mode if 'after == True' and the target is not
1278
versioned but present in the working tree.
1280
move uses the second mode if 'after == False' and the source is
1281
versioned but no longer in the working tree, and the target is not
1282
versioned but present in the working tree.
1284
move uses the first mode if 'after == False' and the source is
1285
versioned and present in the working tree, and the target is not
1286
versioned and not present in the working tree.
1288
Everything else results in an error.
1003
1290
This returns a list of (from_path, to_path) pairs for each
1004
1291
entry that is moved.
1007
## TODO: Option to move IDs only
1008
assert not isinstance(from_paths, basestring)
1296
# check for deprecated use of signature
1298
to_dir = kwargs.get('to_name', None)
1300
raise TypeError('You must supply a target directory')
1302
symbol_versioning.warn('The parameter to_name was deprecated'
1303
' in version 0.13. Use to_dir instead',
1306
# check destination directory
1307
if isinstance(from_paths, basestring):
1009
1309
inv = self.inventory
1010
to_abs = self.abspath(to_name)
1310
to_abs = self.abspath(to_dir)
1011
1311
if not isdir(to_abs):
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)
1312
raise errors.BzrMoveFailedError('',to_dir,
1313
errors.NotADirectory(to_abs))
1314
if not self.has_filename(to_dir):
1315
raise errors.BzrMoveFailedError('',to_dir,
1316
errors.NotInWorkingDirectory(to_dir))
1317
to_dir_id = inv.path2id(to_dir)
1318
if to_dir_id is None:
1319
raise errors.BzrMoveFailedError('',to_dir,
1320
errors.NotVersionedError(path=str(to_dir)))
1018
1322
to_dir_ie = inv[to_dir_id]
1019
1323
if to_dir_ie.kind != 'directory':
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)
1324
raise errors.BzrMoveFailedError('',to_dir,
1325
errors.NotADirectory(to_abs))
1327
# create rename entries and tuples
1328
for from_rel in from_paths:
1329
from_tail = splitpath(from_rel)[-1]
1330
from_id = inv.path2id(from_rel)
1332
raise errors.BzrMoveFailedError(from_rel,to_dir,
1333
errors.NotVersionedError(path=str(from_rel)))
1335
from_entry = inv[from_id]
1336
from_parent_id = from_entry.parent_id
1337
to_rel = pathjoin(to_dir, from_tail)
1338
rename_entry = WorkingTree._RenameEntry(from_rel=from_rel,
1340
from_tail=from_tail,
1341
from_parent_id=from_parent_id,
1342
to_rel=to_rel, to_tail=from_tail,
1343
to_parent_id=to_dir_id)
1344
rename_entries.append(rename_entry)
1345
rename_tuples.append((from_rel, to_rel))
1347
# determine which move mode to use. checks also for movability
1348
rename_entries = self._determine_mv_mode(rename_entries, after)
1350
original_modified = self._inventory_is_modified
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"])
1353
self._inventory_is_modified = True
1354
self._move(rename_entries)
1054
1356
# restore the inventory on error
1055
self._set_inventory(orig_inv)
1357
self._inventory_is_modified = original_modified
1057
1359
self._write_inventory(inv)
1360
return rename_tuples
1362
def _determine_mv_mode(self, rename_entries, after=False):
1363
"""Determines for each from-to pair if both inventory and working tree
1364
or only the inventory has to be changed.
1366
Also does basic plausability tests.
1368
inv = self.inventory
1370
for rename_entry in rename_entries:
1371
# store to local variables for easier reference
1372
from_rel = rename_entry.from_rel
1373
from_id = rename_entry.from_id
1374
to_rel = rename_entry.to_rel
1375
to_id = inv.path2id(to_rel)
1376
only_change_inv = False
1378
# check the inventory for source and destination
1380
raise errors.BzrMoveFailedError(from_rel,to_rel,
1381
errors.NotVersionedError(path=str(from_rel)))
1382
if to_id is not None:
1383
raise errors.BzrMoveFailedError(from_rel,to_rel,
1384
errors.AlreadyVersionedError(path=str(to_rel)))
1386
# try to determine the mode for rename (only change inv or change
1387
# inv and file system)
1389
if not self.has_filename(to_rel):
1390
raise errors.BzrMoveFailedError(from_id,to_rel,
1391
errors.NoSuchFile(path=str(to_rel),
1392
extra="New file has not been created yet"))
1393
only_change_inv = True
1394
elif not self.has_filename(from_rel) and self.has_filename(to_rel):
1395
only_change_inv = True
1396
elif self.has_filename(from_rel) and not self.has_filename(to_rel):
1397
only_change_inv = False
1398
elif (not self.case_sensitive
1399
and from_rel.lower() == to_rel.lower()
1400
and self.has_filename(from_rel)):
1401
only_change_inv = False
1403
# something is wrong, so lets determine what exactly
1404
if not self.has_filename(from_rel) and \
1405
not self.has_filename(to_rel):
1406
raise errors.BzrRenameFailedError(from_rel,to_rel,
1407
errors.PathsDoNotExist(paths=(str(from_rel),
1410
raise errors.RenameFailedFilesExist(from_rel, to_rel)
1411
rename_entry.only_change_inv = only_change_inv
1412
return rename_entries
1414
def _move(self, rename_entries):
1415
"""Moves a list of files.
1417
Depending on the value of the flag 'only_change_inv', the
1418
file will be moved on the file system or not.
1420
inv = self.inventory
1423
for entry in rename_entries:
1425
self._move_entry(entry)
1427
self._rollback_move(moved)
1431
def _rollback_move(self, moved):
1432
"""Try to rollback a previous move in case of an filesystem error."""
1433
inv = self.inventory
1436
self._move_entry(WorkingTree._RenameEntry(
1437
entry.to_rel, entry.from_id,
1438
entry.to_tail, entry.to_parent_id, entry.from_rel,
1439
entry.from_tail, entry.from_parent_id,
1440
entry.only_change_inv))
1441
except errors.BzrMoveFailedError, e:
1442
raise errors.BzrMoveFailedError( '', '', "Rollback failed."
1443
" The working tree is in an inconsistent state."
1444
" Please consider doing a 'bzr revert'."
1445
" Error message is: %s" % e)
1447
def _move_entry(self, entry):
1448
inv = self.inventory
1449
from_rel_abs = self.abspath(entry.from_rel)
1450
to_rel_abs = self.abspath(entry.to_rel)
1451
if from_rel_abs == to_rel_abs:
1452
raise errors.BzrMoveFailedError(entry.from_rel, entry.to_rel,
1453
"Source and target are identical.")
1455
if not entry.only_change_inv:
1457
osutils.rename(from_rel_abs, to_rel_abs)
1459
raise errors.BzrMoveFailedError(entry.from_rel,
1461
inv.rename(entry.from_id, entry.to_parent_id, entry.to_tail)
1060
1463
@needs_tree_write_lock
1061
def rename_one(self, from_rel, to_rel):
1464
def rename_one(self, from_rel, to_rel, after=False):
1062
1465
"""Rename one file.
1064
1467
This can change the directory or the filename or both.
1469
rename_one has several 'modes' to work. First, it can rename a physical
1470
file and change the file_id. That is the normal mode. Second, it can
1471
only change the file_id without touching any physical file. This is
1472
the new mode introduced in version 0.15.
1474
rename_one uses the second mode if 'after == True' and 'to_rel' is not
1475
versioned but present in the working tree.
1477
rename_one uses the second mode if 'after == False' and 'from_rel' is
1478
versioned but no longer in the working tree, and 'to_rel' is not
1479
versioned but present in the working tree.
1481
rename_one uses the first mode if 'after == False' and 'from_rel' is
1482
versioned and present in the working tree, and 'to_rel' is not
1483
versioned and not present in the working tree.
1485
Everything else results in an error.
1066
1487
inv = self.inventory
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)
1490
# create rename entries and tuples
1491
from_tail = splitpath(from_rel)[-1]
1492
from_id = inv.path2id(from_rel)
1494
# if file is missing in the inventory maybe it's in the basis_tree
1495
basis_tree = self.branch.basis_tree()
1496
from_id = basis_tree.path2id(from_rel)
1498
raise errors.BzrRenameFailedError(from_rel,to_rel,
1499
errors.NotVersionedError(path=str(from_rel)))
1500
# put entry back in the inventory so we can rename it
1501
from_entry = basis_tree.inventory[from_id].copy()
1504
from_entry = inv[from_id]
1505
from_parent_id = from_entry.parent_id
1083
1506
to_dir, to_tail = os.path.split(to_rel)
1084
1507
to_dir_id = inv.path2id(to_dir)
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"])
1508
rename_entry = WorkingTree._RenameEntry(from_rel=from_rel,
1510
from_tail=from_tail,
1511
from_parent_id=from_parent_id,
1512
to_rel=to_rel, to_tail=to_tail,
1513
to_parent_id=to_dir_id)
1514
rename_entries.append(rename_entry)
1516
# determine which move mode to use. checks also for movability
1517
rename_entries = self._determine_mv_mode(rename_entries, after)
1519
# check if the target changed directory and if the target directory is
1521
if to_dir_id is None:
1522
raise errors.BzrMoveFailedError(from_rel,to_rel,
1523
errors.NotVersionedError(path=str(to_dir)))
1525
# all checks done. now we can continue with our actual work
1526
mutter('rename_one:\n'
1531
' to_dir_id {%s}\n',
1532
from_id, from_rel, to_rel, to_dir, to_dir_id)
1534
self._move(rename_entries)
1106
1535
self._write_inventory(inv)
1537
class _RenameEntry(object):
1538
def __init__(self, from_rel, from_id, from_tail, from_parent_id,
1539
to_rel, to_tail, to_parent_id, only_change_inv=False):
1540
self.from_rel = from_rel
1541
self.from_id = from_id
1542
self.from_tail = from_tail
1543
self.from_parent_id = from_parent_id
1544
self.to_rel = to_rel
1545
self.to_tail = to_tail
1546
self.to_parent_id = to_parent_id
1547
self.only_change_inv = only_change_inv
1108
1549
@needs_read_lock
1109
1550
def unknowns(self):
1110
1551
"""Return all unknown files.
1309
1711
if ignoreset is not None:
1310
1712
return ignoreset
1312
ignore_globs = set(bzrlib.DEFAULT_IGNORE)
1714
ignore_globs = set()
1313
1715
ignore_globs.update(ignores.get_runtime_ignores())
1315
1716
ignore_globs.update(ignores.get_user_ignores())
1317
1717
if self.has_filename(bzrlib.IGNORE_FILENAME):
1318
1718
f = self.get_file_byname(bzrlib.IGNORE_FILENAME)
1320
1720
ignore_globs.update(ignores.parse_ignore_file(f))
1324
1723
self._ignoreset = ignore_globs
1325
self._ignore_regex = self._combine_ignore_rules(ignore_globs)
1326
1724
return ignore_globs
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
1726
def _flush_ignore_list_cache(self):
1727
"""Resets the cached ignore list to force a cache rebuild."""
1728
self._ignoreset = None
1729
self._ignoreglobster = None
1338
1731
def is_ignored(self, filename):
1339
1732
r"""Check whether the filename matches an ignore pattern.
1341
1734
Patterns containing '/' or '\' need to match the whole path;
1342
others match against only the last component.
1735
others match against only the last component. Patterns starting
1736
with '!' are ignore exceptions. Exceptions take precedence
1737
over regular patterns and cause the filename to not be ignored.
1344
1739
If the file is ignored, returns the pattern which caused it to
1345
1740
be ignored, otherwise None. So this can simply be used as a
1346
1741
boolean if desired."""
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]
1742
if getattr(self, '_ignoreglobster', None) is None:
1743
self._ignoreglobster = globbing.ExceptionGlobster(self.get_ignore_list())
1744
return self._ignoreglobster.match(filename)
1369
1746
def kind(self, file_id):
1370
1747
return file_kind(self.id2abspath(file_id))
1749
def stored_kind(self, file_id):
1750
"""See Tree.stored_kind"""
1751
return self.inventory[file_id].kind
1753
def _comparison_data(self, entry, path):
1754
abspath = self.abspath(path)
1756
stat_value = os.lstat(abspath)
1758
if getattr(e, 'errno', None) == errno.ENOENT:
1765
mode = stat_value.st_mode
1766
kind = osutils.file_kind_from_stat_mode(mode)
1767
if not supports_executable():
1768
executable = entry is not None and entry.executable
1770
executable = bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode)
1771
return kind, executable, stat_value
1773
def _file_size(self, entry, stat_value):
1774
return stat_value.st_size
1372
1776
def last_revision(self):
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.
1777
"""Return the last revision of the branch for this tree.
1779
This format tree does not support a separate marker for last-revision
1780
compared to the branch.
1782
See MutableTree.last_revision
1382
1784
return self._last_revision()
1384
1786
@needs_read_lock
1385
1787
def _last_revision(self):
1386
1788
"""helper for get_parent_ids."""
1387
return self.branch.last_revision()
1789
return _mod_revision.ensure_null(self.branch.last_revision())
1389
1791
def is_locked(self):
1390
1792
return self._control_files.is_locked()
1794
def _must_be_locked(self):
1795
if not self.is_locked():
1796
raise errors.ObjectNotLocked(self)
1392
1798
def lock_read(self):
1393
1799
"""See Branch.lock_read, and WorkingTree.unlock."""
1800
if not self.is_locked():
1394
1802
self.branch.lock_read()
1396
1804
return self._control_files.lock_read()
1451
1866
self.branch.set_revision_history([new_revision])
1869
def _write_basis_inventory(self, xml):
1870
"""Write the basis inventory XML to the basis-inventory file"""
1871
path = self._basis_inventory_name()
1873
self._transport.put_file(path, sio,
1874
mode=self.bzrdir._get_file_mode())
1876
def _create_basis_xml_from_inventory(self, revision_id, inventory):
1877
"""Create the text that will be saved in basis-inventory"""
1878
inventory.revision_id = revision_id
1879
return xml7.serializer_v7.write_inventory_to_string(inventory)
1454
1881
def _cache_basis_inventory(self, new_revision):
1455
1882
"""Cache new_revision as the basis inventory."""
1456
1883
# TODO: this should allow the ready-to-use inventory to be passed in,
1457
1884
# as commit already has that ready-to-use [while the format is the
1458
1885
# same, that is].
1460
# this double handles the inventory - unpack and repack -
1887
# this double handles the inventory - unpack and repack -
1461
1888
# but is easier to understand. We can/should put a conditional
1462
1889
# in here based on whether the inventory is in the latest format
1463
1890
# - perhaps we should repack all inventories on a repository
1465
1892
# the fast path is to copy the raw xml from the repository. If the
1466
# xml contains 'revision_id="', then we assume the right
1893
# xml contains 'revision_id="', then we assume the right
1467
1894
# revision_id is set. We must check for this full string, because a
1468
1895
# root node id can legitimately look like 'revision_id' but cannot
1469
1896
# contain a '"'.
1470
xml = self.branch.repository.get_inventory_xml(new_revision)
1897
xml = self.branch.repository._get_inventory_xml(new_revision)
1471
1898
firstline = xml.split('\n', 1)[0]
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)
1899
if (not 'revision_id="' in firstline or
1900
'format="7"' not in firstline):
1901
inv = self.branch.repository._serializer.read_inventory_from_string(
1903
xml = self._create_basis_xml_from_inventory(new_revision, inv)
1904
self._write_basis_inventory(xml)
1482
1905
except (errors.NoSuchRevision, errors.RevisionNotPresent):
1485
1908
def read_basis_inventory(self):
1486
1909
"""Read the cached basis inventory."""
1487
1910
path = self._basis_inventory_name()
1488
return self._control_files.get(path).read()
1911
return self._transport.get_bytes(path)
1490
1913
@needs_read_lock
1491
1914
def read_working_inventory(self):
1492
"""Read the working inventory."""
1915
"""Read the working inventory.
1917
:raises errors.InventoryModified: read_working_inventory will fail
1918
when the current in memory inventory has been modified.
1920
# conceptually this should be an implementation detail of the tree.
1921
# XXX: Deprecate this.
1493
1922
# ElementTree does its own conversion from UTF-8, so open in
1495
result = bzrlib.xml5.serializer_v5.read_inventory(
1496
self._control_files.get('inventory'))
1497
self._set_inventory(result)
1924
if self._inventory_is_modified:
1925
raise errors.InventoryModified(self)
1926
f = self._transport.get('inventory')
1928
result = self._deserialize(f)
1931
self._set_inventory(result, dirty=False)
1500
1934
@needs_tree_write_lock
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.
1935
def remove(self, files, verbose=False, to_file=None, keep_files=True,
1937
"""Remove nominated files from the working inventory.
1939
:files: File paths relative to the basedir.
1940
:keep_files: If true, the files will also be kept.
1941
:force: Delete files and directories, even if they are changed and
1942
even if the directories are not empty.
1515
## TODO: Normalize names
1516
## TODO: Remove nested loops; better scalability
1517
1944
if isinstance(files, basestring):
1518
1945
files = [files]
1520
inv = self.inventory
1522
# do this before any modifications
1950
unknown_nested_files=set()
1952
to_file = sys.stdout
1954
def recurse_directory_to_add_files(directory):
1955
# Recurse directory and add all files
1956
# so we can check if they have changed.
1957
for parent_info, file_infos in\
1958
self.walkdirs(directory):
1959
for relpath, basename, kind, lstat, fileid, kind in file_infos:
1960
# Is it versioned or ignored?
1961
if self.path2id(relpath) or self.is_ignored(relpath):
1962
# Add nested content for deletion.
1963
new_files.add(relpath)
1965
# Files which are not versioned and not ignored
1966
# should be treated as unknown.
1967
unknown_nested_files.add((relpath, None, kind))
1969
for filename in files:
1970
# Get file name into canonical form.
1971
abspath = self.abspath(filename)
1972
filename = self.relpath(abspath)
1973
if len(filename) > 0:
1974
new_files.add(filename)
1975
recurse_directory_to_add_files(filename)
1977
files = list(new_files)
1980
return # nothing to do
1982
# Sort needed to first handle directory content before the directory
1983
files.sort(reverse=True)
1985
# Bail out if we are going to delete files we shouldn't
1986
if not keep_files and not force:
1987
has_changed_files = len(unknown_nested_files) > 0
1988
if not has_changed_files:
1989
for (file_id, path, content_change, versioned, parent_id, name,
1990
kind, executable) in self.iter_changes(self.basis_tree(),
1991
include_unchanged=True, require_versioned=False,
1992
want_unversioned=True, specific_files=files):
1993
if versioned == (False, False):
1994
# The record is unknown ...
1995
if not self.is_ignored(path[1]):
1996
# ... but not ignored
1997
has_changed_files = True
1999
elif content_change and (kind[1] is not None):
2000
# Versioned and changed, but not deleted
2001
has_changed_files = True
2004
if has_changed_files:
2005
# Make delta show ALL applicable changes in error message.
2006
tree_delta = self.changes_from(self.basis_tree(),
2007
require_versioned=False, want_unversioned=True,
2008
specific_files=files)
2009
for unknown_file in unknown_nested_files:
2010
if unknown_file not in tree_delta.unversioned:
2011
tree_delta.unversioned.extend((unknown_file,))
2012
raise errors.BzrRemoveChangedFilesError(tree_delta)
2014
# Build inv_delta and delete files where applicable,
2015
# do this before any modifications to inventory.
1523
2016
for f in files:
1524
fid = inv.path2id(f)
2017
fid = self.path2id(f)
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)
2020
message = "%s is not versioned." % (f,)
2023
# having removed it, it must be either ignored or unknown
2024
if self.is_ignored(f):
2028
# XXX: Really should be a more abstract reporter interface
2029
kind_ch = osutils.kind_marker(self.kind(fid))
2030
to_file.write(new_status + ' ' + f + kind_ch + '\n')
2032
inv_delta.append((f, None, fid, None))
2033
message = "removed %s" % (f,)
2036
abs_path = self.abspath(f)
2037
if osutils.lexists(abs_path):
2038
if (osutils.isdir(abs_path) and
2039
len(os.listdir(abs_path)) > 0):
2041
osutils.rmtree(abs_path)
2043
message = "%s is not an empty directory "\
2044
"and won't be deleted." % (f,)
2046
osutils.delete_any(abs_path)
2047
message = "deleted %s" % (f,)
2048
elif message is not None:
2049
# Only care if we haven't done anything yet.
2050
message = "%s does not exist." % (f,)
2052
# Print only one message (if any) per file.
2053
if message is not None:
2055
self.apply_inventory_delta(inv_delta)
1540
2057
@needs_tree_write_lock
1541
def revert(self, filenames, old_tree=None, backups=True,
1542
pb=DummyProgress()):
1543
from transform import revert
1544
from conflicts import resolve
2058
def revert(self, filenames=None, old_tree=None, backups=True,
2059
pb=None, report_changes=False):
2060
from bzrlib.conflicts import resolve
2063
symbol_versioning.warn('Using [] to revert all files is deprecated'
2064
' as of bzr 0.91. Please use None (the default) instead.',
2065
DeprecationWarning, stacklevel=2)
1545
2066
if old_tree is None:
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])
2067
basis_tree = self.basis_tree()
2068
basis_tree.lock_read()
2069
old_tree = basis_tree
1552
resolve(self, filenames, ignore_misses=True)
2073
conflicts = transform.revert(self, old_tree, filenames, backups, pb,
2075
if filenames is None and len(self.get_parent_ids()) > 1:
2077
last_revision = self.last_revision()
2078
if last_revision != _mod_revision.NULL_REVISION:
2079
if basis_tree is None:
2080
basis_tree = self.basis_tree()
2081
basis_tree.lock_read()
2082
parent_trees.append((last_revision, basis_tree))
2083
self.set_parent_trees(parent_trees)
2086
resolve(self, filenames, ignore_misses=True, recursive=True)
2088
if basis_tree is not None:
1553
2090
return conflicts
2092
def revision_tree(self, revision_id):
2093
"""See Tree.revision_tree.
2095
WorkingTree can supply revision_trees for the basis revision only
2096
because there is only one cached inventory in the bzr directory.
2098
if revision_id == self.last_revision():
2100
xml = self.read_basis_inventory()
2101
except errors.NoSuchFile:
2105
inv = xml7.serializer_v7.read_inventory_from_string(xml)
2106
# dont use the repository revision_tree api because we want
2107
# to supply the inventory.
2108
if inv.revision_id == revision_id:
2109
return revisiontree.RevisionTree(self.branch.repository,
2111
except errors.BadInventoryFormat:
2113
# raise if there was no inventory, or if we read the wrong inventory.
2114
raise errors.NoSuchRevisionInTree(self, revision_id)
1555
2116
# XXX: This method should be deprecated in favour of taking in a proper
1556
2117
# new Inventory object.
1557
2118
@needs_tree_write_lock
1558
2119
def set_inventory(self, new_inventory_list):
1559
2120
from bzrlib.inventory import (Inventory,
1560
2121
InventoryDirectory,
1564
2124
inv = Inventory(self.get_root_id())
1574
2134
elif kind == 'symlink':
1575
2135
inv.add(InventoryLink(file_id, name, parent))
1577
raise BzrError("unknown kind %r" % kind)
2137
raise errors.BzrError("unknown kind %r" % kind)
1578
2138
self._write_inventory(inv)
1580
2140
@needs_tree_write_lock
1581
2141
def set_root_id(self, file_id):
1582
2142
"""Set the root id for this tree."""
1583
inv = self.read_working_inventory()
2146
'WorkingTree.set_root_id with fileid=None')
2147
file_id = osutils.safe_file_id(file_id)
2148
self._set_root_id(file_id)
2150
def _set_root_id(self, file_id):
2151
"""Set the root id for this tree, in a format specific manner.
2153
:param file_id: The file id to assign to the root. It must not be
2154
present in the current inventory or an error will occur. It must
2155
not be None, but rather a valid file id.
2157
inv = self._inventory
1584
2158
orig_root_id = inv.root.file_id
2159
# TODO: it might be nice to exit early if there was nothing
2160
# to do, saving us from trigger a sync on unlock.
2161
self._inventory_is_modified = True
2162
# we preserve the root inventory entry object, but
2163
# unlinkit from the byid index
1585
2164
del inv._byid[inv.root.file_id]
1586
2165
inv.root.file_id = file_id
2166
# and link it into the index with the new changed id.
1587
2167
inv._byid[inv.root.file_id] = inv.root
2168
# and finally update all children to reference the new id.
2169
# XXX: this should be safe to just look at the root.children
2170
# list, not the WHOLE INVENTORY.
1588
2171
for fid in inv:
1589
2172
entry = inv[fid]
1590
2173
if entry.parent_id == orig_root_id:
1591
2174
entry.parent_id = inv.root.file_id
1592
self._write_inventory(inv)
1594
2176
def unlock(self):
1595
2177
"""See Branch.unlock.
1597
2179
WorkingTree locking just uses the Branch locking facilities.
1598
2180
This is current because all working trees have an embedded branch
1599
2181
within them. IF in the future, we were to make branch data shareable
1600
between multiple working trees, i.e. via shared storage, then we
2182
between multiple working trees, i.e. via shared storage, then we
1601
2183
would probably want to lock both the local tree, and the branch.
1603
2185
raise NotImplementedError(self.unlock)
2189
def update(self, change_reporter=None, possible_transports=None,
2190
revision=None, old_tip=_marker):
1607
2191
"""Update a working tree along its branch.
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.
2193
This will update the branch if its bound too, which means we have
2194
multiple trees involved:
2196
- The new basis tree of the master.
2197
- The old basis tree of the branch.
2198
- The old basis tree of the working tree.
2199
- The current working tree state.
2201
Pathologically, all three may be different, and non-ancestors of each
2202
other. Conceptually we want to:
2204
- Preserve the wt.basis->wt.state changes
2205
- Transform the wt.basis to the new master basis.
2206
- Apply a merge of the old branch basis to get any 'local' changes from
2208
- Restore the wt.basis->wt.state changes.
1621
2210
There isn't a single operation at the moment to do that, so we:
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()
2211
- Merge current state -> basis tree of the master w.r.t. the old tree
2213
- Do a 'normal' merge of the old branch basis if it is relevant.
2215
:param revision: The target revision to update to. Must be in the
2217
:param old_tip: If branch.update() has already been run, the value it
2218
returned (old tip of the branch or None). _marker is used
2221
if self.branch.get_bound_location() is not None:
2223
update_branch = (old_tip is self._marker)
2225
self.lock_tree_write()
2226
update_branch = False
2229
old_tip = self.branch.update(possible_transports)
2231
if old_tip is self._marker:
2233
return self._update_tree(old_tip, change_reporter, revision)
2237
@needs_tree_write_lock
2238
def _update_tree(self, old_tip=None, change_reporter=None, revision=None):
2239
"""Update a tree to the master branch.
2241
:param old_tip: if supplied, the previous tip revision the branch,
2242
before it was changed to the master branch's tip.
1626
2244
# here if old_tip is not None, it is the old tip of the branch before
1627
2245
# it was updated from the master branch. This should become a pending
1628
2246
# merge in the working tree to preserve the user existing work. we
1629
2247
# cant set that until we update the working trees last revision to be
1630
2248
# one from the new branch, because it will just get absorbed by the
1631
2249
# parent de-duplication logic.
1633
2251
# We MUST save it even if an error occurs, because otherwise the users
1634
2252
# local work is unreferenced and will appear to have been lost.
1638
2256
last_rev = self.get_parent_ids()[0]
1639
2257
except IndexError:
1641
if last_rev != self.branch.last_revision():
1642
# merge tree state up to new branch tip.
2258
last_rev = _mod_revision.NULL_REVISION
2259
if revision is None:
2260
revision = self.branch.last_revision()
2262
old_tip = old_tip or _mod_revision.NULL_REVISION
2264
if not _mod_revision.is_null(old_tip) and old_tip != last_rev:
2265
# the branch we are bound to was updated
2266
# merge those changes in first
2267
base_tree = self.basis_tree()
2268
other_tree = self.branch.repository.revision_tree(old_tip)
2269
nb_conflicts = merge.merge_inner(self.branch, other_tree,
2270
base_tree, this_tree=self,
2271
change_reporter=change_reporter)
2273
self.add_parent_tree((old_tip, other_tree))
2274
trace.note('Rerun update after fixing the conflicts.')
2277
if last_rev != _mod_revision.ensure_null(revision):
2278
# the working tree is up to date with the branch
2279
# we can merge the specified revision from master
2280
to_tree = self.branch.repository.revision_tree(revision)
2281
to_root_id = to_tree.get_root_id()
1643
2283
basis = self.basis_tree()
1644
to_tree = self.branch.basis_tree()
1645
result += merge_inner(self.branch,
2286
if (basis.inventory.root is None
2287
or basis.inventory.root.file_id != to_root_id):
2288
self.set_root_id(to_root_id)
2293
# determine the branch point
2294
graph = self.branch.repository.get_graph()
2295
base_rev_id = graph.find_unique_lca(self.branch.last_revision(),
2297
base_tree = self.branch.repository.revision_tree(base_rev_id)
2299
nb_conflicts = merge.merge_inner(self.branch, to_tree, base_tree,
2301
change_reporter=change_reporter)
2302
self.set_last_revision(revision)
1649
2303
# TODO - dedup parents list with things merged by pull ?
1650
2304
# reuse the tree we've updated to to set the basis:
1651
parent_trees = [(self.branch.last_revision(), to_tree)]
2305
parent_trees = [(revision, to_tree)]
1652
2306
merges = self.get_parent_ids()[1:]
1653
2307
# Ideally we ask the tree for the trees here, that way the working
1654
# tree can decide whether to give us teh entire tree or give us a
2308
# tree can decide whether to give us the entire tree or give us a
1655
2309
# lazy initialised tree. dirstate for instance will have the trees
1656
2310
# in ram already, whereas a last-revision + basis-inventory tree
1657
2311
# will not, but also does not need them when setting parents.
1658
2312
for parent in merges:
1659
2313
parent_trees.append(
1660
2314
(parent, self.branch.repository.revision_tree(parent)))
1661
if old_tip is not None:
2315
if not _mod_revision.is_null(old_tip):
1662
2316
parent_trees.append(
1663
2317
(old_tip, self.branch.repository.revision_tree(old_tip)))
1664
2318
self.set_parent_trees(parent_trees)
1665
2319
last_rev = parent_trees[0][0]
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
2322
def _write_hashcache_if_dirty(self):
2323
"""Write out the hashcache if it is dirty."""
2324
if self._hashcache.needs_write:
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,
2326
self._hashcache.write()
2328
if e.errno not in (errno.EPERM, errno.EACCES):
2330
# TODO: jam 20061219 Should this be a warning? A single line
2331
# warning might be sufficient to let the user know what
2333
mutter('Could not write hashcache for %s\nError: %s',
2334
self._hashcache.cache_file_name(), e)
1692
2336
@needs_tree_write_lock
1693
2337
def _write_inventory(self, inv):
1694
2338
"""Write inventory as the current inventory."""
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')
2339
self._set_inventory(inv, dirty=True)
1702
2342
def set_conflicts(self, arg):
1703
raise UnsupportedOperation(self.set_conflicts, self)
2343
raise errors.UnsupportedOperation(self.set_conflicts, self)
1705
2345
def add_conflicts(self, arg):
1706
raise UnsupportedOperation(self.add_conflicts, self)
2346
raise errors.UnsupportedOperation(self.add_conflicts, self)
1708
2348
@needs_read_lock
1709
2349
def conflicts(self):
1710
conflicts = ConflictList()
2350
conflicts = _mod_conflicts.ConflictList()
1711
2351
for conflicted in self._iter_conflicts():
1726
2366
if text == False:
1728
2368
ctype = {True: 'text conflict', False: 'contents conflict'}[text]
1729
conflicts.append(Conflict.factory(ctype, path=conflicted,
2369
conflicts.append(_mod_conflicts.Conflict.factory(ctype,
1730
2371
file_id=self.path2id(conflicted)))
1731
2372
return conflicts
2374
def walkdirs(self, prefix=""):
2375
"""Walk the directories of this tree.
2377
returns a generator which yields items in the form:
2378
((curren_directory_path, fileid),
2379
[(file1_path, file1_name, file1_kind, (lstat), file1_id,
2382
This API returns a generator, which is only valid during the current
2383
tree transaction - within a single lock_read or lock_write duration.
2385
If the tree is not locked, it may cause an error to be raised,
2386
depending on the tree implementation.
2388
disk_top = self.abspath(prefix)
2389
if disk_top.endswith('/'):
2390
disk_top = disk_top[:-1]
2391
top_strip_len = len(disk_top) + 1
2392
inventory_iterator = self._walkdirs(prefix)
2393
disk_iterator = osutils.walkdirs(disk_top, prefix)
2395
current_disk = disk_iterator.next()
2396
disk_finished = False
2398
if not (e.errno == errno.ENOENT or
2399
(sys.platform == 'win32' and e.errno == ERROR_PATH_NOT_FOUND)):
2402
disk_finished = True
2404
current_inv = inventory_iterator.next()
2405
inv_finished = False
2406
except StopIteration:
2409
while not inv_finished or not disk_finished:
2411
((cur_disk_dir_relpath, cur_disk_dir_path_from_top),
2412
cur_disk_dir_content) = current_disk
2414
((cur_disk_dir_relpath, cur_disk_dir_path_from_top),
2415
cur_disk_dir_content) = ((None, None), None)
2416
if not disk_finished:
2417
# strip out .bzr dirs
2418
if (cur_disk_dir_path_from_top[top_strip_len:] == '' and
2419
len(cur_disk_dir_content) > 0):
2420
# osutils.walkdirs can be made nicer -
2421
# yield the path-from-prefix rather than the pathjoined
2423
bzrdir_loc = bisect_left(cur_disk_dir_content,
2425
if (bzrdir_loc < len(cur_disk_dir_content)
2426
and self.bzrdir.is_control_filename(
2427
cur_disk_dir_content[bzrdir_loc][0])):
2428
# we dont yield the contents of, or, .bzr itself.
2429
del cur_disk_dir_content[bzrdir_loc]
2431
# everything is unknown
2434
# everything is missing
2437
direction = cmp(current_inv[0][0], cur_disk_dir_relpath)
2439
# disk is before inventory - unknown
2440
dirblock = [(relpath, basename, kind, stat, None, None) for
2441
relpath, basename, kind, stat, top_path in
2442
cur_disk_dir_content]
2443
yield (cur_disk_dir_relpath, None), dirblock
2445
current_disk = disk_iterator.next()
2446
except StopIteration:
2447
disk_finished = True
2449
# inventory is before disk - missing.
2450
dirblock = [(relpath, basename, 'unknown', None, fileid, kind)
2451
for relpath, basename, dkind, stat, fileid, kind in
2453
yield (current_inv[0][0], current_inv[0][1]), dirblock
2455
current_inv = inventory_iterator.next()
2456
except StopIteration:
2459
# versioned present directory
2460
# merge the inventory and disk data together
2462
for relpath, subiterator in itertools.groupby(sorted(
2463
current_inv[1] + cur_disk_dir_content,
2464
key=operator.itemgetter(0)), operator.itemgetter(1)):
2465
path_elements = list(subiterator)
2466
if len(path_elements) == 2:
2467
inv_row, disk_row = path_elements
2468
# versioned, present file
2469
dirblock.append((inv_row[0],
2470
inv_row[1], disk_row[2],
2471
disk_row[3], inv_row[4],
2473
elif len(path_elements[0]) == 5:
2475
dirblock.append((path_elements[0][0],
2476
path_elements[0][1], path_elements[0][2],
2477
path_elements[0][3], None, None))
2478
elif len(path_elements[0]) == 6:
2479
# versioned, absent file.
2480
dirblock.append((path_elements[0][0],
2481
path_elements[0][1], 'unknown', None,
2482
path_elements[0][4], path_elements[0][5]))
2484
raise NotImplementedError('unreachable code')
2485
yield current_inv[0], dirblock
2487
current_inv = inventory_iterator.next()
2488
except StopIteration:
2491
current_disk = disk_iterator.next()
2492
except StopIteration:
2493
disk_finished = True
2495
def _walkdirs(self, prefix=""):
2496
"""Walk the directories of this tree.
2498
:prefix: is used as the directrory to start with.
2499
returns a generator which yields items in the form:
2500
((curren_directory_path, fileid),
2501
[(file1_path, file1_name, file1_kind, None, file1_id,
2504
_directory = 'directory'
2505
# get the root in the inventory
2506
inv = self.inventory
2507
top_id = inv.path2id(prefix)
2511
pending = [(prefix, '', _directory, None, top_id, None)]
2514
currentdir = pending.pop()
2515
# 0 - relpath, 1- basename, 2- kind, 3- stat, 4-id, 5-kind
2516
top_id = currentdir[4]
2518
relroot = currentdir[0] + '/'
2521
# FIXME: stash the node in pending
2523
if entry.kind == 'directory':
2524
for name, child in entry.sorted_children():
2525
dirblock.append((relroot + name, name, child.kind, None,
2526
child.file_id, child.kind
2528
yield (currentdir[0], entry.file_id), dirblock
2529
# push the user specified dirs from dirblock
2530
for dir in reversed(dirblock):
2531
if dir[2] == _directory:
2534
@needs_tree_write_lock
2535
def auto_resolve(self):
2536
"""Automatically resolve text conflicts according to contents.
2538
Only text conflicts are auto_resolvable. Files with no conflict markers
2539
are considered 'resolved', because bzr always puts conflict markers
2540
into files that have text conflicts. The corresponding .THIS .BASE and
2541
.OTHER files are deleted, as per 'resolve'.
2542
:return: a tuple of ConflictLists: (un_resolved, resolved).
2544
un_resolved = _mod_conflicts.ConflictList()
2545
resolved = _mod_conflicts.ConflictList()
2546
conflict_re = re.compile('^(<{7}|={7}|>{7})')
2547
for conflict in self.conflicts():
2548
if (conflict.typestring != 'text conflict' or
2549
self.kind(conflict.file_id) != 'file'):
2550
un_resolved.append(conflict)
2552
my_file = open(self.id2abspath(conflict.file_id), 'rb')
2554
for line in my_file:
2555
if conflict_re.search(line):
2556
un_resolved.append(conflict)
2559
resolved.append(conflict)
2562
resolved.remove_files(self)
2563
self.set_conflicts(un_resolved)
2564
return un_resolved, resolved
2567
def _check(self, references):
2568
"""Check the tree for consistency.
2570
:param references: A dict with keys matching the items returned by
2571
self._get_check_refs(), and values from looking those keys up in
2574
tree_basis = self.basis_tree()
2575
tree_basis.lock_read()
2577
repo_basis = references[('trees', self.last_revision())]
2578
if len(list(repo_basis.iter_changes(tree_basis))) > 0:
2579
raise errors.BzrCheckError(
2580
"Mismatched basis inventory content.")
2585
def _validate(self):
2586
"""Validate internal structures.
2588
This is meant mostly for the test suite. To give it a chance to detect
2589
corruption after actions have occurred. The default implementation is a
2592
:return: None. An exception should be raised if there is an error.
2596
def _get_rules_searcher(self, default_searcher):
2597
"""See Tree._get_rules_searcher."""
2598
if self._rules_searcher is None:
2599
self._rules_searcher = super(WorkingTree,
2600
self)._get_rules_searcher(default_searcher)
2601
return self._rules_searcher
2603
def get_shelf_manager(self):
2604
"""Return the ShelfManager for this WorkingTree."""
2605
from bzrlib.shelf import ShelfManager
2606
return ShelfManager(self, self._transport)
1734
2609
class WorkingTree2(WorkingTree):
1735
2610
"""This is the Format 2 working tree.
1737
This was the first weave based working tree.
2612
This was the first weave based working tree.
1738
2613
- uses os locks for locking.
1739
2614
- uses the branch last-revision.
2617
def __init__(self, *args, **kwargs):
2618
super(WorkingTree2, self).__init__(*args, **kwargs)
2619
# WorkingTree2 has more of a constraint that self._inventory must
2620
# exist. Because this is an older format, we don't mind the overhead
2621
# caused by the extra computation here.
2623
# Newer WorkingTree's should only have self._inventory set when they
2625
if self._inventory is None:
2626
self.read_working_inventory()
2628
def _get_check_refs(self):
2629
"""Return the references needed to perform a check of this tree."""
2630
return [('trees', self.last_revision())]
1742
2632
def lock_tree_write(self):
1743
2633
"""See WorkingTree.lock_tree_write().
1919
2833
def unregister_format(klass, format):
1920
assert klass._formats[format.get_format_string()] is format
1921
2834
del klass._formats[format.get_format_string()]
1925
2837
class WorkingTreeFormat2(WorkingTreeFormat):
1926
"""The second working tree format.
2838
"""The second working tree format.
1928
2840
This format modified the hash cache from the format 1 hash cache.
2843
upgrade_recommended = True
1931
2845
def get_format_description(self):
1932
2846
"""See WorkingTreeFormat.get_format_description()."""
1933
2847
return "Working tree format 2"
1935
def stub_initialize_remote(self, control_files):
1936
"""As a special workaround create critical control files for a remote working tree
2849
def _stub_initialize_on_transport(self, transport, file_mode):
2850
"""Workaround: create control files for a remote working tree.
1938
2852
This ensures that it can later be updated and dealt with locally,
1939
since BzrDirFormat6 and BzrDirFormat5 cannot represent dirs with
2853
since BzrDirFormat6 and BzrDirFormat5 cannot represent dirs with
1940
2854
no working tree. (See bug #43064).
1942
2856
sio = StringIO()
1944
bzrlib.xml5.serializer_v5.write_inventory(inv, sio)
2857
inv = inventory.Inventory()
2858
xml5.serializer_v5.write_inventory(inv, sio, working=True)
1946
control_files.put('inventory', sio)
1948
control_files.put_utf8('pending-merges', '')
1951
def initialize(self, a_bzrdir, revision_id=None):
2860
transport.put_file('inventory', sio, file_mode)
2861
transport.put_bytes('pending-merges', '', file_mode)
2863
def initialize(self, a_bzrdir, revision_id=None, from_branch=None,
2864
accelerator_tree=None, hardlink=False):
1952
2865
"""See WorkingTreeFormat.initialize()."""
1953
2866
if not isinstance(a_bzrdir.transport, LocalTransport):
1954
2867
raise errors.NotLocalUrl(a_bzrdir.transport.base)
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()
2868
if from_branch is not None:
2869
branch = from_branch
2871
branch = a_bzrdir.open_branch()
2872
if revision_id is None:
2873
revision_id = _mod_revision.ensure_null(branch.last_revision())
2876
branch.generate_revision_history(revision_id)
2879
inv = inventory.Inventory()
1969
2880
wt = WorkingTree2(a_bzrdir.root_transport.local_abspath('.'),
1972
2883
_internal=True,
1974
2885
_bzrdir=a_bzrdir)
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)
2886
basis_tree = branch.repository.revision_tree(revision_id)
2887
if basis_tree.inventory.root is not None:
2888
wt.set_root_id(basis_tree.get_root_id())
2889
# set the parent list and cache the basis tree.
2890
if _mod_revision.is_null(revision_id):
2893
parent_trees = [(revision_id, basis_tree)]
2894
wt.set_parent_trees(parent_trees)
2895
transform.build_tree(basis_tree, wt)
1982
2898
def __init__(self):
2082
3028
raise NotImplementedError
2083
3029
if not isinstance(a_bzrdir.transport, LocalTransport):
2084
3030
raise errors.NotLocalUrl(a_bzrdir.transport.base)
2085
return self._open(a_bzrdir, self._open_control_files(a_bzrdir))
3031
wt = self._open(a_bzrdir, self._open_control_files(a_bzrdir))
2087
3034
def _open(self, a_bzrdir, control_files):
2088
3035
"""Open the tree itself.
2090
3037
:param a_bzrdir: the dir for the tree.
2091
3038
:param control_files: the control files for the tree.
2093
return WorkingTree3(a_bzrdir.root_transport.local_abspath('.'),
2097
_control_files=control_files)
3040
return self._tree_class(a_bzrdir.root_transport.local_abspath('.'),
3044
_control_files=control_files)
2099
3046
def __str__(self):
2100
3047
return self.get_format_string()
3050
__default_format = WorkingTreeFormat6()
3051
WorkingTreeFormat.register_format(__default_format)
3052
WorkingTreeFormat.register_format(WorkingTreeFormat5())
3053
WorkingTreeFormat.register_format(WorkingTreeFormat4())
3054
WorkingTreeFormat.register_format(WorkingTreeFormat3())
3055
WorkingTreeFormat.set_default_format(__default_format)
2103
3056
# formats which have no format string are not discoverable
2104
3057
# and not independently creatable, so are not registered.
2105
__default_format = WorkingTreeFormat3()
2106
WorkingTreeFormat.register_format(__default_format)
2107
WorkingTreeFormat.set_default_format(__default_format)
2108
3058
_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
