65
81
MergeModifiedFormatError,
66
82
UnsupportedOperation,
68
from bzrlib.inventory import InventoryEntry, Inventory
84
from bzrlib.inventory import InventoryEntry, Inventory, ROOT_ID
69
85
from bzrlib.lockable_files import LockableFiles, TransportLock
70
86
from bzrlib.lockdir import LockDir
71
from bzrlib.merge import merge_inner, transform_tree
87
import bzrlib.mutabletree
88
from bzrlib.mutabletree import needs_tree_write_lock
72
89
from bzrlib.osutils import (
101
from bzrlib.trace import mutter, note
102
from bzrlib.transport.local import LocalTransport
90
104
from bzrlib.progress import DummyProgress, ProgressPhase
91
105
from bzrlib.revision import NULL_REVISION
106
import bzrlib.revisiontree
92
107
from bzrlib.rio import RioReader, rio_file, Stanza
93
from bzrlib.symbol_versioning import *
94
from bzrlib.textui import show_status
96
from bzrlib.transform import build_tree
97
from bzrlib.trace import mutter, note
98
from bzrlib.transport import get_transport
99
from bzrlib.transport.local import LocalTransport
108
from bzrlib.symbol_versioning import (deprecated_passed,
111
DEPRECATED_PARAMETER,
118
MERGE_MODIFIED_HEADER_1 = "BZR merge-modified list format 1"
119
CONFLICT_HEADER_1 = "BZR conflict list format 1"
122
@deprecated_function(zero_thirteen)
104
123
def gen_file_id(name):
105
"""Return new file id.
107
This should probably generate proper UUIDs, but for the moment we
108
cope with just randomness because running uuidgen every time is
111
from binascii import hexlify
112
from time import time
115
idx = name.rfind('/')
117
name = name[idx+1 : ]
118
idx = name.rfind('\\')
120
name = name[idx+1 : ]
122
# make it not a hidden file
123
name = name.lstrip('.')
125
# remove any wierd characters; we don't escape them but rather
127
name = re.sub(r'[^\w.]', '', name)
129
s = hexlify(rand_bytes(8))
130
return '-'.join((name, compact_date(time()), s))
124
"""Return new file id for the basename 'name'.
126
Use bzrlib.generate_ids.gen_file_id() instead
128
return generate_ids.gen_file_id(name)
131
@deprecated_function(zero_thirteen)
133
132
def gen_root_id():
134
"""Return a new tree-root file id."""
135
return gen_file_id('TREE_ROOT')
133
"""Return a new tree-root file id.
135
This has been deprecated in favor of bzrlib.generate_ids.gen_root_id()
137
return generate_ids.gen_root_id()
138
140
class TreeEntry(object):
139
"""An entry that implements the minium interface used by commands.
141
"""An entry that implements the minimum interface used by commands.
141
143
This needs further inspection, it may be better to have
142
144
InventoryEntries without ids - though that seems wrong. For now,
267
266
# if needed, or, when the cache sees a change, append it to the hash
268
267
# cache file, and have the parser take the most recent entry for a
269
268
# given path only.
270
cache_filename = self.bzrdir.get_workingtree_transport(None).abspath('stat-cache')
269
cache_filename = self.bzrdir.get_workingtree_transport(None).local_abspath('stat-cache')
271
270
hc = self._hashcache = HashCache(basedir, cache_filename, self._control_files._file_mode)
273
272
# is this scan needed ? it makes things kinda slow.
276
275
if hc.needs_write:
277
276
mutter("write hc")
280
279
if _inventory is None:
281
self._set_inventory(self.read_working_inventory())
280
self._inventory_is_modified = False
281
self.read_working_inventory()
283
self._set_inventory(_inventory)
285
def _set_inventory(self, inv):
283
# the caller of __init__ has provided an inventory,
284
# we assume they know what they are doing - as its only
285
# the Format factory and creation methods that are
286
# permitted to do this.
287
self._set_inventory(_inventory, dirty=False)
290
fget=lambda self: self._branch,
291
doc="""The branch this WorkingTree is connected to.
293
This cannot be set - it is reflective of the actual disk structure
294
the working tree has been constructed from.
297
def break_lock(self):
298
"""Break a lock if one is present from another instance.
300
Uses the ui factory to ask for confirmation if the lock may be from
303
This will probe the repository for its lock as well.
305
self._control_files.break_lock()
306
self.branch.break_lock()
308
def _set_inventory(self, inv, dirty):
309
"""Set the internal cached inventory.
311
:param inv: The inventory to set.
312
:param dirty: A boolean indicating whether the inventory is the same
313
logical inventory as whats on disk. If True the inventory is not
314
the same and should be written to disk or data will be lost, if
315
False then the inventory is the same as that on disk and any
316
serialisation would be unneeded overhead.
318
assert inv.root is not None
286
319
self._inventory = inv
287
self.path2id = self._inventory.path2id
289
def is_control_filename(self, filename):
290
"""True if filename is the name of a control file in this tree.
292
This is true IF and ONLY IF the filename is part of the meta data
293
that bzr controls in this tree. I.E. a random .bzr directory placed
294
on disk will not be a control file for this tree.
297
self.bzrdir.transport.relpath(self.abspath(filename))
299
except errors.PathNotChild:
320
self._inventory_is_modified = dirty
303
323
def open(path=None, _unsupported=False):
496
554
return os.path.getsize(self.id2abspath(file_id))
499
def get_file_sha1(self, file_id):
500
path = self._inventory.id2path(file_id)
501
return self._hashcache.get_sha1(path)
503
def is_executable(self, file_id):
504
if not supports_executable():
557
def get_file_sha1(self, file_id, path=None, stat_value=None):
559
path = self._inventory.id2path(file_id)
560
return self._hashcache.get_sha1(path, stat_value)
562
def get_file_mtime(self, file_id, path=None):
564
path = self._inventory.id2path(file_id)
565
return os.lstat(self.abspath(path)).st_mtime
567
if not supports_executable():
568
def is_executable(self, file_id, path=None):
505
569
return self._inventory[file_id].executable
507
path = self._inventory.id2path(file_id)
571
def is_executable(self, file_id, path=None):
573
path = self._inventory.id2path(file_id)
508
574
mode = os.lstat(self.abspath(path)).st_mode
509
return bool(stat.S_ISREG(mode) and stat.S_IEXEC&mode)
575
return bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode)
511
577
@needs_write_lock
512
def add(self, files, ids=None):
513
"""Make files versioned.
515
Note that the command line normally calls smart_add instead,
516
which can automatically recurse.
518
This adds the files to the inventory, so that they will be
519
recorded by the next commit.
522
List of paths to add, relative to the base of the tree.
525
If set, use these instead of automatically generated ids.
526
Must be the same length as the list of files, but may
527
contain None for ids that are to be autogenerated.
529
TODO: Perhaps have an option to add the ids even if the files do
532
TODO: Perhaps callback with the ids and paths as they're added.
578
def _add(self, files, ids, kinds):
579
"""See MutableTree._add."""
534
580
# TODO: Re-adding a file that is removed in the working copy
535
581
# should probably put it back with the previous ID.
536
if isinstance(files, basestring):
537
assert(ids is None or isinstance(ids, basestring))
543
ids = [None] * len(files)
545
assert(len(ids) == len(files))
582
# the read and write working inventory should not occur in this
583
# function - they should be part of lock_write and unlock.
547
584
inv = self.read_working_inventory()
548
for f,file_id in zip(files, ids):
549
if self.is_control_filename(f):
550
raise BzrError("cannot add control file %s" % quotefn(f))
555
raise BzrError("cannot add top-level %r" % f)
557
fullpath = normpath(self.abspath(f))
560
kind = file_kind(fullpath)
562
if e.errno == errno.ENOENT:
563
raise NoSuchFile(fullpath)
564
# maybe something better?
565
raise BzrError('cannot add: not a regular file, symlink or directory: %s' % quotefn(f))
567
if not InventoryEntry.versionable_kind(kind):
568
raise BzrError('cannot add: not a versionable file ('
569
'i.e. regular file, symlink or directory): %s' % quotefn(f))
585
for f, file_id, kind in zip(files, ids, kinds):
586
assert kind is not None
571
587
if file_id is None:
572
file_id = gen_file_id(f)
573
inv.add_path(f, kind=kind, file_id=file_id)
575
mutter("add file %s file_id:{%s} kind=%r" % (f, file_id, kind))
588
inv.add_path(f, kind=kind)
590
inv.add_path(f, kind=kind, file_id=file_id)
576
591
self._write_inventory(inv)
593
@needs_tree_write_lock
594
def _gather_kinds(self, files, kinds):
595
"""See MutableTree._gather_kinds."""
596
for pos, f in enumerate(files):
597
if kinds[pos] is None:
598
fullpath = normpath(self.abspath(f))
600
kinds[pos] = file_kind(fullpath)
602
if e.errno == errno.ENOENT:
603
raise NoSuchFile(fullpath)
578
605
@needs_write_lock
606
def add_parent_tree_id(self, revision_id, allow_leftmost_as_ghost=False):
607
"""Add revision_id as a parent.
609
This is equivalent to retrieving the current list of parent ids
610
and setting the list to its value plus revision_id.
612
:param revision_id: The revision id to add to the parent list. It may
613
be a ghost revision as long as its not the first parent to be added,
614
or the allow_leftmost_as_ghost parameter is set True.
615
:param allow_leftmost_as_ghost: Allow the first parent to be a ghost.
617
parents = self.get_parent_ids() + [revision_id]
618
self.set_parent_ids(parents,
619
allow_leftmost_as_ghost=len(parents) > 1 or allow_leftmost_as_ghost)
621
@needs_tree_write_lock
622
def add_parent_tree(self, parent_tuple, allow_leftmost_as_ghost=False):
623
"""Add revision_id, tree tuple as a parent.
625
This is equivalent to retrieving the current list of parent trees
626
and setting the list to its value plus parent_tuple. See also
627
add_parent_tree_id - if you only have a parent id available it will be
628
simpler to use that api. If you have the parent already available, using
629
this api is preferred.
631
:param parent_tuple: The (revision id, tree) to add to the parent list.
632
If the revision_id is a ghost, pass None for the tree.
633
:param allow_leftmost_as_ghost: Allow the first parent to be a ghost.
635
parent_ids = self.get_parent_ids() + [parent_tuple[0]]
636
if len(parent_ids) > 1:
637
# the leftmost may have already been a ghost, preserve that if it
639
allow_leftmost_as_ghost = True
640
self.set_parent_ids(parent_ids,
641
allow_leftmost_as_ghost=allow_leftmost_as_ghost)
643
@needs_tree_write_lock
579
644
def add_pending_merge(self, *revision_ids):
580
645
# TODO: Perhaps should check at this point that the
581
646
# history of the revision is actually present?
582
p = self.pending_merges()
647
parents = self.get_parent_ids()
584
649
for rev_id in revision_ids:
650
if rev_id in parents:
652
parents.append(rev_id)
590
self.set_pending_merges(p)
655
self.set_parent_ids(parents, allow_leftmost_as_ghost=True)
657
@deprecated_method(zero_eleven)
593
659
def pending_merges(self):
594
660
"""Return a list of pending merges.
596
662
These are revisions that have been merged into the working
597
663
directory but not yet committed.
600
merges_file = self._control_files.get_utf8('pending-merges')
602
if e.errno != errno.ENOENT:
606
for l in merges_file.readlines():
607
p.append(l.rstrip('\n'))
665
As of 0.11 this is deprecated. Please see WorkingTree.get_parent_ids()
666
instead - which is available on all tree objects.
668
return self.get_parent_ids()[1:]
670
def _check_parents_for_ghosts(self, revision_ids, allow_leftmost_as_ghost):
671
"""Common ghost checking functionality from set_parent_*.
673
This checks that the left hand-parent exists if there are any
676
if len(revision_ids) > 0:
677
leftmost_id = revision_ids[0]
678
if (not allow_leftmost_as_ghost and not
679
self.branch.repository.has_revision(leftmost_id)):
680
raise errors.GhostRevisionUnusableHere(leftmost_id)
682
def _set_merges_from_parent_ids(self, parent_ids):
683
merges = parent_ids[1:]
684
self._control_files.put_utf8('pending-merges', '\n'.join(merges))
686
@needs_tree_write_lock
687
def set_parent_ids(self, revision_ids, allow_leftmost_as_ghost=False):
688
"""Set the parent ids to revision_ids.
690
See also set_parent_trees. This api will try to retrieve the tree data
691
for each element of revision_ids from the trees repository. If you have
692
tree data already available, it is more efficient to use
693
set_parent_trees rather than set_parent_ids. set_parent_ids is however
694
an easier API to use.
696
:param revision_ids: The revision_ids to set as the parent ids of this
697
working tree. Any of these may be ghosts.
699
self._check_parents_for_ghosts(revision_ids,
700
allow_leftmost_as_ghost=allow_leftmost_as_ghost)
702
if len(revision_ids) > 0:
703
self.set_last_revision(revision_ids[0])
705
self.set_last_revision(None)
707
self._set_merges_from_parent_ids(revision_ids)
709
@needs_tree_write_lock
710
def set_parent_trees(self, parents_list, allow_leftmost_as_ghost=False):
711
"""See MutableTree.set_parent_trees."""
712
parent_ids = [rev for (rev, tree) in parents_list]
714
self._check_parents_for_ghosts(parent_ids,
715
allow_leftmost_as_ghost=allow_leftmost_as_ghost)
717
if len(parent_ids) == 0:
718
leftmost_parent_id = None
719
leftmost_parent_tree = None
721
leftmost_parent_id, leftmost_parent_tree = parents_list[0]
723
if self._change_last_revision(leftmost_parent_id):
724
if leftmost_parent_tree is None:
725
# If we don't have a tree, fall back to reading the
726
# parent tree from the repository.
727
self._cache_basis_inventory(leftmost_parent_id)
729
inv = leftmost_parent_tree.inventory
730
xml = self._create_basis_xml_from_inventory(
731
leftmost_parent_id, inv)
732
self._write_basis_inventory(xml)
733
self._set_merges_from_parent_ids(parent_ids)
735
@needs_tree_write_lock
611
736
def set_pending_merges(self, rev_list):
612
self._control_files.put_utf8('pending-merges', '\n'.join(rev_list))
737
parents = self.get_parent_ids()
738
leftmost = parents[:1]
739
new_parents = leftmost + rev_list
740
self.set_parent_ids(new_parents)
742
@needs_tree_write_lock
615
743
def set_merge_modified(self, modified_hashes):
616
744
def iter_stanzas():
617
745
for file_id, hash in modified_hashes.iteritems():
618
746
yield Stanza(file_id=file_id, hash=hash)
619
747
self._put_rio('merge-hashes', iter_stanzas(), MERGE_MODIFIED_HEADER_1)
749
@needs_tree_write_lock
622
750
def _put_rio(self, filename, stanzas, header):
623
751
my_file = rio_file(stanzas, header)
624
752
self._control_files.put(filename, my_file)
754
@needs_write_lock # because merge pulls data into the branch.
755
def merge_from_branch(self, branch, to_revision=None):
756
"""Merge from a branch into this working tree.
758
:param branch: The branch to merge from.
759
:param to_revision: If non-None, the merge will merge to to_revision, but
760
not beyond it. to_revision does not need to be in the history of
761
the branch when it is supplied. If None, to_revision defaults to
762
branch.last_revision().
764
from bzrlib.merge import Merger, Merge3Merger
765
pb = bzrlib.ui.ui_factory.nested_progress_bar()
767
merger = Merger(self.branch, this_tree=self, pb=pb)
768
merger.pp = ProgressPhase("Merge phase", 5, pb)
769
merger.pp.next_phase()
770
# check that there are no
772
merger.check_basis(check_clean=True, require_commits=False)
773
if to_revision is None:
774
to_revision = branch.last_revision()
775
merger.other_rev_id = to_revision
776
if merger.other_rev_id is None:
777
raise error.NoCommits(branch)
778
self.branch.fetch(branch, last_revision=merger.other_rev_id)
779
merger.other_basis = merger.other_rev_id
780
merger.other_tree = self.branch.repository.revision_tree(
782
merger.pp.next_phase()
784
if merger.base_rev_id == merger.other_rev_id:
785
raise errors.PointlessMerge
786
merger.backup_files = False
787
merger.merge_type = Merge3Merger
788
merger.set_interesting_files(None)
789
merger.show_base = False
790
merger.reprocess = False
791
conflicts = merger.do_merge()
627
798
def merge_modified(self):
666
857
Skips the control directory.
668
859
inv = self._inventory
670
def descend(from_dir_relpath, from_dir_id, dp):
860
if include_root is True:
861
yield ('', 'V', 'directory', inv.root.file_id, inv.root)
862
# Convert these into local objects to save lookup times
863
pathjoin = osutils.pathjoin
864
file_kind = osutils.file_kind
866
# transport.base ends in a slash, we want the piece
867
# between the last two slashes
868
transport_base_dir = self.bzrdir.transport.base.rsplit('/', 2)[1]
870
fk_entries = {'directory':TreeDirectory, 'file':TreeFile, 'symlink':TreeLink}
872
# directory file_id, relative path, absolute path, reverse sorted children
873
children = os.listdir(self.basedir)
875
# jam 20060527 The kernel sized tree seems equivalent whether we
876
# use a deque and popleft to keep them sorted, or if we use a plain
877
# list and just reverse() them.
878
children = collections.deque(children)
879
stack = [(inv.root.file_id, u'', self.basedir, children)]
881
from_dir_id, from_dir_relpath, from_dir_abspath, children = stack[-1]
884
f = children.popleft()
674
885
## TODO: If we find a subdirectory with its own .bzr
675
886
## directory, then that is a separate tree and we
676
887
## should exclude it.
678
889
# the bzrdir for this tree
679
if self.bzrdir.transport.base.endswith(f + '/'):
890
if transport_base_dir == f:
683
fp = appendpath(from_dir_relpath, f)
893
# we know that from_dir_relpath and from_dir_abspath never end in a slash
894
# and 'f' doesn't begin with one, we can do a string op, rather
895
# than the checks of pathjoin(), all relative paths will have an extra slash
897
fp = from_dir_relpath + '/' + f
686
fap = appendpath(dp, f)
900
fap = from_dir_abspath + '/' + f
688
902
f_ie = inv.get_child(from_dir_id, f)
691
elif self.is_ignored(fp):
905
elif self.is_ignored(fp[1:]):
908
# we may not have found this file, because of a unicode issue
909
f_norm, can_access = osutils.normalized_filename(f)
910
if f == f_norm or not can_access:
911
# No change, so treat this file normally
914
# this file can be accessed by a normalized path
915
# check again if it is versioned
916
# these lines are repeated here for performance
918
fp = from_dir_relpath + '/' + f
919
fap = from_dir_abspath + '/' + f
920
f_ie = inv.get_child(from_dir_id, f)
923
elif self.is_ignored(fp[1:]):
696
928
fk = file_kind(fap)
981
1265
If the file is ignored, returns the pattern which caused it to
982
1266
be ignored, otherwise None. So this can simply be used as a
983
1267
boolean if desired."""
985
# TODO: Use '**' to match directories, and other extended
986
# globbing stuff from cvs/rsync.
988
# XXX: fnmatch is actually not quite what we want: it's only
989
# approximately the same as real Unix fnmatch, and doesn't
990
# treat dotfiles correctly and allows * to match /.
991
# Eventually it should be replaced with something more
994
for pat in self.get_ignore_list():
995
if '/' in pat or '\\' in pat:
997
# as a special case, you can put ./ at the start of a
998
# pattern; this is good to match in the top-level
1001
if (pat[:2] == './') or (pat[:2] == '.\\'):
1005
if fnmatch.fnmatchcase(filename, newpat):
1008
if fnmatch.fnmatchcase(splitpath(filename)[-1], pat):
1268
if getattr(self, '_ignoreglobster', None) is None:
1269
self._ignoreglobster = globbing.Globster(self.get_ignore_list())
1270
return self._ignoreglobster.match(filename)
1013
1272
def kind(self, file_id):
1014
1273
return file_kind(self.id2abspath(file_id))
1275
def _comparison_data(self, entry, path):
1276
abspath = self.abspath(path)
1278
stat_value = os.lstat(abspath)
1280
if getattr(e, 'errno', None) == errno.ENOENT:
1287
mode = stat_value.st_mode
1288
kind = osutils.file_kind_from_stat_mode(mode)
1289
if not supports_executable():
1290
executable = entry.executable
1292
executable = bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode)
1293
return kind, executable, stat_value
1295
def _file_size(self, entry, stat_value):
1296
return stat_value.st_size
1017
1298
def last_revision(self):
1018
"""Return the last revision id of this working tree.
1020
In early branch formats this was == the branch last_revision,
1021
but that cannot be relied upon - for working tree operations,
1022
always use tree.last_revision().
1299
"""Return the last revision of the branch for this tree.
1301
This format tree does not support a separate marker for last-revision
1302
compared to the branch.
1304
See MutableTree.last_revision
1306
return self._last_revision()
1309
def _last_revision(self):
1310
"""helper for get_parent_ids."""
1024
1311
return self.branch.last_revision()
1313
def is_locked(self):
1314
return self._control_files.is_locked()
1026
1316
def lock_read(self):
1027
1317
"""See Branch.lock_read, and WorkingTree.unlock."""
1028
1318
self.branch.lock_read()
1059
1361
if new_revision is None:
1060
1362
self.branch.set_revision_history([])
1062
# current format is locked in with the branch
1063
revision_history = self.branch.revision_history()
1065
position = revision_history.index(new_revision)
1067
raise errors.NoSuchRevision(self.branch, new_revision)
1068
self.branch.set_revision_history(revision_history[:position + 1])
1365
self.branch.generate_revision_history(new_revision)
1366
except errors.NoSuchRevision:
1367
# not present in the repo - dont try to set it deeper than the tip
1368
self.branch.set_revision_history([new_revision])
1371
def _write_basis_inventory(self, xml):
1372
"""Write the basis inventory XML to the basis-inventory file"""
1373
assert isinstance(xml, str), 'serialised xml must be bytestring.'
1374
path = self._basis_inventory_name()
1376
self._control_files.put(path, sio)
1378
def _create_basis_xml_from_inventory(self, revision_id, inventory):
1379
"""Create the text that will be saved in basis-inventory"""
1380
inventory.revision_id = revision_id
1381
return xml6.serializer_v6.write_inventory_to_string(inventory)
1071
1383
def _cache_basis_inventory(self, new_revision):
1072
1384
"""Cache new_revision as the basis inventory."""
1385
# TODO: this should allow the ready-to-use inventory to be passed in,
1386
# as commit already has that ready-to-use [while the format is the
1074
1389
# this double handles the inventory - unpack and repack -
1075
1390
# but is easier to understand. We can/should put a conditional
1076
1391
# in here based on whether the inventory is in the latest format
1077
1392
# - perhaps we should repack all inventories on a repository
1079
inv = self.branch.repository.get_inventory(new_revision)
1080
inv.revision_id = new_revision
1081
xml = bzrlib.xml5.serializer_v5.write_inventory_to_string(inv)
1083
path = self._basis_inventory_name()
1084
self._control_files.put_utf8(path, xml)
1085
except WeaveRevisionNotPresent:
1394
# the fast path is to copy the raw xml from the repository. If the
1395
# xml contains 'revision_id="', then we assume the right
1396
# revision_id is set. We must check for this full string, because a
1397
# root node id can legitimately look like 'revision_id' but cannot
1399
xml = self.branch.repository.get_inventory_xml(new_revision)
1400
firstline = xml.split('\n', 1)[0]
1401
if (not 'revision_id="' in firstline or
1402
'format="6"' not in firstline):
1403
inv = self.branch.repository.deserialise_inventory(
1405
xml = self._create_basis_xml_from_inventory(new_revision, inv)
1406
self._write_basis_inventory(xml)
1407
except (errors.NoSuchRevision, errors.RevisionNotPresent):
1088
1410
def read_basis_inventory(self):
1089
1411
"""Read the cached basis inventory."""
1090
1412
path = self._basis_inventory_name()
1091
return self._control_files.get_utf8(path).read()
1413
return self._control_files.get(path).read()
1093
1415
@needs_read_lock
1094
1416
def read_working_inventory(self):
1095
"""Read the working inventory."""
1417
"""Read the working inventory.
1419
:raises errors.InventoryModified: read_working_inventory will fail
1420
when the current in memory inventory has been modified.
1422
# conceptually this should be an implementation detail of the tree.
1423
# XXX: Deprecate this.
1096
1424
# ElementTree does its own conversion from UTF-8, so open in
1098
result = bzrlib.xml5.serializer_v5.read_inventory(
1426
if self._inventory_is_modified:
1427
raise errors.InventoryModified(self)
1428
result = xml5.serializer_v5.read_inventory(
1099
1429
self._control_files.get('inventory'))
1100
self._set_inventory(result)
1430
self._set_inventory(result, dirty=False)
1104
def remove(self, files, verbose=False):
1433
@needs_tree_write_lock
1434
def remove(self, files, verbose=False, to_file=None):
1105
1435
"""Remove nominated files from the working inventory..
1107
1437
This does not remove their text. This does not run on XXX on what? RBC
1204
1548
between multiple working trees, i.e. via shared storage, then we
1205
1549
would probably want to lock both the local tree, and the branch.
1207
# FIXME: We want to write out the hashcache only when the last lock on
1208
# this working copy is released. Peeking at the lock count is a bit
1209
# of a nasty hack; probably it's better to have a transaction object,
1210
# which can do some finalization when it's either successfully or
1211
# unsuccessfully completed. (Denys's original patch did that.)
1212
# RBC 20060206 hookinhg into transaction will couple lock and transaction
1213
# wrongly. Hookinh into unllock on the control files object is fine though.
1215
# TODO: split this per format so there is no ugly if block
1216
if self._hashcache.needs_write and (
1217
# dedicated lock files
1218
self._control_files._lock_count==1 or
1220
(self._control_files is self.branch.control_files and
1221
self._control_files._lock_count==3)):
1222
self._hashcache.write()
1223
# reverse order of locking.
1224
result = self._control_files.unlock()
1226
self.branch.unlock()
1551
raise NotImplementedError(self.unlock)
1231
1553
def update(self):
1232
1554
"""Update a working tree along its branch.
1234
This will update the branch if its bound too, which means we have multiple trees involved:
1235
The new basis tree of the master.
1236
The old basis tree of the branch.
1237
The old basis tree of the working tree.
1238
The current working tree state.
1239
pathologically all three may be different, and non ancestors of each other.
1240
Conceptually we want to:
1241
Preserve the wt.basis->wt.state changes
1242
Transform the wt.basis to the new master basis.
1243
Apply a merge of the old branch basis to get any 'local' changes from it into the tree.
1244
Restore the wt.basis->wt.state changes.
1556
This will update the branch if its bound too, which means we have
1557
multiple trees involved:
1559
- The new basis tree of the master.
1560
- The old basis tree of the branch.
1561
- The old basis tree of the working tree.
1562
- The current working tree state.
1564
Pathologically, all three may be different, and non-ancestors of each
1565
other. Conceptually we want to:
1567
- Preserve the wt.basis->wt.state changes
1568
- Transform the wt.basis to the new master basis.
1569
- Apply a merge of the old branch basis to get any 'local' changes from
1571
- Restore the wt.basis->wt.state changes.
1246
1573
There isn't a single operation at the moment to do that, so we:
1247
Merge current state -> basis tree of the master w.r.t. the old tree basis.
1248
Do a 'normal' merge of the old branch basis if it is relevant.
1574
- Merge current state -> basis tree of the master w.r.t. the old tree
1576
- Do a 'normal' merge of the old branch basis if it is relevant.
1250
old_tip = self.branch.update()
1251
if old_tip is not None:
1252
self.add_pending_merge(old_tip)
1253
self.branch.lock_read()
1578
if self.branch.get_master_branch() is not None:
1580
update_branch = True
1582
self.lock_tree_write()
1583
update_branch = False
1256
if self.last_revision() != self.branch.last_revision():
1257
# merge tree state up to new branch tip.
1258
basis = self.basis_tree()
1259
to_tree = self.branch.basis_tree()
1260
result += merge_inner(self.branch,
1264
self.set_last_revision(self.branch.last_revision())
1265
if old_tip and old_tip != self.last_revision():
1266
# our last revision was not the prior branch last reivison
1267
# and we have converted that last revision to a pending merge.
1268
# base is somewhere between the branch tip now
1269
# and the now pending merge
1270
from bzrlib.revision import common_ancestor
1272
base_rev_id = common_ancestor(self.branch.last_revision(),
1274
self.branch.repository)
1275
except errors.NoCommonAncestor:
1277
base_tree = self.branch.repository.revision_tree(base_rev_id)
1278
other_tree = self.branch.repository.revision_tree(old_tip)
1279
result += merge_inner(self.branch,
1586
old_tip = self.branch.update()
1589
return self._update_tree(old_tip)
1285
self.branch.unlock()
1593
@needs_tree_write_lock
1594
def _update_tree(self, old_tip=None):
1595
"""Update a tree to the master branch.
1597
:param old_tip: if supplied, the previous tip revision the branch,
1598
before it was changed to the master branch's tip.
1600
# here if old_tip is not None, it is the old tip of the branch before
1601
# it was updated from the master branch. This should become a pending
1602
# merge in the working tree to preserve the user existing work. we
1603
# cant set that until we update the working trees last revision to be
1604
# one from the new branch, because it will just get absorbed by the
1605
# parent de-duplication logic.
1607
# We MUST save it even if an error occurs, because otherwise the users
1608
# local work is unreferenced and will appear to have been lost.
1612
last_rev = self.get_parent_ids()[0]
1615
if last_rev != self.branch.last_revision():
1616
# merge tree state up to new branch tip.
1617
basis = self.basis_tree()
1618
to_tree = self.branch.basis_tree()
1619
if basis.inventory.root is None:
1620
self.set_root_id(to_tree.inventory.root.file_id)
1621
result += merge.merge_inner(
1626
# TODO - dedup parents list with things merged by pull ?
1627
# reuse the tree we've updated to to set the basis:
1628
parent_trees = [(self.branch.last_revision(), to_tree)]
1629
merges = self.get_parent_ids()[1:]
1630
# Ideally we ask the tree for the trees here, that way the working
1631
# tree can decide whether to give us teh entire tree or give us a
1632
# lazy initialised tree. dirstate for instance will have the trees
1633
# in ram already, whereas a last-revision + basis-inventory tree
1634
# will not, but also does not need them when setting parents.
1635
for parent in merges:
1636
parent_trees.append(
1637
(parent, self.branch.repository.revision_tree(parent)))
1638
if old_tip is not None:
1639
parent_trees.append(
1640
(old_tip, self.branch.repository.revision_tree(old_tip)))
1641
self.set_parent_trees(parent_trees)
1642
last_rev = parent_trees[0][0]
1644
# the working tree had the same last-revision as the master
1645
# branch did. We may still have pivot local work from the local
1646
# branch into old_tip:
1647
if old_tip is not None:
1648
self.add_parent_tree_id(old_tip)
1649
if old_tip and old_tip != last_rev:
1650
# our last revision was not the prior branch last revision
1651
# and we have converted that last revision to a pending merge.
1652
# base is somewhere between the branch tip now
1653
# and the now pending merge
1654
from bzrlib.revision import common_ancestor
1656
base_rev_id = common_ancestor(self.branch.last_revision(),
1658
self.branch.repository)
1659
except errors.NoCommonAncestor:
1661
base_tree = self.branch.repository.revision_tree(base_rev_id)
1662
other_tree = self.branch.repository.revision_tree(old_tip)
1663
result += merge.merge_inner(
1670
@needs_tree_write_lock
1288
1671
def _write_inventory(self, inv):
1289
1672
"""Write inventory as the current inventory."""
1291
bzrlib.xml5.serializer_v5.write_inventory(inv, sio)
1293
self._control_files.put('inventory', sio)
1294
self._set_inventory(inv)
1295
mutter('wrote working inventory')
1673
self._set_inventory(inv, dirty=True)
1297
1676
def set_conflicts(self, arg):
1298
1677
raise UnsupportedOperation(self.set_conflicts, self)
1679
def add_conflicts(self, arg):
1680
raise UnsupportedOperation(self.add_conflicts, self)
1300
1682
@needs_read_lock
1301
1683
def conflicts(self):
1302
conflicts = ConflictList()
1684
conflicts = _mod_conflicts.ConflictList()
1303
1685
for conflicted in self._iter_conflicts():
1306
1688
if file_kind(self.abspath(conflicted)) != "file":
1309
if e.errno == errno.ENOENT:
1690
except errors.NoSuchFile:
1313
1692
if text is True:
1314
1693
for suffix in ('.THIS', '.OTHER'):
1316
1695
kind = file_kind(self.abspath(conflicted+suffix))
1318
if e.errno == errno.ENOENT:
1698
except errors.NoSuchFile:
1326
1702
ctype = {True: 'text conflict', False: 'contents conflict'}[text]
1327
conflicts.append(Conflict.factory(ctype, path=conflicted,
1703
conflicts.append(_mod_conflicts.Conflict.factory(ctype,
1328
1705
file_id=self.path2id(conflicted)))
1329
1706
return conflicts
1709
class WorkingTree2(WorkingTree):
1710
"""This is the Format 2 working tree.
1712
This was the first weave based working tree.
1713
- uses os locks for locking.
1714
- uses the branch last-revision.
1717
def lock_tree_write(self):
1718
"""See WorkingTree.lock_tree_write().
1720
In Format2 WorkingTrees we have a single lock for the branch and tree
1721
so lock_tree_write() degrades to lock_write().
1723
self.branch.lock_write()
1725
return self._control_files.lock_write()
1727
self.branch.unlock()
1731
# we share control files:
1732
if self._control_files._lock_count == 3:
1733
# _inventory_is_modified is always False during a read lock.
1734
if self._inventory_is_modified:
1736
if self._hashcache.needs_write:
1737
self._hashcache.write()
1738
# reverse order of locking.
1740
return self._control_files.unlock()
1742
self.branch.unlock()
1332
1745
class WorkingTree3(WorkingTree):
1333
1746
"""This is the Format 3 working tree.
added
removed
bzrlib/workingtree.py
