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
562
return os.path.getsize(self.id2abspath(file_id))
499
def get_file_sha1(self, file_id):
500
path = self._inventory.id2path(file_id)
565
def get_file_sha1(self, file_id, path=None):
567
path = self._inventory.id2path(file_id)
501
568
return self._hashcache.get_sha1(path)
503
def is_executable(self, file_id):
504
if not supports_executable():
570
def get_file_mtime(self, file_id, path=None):
572
path = self._inventory.id2path(file_id)
573
return os.lstat(self.abspath(path)).st_mtime
575
if not supports_executable():
576
def is_executable(self, file_id, path=None):
505
577
return self._inventory[file_id].executable
507
path = self._inventory.id2path(file_id)
579
def is_executable(self, file_id, path=None):
581
path = self._inventory.id2path(file_id)
508
582
mode = os.lstat(self.abspath(path)).st_mode
509
return bool(stat.S_ISREG(mode) and stat.S_IEXEC&mode)
583
return bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode)
511
585
@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.
586
def _add(self, files, ids, kinds):
587
"""See MutableTree._add."""
534
588
# TODO: Re-adding a file that is removed in the working copy
535
589
# 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))
590
# the read and write working inventory should not occur in this
591
# function - they should be part of lock_write and unlock.
547
592
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))
593
for f, file_id, kind in zip(files, ids, kinds):
594
assert kind is not None
571
595
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))
596
inv.add_path(f, kind=kind)
598
inv.add_path(f, kind=kind, file_id=file_id)
576
599
self._write_inventory(inv)
601
@needs_tree_write_lock
602
def _gather_kinds(self, files, kinds):
603
"""See MutableTree._gather_kinds."""
604
for pos, f in enumerate(files):
605
if kinds[pos] is None:
606
fullpath = normpath(self.abspath(f))
608
kinds[pos] = file_kind(fullpath)
610
if e.errno == errno.ENOENT:
611
raise NoSuchFile(fullpath)
578
613
@needs_write_lock
614
def add_parent_tree_id(self, revision_id, allow_leftmost_as_ghost=False):
615
"""Add revision_id as a parent.
617
This is equivalent to retrieving the current list of parent ids
618
and setting the list to its value plus revision_id.
620
:param revision_id: The revision id to add to the parent list. It may
621
be a ghost revision as long as its not the first parent to be added,
622
or the allow_leftmost_as_ghost parameter is set True.
623
:param allow_leftmost_as_ghost: Allow the first parent to be a ghost.
625
parents = self.get_parent_ids() + [revision_id]
626
self.set_parent_ids(parents,
627
allow_leftmost_as_ghost=len(parents) > 1 or allow_leftmost_as_ghost)
629
@needs_tree_write_lock
630
def add_parent_tree(self, parent_tuple, allow_leftmost_as_ghost=False):
631
"""Add revision_id, tree tuple as a parent.
633
This is equivalent to retrieving the current list of parent trees
634
and setting the list to its value plus parent_tuple. See also
635
add_parent_tree_id - if you only have a parent id available it will be
636
simpler to use that api. If you have the parent already available, using
637
this api is preferred.
639
:param parent_tuple: The (revision id, tree) to add to the parent list.
640
If the revision_id is a ghost, pass None for the tree.
641
:param allow_leftmost_as_ghost: Allow the first parent to be a ghost.
643
parent_ids = self.get_parent_ids() + [parent_tuple[0]]
644
if len(parent_ids) > 1:
645
# the leftmost may have already been a ghost, preserve that if it
647
allow_leftmost_as_ghost = True
648
self.set_parent_ids(parent_ids,
649
allow_leftmost_as_ghost=allow_leftmost_as_ghost)
651
@needs_tree_write_lock
579
652
def add_pending_merge(self, *revision_ids):
580
653
# TODO: Perhaps should check at this point that the
581
654
# history of the revision is actually present?
582
p = self.pending_merges()
655
parents = self.get_parent_ids()
584
657
for rev_id in revision_ids:
658
if rev_id in parents:
660
parents.append(rev_id)
590
self.set_pending_merges(p)
663
self.set_parent_ids(parents, allow_leftmost_as_ghost=True)
665
@deprecated_method(zero_eleven)
593
667
def pending_merges(self):
594
668
"""Return a list of pending merges.
596
670
These are revisions that have been merged into the working
597
671
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'))
673
As of 0.11 this is deprecated. Please see WorkingTree.get_parent_ids()
674
instead - which is available on all tree objects.
676
return self.get_parent_ids()[1:]
678
@needs_tree_write_lock
679
def set_parent_ids(self, revision_ids, allow_leftmost_as_ghost=False):
680
"""Set the parent ids to revision_ids.
682
See also set_parent_trees. This api will try to retrieve the tree data
683
for each element of revision_ids from the trees repository. If you have
684
tree data already available, it is more efficient to use
685
set_parent_trees rather than set_parent_ids. set_parent_ids is however
686
an easier API to use.
688
:param revision_ids: The revision_ids to set as the parent ids of this
689
working tree. Any of these may be ghosts.
691
if len(revision_ids) > 0:
692
leftmost_id = revision_ids[0]
693
if (not allow_leftmost_as_ghost and not
694
self.branch.repository.has_revision(leftmost_id)):
695
raise errors.GhostRevisionUnusableHere(leftmost_id)
696
self.set_last_revision(leftmost_id)
698
self.set_last_revision(None)
699
merges = revision_ids[1:]
700
self._control_files.put_utf8('pending-merges', '\n'.join(merges))
702
@needs_tree_write_lock
703
def set_parent_trees(self, parents_list, allow_leftmost_as_ghost=False):
704
"""See MutableTree.set_parent_trees."""
705
# parent trees are not used in current format trees, delegate to
707
self.set_parent_ids([rev for (rev, tree) in parents_list],
708
allow_leftmost_as_ghost=allow_leftmost_as_ghost)
710
@needs_tree_write_lock
611
711
def set_pending_merges(self, rev_list):
612
self._control_files.put_utf8('pending-merges', '\n'.join(rev_list))
712
parents = self.get_parent_ids()
713
leftmost = parents[:1]
714
new_parents = leftmost + rev_list
715
self.set_parent_ids(new_parents)
717
@needs_tree_write_lock
615
718
def set_merge_modified(self, modified_hashes):
616
719
def iter_stanzas():
617
720
for file_id, hash in modified_hashes.iteritems():
618
721
yield Stanza(file_id=file_id, hash=hash)
619
722
self._put_rio('merge-hashes', iter_stanzas(), MERGE_MODIFIED_HEADER_1)
724
@needs_tree_write_lock
622
725
def _put_rio(self, filename, stanzas, header):
623
726
my_file = rio_file(stanzas, header)
624
727
self._control_files.put(filename, my_file)
729
@needs_write_lock # because merge pulls data into the branch.
730
def merge_from_branch(self, branch, to_revision=None):
731
"""Merge from a branch into this working tree.
733
:param branch: The branch to merge from.
734
:param to_revision: If non-None, the merge will merge to to_revision, but
735
not beyond it. to_revision does not need to be in the history of
736
the branch when it is supplied. If None, to_revision defaults to
737
branch.last_revision().
739
from bzrlib.merge import Merger, Merge3Merger
740
pb = bzrlib.ui.ui_factory.nested_progress_bar()
742
merger = Merger(self.branch, this_tree=self, pb=pb)
743
merger.pp = ProgressPhase("Merge phase", 5, pb)
744
merger.pp.next_phase()
745
# check that there are no
747
merger.check_basis(check_clean=True, require_commits=False)
748
if to_revision is None:
749
to_revision = branch.last_revision()
750
merger.other_rev_id = to_revision
751
if merger.other_rev_id is None:
752
raise error.NoCommits(branch)
753
self.branch.fetch(branch, last_revision=merger.other_rev_id)
754
merger.other_basis = merger.other_rev_id
755
merger.other_tree = self.branch.repository.revision_tree(
757
merger.pp.next_phase()
759
if merger.base_rev_id == merger.other_rev_id:
760
raise errors.PointlessMerge
761
merger.backup_files = False
762
merger.merge_type = Merge3Merger
763
merger.set_interesting_files(None)
764
merger.show_base = False
765
merger.reprocess = False
766
conflicts = merger.do_merge()
627
773
def merge_modified(self):
666
821
Skips the control directory.
668
823
inv = self._inventory
670
def descend(from_dir_relpath, from_dir_id, dp):
824
# Convert these into local objects to save lookup times
825
pathjoin = osutils.pathjoin
826
file_kind = osutils.file_kind
828
# transport.base ends in a slash, we want the piece
829
# between the last two slashes
830
transport_base_dir = self.bzrdir.transport.base.rsplit('/', 2)[1]
832
fk_entries = {'directory':TreeDirectory, 'file':TreeFile, 'symlink':TreeLink}
834
# directory file_id, relative path, absolute path, reverse sorted children
835
children = os.listdir(self.basedir)
837
# jam 20060527 The kernel sized tree seems equivalent whether we
838
# use a deque and popleft to keep them sorted, or if we use a plain
839
# list and just reverse() them.
840
children = collections.deque(children)
841
stack = [(inv.root.file_id, u'', self.basedir, children)]
843
from_dir_id, from_dir_relpath, from_dir_abspath, children = stack[-1]
846
f = children.popleft()
674
847
## TODO: If we find a subdirectory with its own .bzr
675
848
## directory, then that is a separate tree and we
676
849
## should exclude it.
678
851
# the bzrdir for this tree
679
if self.bzrdir.transport.base.endswith(f + '/'):
852
if transport_base_dir == f:
683
fp = appendpath(from_dir_relpath, f)
855
# we know that from_dir_relpath and from_dir_abspath never end in a slash
856
# and 'f' doesn't begin with one, we can do a string op, rather
857
# than the checks of pathjoin(), all relative paths will have an extra slash
859
fp = from_dir_relpath + '/' + f
686
fap = appendpath(dp, f)
862
fap = from_dir_abspath + '/' + f
688
864
f_ie = inv.get_child(from_dir_id, f)
691
elif self.is_ignored(fp):
867
elif self.is_ignored(fp[1:]):
870
# we may not have found this file, because of a unicode issue
871
f_norm, can_access = osutils.normalized_filename(f)
872
if f == f_norm or not can_access:
873
# No change, so treat this file normally
876
# this file can be accessed by a normalized path
877
# check again if it is versioned
878
# these lines are repeated here for performance
880
fp = from_dir_relpath + '/' + f
881
fap = from_dir_abspath + '/' + f
882
f_ie = inv.get_child(from_dir_id, f)
885
elif self.is_ignored(fp[1:]):
696
890
fk = file_kind(fap)
940
1166
for subf in os.listdir(dirabs):
942
and (subf not in dir_entry.children)):
1169
if subf not in dir_entry.children:
1170
subf_norm, can_access = osutils.normalized_filename(subf)
1171
if subf_norm != subf and can_access:
1172
if subf_norm not in dir_entry.children:
1173
fl.append(subf_norm)
947
subp = appendpath(path, subf)
1179
subp = pathjoin(path, subf)
1182
def _translate_ignore_rule(self, rule):
1183
"""Translate a single ignore rule to a regex.
1185
There are two types of ignore rules. Those that do not contain a / are
1186
matched against the tail of the filename (that is, they do not care
1187
what directory the file is in.) Rules which do contain a slash must
1188
match the entire path. As a special case, './' at the start of the
1189
string counts as a slash in the string but is removed before matching
1190
(e.g. ./foo.c, ./src/foo.c)
1192
:return: The translated regex.
1194
if rule[:2] in ('./', '.\\'):
1196
result = fnmatch.translate(rule[2:])
1197
elif '/' in rule or '\\' in rule:
1199
result = fnmatch.translate(rule)
1201
# default rule style.
1202
result = "(?:.*/)?(?!.*/)" + fnmatch.translate(rule)
1203
assert result[-1] == '$', "fnmatch.translate did not add the expected $"
1204
return "(" + result + ")"
1206
def _combine_ignore_rules(self, rules):
1207
"""Combine a list of ignore rules into a single regex object.
1209
Each individual rule is combined with | to form a big regex, which then
1210
has $ added to it to form something like ()|()|()$. The group index for
1211
each subregex's outermost group is placed in a dictionary mapping back
1212
to the rule. This allows quick identification of the matching rule that
1214
:return: a list of the compiled regex and the matching-group index
1215
dictionaries. We return a list because python complains if you try to
1216
combine more than 100 regexes.
1221
translated_rules = []
1223
translated_rule = self._translate_ignore_rule(rule)
1224
compiled_rule = re.compile(translated_rule)
1225
groups[next_group] = rule
1226
next_group += compiled_rule.groups
1227
translated_rules.append(translated_rule)
1228
if next_group == 99:
1229
result.append((re.compile("|".join(translated_rules)), groups))
1232
translated_rules = []
1233
if len(translated_rules):
1234
result.append((re.compile("|".join(translated_rules)), groups))
951
1237
def ignored_files(self):
952
1238
"""Yield list of PATH, IGNORE_PATTERN"""
953
1239
for subp in self.extras():
954
1240
pat = self.is_ignored(subp)
959
1244
def get_ignore_list(self):
960
1245
"""Return list of ignore patterns.
962
1247
Cached in the Tree object after the first call.
964
if hasattr(self, '_ignorelist'):
965
return self._ignorelist
967
l = bzrlib.DEFAULT_IGNORE[:]
1249
ignoreset = getattr(self, '_ignoreset', None)
1250
if ignoreset is not None:
1253
ignore_globs = set(bzrlib.DEFAULT_IGNORE)
1254
ignore_globs.update(ignores.get_runtime_ignores())
1256
ignore_globs.update(ignores.get_user_ignores())
968
1258
if self.has_filename(bzrlib.IGNORE_FILENAME):
969
1259
f = self.get_file_byname(bzrlib.IGNORE_FILENAME)
970
l.extend([line.rstrip("\n\r") for line in f.readlines()])
1261
ignore_globs.update(ignores.parse_ignore_file(f))
1265
self._ignoreset = ignore_globs
1266
self._ignore_regex = self._combine_ignore_rules(ignore_globs)
1269
def _get_ignore_rules_as_regex(self):
1270
"""Return a regex of the ignore rules and a mapping dict.
1272
:return: (ignore rules compiled regex, dictionary mapping rule group
1273
indices to original rule.)
1275
if getattr(self, '_ignoreset', None) is None:
1276
self.get_ignore_list()
1277
return self._ignore_regex
975
1279
def is_ignored(self, filename):
976
1280
r"""Check whether the filename matches an ignore pattern.
1059
1376
if new_revision is None:
1060
1377
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])
1380
self.branch.generate_revision_history(new_revision)
1381
except errors.NoSuchRevision:
1382
# not present in the repo - dont try to set it deeper than the tip
1383
self.branch.set_revision_history([new_revision])
1071
1386
def _cache_basis_inventory(self, new_revision):
1072
1387
"""Cache new_revision as the basis inventory."""
1388
# TODO: this should allow the ready-to-use inventory to be passed in,
1389
# as commit already has that ready-to-use [while the format is the
1074
1392
# this double handles the inventory - unpack and repack -
1075
1393
# but is easier to understand. We can/should put a conditional
1076
1394
# in here based on whether the inventory is in the latest format
1077
1395
# - 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)
1397
# the fast path is to copy the raw xml from the repository. If the
1398
# xml contains 'revision_id="', then we assume the right
1399
# revision_id is set. We must check for this full string, because a
1400
# root node id can legitimately look like 'revision_id' but cannot
1402
xml = self.branch.repository.get_inventory_xml(new_revision)
1403
firstline = xml.split('\n', 1)[0]
1404
if (not 'revision_id="' in firstline or
1405
'format="6"' not in firstline):
1406
inv = self.branch.repository.deserialise_inventory(
1408
inv.revision_id = new_revision
1409
xml = bzrlib.xml6.serializer_v6.write_inventory_to_string(inv)
1410
assert isinstance(xml, str), 'serialised xml must be bytestring.'
1083
1411
path = self._basis_inventory_name()
1084
self._control_files.put_utf8(path, xml)
1085
except WeaveRevisionNotPresent:
1413
self._control_files.put(path, sio)
1414
except (errors.NoSuchRevision, errors.RevisionNotPresent):
1088
1417
def read_basis_inventory(self):
1089
1418
"""Read the cached basis inventory."""
1090
1419
path = self._basis_inventory_name()
1091
return self._control_files.get_utf8(path).read()
1420
return self._control_files.get(path).read()
1093
1422
@needs_read_lock
1094
1423
def read_working_inventory(self):
1248
1555
Do a 'normal' merge of the old branch basis if it is relevant.
1250
1557
old_tip = self.branch.update()
1251
if old_tip is not None:
1252
self.add_pending_merge(old_tip)
1253
self.branch.lock_read()
1558
# here if old_tip is not None, it is the old tip of the branch before
1559
# it was updated from the master branch. This should become a pending
1560
# merge in the working tree to preserve the user existing work. we
1561
# cant set that until we update the working trees last revision to be
1562
# one from the new branch, because it will just get absorbed by the
1563
# parent de-duplication logic.
1565
# We MUST save it even if an error occurs, because otherwise the users
1566
# 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()
1570
last_rev = self.get_parent_ids()[0]
1573
if last_rev != self.branch.last_revision():
1574
# merge tree state up to new branch tip.
1575
basis = self.basis_tree()
1576
to_tree = self.branch.basis_tree()
1577
result += merge_inner(self.branch,
1581
# TODO - dedup parents list with things merged by pull ?
1582
# reuse the tree we've updated to to set the basis:
1583
parent_trees = [(self.branch.last_revision(), to_tree)]
1584
merges = self.get_parent_ids()[1:]
1585
# Ideally we ask the tree for the trees here, that way the working
1586
# tree can decide whether to give us teh entire tree or give us a
1587
# lazy initialised tree. dirstate for instance will have the trees
1588
# in ram already, whereas a last-revision + basis-inventory tree
1589
# will not, but also does not need them when setting parents.
1590
for parent in merges:
1591
parent_trees.append(
1592
(parent, self.branch.repository.revision_tree(parent)))
1593
if old_tip is not None:
1594
parent_trees.append(
1595
(old_tip, self.branch.repository.revision_tree(old_tip)))
1596
self.set_parent_trees(parent_trees)
1597
last_rev = parent_trees[0][0]
1599
# the working tree had the same last-revision as the master
1600
# branch did. We may still have pivot local work from the local
1601
# branch into old_tip:
1602
if old_tip is not None:
1603
self.add_parent_tree_id(old_tip)
1604
if old_tip and old_tip != last_rev:
1605
# our last revision was not the prior branch last revision
1606
# and we have converted that last revision to a pending merge.
1607
# base is somewhere between the branch tip now
1608
# and the now pending merge
1609
from bzrlib.revision import common_ancestor
1611
base_rev_id = common_ancestor(self.branch.last_revision(),
1613
self.branch.repository)
1614
except errors.NoCommonAncestor:
1616
base_tree = self.branch.repository.revision_tree(base_rev_id)
1617
other_tree = self.branch.repository.revision_tree(old_tip)
1618
result += merge_inner(self.branch,
1624
@needs_tree_write_lock
1288
1625
def _write_inventory(self, inv):
1289
1626
"""Write inventory as the current inventory."""
1290
1627
sio = StringIO()
added
removed
bzrlib/workingtree.py
