65
82
MergeModifiedFormatError,
66
83
UnsupportedOperation,
68
from bzrlib.inventory import InventoryEntry, Inventory
85
from bzrlib.inventory import InventoryEntry, Inventory, ROOT_ID
69
86
from bzrlib.lockable_files import LockableFiles, TransportLock
70
87
from bzrlib.lockdir import LockDir
71
from bzrlib.merge import merge_inner, transform_tree
88
import bzrlib.mutabletree
89
from bzrlib.mutabletree import needs_tree_write_lock
72
90
from bzrlib.osutils import (
102
from bzrlib.trace import mutter, note
103
from bzrlib.transport.local import LocalTransport
90
105
from bzrlib.progress import DummyProgress, ProgressPhase
91
106
from bzrlib.revision import NULL_REVISION
107
import bzrlib.revisiontree
92
108
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
109
from bzrlib.symbol_versioning import (deprecated_passed,
112
DEPRECATED_PARAMETER,
119
MERGE_MODIFIED_HEADER_1 = "BZR merge-modified list format 1"
120
CONFLICT_HEADER_1 = "BZR conflict list format 1"
123
@deprecated_function(zero_thirteen)
104
124
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))
125
"""Return new file id for the basename 'name'.
127
Use bzrlib.generate_ids.gen_file_id() instead
129
return generate_ids.gen_file_id(name)
132
@deprecated_function(zero_thirteen)
133
133
def gen_root_id():
134
"""Return a new tree-root file id."""
135
return gen_file_id('TREE_ROOT')
134
"""Return a new tree-root file id.
136
This has been deprecated in favor of bzrlib.generate_ids.gen_root_id()
138
return generate_ids.gen_root_id()
138
141
class TreeEntry(object):
139
"""An entry that implements the minium interface used by commands.
142
"""An entry that implements the minimum interface used by commands.
141
144
This needs further inspection, it may be better to have
142
145
InventoryEntries without ids - though that seems wrong. For now,
267
267
# if needed, or, when the cache sees a change, append it to the hash
268
268
# cache file, and have the parser take the most recent entry for a
269
269
# given path only.
270
cache_filename = self.bzrdir.get_workingtree_transport(None).abspath('stat-cache')
270
cache_filename = self.bzrdir.get_workingtree_transport(None).local_abspath('stat-cache')
271
271
hc = self._hashcache = HashCache(basedir, cache_filename, self._control_files._file_mode)
273
273
# is this scan needed ? it makes things kinda slow.
276
276
if hc.needs_write:
277
277
mutter("write hc")
280
280
if _inventory is None:
281
self._set_inventory(self.read_working_inventory())
281
self._inventory_is_modified = False
282
self.read_working_inventory()
283
self._set_inventory(_inventory)
285
def _set_inventory(self, inv):
284
# the caller of __init__ has provided an inventory,
285
# we assume they know what they are doing - as its only
286
# the Format factory and creation methods that are
287
# permitted to do this.
288
self._set_inventory(_inventory, dirty=False)
291
fget=lambda self: self._branch,
292
doc="""The branch this WorkingTree is connected to.
294
This cannot be set - it is reflective of the actual disk structure
295
the working tree has been constructed from.
298
def break_lock(self):
299
"""Break a lock if one is present from another instance.
301
Uses the ui factory to ask for confirmation if the lock may be from
304
This will probe the repository for its lock as well.
306
self._control_files.break_lock()
307
self.branch.break_lock()
309
def _set_inventory(self, inv, dirty):
310
"""Set the internal cached inventory.
312
:param inv: The inventory to set.
313
:param dirty: A boolean indicating whether the inventory is the same
314
logical inventory as whats on disk. If True the inventory is not
315
the same and should be written to disk or data will be lost, if
316
False then the inventory is the same as that on disk and any
317
serialisation would be unneeded overhead.
319
assert inv.root is not None
286
320
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:
321
self._inventory_is_modified = dirty
303
324
def open(path=None, _unsupported=False):
496
555
return os.path.getsize(self.id2abspath(file_id))
499
def get_file_sha1(self, file_id):
500
path = self._inventory.id2path(file_id)
558
def get_file_sha1(self, file_id, path=None):
560
path = self._inventory.id2path(file_id)
501
561
return self._hashcache.get_sha1(path)
503
def is_executable(self, file_id):
504
if not supports_executable():
563
def get_file_mtime(self, file_id, path=None):
565
path = self._inventory.id2path(file_id)
566
return os.lstat(self.abspath(path)).st_mtime
568
if not supports_executable():
569
def is_executable(self, file_id, path=None):
505
570
return self._inventory[file_id].executable
507
path = self._inventory.id2path(file_id)
572
def is_executable(self, file_id, path=None):
574
path = self._inventory.id2path(file_id)
508
575
mode = os.lstat(self.abspath(path)).st_mode
509
return bool(stat.S_ISREG(mode) and stat.S_IEXEC&mode)
576
return bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode)
511
578
@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.
579
def _add(self, files, ids, kinds):
580
"""See MutableTree._add."""
534
581
# TODO: Re-adding a file that is removed in the working copy
535
582
# 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))
583
# the read and write working inventory should not occur in this
584
# function - they should be part of lock_write and unlock.
547
585
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))
586
for f, file_id, kind in zip(files, ids, kinds):
587
assert kind is not None
571
588
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))
589
inv.add_path(f, kind=kind)
591
inv.add_path(f, kind=kind, file_id=file_id)
576
592
self._write_inventory(inv)
594
@needs_tree_write_lock
595
def _gather_kinds(self, files, kinds):
596
"""See MutableTree._gather_kinds."""
597
for pos, f in enumerate(files):
598
if kinds[pos] is None:
599
fullpath = normpath(self.abspath(f))
601
kinds[pos] = file_kind(fullpath)
603
if e.errno == errno.ENOENT:
604
raise NoSuchFile(fullpath)
578
606
@needs_write_lock
607
def add_parent_tree_id(self, revision_id, allow_leftmost_as_ghost=False):
608
"""Add revision_id as a parent.
610
This is equivalent to retrieving the current list of parent ids
611
and setting the list to its value plus revision_id.
613
:param revision_id: The revision id to add to the parent list. It may
614
be a ghost revision as long as its not the first parent to be added,
615
or the allow_leftmost_as_ghost parameter is set True.
616
:param allow_leftmost_as_ghost: Allow the first parent to be a ghost.
618
parents = self.get_parent_ids() + [revision_id]
619
self.set_parent_ids(parents,
620
allow_leftmost_as_ghost=len(parents) > 1 or allow_leftmost_as_ghost)
622
@needs_tree_write_lock
623
def add_parent_tree(self, parent_tuple, allow_leftmost_as_ghost=False):
624
"""Add revision_id, tree tuple as a parent.
626
This is equivalent to retrieving the current list of parent trees
627
and setting the list to its value plus parent_tuple. See also
628
add_parent_tree_id - if you only have a parent id available it will be
629
simpler to use that api. If you have the parent already available, using
630
this api is preferred.
632
:param parent_tuple: The (revision id, tree) to add to the parent list.
633
If the revision_id is a ghost, pass None for the tree.
634
:param allow_leftmost_as_ghost: Allow the first parent to be a ghost.
636
parent_ids = self.get_parent_ids() + [parent_tuple[0]]
637
if len(parent_ids) > 1:
638
# the leftmost may have already been a ghost, preserve that if it
640
allow_leftmost_as_ghost = True
641
self.set_parent_ids(parent_ids,
642
allow_leftmost_as_ghost=allow_leftmost_as_ghost)
644
@needs_tree_write_lock
579
645
def add_pending_merge(self, *revision_ids):
580
646
# TODO: Perhaps should check at this point that the
581
647
# history of the revision is actually present?
582
p = self.pending_merges()
648
parents = self.get_parent_ids()
584
650
for rev_id in revision_ids:
651
if rev_id in parents:
653
parents.append(rev_id)
590
self.set_pending_merges(p)
656
self.set_parent_ids(parents, allow_leftmost_as_ghost=True)
658
@deprecated_method(zero_eleven)
593
660
def pending_merges(self):
594
661
"""Return a list of pending merges.
596
663
These are revisions that have been merged into the working
597
664
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'))
666
As of 0.11 this is deprecated. Please see WorkingTree.get_parent_ids()
667
instead - which is available on all tree objects.
669
return self.get_parent_ids()[1:]
671
def _check_parents_for_ghosts(self, revision_ids, allow_leftmost_as_ghost):
672
"""Common ghost checking functionality from set_parent_*.
674
This checks that the left hand-parent exists if there are any
677
if len(revision_ids) > 0:
678
leftmost_id = revision_ids[0]
679
if (not allow_leftmost_as_ghost and not
680
self.branch.repository.has_revision(leftmost_id)):
681
raise errors.GhostRevisionUnusableHere(leftmost_id)
683
def _set_merges_from_parent_ids(self, parent_ids):
684
merges = parent_ids[1:]
685
self._control_files.put_utf8('pending-merges', '\n'.join(merges))
687
@needs_tree_write_lock
688
def set_parent_ids(self, revision_ids, allow_leftmost_as_ghost=False):
689
"""Set the parent ids to revision_ids.
691
See also set_parent_trees. This api will try to retrieve the tree data
692
for each element of revision_ids from the trees repository. If you have
693
tree data already available, it is more efficient to use
694
set_parent_trees rather than set_parent_ids. set_parent_ids is however
695
an easier API to use.
697
:param revision_ids: The revision_ids to set as the parent ids of this
698
working tree. Any of these may be ghosts.
700
self._check_parents_for_ghosts(revision_ids,
701
allow_leftmost_as_ghost=allow_leftmost_as_ghost)
703
if len(revision_ids) > 0:
704
self.set_last_revision(revision_ids[0])
706
self.set_last_revision(None)
708
self._set_merges_from_parent_ids(revision_ids)
710
@needs_tree_write_lock
711
def set_parent_trees(self, parents_list, allow_leftmost_as_ghost=False):
712
"""See MutableTree.set_parent_trees."""
713
parent_ids = [rev for (rev, tree) in parents_list]
715
self._check_parents_for_ghosts(parent_ids,
716
allow_leftmost_as_ghost=allow_leftmost_as_ghost)
718
if len(parent_ids) == 0:
719
leftmost_parent_id = None
720
leftmost_parent_tree = None
722
leftmost_parent_id, leftmost_parent_tree = parents_list[0]
724
if self._change_last_revision(leftmost_parent_id):
725
if leftmost_parent_tree is None:
726
# If we don't have a tree, fall back to reading the
727
# parent tree from the repository.
728
self._cache_basis_inventory(leftmost_parent_id)
730
inv = leftmost_parent_tree.inventory
731
xml = self._create_basis_xml_from_inventory(
732
leftmost_parent_id, inv)
733
self._write_basis_inventory(xml)
734
self._set_merges_from_parent_ids(parent_ids)
736
@needs_tree_write_lock
611
737
def set_pending_merges(self, rev_list):
612
self._control_files.put_utf8('pending-merges', '\n'.join(rev_list))
738
parents = self.get_parent_ids()
739
leftmost = parents[:1]
740
new_parents = leftmost + rev_list
741
self.set_parent_ids(new_parents)
743
@needs_tree_write_lock
615
744
def set_merge_modified(self, modified_hashes):
616
745
def iter_stanzas():
617
746
for file_id, hash in modified_hashes.iteritems():
618
747
yield Stanza(file_id=file_id, hash=hash)
619
748
self._put_rio('merge-hashes', iter_stanzas(), MERGE_MODIFIED_HEADER_1)
750
@needs_tree_write_lock
622
751
def _put_rio(self, filename, stanzas, header):
623
752
my_file = rio_file(stanzas, header)
624
753
self._control_files.put(filename, my_file)
755
@needs_write_lock # because merge pulls data into the branch.
756
def merge_from_branch(self, branch, to_revision=None):
757
"""Merge from a branch into this working tree.
759
:param branch: The branch to merge from.
760
:param to_revision: If non-None, the merge will merge to to_revision, but
761
not beyond it. to_revision does not need to be in the history of
762
the branch when it is supplied. If None, to_revision defaults to
763
branch.last_revision().
765
from bzrlib.merge import Merger, Merge3Merger
766
pb = bzrlib.ui.ui_factory.nested_progress_bar()
768
merger = Merger(self.branch, this_tree=self, pb=pb)
769
merger.pp = ProgressPhase("Merge phase", 5, pb)
770
merger.pp.next_phase()
771
# check that there are no
773
merger.check_basis(check_clean=True, require_commits=False)
774
if to_revision is None:
775
to_revision = branch.last_revision()
776
merger.other_rev_id = to_revision
777
if merger.other_rev_id is None:
778
raise error.NoCommits(branch)
779
self.branch.fetch(branch, last_revision=merger.other_rev_id)
780
merger.other_basis = merger.other_rev_id
781
merger.other_tree = self.branch.repository.revision_tree(
783
merger.pp.next_phase()
785
if merger.base_rev_id == merger.other_rev_id:
786
raise errors.PointlessMerge
787
merger.backup_files = False
788
merger.merge_type = Merge3Merger
789
merger.set_interesting_files(None)
790
merger.show_base = False
791
merger.reprocess = False
792
conflicts = merger.do_merge()
627
799
def merge_modified(self):
666
858
Skips the control directory.
668
860
inv = self._inventory
670
def descend(from_dir_relpath, from_dir_id, dp):
861
if include_root is True:
862
yield ('', 'V', 'directory', inv.root.file_id, inv.root)
863
# Convert these into local objects to save lookup times
864
pathjoin = osutils.pathjoin
865
file_kind = osutils.file_kind
867
# transport.base ends in a slash, we want the piece
868
# between the last two slashes
869
transport_base_dir = self.bzrdir.transport.base.rsplit('/', 2)[1]
871
fk_entries = {'directory':TreeDirectory, 'file':TreeFile, 'symlink':TreeLink}
873
# directory file_id, relative path, absolute path, reverse sorted children
874
children = os.listdir(self.basedir)
876
# jam 20060527 The kernel sized tree seems equivalent whether we
877
# use a deque and popleft to keep them sorted, or if we use a plain
878
# list and just reverse() them.
879
children = collections.deque(children)
880
stack = [(inv.root.file_id, u'', self.basedir, children)]
882
from_dir_id, from_dir_relpath, from_dir_abspath, children = stack[-1]
885
f = children.popleft()
674
886
## TODO: If we find a subdirectory with its own .bzr
675
887
## directory, then that is a separate tree and we
676
888
## should exclude it.
678
890
# the bzrdir for this tree
679
if self.bzrdir.transport.base.endswith(f + '/'):
891
if transport_base_dir == f:
683
fp = appendpath(from_dir_relpath, f)
894
# we know that from_dir_relpath and from_dir_abspath never end in a slash
895
# and 'f' doesn't begin with one, we can do a string op, rather
896
# than the checks of pathjoin(), all relative paths will have an extra slash
898
fp = from_dir_relpath + '/' + f
686
fap = appendpath(dp, f)
901
fap = from_dir_abspath + '/' + f
688
903
f_ie = inv.get_child(from_dir_id, f)
691
elif self.is_ignored(fp):
906
elif self.is_ignored(fp[1:]):
909
# we may not have found this file, because of a unicode issue
910
f_norm, can_access = osutils.normalized_filename(f)
911
if f == f_norm or not can_access:
912
# No change, so treat this file normally
915
# this file can be accessed by a normalized path
916
# check again if it is versioned
917
# these lines are repeated here for performance
919
fp = from_dir_relpath + '/' + f
920
fap = from_dir_abspath + '/' + f
921
f_ie = inv.get_child(from_dir_id, f)
924
elif self.is_ignored(fp[1:]):
696
929
fk = file_kind(fap)
940
1210
for subf in os.listdir(dirabs):
942
and (subf not in dir_entry.children)):
1213
if subf not in dir_entry.children:
1214
subf_norm, can_access = osutils.normalized_filename(subf)
1215
if subf_norm != subf and can_access:
1216
if subf_norm not in dir_entry.children:
1217
fl.append(subf_norm)
947
subp = appendpath(path, subf)
1223
subp = pathjoin(path, subf)
1226
def _translate_ignore_rule(self, rule):
1227
"""Translate a single ignore rule to a regex.
1229
There are two types of ignore rules. Those that do not contain a / are
1230
matched against the tail of the filename (that is, they do not care
1231
what directory the file is in.) Rules which do contain a slash must
1232
match the entire path. As a special case, './' at the start of the
1233
string counts as a slash in the string but is removed before matching
1234
(e.g. ./foo.c, ./src/foo.c)
1236
:return: The translated regex.
1238
if rule[:2] in ('./', '.\\'):
1240
result = fnmatch.translate(rule[2:])
1241
elif '/' in rule or '\\' in rule:
1243
result = fnmatch.translate(rule)
1245
# default rule style.
1246
result = "(?:.*/)?(?!.*/)" + fnmatch.translate(rule)
1247
assert result[-1] == '$', "fnmatch.translate did not add the expected $"
1248
return "(" + result + ")"
1250
def _combine_ignore_rules(self, rules):
1251
"""Combine a list of ignore rules into a single regex object.
1253
Each individual rule is combined with | to form a big regex, which then
1254
has $ added to it to form something like ()|()|()$. The group index for
1255
each subregex's outermost group is placed in a dictionary mapping back
1256
to the rule. This allows quick identification of the matching rule that
1258
:return: a list of the compiled regex and the matching-group index
1259
dictionaries. We return a list because python complains if you try to
1260
combine more than 100 regexes.
1265
translated_rules = []
1267
translated_rule = self._translate_ignore_rule(rule)
1268
compiled_rule = re.compile(translated_rule)
1269
groups[next_group] = rule
1270
next_group += compiled_rule.groups
1271
translated_rules.append(translated_rule)
1272
if next_group == 99:
1273
result.append((re.compile("|".join(translated_rules)), groups))
1276
translated_rules = []
1277
if len(translated_rules):
1278
result.append((re.compile("|".join(translated_rules)), groups))
951
1281
def ignored_files(self):
952
1282
"""Yield list of PATH, IGNORE_PATTERN"""
953
1283
for subp in self.extras():
954
1284
pat = self.is_ignored(subp)
959
1288
def get_ignore_list(self):
960
1289
"""Return list of ignore patterns.
962
1291
Cached in the Tree object after the first call.
964
if hasattr(self, '_ignorelist'):
965
return self._ignorelist
967
l = bzrlib.DEFAULT_IGNORE[:]
1293
ignoreset = getattr(self, '_ignoreset', None)
1294
if ignoreset is not None:
1297
ignore_globs = set(bzrlib.DEFAULT_IGNORE)
1298
ignore_globs.update(ignores.get_runtime_ignores())
1300
ignore_globs.update(ignores.get_user_ignores())
968
1302
if self.has_filename(bzrlib.IGNORE_FILENAME):
969
1303
f = self.get_file_byname(bzrlib.IGNORE_FILENAME)
970
l.extend([line.rstrip("\n\r") for line in f.readlines()])
1305
ignore_globs.update(ignores.parse_ignore_file(f))
1309
self._ignoreset = ignore_globs
1310
self._ignore_regex = self._combine_ignore_rules(ignore_globs)
1313
def _get_ignore_rules_as_regex(self):
1314
"""Return a regex of the ignore rules and a mapping dict.
1316
:return: (ignore rules compiled regex, dictionary mapping rule group
1317
indices to original rule.)
1319
if getattr(self, '_ignoreset', None) is None:
1320
self.get_ignore_list()
1321
return self._ignore_regex
975
1323
def is_ignored(self, filename):
976
1324
r"""Check whether the filename matches an ignore pattern.
1059
1420
if new_revision is None:
1060
1421
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])
1424
self.branch.generate_revision_history(new_revision)
1425
except errors.NoSuchRevision:
1426
# not present in the repo - dont try to set it deeper than the tip
1427
self.branch.set_revision_history([new_revision])
1430
def _write_basis_inventory(self, xml):
1431
"""Write the basis inventory XML to the basis-inventory file"""
1432
assert isinstance(xml, str), 'serialised xml must be bytestring.'
1433
path = self._basis_inventory_name()
1435
self._control_files.put(path, sio)
1437
def _create_basis_xml_from_inventory(self, revision_id, inventory):
1438
"""Create the text that will be saved in basis-inventory"""
1439
inventory.revision_id = revision_id
1440
return xml6.serializer_v6.write_inventory_to_string(inventory)
1071
1442
def _cache_basis_inventory(self, new_revision):
1072
1443
"""Cache new_revision as the basis inventory."""
1444
# TODO: this should allow the ready-to-use inventory to be passed in,
1445
# as commit already has that ready-to-use [while the format is the
1074
1448
# this double handles the inventory - unpack and repack -
1075
1449
# but is easier to understand. We can/should put a conditional
1076
1450
# in here based on whether the inventory is in the latest format
1077
1451
# - 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:
1453
# the fast path is to copy the raw xml from the repository. If the
1454
# xml contains 'revision_id="', then we assume the right
1455
# revision_id is set. We must check for this full string, because a
1456
# root node id can legitimately look like 'revision_id' but cannot
1458
xml = self.branch.repository.get_inventory_xml(new_revision)
1459
firstline = xml.split('\n', 1)[0]
1460
if (not 'revision_id="' in firstline or
1461
'format="6"' not in firstline):
1462
inv = self.branch.repository.deserialise_inventory(
1464
xml = self._create_basis_xml_from_inventory(new_revision, inv)
1465
self._write_basis_inventory(xml)
1466
except (errors.NoSuchRevision, errors.RevisionNotPresent):
1088
1469
def read_basis_inventory(self):
1089
1470
"""Read the cached basis inventory."""
1090
1471
path = self._basis_inventory_name()
1091
return self._control_files.get_utf8(path).read()
1472
return self._control_files.get(path).read()
1093
1474
@needs_read_lock
1094
1475
def read_working_inventory(self):
1095
"""Read the working inventory."""
1476
"""Read the working inventory.
1478
:raises errors.InventoryModified: read_working_inventory will fail
1479
when the current in memory inventory has been modified.
1481
# conceptually this should be an implementation detail of the tree.
1482
# XXX: Deprecate this.
1096
1483
# ElementTree does its own conversion from UTF-8, so open in
1098
result = bzrlib.xml5.serializer_v5.read_inventory(
1485
if self._inventory_is_modified:
1486
raise errors.InventoryModified(self)
1487
result = xml5.serializer_v5.read_inventory(
1099
1488
self._control_files.get('inventory'))
1100
self._set_inventory(result)
1489
self._set_inventory(result, dirty=False)
1104
def remove(self, files, verbose=False):
1492
@needs_tree_write_lock
1493
def remove(self, files, verbose=False, to_file=None):
1105
1494
"""Remove nominated files from the working inventory..
1107
1496
This does not remove their text. This does not run on XXX on what? RBC
1204
1607
between multiple working trees, i.e. via shared storage, then we
1205
1608
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()
1610
raise NotImplementedError(self.unlock)
1231
1612
def update(self):
1232
1613
"""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.
1615
This will update the branch if its bound too, which means we have
1616
multiple trees involved:
1618
- The new basis tree of the master.
1619
- The old basis tree of the branch.
1620
- The old basis tree of the working tree.
1621
- The current working tree state.
1623
Pathologically, all three may be different, and non-ancestors of each
1624
other. Conceptually we want to:
1626
- Preserve the wt.basis->wt.state changes
1627
- Transform the wt.basis to the new master basis.
1628
- Apply a merge of the old branch basis to get any 'local' changes from
1630
- Restore the wt.basis->wt.state changes.
1246
1632
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.
1633
- Merge current state -> basis tree of the master w.r.t. the old tree
1635
- 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()
1637
if self.branch.get_master_branch() is not None:
1639
update_branch = True
1641
self.lock_tree_write()
1642
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,
1645
old_tip = self.branch.update()
1648
return self._update_tree(old_tip)
1285
self.branch.unlock()
1652
@needs_tree_write_lock
1653
def _update_tree(self, old_tip=None):
1654
"""Update a tree to the master branch.
1656
:param old_tip: if supplied, the previous tip revision the branch,
1657
before it was changed to the master branch's tip.
1659
# here if old_tip is not None, it is the old tip of the branch before
1660
# it was updated from the master branch. This should become a pending
1661
# merge in the working tree to preserve the user existing work. we
1662
# cant set that until we update the working trees last revision to be
1663
# one from the new branch, because it will just get absorbed by the
1664
# parent de-duplication logic.
1666
# We MUST save it even if an error occurs, because otherwise the users
1667
# local work is unreferenced and will appear to have been lost.
1671
last_rev = self.get_parent_ids()[0]
1674
if last_rev != self.branch.last_revision():
1675
# merge tree state up to new branch tip.
1676
basis = self.basis_tree()
1677
to_tree = self.branch.basis_tree()
1678
if basis.inventory.root is None:
1679
self.set_root_id(to_tree.inventory.root.file_id)
1680
result += merge.merge_inner(
1685
# TODO - dedup parents list with things merged by pull ?
1686
# reuse the tree we've updated to to set the basis:
1687
parent_trees = [(self.branch.last_revision(), to_tree)]
1688
merges = self.get_parent_ids()[1:]
1689
# Ideally we ask the tree for the trees here, that way the working
1690
# tree can decide whether to give us teh entire tree or give us a
1691
# lazy initialised tree. dirstate for instance will have the trees
1692
# in ram already, whereas a last-revision + basis-inventory tree
1693
# will not, but also does not need them when setting parents.
1694
for parent in merges:
1695
parent_trees.append(
1696
(parent, self.branch.repository.revision_tree(parent)))
1697
if old_tip is not None:
1698
parent_trees.append(
1699
(old_tip, self.branch.repository.revision_tree(old_tip)))
1700
self.set_parent_trees(parent_trees)
1701
last_rev = parent_trees[0][0]
1703
# the working tree had the same last-revision as the master
1704
# branch did. We may still have pivot local work from the local
1705
# branch into old_tip:
1706
if old_tip is not None:
1707
self.add_parent_tree_id(old_tip)
1708
if old_tip and old_tip != last_rev:
1709
# our last revision was not the prior branch last revision
1710
# and we have converted that last revision to a pending merge.
1711
# base is somewhere between the branch tip now
1712
# and the now pending merge
1713
from bzrlib.revision import common_ancestor
1715
base_rev_id = common_ancestor(self.branch.last_revision(),
1717
self.branch.repository)
1718
except errors.NoCommonAncestor:
1720
base_tree = self.branch.repository.revision_tree(base_rev_id)
1721
other_tree = self.branch.repository.revision_tree(old_tip)
1722
result += merge.merge_inner(
1729
@needs_tree_write_lock
1288
1730
def _write_inventory(self, inv):
1289
1731
"""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')
1732
self._set_inventory(inv, dirty=True)
1297
1735
def set_conflicts(self, arg):
1298
1736
raise UnsupportedOperation(self.set_conflicts, self)
1738
def add_conflicts(self, arg):
1739
raise UnsupportedOperation(self.add_conflicts, self)
1300
1741
@needs_read_lock
1301
1742
def conflicts(self):
1302
conflicts = ConflictList()
1743
conflicts = _mod_conflicts.ConflictList()
1303
1744
for conflicted in self._iter_conflicts():
1306
1747
if file_kind(self.abspath(conflicted)) != "file":
1309
if e.errno == errno.ENOENT:
1749
except errors.NoSuchFile:
1313
1751
if text is True:
1314
1752
for suffix in ('.THIS', '.OTHER'):
1316
1754
kind = file_kind(self.abspath(conflicted+suffix))
1318
if e.errno == errno.ENOENT:
1757
except errors.NoSuchFile:
1326
1761
ctype = {True: 'text conflict', False: 'contents conflict'}[text]
1327
conflicts.append(Conflict.factory(ctype, path=conflicted,
1762
conflicts.append(_mod_conflicts.Conflict.factory(ctype,
1328
1764
file_id=self.path2id(conflicted)))
1329
1765
return conflicts
1768
class WorkingTree2(WorkingTree):
1769
"""This is the Format 2 working tree.
1771
This was the first weave based working tree.
1772
- uses os locks for locking.
1773
- uses the branch last-revision.
1776
def lock_tree_write(self):
1777
"""See WorkingTree.lock_tree_write().
1779
In Format2 WorkingTrees we have a single lock for the branch and tree
1780
so lock_tree_write() degrades to lock_write().
1782
self.branch.lock_write()
1784
return self._control_files.lock_write()
1786
self.branch.unlock()
1790
# we share control files:
1791
if self._control_files._lock_count == 3:
1792
# _inventory_is_modified is always False during a read lock.
1793
if self._inventory_is_modified:
1795
if self._hashcache.needs_write:
1796
self._hashcache.write()
1797
# reverse order of locking.
1799
return self._control_files.unlock()
1801
self.branch.unlock()
1332
1804
class WorkingTree3(WorkingTree):
1333
1805
"""This is the Format 3 working tree.
added
removed
bzrlib/workingtree.py
