90
93
from bzrlib.progress import DummyProgress, ProgressPhase
91
94
from bzrlib.revision import NULL_REVISION
95
import bzrlib.revisiontree
92
96
from bzrlib.rio import RioReader, rio_file, Stanza
93
from bzrlib.symbol_versioning import *
94
from bzrlib.textui import show_status
97
from bzrlib.symbol_versioning import (deprecated_passed,
100
DEPRECATED_PARAMETER,
104
from bzrlib.trace import mutter, note
96
105
from bzrlib.transform import build_tree
97
from bzrlib.trace import mutter, note
98
106
from bzrlib.transport import get_transport
99
107
from bzrlib.transport.local import LocalTransport
108
from bzrlib.textui import show_status
101
110
import bzrlib.xml5
113
# the regex removes any weird characters; we don't escape them
114
# but rather just pull them out
115
_gen_file_id_re = re.compile(r'[^\w.]')
116
_gen_id_suffix = None
120
def _next_id_suffix():
121
"""Create a new file id suffix that is reasonably unique.
123
On the first call we combine the current time with 64 bits of randomness
124
to give a highly probably globally unique number. Then each call in the same
125
process adds 1 to a serial number we append to that unique value.
127
# XXX TODO: change bzrlib.add.smart_add to call workingtree.add() rather
128
# than having to move the id randomness out of the inner loop like this.
129
# XXX TODO: for the global randomness this uses we should add the thread-id
130
# before the serial #.
131
global _gen_id_suffix, _gen_id_serial
132
if _gen_id_suffix is None:
133
_gen_id_suffix = "-%s-%s-" % (compact_date(time()), rand_chars(16))
135
return _gen_id_suffix + str(_gen_id_serial)
104
138
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))
139
"""Return new file id for the basename 'name'.
141
The uniqueness is supplied from _next_id_suffix.
143
# The real randomness is in the _next_id_suffix, the
144
# rest of the identifier is just to be nice.
146
# 1) Remove non-ascii word characters to keep the ids portable
147
# 2) squash to lowercase, so the file id doesn't have to
148
# be escaped (case insensitive filesystems would bork for ids
149
# that only differred in case without escaping).
150
# 3) truncate the filename to 20 chars. Long filenames also bork on some
152
# 4) Removing starting '.' characters to prevent the file ids from
153
# being considered hidden.
154
ascii_word_only = _gen_file_id_re.sub('', name.lower())
155
short_no_dots = ascii_word_only.lstrip('.')[:20]
156
return short_no_dots + _next_id_suffix()
133
159
def gen_root_id():
496
556
return os.path.getsize(self.id2abspath(file_id))
499
def get_file_sha1(self, file_id):
500
path = self._inventory.id2path(file_id)
559
def get_file_sha1(self, file_id, path=None):
561
path = self._inventory.id2path(file_id)
501
562
return self._hashcache.get_sha1(path)
503
def is_executable(self, file_id):
504
if not supports_executable():
564
def get_file_mtime(self, file_id, path=None):
566
path = self._inventory.id2path(file_id)
567
return os.lstat(self.abspath(path)).st_mtime
569
if not supports_executable():
570
def is_executable(self, file_id, path=None):
505
571
return self._inventory[file_id].executable
507
path = self._inventory.id2path(file_id)
573
def is_executable(self, file_id, path=None):
575
path = self._inventory.id2path(file_id)
508
576
mode = os.lstat(self.abspath(path)).st_mode
509
return bool(stat.S_ISREG(mode) and stat.S_IEXEC&mode)
577
return bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode)
511
579
@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.
580
def _add(self, files, ids, kinds):
581
"""See MutableTree._add."""
534
582
# TODO: Re-adding a file that is removed in the working copy
535
583
# 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))
584
# the read and write working inventory should not occur in this
585
# function - they should be part of lock_write and unlock.
547
586
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))
587
for f, file_id, kind in zip(files, ids, kinds):
588
assert kind is not None
571
589
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))
590
inv.add_path(f, kind=kind)
592
inv.add_path(f, kind=kind, file_id=file_id)
576
593
self._write_inventory(inv)
595
@needs_tree_write_lock
596
def _gather_kinds(self, files, kinds):
597
"""See MutableTree._gather_kinds."""
598
for pos, f in enumerate(files):
599
if kinds[pos] is None:
600
fullpath = normpath(self.abspath(f))
602
kinds[pos] = file_kind(fullpath)
604
if e.errno == errno.ENOENT:
605
raise NoSuchFile(fullpath)
578
607
@needs_write_lock
608
def add_parent_tree_id(self, revision_id, allow_leftmost_as_ghost=False):
609
"""Add revision_id as a parent.
611
This is equivalent to retrieving the current list of parent ids
612
and setting the list to its value plus revision_id.
614
:param revision_id: The revision id to add to the parent list. It may
615
be a ghost revision as long as its not the first parent to be added,
616
or the allow_leftmost_as_ghost parameter is set True.
617
:param allow_leftmost_as_ghost: Allow the first parent to be a ghost.
619
parents = self.get_parent_ids() + [revision_id]
620
self.set_parent_ids(parents,
621
allow_leftmost_as_ghost=len(parents) > 1 or allow_leftmost_as_ghost)
623
@needs_tree_write_lock
624
def add_parent_tree(self, parent_tuple, allow_leftmost_as_ghost=False):
625
"""Add revision_id, tree tuple as a parent.
627
This is equivalent to retrieving the current list of parent trees
628
and setting the list to its value plus parent_tuple. See also
629
add_parent_tree_id - if you only have a parent id available it will be
630
simpler to use that api. If you have the parent already available, using
631
this api is preferred.
633
:param parent_tuple: The (revision id, tree) to add to the parent list.
634
If the revision_id is a ghost, pass None for the tree.
635
:param allow_leftmost_as_ghost: Allow the first parent to be a ghost.
637
parent_ids = self.get_parent_ids() + [parent_tuple[0]]
638
if len(parent_ids) > 1:
639
# the leftmost may have already been a ghost, preserve that if it
641
allow_leftmost_as_ghost = True
642
self.set_parent_ids(parent_ids,
643
allow_leftmost_as_ghost=allow_leftmost_as_ghost)
645
@needs_tree_write_lock
579
646
def add_pending_merge(self, *revision_ids):
580
647
# TODO: Perhaps should check at this point that the
581
648
# history of the revision is actually present?
582
p = self.pending_merges()
649
parents = self.get_parent_ids()
584
651
for rev_id in revision_ids:
652
if rev_id in parents:
654
parents.append(rev_id)
590
self.set_pending_merges(p)
657
self.set_parent_ids(parents, allow_leftmost_as_ghost=True)
659
@deprecated_method(zero_eleven)
593
661
def pending_merges(self):
594
662
"""Return a list of pending merges.
596
664
These are revisions that have been merged into the working
597
665
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'))
667
As of 0.11 this is deprecated. Please see WorkingTree.get_parent_ids()
668
instead - which is available on all tree objects.
670
return self.get_parent_ids()[1:]
672
def _check_parents_for_ghosts(self, revision_ids, allow_leftmost_as_ghost):
673
"""Common ghost checking functionality from set_parent_*.
675
This checks that the left hand-parent exists if there are any
678
if len(revision_ids) > 0:
679
leftmost_id = revision_ids[0]
680
if (not allow_leftmost_as_ghost and not
681
self.branch.repository.has_revision(leftmost_id)):
682
raise errors.GhostRevisionUnusableHere(leftmost_id)
684
def _set_merges_from_parent_ids(self, parent_ids):
685
merges = parent_ids[1:]
686
self._control_files.put_utf8('pending-merges', '\n'.join(merges))
688
@needs_tree_write_lock
689
def set_parent_ids(self, revision_ids, allow_leftmost_as_ghost=False):
690
"""Set the parent ids to revision_ids.
692
See also set_parent_trees. This api will try to retrieve the tree data
693
for each element of revision_ids from the trees repository. If you have
694
tree data already available, it is more efficient to use
695
set_parent_trees rather than set_parent_ids. set_parent_ids is however
696
an easier API to use.
698
:param revision_ids: The revision_ids to set as the parent ids of this
699
working tree. Any of these may be ghosts.
701
self._check_parents_for_ghosts(revision_ids,
702
allow_leftmost_as_ghost=allow_leftmost_as_ghost)
704
if len(revision_ids) > 0:
705
self.set_last_revision(revision_ids[0])
707
self.set_last_revision(None)
709
self._set_merges_from_parent_ids(revision_ids)
711
@needs_tree_write_lock
712
def set_parent_trees(self, parents_list, allow_leftmost_as_ghost=False):
713
"""See MutableTree.set_parent_trees."""
714
parent_ids = [rev for (rev, tree) in parents_list]
716
self._check_parents_for_ghosts(parent_ids,
717
allow_leftmost_as_ghost=allow_leftmost_as_ghost)
719
if len(parent_ids) == 0:
720
leftmost_parent_id = None
721
leftmost_parent_tree = None
723
leftmost_parent_id, leftmost_parent_tree = parents_list[0]
725
if self._change_last_revision(leftmost_parent_id):
726
if leftmost_parent_tree is None:
727
# If we don't have a tree, fall back to reading the
728
# parent tree from the repository.
729
self._cache_basis_inventory(leftmost_parent_id)
731
inv = leftmost_parent_tree.inventory
732
xml = self._create_basis_xml_from_inventory(
733
leftmost_parent_id, inv)
734
self._write_basis_inventory(xml)
735
self._set_merges_from_parent_ids(parent_ids)
737
@needs_tree_write_lock
611
738
def set_pending_merges(self, rev_list):
612
self._control_files.put_utf8('pending-merges', '\n'.join(rev_list))
739
parents = self.get_parent_ids()
740
leftmost = parents[:1]
741
new_parents = leftmost + rev_list
742
self.set_parent_ids(new_parents)
744
@needs_tree_write_lock
615
745
def set_merge_modified(self, modified_hashes):
616
746
def iter_stanzas():
617
747
for file_id, hash in modified_hashes.iteritems():
618
748
yield Stanza(file_id=file_id, hash=hash)
619
749
self._put_rio('merge-hashes', iter_stanzas(), MERGE_MODIFIED_HEADER_1)
751
@needs_tree_write_lock
622
752
def _put_rio(self, filename, stanzas, header):
623
753
my_file = rio_file(stanzas, header)
624
754
self._control_files.put(filename, my_file)
756
@needs_write_lock # because merge pulls data into the branch.
757
def merge_from_branch(self, branch, to_revision=None):
758
"""Merge from a branch into this working tree.
760
:param branch: The branch to merge from.
761
:param to_revision: If non-None, the merge will merge to to_revision, but
762
not beyond it. to_revision does not need to be in the history of
763
the branch when it is supplied. If None, to_revision defaults to
764
branch.last_revision().
766
from bzrlib.merge import Merger, Merge3Merger
767
pb = bzrlib.ui.ui_factory.nested_progress_bar()
769
merger = Merger(self.branch, this_tree=self, pb=pb)
770
merger.pp = ProgressPhase("Merge phase", 5, pb)
771
merger.pp.next_phase()
772
# check that there are no
774
merger.check_basis(check_clean=True, require_commits=False)
775
if to_revision is None:
776
to_revision = branch.last_revision()
777
merger.other_rev_id = to_revision
778
if merger.other_rev_id is None:
779
raise error.NoCommits(branch)
780
self.branch.fetch(branch, last_revision=merger.other_rev_id)
781
merger.other_basis = merger.other_rev_id
782
merger.other_tree = self.branch.repository.revision_tree(
784
merger.pp.next_phase()
786
if merger.base_rev_id == merger.other_rev_id:
787
raise errors.PointlessMerge
788
merger.backup_files = False
789
merger.merge_type = Merge3Merger
790
merger.set_interesting_files(None)
791
merger.show_base = False
792
merger.reprocess = False
793
conflicts = merger.do_merge()
627
800
def merge_modified(self):
666
848
Skips the control directory.
668
850
inv = self._inventory
670
def descend(from_dir_relpath, from_dir_id, dp):
851
if include_root is True:
852
yield ('', 'V', 'directory', inv.root.file_id, inv.root)
853
# Convert these into local objects to save lookup times
854
pathjoin = osutils.pathjoin
855
file_kind = osutils.file_kind
857
# transport.base ends in a slash, we want the piece
858
# between the last two slashes
859
transport_base_dir = self.bzrdir.transport.base.rsplit('/', 2)[1]
861
fk_entries = {'directory':TreeDirectory, 'file':TreeFile, 'symlink':TreeLink}
863
# directory file_id, relative path, absolute path, reverse sorted children
864
children = os.listdir(self.basedir)
866
# jam 20060527 The kernel sized tree seems equivalent whether we
867
# use a deque and popleft to keep them sorted, or if we use a plain
868
# list and just reverse() them.
869
children = collections.deque(children)
870
stack = [(inv.root.file_id, u'', self.basedir, children)]
872
from_dir_id, from_dir_relpath, from_dir_abspath, children = stack[-1]
875
f = children.popleft()
674
876
## TODO: If we find a subdirectory with its own .bzr
675
877
## directory, then that is a separate tree and we
676
878
## should exclude it.
678
880
# the bzrdir for this tree
679
if self.bzrdir.transport.base.endswith(f + '/'):
881
if transport_base_dir == f:
683
fp = appendpath(from_dir_relpath, f)
884
# we know that from_dir_relpath and from_dir_abspath never end in a slash
885
# and 'f' doesn't begin with one, we can do a string op, rather
886
# than the checks of pathjoin(), all relative paths will have an extra slash
888
fp = from_dir_relpath + '/' + f
686
fap = appendpath(dp, f)
891
fap = from_dir_abspath + '/' + f
688
893
f_ie = inv.get_child(from_dir_id, f)
691
elif self.is_ignored(fp):
896
elif self.is_ignored(fp[1:]):
899
# we may not have found this file, because of a unicode issue
900
f_norm, can_access = osutils.normalized_filename(f)
901
if f == f_norm or not can_access:
902
# No change, so treat this file normally
905
# this file can be accessed by a normalized path
906
# check again if it is versioned
907
# these lines are repeated here for performance
909
fp = from_dir_relpath + '/' + f
910
fap = from_dir_abspath + '/' + f
911
f_ie = inv.get_child(from_dir_id, f)
914
elif self.is_ignored(fp[1:]):
696
919
fk = file_kind(fap)
940
1195
for subf in os.listdir(dirabs):
942
and (subf not in dir_entry.children)):
1198
if subf not in dir_entry.children:
1199
subf_norm, can_access = osutils.normalized_filename(subf)
1200
if subf_norm != subf and can_access:
1201
if subf_norm not in dir_entry.children:
1202
fl.append(subf_norm)
947
subp = appendpath(path, subf)
1208
subp = pathjoin(path, subf)
1211
def _translate_ignore_rule(self, rule):
1212
"""Translate a single ignore rule to a regex.
1214
There are two types of ignore rules. Those that do not contain a / are
1215
matched against the tail of the filename (that is, they do not care
1216
what directory the file is in.) Rules which do contain a slash must
1217
match the entire path. As a special case, './' at the start of the
1218
string counts as a slash in the string but is removed before matching
1219
(e.g. ./foo.c, ./src/foo.c)
1221
:return: The translated regex.
1223
if rule[:2] in ('./', '.\\'):
1225
result = fnmatch.translate(rule[2:])
1226
elif '/' in rule or '\\' in rule:
1228
result = fnmatch.translate(rule)
1230
# default rule style.
1231
result = "(?:.*/)?(?!.*/)" + fnmatch.translate(rule)
1232
assert result[-1] == '$', "fnmatch.translate did not add the expected $"
1233
return "(" + result + ")"
1235
def _combine_ignore_rules(self, rules):
1236
"""Combine a list of ignore rules into a single regex object.
1238
Each individual rule is combined with | to form a big regex, which then
1239
has $ added to it to form something like ()|()|()$. The group index for
1240
each subregex's outermost group is placed in a dictionary mapping back
1241
to the rule. This allows quick identification of the matching rule that
1243
:return: a list of the compiled regex and the matching-group index
1244
dictionaries. We return a list because python complains if you try to
1245
combine more than 100 regexes.
1250
translated_rules = []
1252
translated_rule = self._translate_ignore_rule(rule)
1253
compiled_rule = re.compile(translated_rule)
1254
groups[next_group] = rule
1255
next_group += compiled_rule.groups
1256
translated_rules.append(translated_rule)
1257
if next_group == 99:
1258
result.append((re.compile("|".join(translated_rules)), groups))
1261
translated_rules = []
1262
if len(translated_rules):
1263
result.append((re.compile("|".join(translated_rules)), groups))
951
1266
def ignored_files(self):
952
1267
"""Yield list of PATH, IGNORE_PATTERN"""
953
1268
for subp in self.extras():
954
1269
pat = self.is_ignored(subp)
959
1273
def get_ignore_list(self):
960
1274
"""Return list of ignore patterns.
962
1276
Cached in the Tree object after the first call.
964
if hasattr(self, '_ignorelist'):
965
return self._ignorelist
967
l = bzrlib.DEFAULT_IGNORE[:]
1278
ignoreset = getattr(self, '_ignoreset', None)
1279
if ignoreset is not None:
1282
ignore_globs = set(bzrlib.DEFAULT_IGNORE)
1283
ignore_globs.update(ignores.get_runtime_ignores())
1285
ignore_globs.update(ignores.get_user_ignores())
968
1287
if self.has_filename(bzrlib.IGNORE_FILENAME):
969
1288
f = self.get_file_byname(bzrlib.IGNORE_FILENAME)
970
l.extend([line.rstrip("\n\r") for line in f.readlines()])
1290
ignore_globs.update(ignores.parse_ignore_file(f))
1294
self._ignoreset = ignore_globs
1295
self._ignore_regex = self._combine_ignore_rules(ignore_globs)
1298
def _get_ignore_rules_as_regex(self):
1299
"""Return a regex of the ignore rules and a mapping dict.
1301
:return: (ignore rules compiled regex, dictionary mapping rule group
1302
indices to original rule.)
1304
if getattr(self, '_ignoreset', None) is None:
1305
self.get_ignore_list()
1306
return self._ignore_regex
975
1308
def is_ignored(self, filename):
976
1309
r"""Check whether the filename matches an ignore pattern.
1059
1405
if new_revision is None:
1060
1406
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])
1409
self.branch.generate_revision_history(new_revision)
1410
except errors.NoSuchRevision:
1411
# not present in the repo - dont try to set it deeper than the tip
1412
self.branch.set_revision_history([new_revision])
1415
def _write_basis_inventory(self, xml):
1416
"""Write the basis inventory XML to the basis-inventory file"""
1417
assert isinstance(xml, str), 'serialised xml must be bytestring.'
1418
path = self._basis_inventory_name()
1420
self._control_files.put(path, sio)
1422
def _create_basis_xml_from_inventory(self, revision_id, inventory):
1423
"""Create the text that will be saved in basis-inventory"""
1424
inventory.revision_id = revision_id
1425
return bzrlib.xml6.serializer_v6.write_inventory_to_string(inventory)
1071
1427
def _cache_basis_inventory(self, new_revision):
1072
1428
"""Cache new_revision as the basis inventory."""
1429
# TODO: this should allow the ready-to-use inventory to be passed in,
1430
# as commit already has that ready-to-use [while the format is the
1074
1433
# this double handles the inventory - unpack and repack -
1075
1434
# but is easier to understand. We can/should put a conditional
1076
1435
# in here based on whether the inventory is in the latest format
1077
1436
# - 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:
1438
# the fast path is to copy the raw xml from the repository. If the
1439
# xml contains 'revision_id="', then we assume the right
1440
# revision_id is set. We must check for this full string, because a
1441
# root node id can legitimately look like 'revision_id' but cannot
1443
xml = self.branch.repository.get_inventory_xml(new_revision)
1444
firstline = xml.split('\n', 1)[0]
1445
if (not 'revision_id="' in firstline or
1446
'format="6"' not in firstline):
1447
inv = self.branch.repository.deserialise_inventory(
1449
xml = self._create_basis_xml_from_inventory(new_revision, inv)
1450
self._write_basis_inventory(xml)
1451
except (errors.NoSuchRevision, errors.RevisionNotPresent):
1088
1454
def read_basis_inventory(self):
1089
1455
"""Read the cached basis inventory."""
1090
1456
path = self._basis_inventory_name()
1091
return self._control_files.get_utf8(path).read()
1457
return self._control_files.get(path).read()
1093
1459
@needs_read_lock
1094
1460
def read_working_inventory(self):
1248
1616
Do a 'normal' merge of the old branch basis if it is relevant.
1250
1618
old_tip = self.branch.update()
1251
if old_tip is not None:
1252
self.add_pending_merge(old_tip)
1253
self.branch.lock_read()
1619
# here if old_tip is not None, it is the old tip of the branch before
1620
# it was updated from the master branch. This should become a pending
1621
# merge in the working tree to preserve the user existing work. we
1622
# cant set that until we update the working trees last revision to be
1623
# one from the new branch, because it will just get absorbed by the
1624
# parent de-duplication logic.
1626
# We MUST save it even if an error occurs, because otherwise the users
1627
# 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()
1631
last_rev = self.get_parent_ids()[0]
1634
if last_rev != self.branch.last_revision():
1635
# merge tree state up to new branch tip.
1636
basis = self.basis_tree()
1637
to_tree = self.branch.basis_tree()
1638
result += merge_inner(self.branch,
1642
# TODO - dedup parents list with things merged by pull ?
1643
# reuse the tree we've updated to to set the basis:
1644
parent_trees = [(self.branch.last_revision(), to_tree)]
1645
merges = self.get_parent_ids()[1:]
1646
# Ideally we ask the tree for the trees here, that way the working
1647
# tree can decide whether to give us teh entire tree or give us a
1648
# lazy initialised tree. dirstate for instance will have the trees
1649
# in ram already, whereas a last-revision + basis-inventory tree
1650
# will not, but also does not need them when setting parents.
1651
for parent in merges:
1652
parent_trees.append(
1653
(parent, self.branch.repository.revision_tree(parent)))
1654
if old_tip is not None:
1655
parent_trees.append(
1656
(old_tip, self.branch.repository.revision_tree(old_tip)))
1657
self.set_parent_trees(parent_trees)
1658
last_rev = parent_trees[0][0]
1660
# the working tree had the same last-revision as the master
1661
# branch did. We may still have pivot local work from the local
1662
# branch into old_tip:
1663
if old_tip is not None:
1664
self.add_parent_tree_id(old_tip)
1665
if old_tip and old_tip != last_rev:
1666
# our last revision was not the prior branch last revision
1667
# and we have converted that last revision to a pending merge.
1668
# base is somewhere between the branch tip now
1669
# and the now pending merge
1670
from bzrlib.revision import common_ancestor
1672
base_rev_id = common_ancestor(self.branch.last_revision(),
1674
self.branch.repository)
1675
except errors.NoCommonAncestor:
1677
base_tree = self.branch.repository.revision_tree(base_rev_id)
1678
other_tree = self.branch.repository.revision_tree(old_tip)
1679
result += merge_inner(self.branch,
1685
@needs_tree_write_lock
1288
1686
def _write_inventory(self, inv):
1289
1687
"""Write inventory as the current inventory."""
1290
1688
sio = StringIO()
added
removed
bzrlib/workingtree.py
