90
100
from bzrlib.progress import DummyProgress, ProgressPhase
91
101
from bzrlib.revision import NULL_REVISION
102
import bzrlib.revisiontree
92
103
from bzrlib.rio import RioReader, rio_file, Stanza
93
from bzrlib.symbol_versioning import *
94
from bzrlib.textui import show_status
104
from bzrlib.symbol_versioning import (deprecated_passed,
107
DEPRECATED_PARAMETER,
111
from bzrlib.trace import mutter, note
96
112
from bzrlib.transform import build_tree
97
from bzrlib.trace import mutter, note
98
113
from bzrlib.transport import get_transport
99
114
from bzrlib.transport.local import LocalTransport
115
from bzrlib.textui import show_status
101
117
import bzrlib.xml5
120
# the regex removes any weird characters; we don't escape them
121
# but rather just pull them out
122
_gen_file_id_re = re.compile(r'[^\w.]')
123
_gen_id_suffix = None
127
def _next_id_suffix():
128
"""Create a new file id suffix that is reasonably unique.
130
On the first call we combine the current time with 64 bits of randomness
131
to give a highly probably globally unique number. Then each call in the same
132
process adds 1 to a serial number we append to that unique value.
134
# XXX TODO: change bzrlib.add.smart_add to call workingtree.add() rather
135
# than having to move the id randomness out of the inner loop like this.
136
# XXX TODO: for the global randomness this uses we should add the thread-id
137
# before the serial #.
138
global _gen_id_suffix, _gen_id_serial
139
if _gen_id_suffix is None:
140
_gen_id_suffix = "-%s-%s-" % (compact_date(time()), rand_chars(16))
142
return _gen_id_suffix + str(_gen_id_serial)
104
145
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))
146
"""Return new file id for the basename 'name'.
148
The uniqueness is supplied from _next_id_suffix.
150
# The real randomness is in the _next_id_suffix, the
151
# rest of the identifier is just to be nice.
153
# 1) Remove non-ascii word characters to keep the ids portable
154
# 2) squash to lowercase, so the file id doesn't have to
155
# be escaped (case insensitive filesystems would bork for ids
156
# that only differred in case without escaping).
157
# 3) truncate the filename to 20 chars. Long filenames also bork on some
159
# 4) Removing starting '.' characters to prevent the file ids from
160
# being considered hidden.
161
ascii_word_only = _gen_file_id_re.sub('', name.lower())
162
short_no_dots = ascii_word_only.lstrip('.')[:20]
163
return short_no_dots + _next_id_suffix()
133
166
def gen_root_id():
267
297
# if needed, or, when the cache sees a change, append it to the hash
268
298
# cache file, and have the parser take the most recent entry for a
269
299
# given path only.
270
cache_filename = self.bzrdir.get_workingtree_transport(None).abspath('stat-cache')
300
cache_filename = self.bzrdir.get_workingtree_transport(None).local_abspath('stat-cache')
271
301
hc = self._hashcache = HashCache(basedir, cache_filename, self._control_files._file_mode)
273
303
# is this scan needed ? it makes things kinda slow.
276
306
if hc.needs_write:
277
307
mutter("write hc")
280
310
if _inventory is None:
281
self._set_inventory(self.read_working_inventory())
311
self._inventory_is_modified = False
312
self.read_working_inventory()
283
self._set_inventory(_inventory)
285
def _set_inventory(self, inv):
314
# the caller of __init__ has provided an inventory,
315
# we assume they know what they are doing - as its only
316
# the Format factory and creation methods that are
317
# permitted to do this.
318
self._set_inventory(_inventory, dirty=False)
321
fget=lambda self: self._branch,
322
doc="""The branch this WorkingTree is connected to.
324
This cannot be set - it is reflective of the actual disk structure
325
the working tree has been constructed from.
328
def break_lock(self):
329
"""Break a lock if one is present from another instance.
331
Uses the ui factory to ask for confirmation if the lock may be from
334
This will probe the repository for its lock as well.
336
self._control_files.break_lock()
337
self.branch.break_lock()
339
def _set_inventory(self, inv, dirty):
340
"""Set the internal cached inventory.
342
:param inv: The inventory to set.
343
:param dirty: A boolean indicating whether the inventory is the same
344
logical inventory as whats on disk. If True the inventory is not
345
the same and should be written to disk or data will be lost, if
346
False then the inventory is the same as that on disk and any
347
serialisation would be unneeded overhead.
349
assert inv.root is not None
286
350
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:
351
self._inventory_is_modified = dirty
303
354
def open(path=None, _unsupported=False):
496
578
return os.path.getsize(self.id2abspath(file_id))
499
def get_file_sha1(self, file_id):
500
path = self._inventory.id2path(file_id)
581
def get_file_sha1(self, file_id, path=None):
583
path = self._inventory.id2path(file_id)
501
584
return self._hashcache.get_sha1(path)
503
def is_executable(self, file_id):
504
if not supports_executable():
586
def get_file_mtime(self, file_id, path=None):
588
path = self._inventory.id2path(file_id)
589
return os.lstat(self.abspath(path)).st_mtime
591
if not supports_executable():
592
def is_executable(self, file_id, path=None):
505
593
return self._inventory[file_id].executable
507
path = self._inventory.id2path(file_id)
595
def is_executable(self, file_id, path=None):
597
path = self._inventory.id2path(file_id)
508
598
mode = os.lstat(self.abspath(path)).st_mode
509
return bool(stat.S_ISREG(mode) and stat.S_IEXEC&mode)
599
return bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode)
511
601
@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.
602
def _add(self, files, ids, kinds):
603
"""See MutableTree._add."""
534
604
# TODO: Re-adding a file that is removed in the working copy
535
605
# 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))
606
# the read and write working inventory should not occur in this
607
# function - they should be part of lock_write and unlock.
547
608
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))
609
for f, file_id, kind in zip(files, ids, kinds):
610
assert kind is not None
571
611
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))
612
inv.add_path(f, kind=kind)
614
inv.add_path(f, kind=kind, file_id=file_id)
576
615
self._write_inventory(inv)
617
@needs_tree_write_lock
618
def _gather_kinds(self, files, kinds):
619
"""See MutableTree._gather_kinds."""
620
for pos, f in enumerate(files):
621
if kinds[pos] is None:
622
fullpath = normpath(self.abspath(f))
624
kinds[pos] = file_kind(fullpath)
626
if e.errno == errno.ENOENT:
627
raise NoSuchFile(fullpath)
578
629
@needs_write_lock
630
def add_parent_tree_id(self, revision_id, allow_leftmost_as_ghost=False):
631
"""Add revision_id as a parent.
633
This is equivalent to retrieving the current list of parent ids
634
and setting the list to its value plus revision_id.
636
:param revision_id: The revision id to add to the parent list. It may
637
be a ghost revision as long as its not the first parent to be added,
638
or the allow_leftmost_as_ghost parameter is set True.
639
:param allow_leftmost_as_ghost: Allow the first parent to be a ghost.
641
parents = self.get_parent_ids() + [revision_id]
642
self.set_parent_ids(parents,
643
allow_leftmost_as_ghost=len(parents) > 1 or allow_leftmost_as_ghost)
645
@needs_tree_write_lock
646
def add_parent_tree(self, parent_tuple, allow_leftmost_as_ghost=False):
647
"""Add revision_id, tree tuple as a parent.
649
This is equivalent to retrieving the current list of parent trees
650
and setting the list to its value plus parent_tuple. See also
651
add_parent_tree_id - if you only have a parent id available it will be
652
simpler to use that api. If you have the parent already available, using
653
this api is preferred.
655
:param parent_tuple: The (revision id, tree) to add to the parent list.
656
If the revision_id is a ghost, pass None for the tree.
657
:param allow_leftmost_as_ghost: Allow the first parent to be a ghost.
659
parent_ids = self.get_parent_ids() + [parent_tuple[0]]
660
if len(parent_ids) > 1:
661
# the leftmost may have already been a ghost, preserve that if it
663
allow_leftmost_as_ghost = True
664
self.set_parent_ids(parent_ids,
665
allow_leftmost_as_ghost=allow_leftmost_as_ghost)
667
@needs_tree_write_lock
579
668
def add_pending_merge(self, *revision_ids):
580
669
# TODO: Perhaps should check at this point that the
581
670
# history of the revision is actually present?
582
p = self.pending_merges()
671
parents = self.get_parent_ids()
584
673
for rev_id in revision_ids:
674
if rev_id in parents:
676
parents.append(rev_id)
590
self.set_pending_merges(p)
679
self.set_parent_ids(parents, allow_leftmost_as_ghost=True)
681
@deprecated_method(zero_eleven)
593
683
def pending_merges(self):
594
684
"""Return a list of pending merges.
596
686
These are revisions that have been merged into the working
597
687
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'))
689
As of 0.11 this is deprecated. Please see WorkingTree.get_parent_ids()
690
instead - which is available on all tree objects.
692
return self.get_parent_ids()[1:]
694
def _check_parents_for_ghosts(self, revision_ids, allow_leftmost_as_ghost):
695
"""Common ghost checking functionality from set_parent_*.
697
This checks that the left hand-parent exists if there are any
700
if len(revision_ids) > 0:
701
leftmost_id = revision_ids[0]
702
if (not allow_leftmost_as_ghost and not
703
self.branch.repository.has_revision(leftmost_id)):
704
raise errors.GhostRevisionUnusableHere(leftmost_id)
706
def _set_merges_from_parent_ids(self, parent_ids):
707
merges = parent_ids[1:]
708
self._control_files.put_utf8('pending-merges', '\n'.join(merges))
710
@needs_tree_write_lock
711
def set_parent_ids(self, revision_ids, allow_leftmost_as_ghost=False):
712
"""Set the parent ids to revision_ids.
714
See also set_parent_trees. This api will try to retrieve the tree data
715
for each element of revision_ids from the trees repository. If you have
716
tree data already available, it is more efficient to use
717
set_parent_trees rather than set_parent_ids. set_parent_ids is however
718
an easier API to use.
720
:param revision_ids: The revision_ids to set as the parent ids of this
721
working tree. Any of these may be ghosts.
723
self._check_parents_for_ghosts(revision_ids,
724
allow_leftmost_as_ghost=allow_leftmost_as_ghost)
726
if len(revision_ids) > 0:
727
self.set_last_revision(revision_ids[0])
729
self.set_last_revision(None)
731
self._set_merges_from_parent_ids(revision_ids)
733
@needs_tree_write_lock
734
def set_parent_trees(self, parents_list, allow_leftmost_as_ghost=False):
735
"""See MutableTree.set_parent_trees."""
736
parent_ids = [rev for (rev, tree) in parents_list]
738
self._check_parents_for_ghosts(parent_ids,
739
allow_leftmost_as_ghost=allow_leftmost_as_ghost)
741
if len(parent_ids) == 0:
742
leftmost_parent_id = None
743
leftmost_parent_tree = None
745
leftmost_parent_id, leftmost_parent_tree = parents_list[0]
747
if self._change_last_revision(leftmost_parent_id):
748
if leftmost_parent_tree is None:
749
# If we don't have a tree, fall back to reading the
750
# parent tree from the repository.
751
self._cache_basis_inventory(leftmost_parent_id)
753
inv = leftmost_parent_tree.inventory
754
xml = self._create_basis_xml_from_inventory(
755
leftmost_parent_id, inv)
756
self._write_basis_inventory(xml)
757
self._set_merges_from_parent_ids(parent_ids)
759
@needs_tree_write_lock
611
760
def set_pending_merges(self, rev_list):
612
self._control_files.put_utf8('pending-merges', '\n'.join(rev_list))
761
parents = self.get_parent_ids()
762
leftmost = parents[:1]
763
new_parents = leftmost + rev_list
764
self.set_parent_ids(new_parents)
766
@needs_tree_write_lock
615
767
def set_merge_modified(self, modified_hashes):
616
768
def iter_stanzas():
617
769
for file_id, hash in modified_hashes.iteritems():
618
770
yield Stanza(file_id=file_id, hash=hash)
619
771
self._put_rio('merge-hashes', iter_stanzas(), MERGE_MODIFIED_HEADER_1)
773
@needs_tree_write_lock
622
774
def _put_rio(self, filename, stanzas, header):
623
775
my_file = rio_file(stanzas, header)
624
776
self._control_files.put(filename, my_file)
778
@needs_write_lock # because merge pulls data into the branch.
779
def merge_from_branch(self, branch, to_revision=None):
780
"""Merge from a branch into this working tree.
782
:param branch: The branch to merge from.
783
:param to_revision: If non-None, the merge will merge to to_revision, but
784
not beyond it. to_revision does not need to be in the history of
785
the branch when it is supplied. If None, to_revision defaults to
786
branch.last_revision().
788
from bzrlib.merge import Merger, Merge3Merger
789
pb = bzrlib.ui.ui_factory.nested_progress_bar()
791
merger = Merger(self.branch, this_tree=self, pb=pb)
792
merger.pp = ProgressPhase("Merge phase", 5, pb)
793
merger.pp.next_phase()
794
# check that there are no
796
merger.check_basis(check_clean=True, require_commits=False)
797
if to_revision is None:
798
to_revision = branch.last_revision()
799
merger.other_rev_id = to_revision
800
if merger.other_rev_id is None:
801
raise error.NoCommits(branch)
802
self.branch.fetch(branch, last_revision=merger.other_rev_id)
803
merger.other_basis = merger.other_rev_id
804
merger.other_tree = self.branch.repository.revision_tree(
806
merger.pp.next_phase()
808
if merger.base_rev_id == merger.other_rev_id:
809
raise errors.PointlessMerge
810
merger.backup_files = False
811
merger.merge_type = Merge3Merger
812
merger.set_interesting_files(None)
813
merger.show_base = False
814
merger.reprocess = False
815
conflicts = merger.do_merge()
627
822
def merge_modified(self):
666
881
Skips the control directory.
668
883
inv = self._inventory
670
def descend(from_dir_relpath, from_dir_id, dp):
884
if include_root is True:
885
yield ('', 'V', 'directory', inv.root.file_id, inv.root)
886
# Convert these into local objects to save lookup times
887
pathjoin = osutils.pathjoin
888
file_kind = osutils.file_kind
890
# transport.base ends in a slash, we want the piece
891
# between the last two slashes
892
transport_base_dir = self.bzrdir.transport.base.rsplit('/', 2)[1]
894
fk_entries = {'directory':TreeDirectory, 'file':TreeFile, 'symlink':TreeLink}
896
# directory file_id, relative path, absolute path, reverse sorted children
897
children = os.listdir(self.basedir)
899
# jam 20060527 The kernel sized tree seems equivalent whether we
900
# use a deque and popleft to keep them sorted, or if we use a plain
901
# list and just reverse() them.
902
children = collections.deque(children)
903
stack = [(inv.root.file_id, u'', self.basedir, children)]
905
from_dir_id, from_dir_relpath, from_dir_abspath, children = stack[-1]
908
f = children.popleft()
674
909
## TODO: If we find a subdirectory with its own .bzr
675
910
## directory, then that is a separate tree and we
676
911
## should exclude it.
678
913
# the bzrdir for this tree
679
if self.bzrdir.transport.base.endswith(f + '/'):
914
if transport_base_dir == f:
683
fp = appendpath(from_dir_relpath, f)
917
# we know that from_dir_relpath and from_dir_abspath never end in a slash
918
# and 'f' doesn't begin with one, we can do a string op, rather
919
# than the checks of pathjoin(), all relative paths will have an extra slash
921
fp = from_dir_relpath + '/' + f
686
fap = appendpath(dp, f)
924
fap = from_dir_abspath + '/' + f
688
926
f_ie = inv.get_child(from_dir_id, f)
691
elif self.is_ignored(fp):
929
elif self.is_ignored(fp[1:]):
932
# we may not have found this file, because of a unicode issue
933
f_norm, can_access = osutils.normalized_filename(f)
934
if f == f_norm or not can_access:
935
# No change, so treat this file normally
938
# this file can be accessed by a normalized path
939
# check again if it is versioned
940
# these lines are repeated here for performance
942
fp = from_dir_relpath + '/' + f
943
fap = from_dir_abspath + '/' + f
944
f_ie = inv.get_child(from_dir_id, f)
947
elif self.is_ignored(fp[1:]):
696
952
fk = file_kind(fap)
940
1231
for subf in os.listdir(dirabs):
942
and (subf not in dir_entry.children)):
1234
if subf not in dir_entry.children:
1235
subf_norm, can_access = osutils.normalized_filename(subf)
1236
if subf_norm != subf and can_access:
1237
if subf_norm not in dir_entry.children:
1238
fl.append(subf_norm)
947
subp = appendpath(path, subf)
1244
subp = pathjoin(path, subf)
1247
def _translate_ignore_rule(self, rule):
1248
"""Translate a single ignore rule to a regex.
1250
There are two types of ignore rules. Those that do not contain a / are
1251
matched against the tail of the filename (that is, they do not care
1252
what directory the file is in.) Rules which do contain a slash must
1253
match the entire path. As a special case, './' at the start of the
1254
string counts as a slash in the string but is removed before matching
1255
(e.g. ./foo.c, ./src/foo.c)
1257
:return: The translated regex.
1259
if rule[:2] in ('./', '.\\'):
1261
result = fnmatch.translate(rule[2:])
1262
elif '/' in rule or '\\' in rule:
1264
result = fnmatch.translate(rule)
1266
# default rule style.
1267
result = "(?:.*/)?(?!.*/)" + fnmatch.translate(rule)
1268
assert result[-1] == '$', "fnmatch.translate did not add the expected $"
1269
return "(" + result + ")"
1271
def _combine_ignore_rules(self, rules):
1272
"""Combine a list of ignore rules into a single regex object.
1274
Each individual rule is combined with | to form a big regex, which then
1275
has $ added to it to form something like ()|()|()$. The group index for
1276
each subregex's outermost group is placed in a dictionary mapping back
1277
to the rule. This allows quick identification of the matching rule that
1279
:return: a list of the compiled regex and the matching-group index
1280
dictionaries. We return a list because python complains if you try to
1281
combine more than 100 regexes.
1286
translated_rules = []
1288
translated_rule = self._translate_ignore_rule(rule)
1289
compiled_rule = re.compile(translated_rule)
1290
groups[next_group] = rule
1291
next_group += compiled_rule.groups
1292
translated_rules.append(translated_rule)
1293
if next_group == 99:
1294
result.append((re.compile("|".join(translated_rules)), groups))
1297
translated_rules = []
1298
if len(translated_rules):
1299
result.append((re.compile("|".join(translated_rules)), groups))
951
1302
def ignored_files(self):
952
1303
"""Yield list of PATH, IGNORE_PATTERN"""
953
1304
for subp in self.extras():
954
1305
pat = self.is_ignored(subp)
959
1309
def get_ignore_list(self):
960
1310
"""Return list of ignore patterns.
962
1312
Cached in the Tree object after the first call.
964
if hasattr(self, '_ignorelist'):
965
return self._ignorelist
967
l = bzrlib.DEFAULT_IGNORE[:]
1314
ignoreset = getattr(self, '_ignoreset', None)
1315
if ignoreset is not None:
1318
ignore_globs = set(bzrlib.DEFAULT_IGNORE)
1319
ignore_globs.update(ignores.get_runtime_ignores())
1321
ignore_globs.update(ignores.get_user_ignores())
968
1323
if self.has_filename(bzrlib.IGNORE_FILENAME):
969
1324
f = self.get_file_byname(bzrlib.IGNORE_FILENAME)
970
l.extend([line.rstrip("\n\r") for line in f.readlines()])
1326
ignore_globs.update(ignores.parse_ignore_file(f))
1330
self._ignoreset = ignore_globs
1331
self._ignore_regex = self._combine_ignore_rules(ignore_globs)
1334
def _get_ignore_rules_as_regex(self):
1335
"""Return a regex of the ignore rules and a mapping dict.
1337
:return: (ignore rules compiled regex, dictionary mapping rule group
1338
indices to original rule.)
1340
if getattr(self, '_ignoreset', None) is None:
1341
self.get_ignore_list()
1342
return self._ignore_regex
975
1344
def is_ignored(self, filename):
976
1345
r"""Check whether the filename matches an ignore pattern.
1059
1441
if new_revision is None:
1060
1442
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])
1445
self.branch.generate_revision_history(new_revision)
1446
except errors.NoSuchRevision:
1447
# not present in the repo - dont try to set it deeper than the tip
1448
self.branch.set_revision_history([new_revision])
1451
def _write_basis_inventory(self, xml):
1452
"""Write the basis inventory XML to the basis-inventory file"""
1453
assert isinstance(xml, str), 'serialised xml must be bytestring.'
1454
path = self._basis_inventory_name()
1456
self._control_files.put(path, sio)
1458
def _create_basis_xml_from_inventory(self, revision_id, inventory):
1459
"""Create the text that will be saved in basis-inventory"""
1460
inventory.revision_id = revision_id
1461
return bzrlib.xml6.serializer_v6.write_inventory_to_string(inventory)
1071
1463
def _cache_basis_inventory(self, new_revision):
1072
1464
"""Cache new_revision as the basis inventory."""
1465
# TODO: this should allow the ready-to-use inventory to be passed in,
1466
# as commit already has that ready-to-use [while the format is the
1074
1469
# this double handles the inventory - unpack and repack -
1075
1470
# but is easier to understand. We can/should put a conditional
1076
1471
# in here based on whether the inventory is in the latest format
1077
1472
# - 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:
1474
# the fast path is to copy the raw xml from the repository. If the
1475
# xml contains 'revision_id="', then we assume the right
1476
# revision_id is set. We must check for this full string, because a
1477
# root node id can legitimately look like 'revision_id' but cannot
1479
xml = self.branch.repository.get_inventory_xml(new_revision)
1480
firstline = xml.split('\n', 1)[0]
1481
if (not 'revision_id="' in firstline or
1482
'format="6"' not in firstline):
1483
inv = self.branch.repository.deserialise_inventory(
1485
xml = self._create_basis_xml_from_inventory(new_revision, inv)
1486
self._write_basis_inventory(xml)
1487
except (errors.NoSuchRevision, errors.RevisionNotPresent):
1088
1490
def read_basis_inventory(self):
1089
1491
"""Read the cached basis inventory."""
1090
1492
path = self._basis_inventory_name()
1091
return self._control_files.get_utf8(path).read()
1493
return self._control_files.get(path).read()
1093
1495
@needs_read_lock
1094
1496
def read_working_inventory(self):
1095
"""Read the working inventory."""
1497
"""Read the working inventory.
1499
:raises errors.InventoryModified: When the current in memory
1500
inventory has been modified, read_working_inventory will
1503
# conceptually this should be an implementation detail of the tree.
1504
# XXX: Deprecate this.
1096
1505
# ElementTree does its own conversion from UTF-8, so open in
1507
if self._inventory_is_modified:
1508
raise errors.InventoryModified(self)
1098
1509
result = bzrlib.xml5.serializer_v5.read_inventory(
1099
1510
self._control_files.get('inventory'))
1100
self._set_inventory(result)
1511
self._set_inventory(result, dirty=False)
1104
def remove(self, files, verbose=False):
1514
@needs_tree_write_lock
1515
def remove(self, files, verbose=False, to_file=None):
1105
1516
"""Remove nominated files from the working inventory..
1107
1518
This does not remove their text. This does not run on XXX on what? RBC
1248
1676
Do a 'normal' merge of the old branch basis if it is relevant.
1250
1678
old_tip = self.branch.update()
1251
if old_tip is not None:
1252
self.add_pending_merge(old_tip)
1253
self.branch.lock_read()
1679
# here if old_tip is not None, it is the old tip of the branch before
1680
# it was updated from the master branch. This should become a pending
1681
# merge in the working tree to preserve the user existing work. we
1682
# cant set that until we update the working trees last revision to be
1683
# one from the new branch, because it will just get absorbed by the
1684
# parent de-duplication logic.
1686
# We MUST save it even if an error occurs, because otherwise the users
1687
# local work is unreferenced and will appear to have been lost.
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,
1285
self.branch.unlock()
1691
last_rev = self.get_parent_ids()[0]
1694
if last_rev != self.branch.last_revision():
1695
# merge tree state up to new branch tip.
1696
basis = self.basis_tree()
1697
to_tree = self.branch.basis_tree()
1698
result += merge_inner(self.branch,
1702
# TODO - dedup parents list with things merged by pull ?
1703
# reuse the tree we've updated to to set the basis:
1704
parent_trees = [(self.branch.last_revision(), to_tree)]
1705
merges = self.get_parent_ids()[1:]
1706
# Ideally we ask the tree for the trees here, that way the working
1707
# tree can decide whether to give us teh entire tree or give us a
1708
# lazy initialised tree. dirstate for instance will have the trees
1709
# in ram already, whereas a last-revision + basis-inventory tree
1710
# will not, but also does not need them when setting parents.
1711
for parent in merges:
1712
parent_trees.append(
1713
(parent, self.branch.repository.revision_tree(parent)))
1714
if old_tip is not None:
1715
parent_trees.append(
1716
(old_tip, self.branch.repository.revision_tree(old_tip)))
1717
self.set_parent_trees(parent_trees)
1718
last_rev = parent_trees[0][0]
1720
# the working tree had the same last-revision as the master
1721
# branch did. We may still have pivot local work from the local
1722
# branch into old_tip:
1723
if old_tip is not None:
1724
self.add_parent_tree_id(old_tip)
1725
if old_tip and old_tip != last_rev:
1726
# our last revision was not the prior branch last revision
1727
# and we have converted that last revision to a pending merge.
1728
# base is somewhere between the branch tip now
1729
# and the now pending merge
1730
from bzrlib.revision import common_ancestor
1732
base_rev_id = common_ancestor(self.branch.last_revision(),
1734
self.branch.repository)
1735
except errors.NoCommonAncestor:
1737
base_tree = self.branch.repository.revision_tree(base_rev_id)
1738
other_tree = self.branch.repository.revision_tree(old_tip)
1739
result += merge_inner(self.branch,
1745
@needs_tree_write_lock
1288
1746
def _write_inventory(self, inv):
1289
1747
"""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')
1748
self._set_inventory(inv, dirty=True)
1297
1751
def set_conflicts(self, arg):
1298
1752
raise UnsupportedOperation(self.set_conflicts, self)
1754
def add_conflicts(self, arg):
1755
raise UnsupportedOperation(self.add_conflicts, self)
1300
1757
@needs_read_lock
1301
1758
def conflicts(self):
1302
1759
conflicts = ConflictList()
added
removed
bzrlib/workingtree.py
