69
71
from copy import copy
70
72
from cStringIO import StringIO
73
from bzrlib.lazy_import import lazy_import
74
lazy_import(globals(), """
75
from bzrlib import tsort
77
from bzrlib.trace import mutter
81
78
from bzrlib.errors import (WeaveError, WeaveFormatError, WeaveParentMismatch,
82
79
RevisionAlreadyPresent,
83
80
RevisionNotPresent,
84
UnavailableRepresentation,
81
WeaveRevisionAlreadyPresent,
82
WeaveRevisionNotPresent,
86
from bzrlib.osutils import dirname, sha, sha_strings, split_lines
84
import bzrlib.errors as errors
85
from bzrlib.osutils import sha_strings
87
86
import bzrlib.patiencediff
88
from bzrlib.revision import NULL_REVISION
89
87
from bzrlib.symbol_versioning import *
90
from bzrlib.trace import mutter
91
from bzrlib.versionedfile import (
88
from bzrlib.tsort import topo_sort
89
from bzrlib.versionedfile import VersionedFile, InterVersionedFile
98
90
from bzrlib.weavefile import _read_weave_v5, write_weave_v5
101
class WeaveContentFactory(ContentFactory):
102
"""Content factory for streaming from weaves.
104
:seealso ContentFactory:
107
def __init__(self, version, weave):
108
"""Create a WeaveContentFactory for version from weave."""
109
ContentFactory.__init__(self)
110
self.sha1 = weave.get_sha1s([version])[version]
111
self.key = (version,)
112
parents = weave.get_parent_map([version])[version]
113
self.parents = tuple((parent,) for parent in parents)
114
self.storage_kind = 'fulltext'
117
def get_bytes_as(self, storage_kind):
118
if storage_kind == 'fulltext':
119
return self._weave.get_text(self.key[-1])
120
elif storage_kind == 'chunked':
121
return self._weave.get_lines(self.key[-1])
123
raise UnavailableRepresentation(self.key, storage_kind, 'fulltext')
126
93
class Weave(VersionedFile):
127
94
"""weave - versioned text file storage.
129
96
A Weave manages versions of line-based text files, keeping track
130
97
of the originating version for each line.
270
217
return self._parents == other._parents \
271
218
and self._weave == other._weave \
272
and self._sha1s == other._sha1s
219
and self._sha1s == other._sha1s
274
221
def __ne__(self, other):
275
222
return not self.__eq__(other)
224
@deprecated_method(zero_eight)
225
def idx_to_name(self, index):
226
"""Old public interface, the public interface is all names now."""
277
229
def _idx_to_name(self, version):
278
230
return self._names[version]
232
@deprecated_method(zero_eight)
233
def lookup(self, name):
234
"""Backwards compatibility thunk:
236
Return name, as name is valid in the api now, and spew deprecation
280
241
def _lookup(self, name):
281
242
"""Convert symbolic version name to index."""
282
if not self._allow_reserved:
283
self.check_not_reserved_id(name)
285
244
return self._name_map[name]
287
246
raise RevisionNotPresent(name, self._weave_name)
248
@deprecated_method(zero_eight)
249
def iter_names(self):
250
"""Deprecated convenience function, please see VersionedFile.names()."""
251
return iter(self.names())
253
@deprecated_method(zero_eight)
255
"""See Weave.versions for the current api."""
256
return self.versions()
289
258
def versions(self):
290
259
"""See VersionedFile.versions."""
291
260
return self._names[:]
293
262
def has_version(self, version_id):
294
263
"""See VersionedFile.has_version."""
295
return (version_id in self._name_map)
264
return self._name_map.has_key(version_id)
297
266
__contains__ = has_version
299
def get_record_stream(self, versions, ordering, include_delta_closure):
300
"""Get a stream of records for versions.
302
:param versions: The versions to include. Each version is a tuple
304
:param ordering: Either 'unordered' or 'topological'. A topologically
305
sorted stream has compression parents strictly before their
307
:param include_delta_closure: If True then the closure across any
308
compression parents will be included (in the opaque data).
309
:return: An iterator of ContentFactory objects, each of which is only
310
valid until the iterator is advanced.
312
versions = [version[-1] for version in versions]
313
if ordering == 'topological':
314
parents = self.get_parent_map(versions)
315
new_versions = tsort.topo_sort(parents)
316
new_versions.extend(set(versions).difference(set(parents)))
317
versions = new_versions
318
elif ordering == 'groupcompress':
319
parents = self.get_parent_map(versions)
320
new_versions = sort_groupcompress(parents)
321
new_versions.extend(set(versions).difference(set(parents)))
322
versions = new_versions
323
for version in versions:
325
yield WeaveContentFactory(version, self)
327
yield AbsentContentFactory((version,))
329
def get_parent_map(self, version_ids):
330
"""See VersionedFile.get_parent_map."""
268
def get_delta(self, version_id):
269
"""See VersionedFile.get_delta."""
270
return self.get_deltas([version_id])[version_id]
272
def get_deltas(self, version_ids):
273
"""See VersionedFile.get_deltas."""
274
version_ids = self.get_ancestry(version_ids)
332
275
for version_id in version_ids:
333
if version_id == NULL_REVISION:
338
map(self._idx_to_name,
339
self._parents[self._lookup(version_id)]))
340
except RevisionNotPresent:
276
if not self.has_version(version_id):
277
raise RevisionNotPresent(version_id, self)
278
# try extracting all versions; parallel extraction is used
279
nv = self.num_versions()
285
last_parent_lines = {}
287
parent_inclusions = {}
292
# its simplest to generate a full set of prepared variables.
294
name = self._names[i]
295
sha1s[name] = self.get_sha1(name)
296
parents_list = self.get_parents(name)
298
parent = parents_list[0]
299
parents[name] = parent
300
parent_inclusions[name] = inclusions[parent]
303
parent_inclusions[name] = set()
304
# we want to emit start, finish, replacement_length, replacement_lines tuples.
305
diff_hunks[name] = []
306
current_hunks[name] = [0, 0, 0, []] # #start, finish, repl_length, repl_tuples
307
parent_linenums[name] = 0
309
parent_noeols[name] = False
310
last_parent_lines[name] = None
311
new_inc = set([name])
312
for p in self._parents[i]:
313
new_inc.update(inclusions[self._idx_to_name(p)])
314
# debug only, known good so far.
315
#assert set(new_inc) == set(self.get_ancestry(name)), \
316
# 'failed %s != %s' % (set(new_inc), set(self.get_ancestry(name)))
317
inclusions[name] = new_inc
319
nlines = len(self._weave)
321
for lineno, inserted, deletes, line in self._walk_internal():
322
# a line is active in a version if:
323
# insert is in the versions inclusions
325
# deleteset & the versions inclusions is an empty set.
326
# so - if we have a included by mapping - version is included by
327
# children, we get a list of children to examine for deletes affect
328
# ing them, which is less than the entire set of children.
329
for version_id in version_ids:
330
# The active inclusion must be an ancestor,
331
# and no ancestors must have deleted this line,
332
# because we don't support resurrection.
333
parent_inclusion = parent_inclusions[version_id]
334
inclusion = inclusions[version_id]
335
parent_active = inserted in parent_inclusion and not (deletes & parent_inclusion)
336
version_active = inserted in inclusion and not (deletes & inclusion)
337
if not parent_active and not version_active:
338
# unrelated line of ancestry
342
result[version_id] = parents
340
elif parent_active and version_active:
342
parent_linenum = parent_linenums[version_id]
343
if current_hunks[version_id] != [parent_linenum, parent_linenum, 0, []]:
344
diff_hunks[version_id].append(tuple(current_hunks[version_id]))
346
current_hunks[version_id] = [parent_linenum, parent_linenum, 0, []]
347
parent_linenums[version_id] = parent_linenum
350
noeols[version_id] = True
353
elif parent_active and not version_active:
355
current_hunks[version_id][1] += 1
356
parent_linenums[version_id] += 1
357
last_parent_lines[version_id] = line
358
elif not parent_active and version_active:
360
# noeol only occurs at the end of a file because we
361
# diff linewise. We want to show noeol changes as a
362
# empty diff unless the actual eol-less content changed.
365
if last_parent_lines[version_id][-1] != '\n':
366
parent_noeols[version_id] = True
367
except (TypeError, IndexError):
370
if theline[-1] != '\n':
371
noeols[version_id] = True
375
parent_should_go = False
377
if parent_noeols[version_id] == noeols[version_id]:
378
# no noeol toggle, so trust the weaves statement
379
# that this line is changed.
381
if parent_noeols[version_id]:
382
theline = theline + '\n'
383
elif parent_noeols[version_id]:
384
# parent has no eol, we do:
385
# our line is new, report as such..
387
elif noeols[version_id]:
388
# append a eol so that it looks like
390
theline = theline + '\n'
391
if parents[version_id] is not None:
392
#if last_parent_lines[version_id] is not None:
393
parent_should_go = True
394
if last_parent_lines[version_id] != theline:
397
#parent_should_go = False
399
current_hunks[version_id][2] += 1
400
current_hunks[version_id][3].append((inserted, theline))
402
# last hunk last parent line is not eaten
403
current_hunks[version_id][1] -= 1
404
if current_hunks[version_id][1] < 0:
405
current_hunks[version_id][1] = 0
406
# import pdb;pdb.set_trace()
407
# assert current_hunks[version_id][1] >= 0
411
version = self._idx_to_name(i)
412
if current_hunks[version] != [0, 0, 0, []]:
413
diff_hunks[version].append(tuple(current_hunks[version]))
415
for version_id in version_ids:
416
result[version_id] = (
420
diff_hunks[version_id],
345
def get_parents_with_ghosts(self, version_id):
346
raise NotImplementedError(self.get_parents_with_ghosts)
348
def insert_record_stream(self, stream):
349
"""Insert a record stream into this versioned file.
351
:param stream: A stream of records to insert.
353
:seealso VersionedFile.get_record_stream:
356
for record in stream:
357
# Raise an error when a record is missing.
358
if record.storage_kind == 'absent':
359
raise RevisionNotPresent([record.key[0]], self)
360
# adapt to non-tuple interface
361
parents = [parent[0] for parent in record.parents]
362
if (record.storage_kind == 'fulltext'
363
or record.storage_kind == 'chunked'):
364
self.add_lines(record.key[0], parents,
365
osutils.chunks_to_lines(record.get_bytes_as('chunked')))
367
adapter_key = record.storage_kind, 'fulltext'
369
adapter = adapters[adapter_key]
371
adapter_factory = adapter_registry.get(adapter_key)
372
adapter = adapter_factory(self)
373
adapters[adapter_key] = adapter
374
lines = split_lines(adapter.get_bytes(record))
376
self.add_lines(record.key[0], parents, lines)
377
except RevisionAlreadyPresent:
424
def get_parents(self, version_id):
425
"""See VersionedFile.get_parent."""
426
return map(self._idx_to_name, self._parents[self._lookup(version_id)])
380
428
def _check_repeated_add(self, name, parents, text, sha1):
381
429
"""Check that a duplicated add is OK.
388
436
raise RevisionAlreadyPresent(name, self._weave_name)
391
def _add_lines(self, version_id, parents, lines, parent_texts,
392
left_matching_blocks, nostore_sha, random_id, check_content):
439
@deprecated_method(zero_eight)
440
def add_identical(self, old_rev_id, new_rev_id, parents):
441
"""Please use Weave.clone_text now."""
442
return self.clone_text(new_rev_id, old_rev_id, parents)
444
def _add_lines(self, version_id, parents, lines, parent_texts):
393
445
"""See VersionedFile.add_lines."""
394
idx = self._add(version_id, lines, map(self._lookup, parents),
395
nostore_sha=nostore_sha)
396
return sha_strings(lines), sum(map(len, lines)), idx
398
def _add(self, version_id, lines, parents, sha1=None, nostore_sha=None):
446
return self._add(version_id, lines, map(self._lookup, parents))
448
@deprecated_method(zero_eight)
449
def add(self, name, parents, text, sha1=None):
450
"""See VersionedFile.add_lines for the non deprecated api."""
451
return self._add(name, text, map(self._maybe_lookup, parents), sha1)
453
def _add(self, version_id, lines, parents, sha1=None):
399
454
"""Add a single text on top of the weave.
401
456
Returns the index number of the newly added version.
404
459
Symbolic name for this version.
405
460
(Typically the revision-id of the revision that added it.)
406
If None, a name will be allocated based on the hash. (sha1:SHAHASH)
409
463
List or set of direct parent version numbers.
412
466
Sequence of lines to be added in the new version.
414
:param nostore_sha: See VersionedFile.add_lines.
469
assert isinstance(version_id, basestring)
416
470
self._check_lines_not_unicode(lines)
417
471
self._check_lines_are_lines(lines)
419
473
sha1 = sha_strings(lines)
420
if sha1 == nostore_sha:
421
raise errors.ExistingContent
422
if version_id is None:
423
version_id = "sha1:" + sha1
424
474
if version_id in self._name_map:
425
475
return self._check_repeated_add(version_id, parents, lines, sha1)
557
628
def _compatible_parents(self, my_parents, other_parents):
558
629
"""During join check that other_parents are joinable with my_parents.
560
Joinable is defined as 'is a subset of' - supersets may require
631
Joinable is defined as 'is a subset of' - supersets may require
561
632
regeneration of diffs, but subsets do not.
563
634
return len(other_parents.difference(my_parents)) == 0
565
636
def annotate(self, version_id):
566
"""Return a list of (version-id, line) tuples for version_id.
637
if isinstance(version_id, int):
638
warn('Weave.annotate(int) is deprecated. Please use version names'
639
' in all circumstances as of 0.8',
644
for origin, lineno, text in self._extract([version_id]):
645
result.append((origin, text))
648
return super(Weave, self).annotate(version_id)
650
def annotate_iter(self, version_id):
651
"""Yield list of (version-id, line) pairs for the specified version.
568
653
The index indicates when the line originated in the weave."""
569
654
incls = [self._lookup(version_id)]
570
return [(self._idx_to_name(origin), text) for origin, lineno, text in
571
self._extract(incls)]
573
def iter_lines_added_or_present_in_versions(self, version_ids=None,
655
for origin, lineno, text in self._extract(incls):
656
yield self._idx_to_name(origin), text
658
@deprecated_method(zero_eight)
660
"""_walk has become visit, a supported api."""
661
return self._walk_internal()
663
def iter_lines_added_or_present_in_versions(self, version_ids=None):
575
664
"""See VersionedFile.iter_lines_added_or_present_in_versions()."""
576
665
if version_ids is None:
577
666
version_ids = self.versions()
578
667
version_ids = set(version_ids)
579
668
for lineno, inserted, deletes, line in self._walk_internal(version_ids):
580
if inserted not in version_ids: continue
669
# if inserted not in version_ids then it was inserted before the
670
# versions we care about, but because weaves cannot represent ghosts
671
# properly, we do not filter down to that
672
# if inserted not in version_ids: continue
581
673
if line[-1] != '\n':
582
yield line + '\n', inserted
678
#@deprecated_method(zero_eight)
679
def walk(self, version_ids=None):
680
"""See VersionedFile.walk."""
681
return self._walk_internal(version_ids)
586
683
def _walk_internal(self, version_ids=None):
587
684
"""Helper method for weave actions."""
848
976
# no lines outside of insertion blocks, that deletions are
849
977
# properly paired, etc.
979
def _join(self, other, pb, msg, version_ids, ignore_missing):
980
"""Worker routine for join()."""
981
if not other.versions():
982
return # nothing to update, easy
985
# versions is never none, InterWeave checks this.
988
# two loops so that we do not change ourselves before verifying it
990
# work through in index order to make sure we get all dependencies
993
# get the selected versions only that are in other.versions.
994
version_ids = set(other.versions()).intersection(set(version_ids))
995
# pull in the referenced graph.
996
version_ids = other.get_ancestry(version_ids)
997
pending_graph = [(version, other.get_parents(version)) for
998
version in version_ids]
999
for name in topo_sort(pending_graph):
1000
other_idx = other._name_map[name]
1001
# returns True if we have it, False if we need it.
1002
if not self._check_version_consistent(other, other_idx, name):
1003
names_to_join.append((other_idx, name))
1012
for other_idx, name in names_to_join:
1013
# TODO: If all the parents of the other version are already
1014
# present then we can avoid some work by just taking the delta
1015
# and adjusting the offsets.
1016
new_parents = self._imported_parents(other, other_idx)
1017
sha1 = other._sha1s[other_idx]
1022
pb.update(msg, merged, len(names_to_join))
1024
lines = other.get_lines(other_idx)
1025
self._add(name, lines, new_parents, sha1)
1027
mutter("merged = %d, processed = %d, file_id=%s; deltat=%d"%(
1028
merged, processed, self._weave_name, time.time()-time0))
851
1030
def _imported_parents(self, other, other_idx):
852
1031
"""Return list of parents in self corresponding to indexes in other."""
853
1032
new_parents = []
951
1139
sio = StringIO()
952
1140
write_weave_v5(self, sio)
954
bytes = sio.getvalue()
955
path = self._weave_name + WeaveFile.WEAVE_SUFFIX
957
self._transport.put_bytes(path, bytes, self._filemode)
958
except errors.NoSuchFile:
959
self._transport.mkdir(dirname(path))
960
self._transport.put_bytes(path, bytes, self._filemode)
1142
self._transport.put(self._weave_name + WeaveFile.WEAVE_SUFFIX,
963
1147
def get_suffixes():
964
1148
"""See VersionedFile.get_suffixes()."""
965
1149
return [WeaveFile.WEAVE_SUFFIX]
967
def insert_record_stream(self, stream):
968
super(WeaveFile, self).insert_record_stream(stream)
1151
def join(self, other, pb=None, msg=None, version_ids=None,
1152
ignore_missing=False):
1153
"""Join other into self and save."""
1154
super(WeaveFile, self).join(other, pb, msg, version_ids, ignore_missing)
1158
@deprecated_function(zero_eight)
1159
def reweave(wa, wb, pb=None, msg=None):
1160
"""reweaving is deprecation, please just use weave.join()."""
1161
_reweave(wa, wb, pb, msg)
972
1163
def _reweave(wa, wb, pb=None, msg=None):
973
1164
"""Combine two weaves and return the result.
975
This works even if a revision R has different parents in
1166
This works even if a revision R has different parents in
976
1167
wa and wb. In the resulting weave all the parents are given.
978
This is done by just building up a new weave, maintaining ordering
1169
This is done by just building up a new weave, maintaining ordering
979
1170
of the versions in the two inputs. More efficient approaches
980
might be possible but it should only be necessary to do
981
this operation rarely, when a new previously ghost version is
1171
might be possible but it should only be necessary to do
1172
this operation rarely, when a new previously ghost version is
984
1175
:param pb: An optional progress bar, indicating how far done we are
1029
1219
p = combined.setdefault(name, set())
1030
1220
p.update(map(weave._idx_to_name, weave._parents[idx]))
1031
1221
return combined
1225
"""Show the weave's table-of-contents"""
1226
print '%6s %50s %10s %10s' % ('ver', 'name', 'sha1', 'parents')
1227
for i in (6, 50, 10, 10):
1230
for i in range(w.num_versions()):
1233
parent_str = ' '.join(map(str, w._parents[i]))
1234
print '%6d %-50.50s %10.10s %s' % (i, name, sha1, parent_str)
1238
def weave_stats(weave_file, pb):
1239
from bzrlib.weavefile import read_weave
1241
wf = file(weave_file, 'rb')
1242
w = read_weave(wf, WeaveVersionedFile)
1243
# FIXME: doesn't work on pipes
1244
weave_size = wf.tell()
1248
for i in range(vers):
1249
pb.update('checking sizes', i, vers)
1250
for origin, lineno, line in w._extract([i]):
1255
print 'versions %9d' % vers
1256
print 'weave file %9d bytes' % weave_size
1257
print 'total contents %9d bytes' % total
1258
print 'compression ratio %9.2fx' % (float(total) / float(weave_size))
1261
print 'average size %9d bytes' % avg
1262
print 'relative size %9.2fx' % (float(weave_size) / float(avg))
1266
print """bzr weave tool
1268
Experimental tool for weave algorithm.
1271
weave init WEAVEFILE
1272
Create an empty weave file
1273
weave get WEAVEFILE VERSION
1274
Write out specified version.
1275
weave check WEAVEFILE
1276
Check consistency of all versions.
1278
Display table of contents.
1279
weave add WEAVEFILE NAME [BASE...] < NEWTEXT
1280
Add NEWTEXT, with specified parent versions.
1281
weave annotate WEAVEFILE VERSION
1282
Display origin of each line.
1283
weave merge WEAVEFILE VERSION1 VERSION2 > OUT
1284
Auto-merge two versions and display conflicts.
1285
weave diff WEAVEFILE VERSION1 VERSION2
1286
Show differences between two versions.
1290
% weave init foo.weave
1292
% weave add foo.weave ver0 < foo.txt
1295
(create updated version)
1297
% weave get foo.weave 0 | diff -u - foo.txt
1298
% weave add foo.weave ver1 0 < foo.txt
1301
% weave get foo.weave 0 > foo.txt (create forked version)
1303
% weave add foo.weave ver2 0 < foo.txt
1306
% weave merge foo.weave 1 2 > foo.txt (merge them)
1307
% vi foo.txt (resolve conflicts)
1308
% weave add foo.weave merged 1 2 < foo.txt (commit merged version)
1320
# in case we're run directly from the subdirectory
1321
sys.path.append('..')
1323
from bzrlib.weavefile import write_weave, read_weave
1324
from bzrlib.progress import ProgressBar
1339
return read_weave(file(argv[2], 'rb'))
1345
# at the moment, based on everything in the file
1347
parents = map(int, argv[4:])
1348
lines = sys.stdin.readlines()
1349
ver = w.add(name, parents, lines)
1350
write_weave(w, file(argv[2], 'wb'))
1351
print 'added version %r %d' % (name, ver)
1354
if os.path.exists(fn):
1355
raise IOError("file exists")
1357
write_weave(w, file(fn, 'wb'))
1358
elif cmd == 'get': # get one version
1360
sys.stdout.writelines(w.get_iter(int(argv[3])))
1365
v1, v2 = map(int, argv[3:5])
1368
diff_gen = bzrlib.patiencediff.unified_diff(lines1, lines2,
1369
'%s version %d' % (fn, v1),
1370
'%s version %d' % (fn, v2))
1371
sys.stdout.writelines(diff_gen)
1373
elif cmd == 'annotate':
1375
# newline is added to all lines regardless; too hard to get
1376
# reasonable formatting otherwise
1378
for origin, text in w.annotate(int(argv[3])):
1379
text = text.rstrip('\r\n')
1381
print ' | %s' % (text)
1383
print '%5d | %s' % (origin, text)
1389
elif cmd == 'stats':
1390
weave_stats(argv[2], ProgressBar())
1392
elif cmd == 'check':
1397
print '%d versions ok' % w.num_versions()
1399
elif cmd == 'inclusions':
1401
print ' '.join(map(str, w.inclusions([int(argv[3])])))
1403
elif cmd == 'parents':
1405
print ' '.join(map(str, w._parents[int(argv[3])]))
1407
elif cmd == 'plan-merge':
1408
# replaced by 'bzr weave-plan-merge'
1410
for state, line in w.plan_merge(int(argv[3]), int(argv[4])):
1412
print '%14s | %s' % (state, line),
1413
elif cmd == 'merge':
1414
# replaced by 'bzr weave-merge-text'
1416
p = w.plan_merge(int(argv[3]), int(argv[4]))
1417
sys.stdout.writelines(w.weave_merge(p))
1419
raise ValueError('unknown command %r' % cmd)
1423
def profile_main(argv):
1424
import tempfile, hotshot, hotshot.stats
1426
prof_f = tempfile.NamedTemporaryFile()
1428
prof = hotshot.Profile(prof_f.name)
1430
ret = prof.runcall(main, argv)
1433
stats = hotshot.stats.load(prof_f.name)
1435
stats.sort_stats('cumulative')
1436
## XXX: Might like to write to stderr or the trace file instead but
1437
## print_stats seems hardcoded to stdout
1438
stats.print_stats(20)
1443
def lsprofile_main(argv):
1444
from bzrlib.lsprof import profile
1445
ret,stats = profile(main, argv)
1451
if __name__ == '__main__':
1453
if '--profile' in sys.argv:
1455
args.remove('--profile')
1456
sys.exit(profile_main(args))
1457
elif '--lsprof' in sys.argv:
1459
args.remove('--lsprof')
1460
sys.exit(lsprofile_main(args))
1462
sys.exit(main(sys.argv))
1465
class InterWeave(InterVersionedFile):
1466
"""Optimised code paths for weave to weave operations."""
1468
_matching_file_from_factory = staticmethod(WeaveFile)
1469
_matching_file_to_factory = staticmethod(WeaveFile)
1472
def is_compatible(source, target):
1473
"""Be compatible with weaves."""
1475
return (isinstance(source, Weave) and
1476
isinstance(target, Weave))
1477
except AttributeError:
1480
def join(self, pb=None, msg=None, version_ids=None, ignore_missing=False):
1481
"""See InterVersionedFile.join."""
1482
version_ids = self._get_source_version_ids(version_ids, ignore_missing)
1483
if self.target.versions() == [] and version_ids is None:
1484
self.target._copy_weave_content(self.source)
1487
self.target._join(self.source, pb, msg, version_ids, ignore_missing)
1488
except errors.WeaveParentMismatch:
1489
self.target._reweave(self.source, pb, msg)
1492
InterVersionedFile.register_optimiser(InterWeave)
added
removed
bzrlib/weave.py
