71
69
from copy import copy
72
70
from cStringIO import StringIO
73
from difflib import SequenceMatcher
78
from bzrlib.trace import mutter
73
from bzrlib.lazy_import import lazy_import
74
lazy_import(globals(), """
75
from bzrlib import tsort
79
81
from bzrlib.errors import (WeaveError, WeaveFormatError, WeaveParentMismatch,
80
82
RevisionAlreadyPresent,
81
83
RevisionNotPresent,
82
WeaveRevisionAlreadyPresent,
83
WeaveRevisionNotPresent,
84
UnavailableRepresentation,
85
import bzrlib.errors as errors
86
from bzrlib.osutils import sha_strings
86
from bzrlib.osutils import dirname, sha, sha_strings, split_lines
87
import bzrlib.patiencediff
88
from bzrlib.revision import NULL_REVISION
87
89
from bzrlib.symbol_versioning import *
88
from bzrlib.tsort import topo_sort
89
from bzrlib.versionedfile import VersionedFile, InterVersionedFile
90
from bzrlib.trace import mutter
91
from bzrlib.versionedfile import (
90
98
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')
93
126
class Weave(VersionedFile):
94
127
"""weave - versioned text file storage.
96
129
A Weave manages versions of line-based text files, keeping track
97
130
of the originating version for each line.
213
270
return self._parents == other._parents \
214
271
and self._weave == other._weave \
215
and self._sha1s == other._sha1s
272
and self._sha1s == other._sha1s
217
274
def __ne__(self, other):
218
275
return not self.__eq__(other)
220
@deprecated_method(zero_eight)
221
def idx_to_name(self, index):
222
"""Old public interface, the public interface is all names now."""
225
277
def _idx_to_name(self, version):
226
278
return self._names[version]
228
@deprecated_method(zero_eight)
229
def lookup(self, name):
230
"""Backwards compatability thunk:
232
Return name, as name is valid in the api now, and spew deprecation
237
280
def _lookup(self, name):
238
281
"""Convert symbolic version name to index."""
282
if not self._allow_reserved:
283
self.check_not_reserved_id(name)
240
285
return self._name_map[name]
242
287
raise RevisionNotPresent(name, self._weave_name)
244
@deprecated_method(zero_eight)
245
def iter_names(self):
246
"""Deprecated convenience function, please see VersionedFile.names()."""
247
return iter(self.names())
249
@deprecated_method(zero_eight)
251
"""See Weave.versions for the current api."""
252
return self.versions()
254
289
def versions(self):
255
290
"""See VersionedFile.versions."""
256
291
return self._names[:]
258
293
def has_version(self, version_id):
259
294
"""See VersionedFile.has_version."""
260
return self._name_map.has_key(version_id)
295
return (version_id in self._name_map)
262
297
__contains__ = has_version
264
def get_delta(self, version_id):
265
"""See VersionedFile.get_delta."""
266
return self.get_deltas([version_id])[version_id]
268
def get_deltas(self, version_ids):
269
"""See VersionedFile.get_deltas."""
270
version_ids = self.get_ancestry(version_ids)
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."""
271
332
for version_id in version_ids:
272
if not self.has_version(version_id):
273
raise RevisionNotPresent(version_id, self)
274
# try extracting all versions; parallel extraction is used
275
nv = self.num_versions()
281
last_parent_lines = {}
283
parent_inclusions = {}
288
# its simplest to generate a full set of prepared variables.
290
name = self._names[i]
291
sha1s[name] = self.get_sha1(name)
292
parents_list = self.get_parents(name)
294
parent = parents_list[0]
295
parents[name] = parent
296
parent_inclusions[name] = inclusions[parent]
299
parent_inclusions[name] = set()
300
# we want to emit start, finish, replacement_length, replacement_lines tuples.
301
diff_hunks[name] = []
302
current_hunks[name] = [0, 0, 0, []] # #start, finish, repl_length, repl_tuples
303
parent_linenums[name] = 0
305
parent_noeols[name] = False
306
last_parent_lines[name] = None
307
new_inc = set([name])
308
for p in self._parents[i]:
309
new_inc.update(inclusions[self._idx_to_name(p)])
310
# debug only, known good so far.
311
#assert set(new_inc) == set(self.get_ancestry(name)), \
312
# 'failed %s != %s' % (set(new_inc), set(self.get_ancestry(name)))
313
inclusions[name] = new_inc
315
nlines = len(self._weave)
317
for lineno, inserted, deletes, line in self._walk_internal():
318
# a line is active in a version if:
319
# insert is in the versions inclusions
321
# deleteset & the versions inclusions is an empty set.
322
# so - if we have a included by mapping - version is included by
323
# children, we get a list of children to examine for deletes affect
324
# ing them, which is less than the entire set of children.
325
for version_id in version_ids:
326
# The active inclusion must be an ancestor,
327
# and no ancestors must have deleted this line,
328
# because we don't support resurrection.
329
parent_inclusion = parent_inclusions[version_id]
330
inclusion = inclusions[version_id]
331
parent_active = inserted in parent_inclusion and not (deletes & parent_inclusion)
332
version_active = inserted in inclusion and not (deletes & inclusion)
333
if not parent_active and not version_active:
334
# unrelated line of ancestry
333
if version_id == NULL_REVISION:
338
map(self._idx_to_name,
339
self._parents[self._lookup(version_id)]))
340
except RevisionNotPresent:
336
elif parent_active and version_active:
338
parent_linenum = parent_linenums[version_id]
339
if current_hunks[version_id] != [parent_linenum, parent_linenum, 0, []]:
340
diff_hunks[version_id].append(tuple(current_hunks[version_id]))
342
current_hunks[version_id] = [parent_linenum, parent_linenum, 0, []]
343
parent_linenums[version_id] = parent_linenum
346
noeols[version_id] = True
349
elif parent_active and not version_active:
351
current_hunks[version_id][1] += 1
352
parent_linenums[version_id] += 1
353
last_parent_lines[version_id] = line
354
elif not parent_active and version_active:
356
# noeol only occurs at the end of a file because we
357
# diff linewise. We want to show noeol changes as a
358
# empty diff unless the actual eol-less content changed.
361
if last_parent_lines[version_id][-1] != '\n':
362
parent_noeols[version_id] = True
363
except (TypeError, IndexError):
366
if theline[-1] != '\n':
367
noeols[version_id] = True
371
parent_should_go = False
373
if parent_noeols[version_id] == noeols[version_id]:
374
# no noeol toggle, so trust the weaves statement
375
# that this line is changed.
377
if parent_noeols[version_id]:
378
theline = theline + '\n'
379
elif parent_noeols[version_id]:
380
# parent has no eol, we do:
381
# our line is new, report as such..
383
elif noeols[version_id]:
384
# append a eol so that it looks like
386
theline = theline + '\n'
387
if parents[version_id] is not None:
388
#if last_parent_lines[version_id] is not None:
389
parent_should_go = True
390
if last_parent_lines[version_id] != theline:
393
#parent_should_go = False
395
current_hunks[version_id][2] += 1
396
current_hunks[version_id][3].append((inserted, theline))
398
# last hunk last parent line is not eaten
399
current_hunks[version_id][1] -= 1
400
if current_hunks[version_id][1] < 0:
401
current_hunks[version_id][1] = 0
402
# import pdb;pdb.set_trace()
403
# assert current_hunks[version_id][1] >= 0
407
version = self._idx_to_name(i)
408
if current_hunks[version] != [0, 0, 0, []]:
409
diff_hunks[version].append(tuple(current_hunks[version]))
411
for version_id in version_ids:
412
result[version_id] = (
416
diff_hunks[version_id],
342
result[version_id] = parents
420
def get_parents(self, version_id):
421
"""See VersionedFile.get_parent."""
422
return map(self._idx_to_name, self._parents[self._lookup(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
380
def _check_repeated_add(self, name, parents, text, sha1):
425
381
"""Check that a duplicated add is OK.
432
388
raise RevisionAlreadyPresent(name, self._weave_name)
435
@deprecated_method(zero_eight)
436
def add_identical(self, old_rev_id, new_rev_id, parents):
437
"""Please use Weave.clone_text now."""
438
return self.clone_text(new_rev_id, old_rev_id, parents)
440
def _add_lines(self, version_id, parents, lines, parent_texts):
391
def _add_lines(self, version_id, parents, lines, parent_texts,
392
left_matching_blocks, nostore_sha, random_id, check_content):
441
393
"""See VersionedFile.add_lines."""
442
return self._add(version_id, lines, map(self._lookup, parents))
444
@deprecated_method(zero_eight)
445
def add(self, name, parents, text, sha1=None):
446
"""See VersionedFile.add_lines for the non deprecated api."""
447
return self._add(name, text, map(self._maybe_lookup, parents), sha1)
449
def _add(self, version_id, lines, parents, sha1=None):
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):
450
399
"""Add a single text on top of the weave.
452
401
Returns the index number of the newly added version.
455
404
Symbolic name for this version.
456
405
(Typically the revision-id of the revision that added it.)
406
If None, a name will be allocated based on the hash. (sha1:SHAHASH)
459
409
List or set of direct parent version numbers.
462
412
Sequence of lines to be added in the new version.
414
:param nostore_sha: See VersionedFile.add_lines.
465
assert isinstance(version_id, basestring)
466
416
self._check_lines_not_unicode(lines)
467
417
self._check_lines_are_lines(lines)
469
419
sha1 = sha_strings(lines)
420
if sha1 == nostore_sha:
421
raise errors.ExistingContent
422
if version_id is None:
423
version_id = "sha1:" + sha1
470
424
if version_id in self._name_map:
471
425
return self._check_repeated_add(version_id, parents, lines, sha1)
624
557
def _compatible_parents(self, my_parents, other_parents):
625
558
"""During join check that other_parents are joinable with my_parents.
627
Joinable is defined as 'is a subset of' - supersets may require
560
Joinable is defined as 'is a subset of' - supersets may require
628
561
regeneration of diffs, but subsets do not.
630
563
return len(other_parents.difference(my_parents)) == 0
632
565
def annotate(self, version_id):
633
if isinstance(version_id, int):
634
warn('Weave.annotate(int) is deprecated. Please use version names'
635
' in all circumstances as of 0.8',
640
for origin, lineno, text in self._extract([version_id]):
641
result.append((origin, text))
644
return super(Weave, self).annotate(version_id)
646
def annotate_iter(self, version_id):
647
"""Yield list of (version-id, line) pairs for the specified version.
566
"""Return a list of (version-id, line) tuples for version_id.
649
568
The index indicates when the line originated in the weave."""
650
569
incls = [self._lookup(version_id)]
651
for origin, lineno, text in self._extract(incls):
652
yield self._idx_to_name(origin), text
654
@deprecated_method(zero_eight)
656
"""_walk has become visit, a supported api."""
657
return self._walk_internal()
659
def iter_lines_added_or_present_in_versions(self, version_ids=None):
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,
660
575
"""See VersionedFile.iter_lines_added_or_present_in_versions()."""
661
576
if version_ids is None:
662
577
version_ids = self.versions()
663
578
version_ids = set(version_ids)
664
579
for lineno, inserted, deletes, line in self._walk_internal(version_ids):
665
# if inserted not in version_ids then it was inserted before the
666
# versions we care about, but because weaves cannot represent ghosts
667
# properly, we do not filter down to that
668
# if inserted not in version_ids: continue
580
if inserted not in version_ids: continue
669
581
if line[-1] != '\n':
582
yield line + '\n', inserted
674
#@deprecated_method(zero_eight)
675
def walk(self, version_ids=None):
676
"""See VersionedFile.walk."""
677
return self._walk_internal(version_ids)
679
586
def _walk_internal(self, version_ids=None):
680
587
"""Helper method for weave actions."""
972
848
# no lines outside of insertion blocks, that deletions are
973
849
# properly paired, etc.
975
def _join(self, other, pb, msg, version_ids, ignore_missing):
976
"""Worker routine for join()."""
977
if not other.versions():
978
return # nothing to update, easy
981
# versions is never none, InterWeave checks this.
984
# two loops so that we do not change ourselves before verifying it
986
# work through in index order to make sure we get all dependencies
989
# get the selected versions only that are in other.versions.
990
version_ids = set(other.versions()).intersection(set(version_ids))
991
# pull in the referenced graph.
992
version_ids = other.get_ancestry(version_ids)
993
pending_graph = [(version, other.get_parents(version)) for
994
version in version_ids]
995
for name in topo_sort(pending_graph):
996
other_idx = other._name_map[name]
997
# returns True if we have it, False if we need it.
998
if not self._check_version_consistent(other, other_idx, name):
999
names_to_join.append((other_idx, name))
1008
for other_idx, name in names_to_join:
1009
# TODO: If all the parents of the other version are already
1010
# present then we can avoid some work by just taking the delta
1011
# and adjusting the offsets.
1012
new_parents = self._imported_parents(other, other_idx)
1013
sha1 = other._sha1s[other_idx]
1018
pb.update(msg, merged, len(names_to_join))
1020
lines = other.get_lines(other_idx)
1021
self._add(name, lines, new_parents, sha1)
1023
mutter("merged = %d, processed = %d, file_id=%s; deltat=%d"%(
1024
merged, processed, self._weave_name, time.time()-time0))
1026
851
def _imported_parents(self, other, other_idx):
1027
852
"""Return list of parents in self corresponding to indexes in other."""
1028
853
new_parents = []
1135
951
sio = StringIO()
1136
952
write_weave_v5(self, sio)
1138
self._transport.put(self._weave_name + WeaveFile.WEAVE_SUFFIX,
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)
1143
963
def get_suffixes():
1144
964
"""See VersionedFile.get_suffixes()."""
1145
965
return [WeaveFile.WEAVE_SUFFIX]
1147
def join(self, other, pb=None, msg=None, version_ids=None,
1148
ignore_missing=False):
1149
"""Join other into self and save."""
1150
super(WeaveFile, self).join(other, pb, msg, version_ids, ignore_missing)
967
def insert_record_stream(self, stream):
968
super(WeaveFile, self).insert_record_stream(stream)
1154
@deprecated_function(zero_eight)
1155
def reweave(wa, wb, pb=None, msg=None):
1156
"""reweaving is deprecation, please just use weave.join()."""
1157
_reweave(wa, wb, pb, msg)
1159
972
def _reweave(wa, wb, pb=None, msg=None):
1160
973
"""Combine two weaves and return the result.
1162
This works even if a revision R has different parents in
975
This works even if a revision R has different parents in
1163
976
wa and wb. In the resulting weave all the parents are given.
1165
This is done by just building up a new weave, maintaining ordering
978
This is done by just building up a new weave, maintaining ordering
1166
979
of the versions in the two inputs. More efficient approaches
1167
might be possible but it should only be necessary to do
1168
this operation rarely, when a new previously ghost version is
980
might be possible but it should only be necessary to do
981
this operation rarely, when a new previously ghost version is
1171
984
:param pb: An optional progress bar, indicating how far done we are
1215
1029
p = combined.setdefault(name, set())
1216
1030
p.update(map(weave._idx_to_name, weave._parents[idx]))
1217
1031
return combined
1221
"""Show the weave's table-of-contents"""
1222
print '%6s %50s %10s %10s' % ('ver', 'name', 'sha1', 'parents')
1223
for i in (6, 50, 10, 10):
1226
for i in range(w.num_versions()):
1229
parent_str = ' '.join(map(str, w._parents[i]))
1230
print '%6d %-50.50s %10.10s %s' % (i, name, sha1, parent_str)
1234
def weave_stats(weave_file, pb):
1235
from bzrlib.weavefile import read_weave
1237
wf = file(weave_file, 'rb')
1238
w = read_weave(wf, WeaveVersionedFile)
1239
# FIXME: doesn't work on pipes
1240
weave_size = wf.tell()
1244
for i in range(vers):
1245
pb.update('checking sizes', i, vers)
1246
for origin, lineno, line in w._extract([i]):
1251
print 'versions %9d' % vers
1252
print 'weave file %9d bytes' % weave_size
1253
print 'total contents %9d bytes' % total
1254
print 'compression ratio %9.2fx' % (float(total) / float(weave_size))
1257
print 'average size %9d bytes' % avg
1258
print 'relative size %9.2fx' % (float(weave_size) / float(avg))
1262
print """bzr weave tool
1264
Experimental tool for weave algorithm.
1267
weave init WEAVEFILE
1268
Create an empty weave file
1269
weave get WEAVEFILE VERSION
1270
Write out specified version.
1271
weave check WEAVEFILE
1272
Check consistency of all versions.
1274
Display table of contents.
1275
weave add WEAVEFILE NAME [BASE...] < NEWTEXT
1276
Add NEWTEXT, with specified parent versions.
1277
weave annotate WEAVEFILE VERSION
1278
Display origin of each line.
1279
weave merge WEAVEFILE VERSION1 VERSION2 > OUT
1280
Auto-merge two versions and display conflicts.
1281
weave diff WEAVEFILE VERSION1 VERSION2
1282
Show differences between two versions.
1286
% weave init foo.weave
1288
% weave add foo.weave ver0 < foo.txt
1291
(create updated version)
1293
% weave get foo.weave 0 | diff -u - foo.txt
1294
% weave add foo.weave ver1 0 < foo.txt
1297
% weave get foo.weave 0 > foo.txt (create forked version)
1299
% weave add foo.weave ver2 0 < foo.txt
1302
% weave merge foo.weave 1 2 > foo.txt (merge them)
1303
% vi foo.txt (resolve conflicts)
1304
% weave add foo.weave merged 1 2 < foo.txt (commit merged version)
1316
# in case we're run directly from the subdirectory
1317
sys.path.append('..')
1319
from bzrlib.weavefile import write_weave, read_weave
1320
from bzrlib.progress import ProgressBar
1335
return read_weave(file(argv[2], 'rb'))
1341
# at the moment, based on everything in the file
1343
parents = map(int, argv[4:])
1344
lines = sys.stdin.readlines()
1345
ver = w.add(name, parents, lines)
1346
write_weave(w, file(argv[2], 'wb'))
1347
print 'added version %r %d' % (name, ver)
1350
if os.path.exists(fn):
1351
raise IOError("file exists")
1353
write_weave(w, file(fn, 'wb'))
1354
elif cmd == 'get': # get one version
1356
sys.stdout.writelines(w.get_iter(int(argv[3])))
1359
from difflib import unified_diff
1362
v1, v2 = map(int, argv[3:5])
1365
diff_gen = unified_diff(lines1, lines2,
1366
'%s version %d' % (fn, v1),
1367
'%s version %d' % (fn, v2))
1368
sys.stdout.writelines(diff_gen)
1370
elif cmd == 'annotate':
1372
# newline is added to all lines regardless; too hard to get
1373
# reasonable formatting otherwise
1375
for origin, text in w.annotate(int(argv[3])):
1376
text = text.rstrip('\r\n')
1378
print ' | %s' % (text)
1380
print '%5d | %s' % (origin, text)
1386
elif cmd == 'stats':
1387
weave_stats(argv[2], ProgressBar())
1389
elif cmd == 'check':
1394
print '%d versions ok' % w.num_versions()
1396
elif cmd == 'inclusions':
1398
print ' '.join(map(str, w.inclusions([int(argv[3])])))
1400
elif cmd == 'parents':
1402
print ' '.join(map(str, w._parents[int(argv[3])]))
1404
elif cmd == 'plan-merge':
1405
# replaced by 'bzr weave-plan-merge'
1407
for state, line in w.plan_merge(int(argv[3]), int(argv[4])):
1409
print '%14s | %s' % (state, line),
1410
elif cmd == 'merge':
1411
# replaced by 'bzr weave-merge-text'
1413
p = w.plan_merge(int(argv[3]), int(argv[4]))
1414
sys.stdout.writelines(w.weave_merge(p))
1416
raise ValueError('unknown command %r' % cmd)
1420
def profile_main(argv):
1421
import tempfile, hotshot, hotshot.stats
1423
prof_f = tempfile.NamedTemporaryFile()
1425
prof = hotshot.Profile(prof_f.name)
1427
ret = prof.runcall(main, argv)
1430
stats = hotshot.stats.load(prof_f.name)
1432
stats.sort_stats('cumulative')
1433
## XXX: Might like to write to stderr or the trace file instead but
1434
## print_stats seems hardcoded to stdout
1435
stats.print_stats(20)
1440
def lsprofile_main(argv):
1441
from bzrlib.lsprof import profile
1442
ret,stats = profile(main, argv)
1448
if __name__ == '__main__':
1450
if '--profile' in sys.argv:
1452
args.remove('--profile')
1453
sys.exit(profile_main(args))
1454
elif '--lsprof' in sys.argv:
1456
args.remove('--lsprof')
1457
sys.exit(lsprofile_main(args))
1459
sys.exit(main(sys.argv))
1462
class InterWeave(InterVersionedFile):
1463
"""Optimised code paths for weave to weave operations."""
1465
_matching_file_from_factory = staticmethod(WeaveFile)
1466
_matching_file_to_factory = staticmethod(WeaveFile)
1469
def is_compatible(source, target):
1470
"""Be compatible with weaves."""
1472
return (isinstance(source, Weave) and
1473
isinstance(target, Weave))
1474
except AttributeError:
1477
def join(self, pb=None, msg=None, version_ids=None, ignore_missing=False):
1478
"""See InterVersionedFile.join."""
1479
version_ids = self._get_source_version_ids(version_ids, ignore_missing)
1480
if self.target.versions() == [] and version_ids is None:
1481
self.target._copy_weave_content(self.source)
1484
self.target._join(self.source, pb, msg, version_ids, ignore_missing)
1485
except errors.WeaveParentMismatch:
1486
self.target._reweave(self.source, pb, msg)
1489
InterVersionedFile.register_optimiser(InterWeave)