1
# Copyright (C) 2004-2006 by Canonical Ltd
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11
# GNU General Public License for more details.
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
17
from StringIO import StringIO
19
from bzrlib.builtins import merge
20
from bzrlib.bzrdir import BzrDir
21
from bzrlib.bundle.apply_bundle import install_bundle, merge_bundle
22
from bzrlib.bundle.read_bundle import BundleTree, BundleReader
23
from bzrlib.bundle.serializer import write_bundle
24
from bzrlib.diff import internal_diff
25
from bzrlib.errors import BzrError, TestamentMismatch
26
from bzrlib.merge import Merge3Merger
27
from bzrlib.osutils import has_symlinks, sha_file
28
from bzrlib.tests import TestCaseInTempDir, TestCase
29
from bzrlib.transform import TreeTransform
30
from bzrlib.workingtree import WorkingTree
33
class MockTree(object):
35
from bzrlib.inventory import RootEntry, ROOT_ID
37
self.paths = {ROOT_ID: ""}
38
self.ids = {"": ROOT_ID}
40
self.root = RootEntry(ROOT_ID)
42
inventory = property(lambda x:x)
45
return self.paths.iterkeys()
47
def __getitem__(self, file_id):
48
if file_id == self.root.file_id:
51
return self.make_entry(file_id, self.paths[file_id])
53
def parent_id(self, file_id):
54
from os.path import dirname
55
parent_dir = dirname(self.paths[file_id])
58
return self.ids[parent_dir]
60
def iter_entries(self):
61
for path, file_id in self.ids.iteritems():
62
yield path, self[file_id]
64
def get_file_kind(self, file_id):
65
if file_id in self.contents:
71
def make_entry(self, file_id, path):
72
from os.path import basename
73
from bzrlib.inventory import (InventoryEntry, InventoryFile
74
, InventoryDirectory, InventoryLink)
76
kind = self.get_file_kind(file_id)
77
parent_id = self.parent_id(file_id)
78
text_sha_1, text_size = self.contents_stats(file_id)
79
if kind == 'directory':
80
ie = InventoryDirectory(file_id, name, parent_id)
82
ie = InventoryFile(file_id, name, parent_id)
83
elif kind == 'symlink':
84
ie = InventoryLink(file_id, name, parent_id)
86
raise BzrError('unknown kind %r' % kind)
87
ie.text_sha1 = text_sha_1
88
ie.text_size = text_size
91
def add_dir(self, file_id, path):
92
self.paths[file_id] = path
93
self.ids[path] = file_id
95
def add_file(self, file_id, path, contents):
96
self.add_dir(file_id, path)
97
self.contents[file_id] = contents
99
def path2id(self, path):
100
return self.ids.get(path)
102
def id2path(self, file_id):
103
return self.paths.get(file_id)
105
def has_id(self, file_id):
106
return self.id2path(file_id) is not None
108
def get_file(self, file_id):
110
result.write(self.contents[file_id])
114
def contents_stats(self, file_id):
115
if file_id not in self.contents:
117
text_sha1 = sha_file(self.get_file(file_id))
118
return text_sha1, len(self.contents[file_id])
121
class BTreeTester(TestCase):
122
"""A simple unittest tester for the BundleTree class."""
124
def make_tree_1(self):
126
mtree.add_dir("a", "grandparent")
127
mtree.add_dir("b", "grandparent/parent")
128
mtree.add_file("c", "grandparent/parent/file", "Hello\n")
129
mtree.add_dir("d", "grandparent/alt_parent")
130
return BundleTree(mtree, ''), mtree
132
def test_renames(self):
133
"""Ensure that file renames have the proper effect on children"""
134
btree = self.make_tree_1()[0]
135
self.assertEqual(btree.old_path("grandparent"), "grandparent")
136
self.assertEqual(btree.old_path("grandparent/parent"),
137
"grandparent/parent")
138
self.assertEqual(btree.old_path("grandparent/parent/file"),
139
"grandparent/parent/file")
141
self.assertEqual(btree.id2path("a"), "grandparent")
142
self.assertEqual(btree.id2path("b"), "grandparent/parent")
143
self.assertEqual(btree.id2path("c"), "grandparent/parent/file")
145
self.assertEqual(btree.path2id("grandparent"), "a")
146
self.assertEqual(btree.path2id("grandparent/parent"), "b")
147
self.assertEqual(btree.path2id("grandparent/parent/file"), "c")
149
assert btree.path2id("grandparent2") is None
150
assert btree.path2id("grandparent2/parent") is None
151
assert btree.path2id("grandparent2/parent/file") is None
153
btree.note_rename("grandparent", "grandparent2")
154
assert btree.old_path("grandparent") is None
155
assert btree.old_path("grandparent/parent") is None
156
assert btree.old_path("grandparent/parent/file") is None
158
self.assertEqual(btree.id2path("a"), "grandparent2")
159
self.assertEqual(btree.id2path("b"), "grandparent2/parent")
160
self.assertEqual(btree.id2path("c"), "grandparent2/parent/file")
162
self.assertEqual(btree.path2id("grandparent2"), "a")
163
self.assertEqual(btree.path2id("grandparent2/parent"), "b")
164
self.assertEqual(btree.path2id("grandparent2/parent/file"), "c")
166
assert btree.path2id("grandparent") is None
167
assert btree.path2id("grandparent/parent") is None
168
assert btree.path2id("grandparent/parent/file") is None
170
btree.note_rename("grandparent/parent", "grandparent2/parent2")
171
self.assertEqual(btree.id2path("a"), "grandparent2")
172
self.assertEqual(btree.id2path("b"), "grandparent2/parent2")
173
self.assertEqual(btree.id2path("c"), "grandparent2/parent2/file")
175
self.assertEqual(btree.path2id("grandparent2"), "a")
176
self.assertEqual(btree.path2id("grandparent2/parent2"), "b")
177
self.assertEqual(btree.path2id("grandparent2/parent2/file"), "c")
179
assert btree.path2id("grandparent2/parent") is None
180
assert btree.path2id("grandparent2/parent/file") is None
182
btree.note_rename("grandparent/parent/file",
183
"grandparent2/parent2/file2")
184
self.assertEqual(btree.id2path("a"), "grandparent2")
185
self.assertEqual(btree.id2path("b"), "grandparent2/parent2")
186
self.assertEqual(btree.id2path("c"), "grandparent2/parent2/file2")
188
self.assertEqual(btree.path2id("grandparent2"), "a")
189
self.assertEqual(btree.path2id("grandparent2/parent2"), "b")
190
self.assertEqual(btree.path2id("grandparent2/parent2/file2"), "c")
192
assert btree.path2id("grandparent2/parent2/file") is None
194
def test_moves(self):
195
"""Ensure that file moves have the proper effect on children"""
196
btree = self.make_tree_1()[0]
197
btree.note_rename("grandparent/parent/file",
198
"grandparent/alt_parent/file")
199
self.assertEqual(btree.id2path("c"), "grandparent/alt_parent/file")
200
self.assertEqual(btree.path2id("grandparent/alt_parent/file"), "c")
201
assert btree.path2id("grandparent/parent/file") is None
203
def unified_diff(self, old, new):
205
internal_diff("old", old, "new", new, out)
209
def make_tree_2(self):
210
btree = self.make_tree_1()[0]
211
btree.note_rename("grandparent/parent/file",
212
"grandparent/alt_parent/file")
213
assert btree.id2path("e") is None
214
assert btree.path2id("grandparent/parent/file") is None
215
btree.note_id("e", "grandparent/parent/file")
219
"""File/inventory adds"""
220
btree = self.make_tree_2()
221
add_patch = self.unified_diff([], ["Extra cheese\n"])
222
btree.note_patch("grandparent/parent/file", add_patch)
223
btree.note_id('f', 'grandparent/parent/symlink', kind='symlink')
224
btree.note_target('grandparent/parent/symlink', 'venus')
225
self.adds_test(btree)
227
def adds_test(self, btree):
228
self.assertEqual(btree.id2path("e"), "grandparent/parent/file")
229
self.assertEqual(btree.path2id("grandparent/parent/file"), "e")
230
self.assertEqual(btree.get_file("e").read(), "Extra cheese\n")
231
self.assertEqual(btree.get_symlink_target('f'), 'venus')
233
def test_adds2(self):
234
"""File/inventory adds, with patch-compatibile renames"""
235
btree = self.make_tree_2()
236
btree.contents_by_id = False
237
add_patch = self.unified_diff(["Hello\n"], ["Extra cheese\n"])
238
btree.note_patch("grandparent/parent/file", add_patch)
239
btree.note_id('f', 'grandparent/parent/symlink', kind='symlink')
240
btree.note_target('grandparent/parent/symlink', 'venus')
241
self.adds_test(btree)
243
def make_tree_3(self):
244
btree, mtree = self.make_tree_1()
245
mtree.add_file("e", "grandparent/parent/topping", "Anchovies\n")
246
btree.note_rename("grandparent/parent/file",
247
"grandparent/alt_parent/file")
248
btree.note_rename("grandparent/parent/topping",
249
"grandparent/alt_parent/stopping")
252
def get_file_test(self, btree):
253
self.assertEqual(btree.get_file("e").read(), "Lemon\n")
254
self.assertEqual(btree.get_file("c").read(), "Hello\n")
256
def test_get_file(self):
257
"""Get file contents"""
258
btree = self.make_tree_3()
259
mod_patch = self.unified_diff(["Anchovies\n"], ["Lemon\n"])
260
btree.note_patch("grandparent/alt_parent/stopping", mod_patch)
261
self.get_file_test(btree)
263
def test_get_file2(self):
264
"""Get file contents, with patch-compatibile renames"""
265
btree = self.make_tree_3()
266
btree.contents_by_id = False
267
mod_patch = self.unified_diff([], ["Lemon\n"])
268
btree.note_patch("grandparent/alt_parent/stopping", mod_patch)
269
mod_patch = self.unified_diff([], ["Hello\n"])
270
btree.note_patch("grandparent/alt_parent/file", mod_patch)
271
self.get_file_test(btree)
273
def test_delete(self):
275
btree = self.make_tree_1()[0]
276
self.assertEqual(btree.get_file("c").read(), "Hello\n")
277
btree.note_deletion("grandparent/parent/file")
278
assert btree.id2path("c") is None
279
assert btree.path2id("grandparent/parent/file") is None
281
def sorted_ids(self, tree):
286
def test_iteration(self):
287
"""Ensure that iteration through ids works properly"""
288
btree = self.make_tree_1()[0]
289
self.assertEqual(self.sorted_ids(btree), ['a', 'b', 'c', 'd'])
290
btree.note_deletion("grandparent/parent/file")
291
btree.note_id("e", "grandparent/alt_parent/fool", kind="directory")
292
btree.note_last_changed("grandparent/alt_parent/fool",
294
self.assertEqual(self.sorted_ids(btree), ['a', 'b', 'd', 'e'])
297
class CSetTester(TestCaseInTempDir):
299
def get_valid_bundle(self, base_rev_id, rev_id, checkout_dir=None,
301
"""Create a bundle from base_rev_id -> rev_id in built-in branch.
302
Make sure that the text generated is valid, and that it
303
can be applied against the base, and generate the same information.
305
:return: The in-memory bundle
307
from cStringIO import StringIO
309
bundle_txt = StringIO()
310
rev_ids = write_bundle(self.b1.repository, rev_id, base_rev_id,
313
self.assertEqual(bundle_txt.readline(),
314
'# Bazaar revision bundle v0.7\n')
315
self.assertEqual(bundle_txt.readline(), '#\n')
317
rev = self.b1.repository.get_revision(rev_id)
318
self.assertEqual(bundle_txt.readline().decode('utf-8'),
321
open(',,bundle', 'wb').write(bundle_txt.getvalue())
323
# This should also validate the generated bundle
324
bundle = BundleReader(bundle_txt)
325
repository = self.b1.repository
326
for bundle_rev in bundle.info.real_revisions:
327
# These really should have already been checked when we read the
328
# bundle, since it computes the sha1 hash for the revision, which
329
# only will match if everything is okay, but lets be explicit about
331
branch_rev = repository.get_revision(bundle_rev.revision_id)
332
for a in ('inventory_sha1', 'revision_id', 'parent_ids',
333
'timestamp', 'timezone', 'message', 'committer',
334
'parent_ids', 'properties'):
335
self.assertEqual(getattr(branch_rev, a),
336
getattr(bundle_rev, a))
337
self.assertEqual(len(branch_rev.parent_ids),
338
len(bundle_rev.parent_ids))
339
self.assertEqual(rev_ids,
340
[r.revision_id for r in bundle.info.real_revisions])
341
self.valid_apply_bundle(base_rev_id, bundle,
342
checkout_dir=checkout_dir)
346
def get_invalid_bundle(self, base_rev_id, rev_id):
347
"""Create a bundle from base_rev_id -> rev_id in built-in branch.
348
Munge the text so that it's invalid.
350
:return: The in-memory bundle
352
from cStringIO import StringIO
354
bundle_txt = StringIO()
355
rev_ids = write_bundle(self.b1.repository, rev_id, base_rev_id,
358
open(',,bundle', 'wb').write(bundle_txt.getvalue())
360
new_text = bundle_txt.getvalue().replace('executable:no',
362
bundle_txt = StringIO(new_text)
363
bundle = BundleReader(bundle_txt)
364
self.valid_apply_bundle(base_rev_id, bundle)
367
def get_checkout(self, rev_id, checkout_dir=None):
368
"""Get a new tree, with the specified revision in it.
370
from bzrlib.branch import Branch
373
if checkout_dir is None:
374
checkout_dir = tempfile.mkdtemp(prefix='test-branch-', dir='.')
377
if not os.path.exists(checkout_dir):
378
os.mkdir(checkout_dir)
379
tree = BzrDir.create_standalone_workingtree(checkout_dir)
381
ancestors = write_bundle(self.b1.repository, rev_id, None, s)
383
install_bundle(tree.branch.repository, BundleReader(s))
384
for ancestor in ancestors:
385
old = self.b1.repository.revision_tree(ancestor)
386
new = tree.branch.repository.revision_tree(ancestor)
387
for inventory_id in old:
389
old_file = old.get_file(inventory_id)
394
self.assertEqual(old_file.read(),
395
new.get_file(inventory_id).read())
396
if rev_id is not None:
397
rh = self.b1.revision_history()
398
tree.branch.set_revision_history(rh[:rh.index(rev_id)+1])
402
def valid_apply_bundle(self, base_rev_id, reader, checkout_dir=None):
403
"""Get the base revision, apply the changes, and make
404
sure everything matches the builtin branch.
406
to_tree = self.get_checkout(base_rev_id, checkout_dir=checkout_dir)
407
repository = to_tree.branch.repository
408
self.assertIs(repository.has_revision(base_rev_id), True)
410
for rev in info.real_revisions:
411
self.assert_(not repository.has_revision(rev.revision_id),
412
'Revision {%s} present before applying bundle'
414
merge_bundle(reader, to_tree, True, Merge3Merger, False, False)
416
for rev in info.real_revisions:
417
self.assert_(repository.has_revision(rev.revision_id),
418
'Missing revision {%s} after applying bundle'
421
self.assert_(to_tree.branch.repository.has_revision(info.target))
422
# Do we also want to verify that all the texts have been added?
424
self.assert_(info.target in to_tree.pending_merges())
427
rev = info.real_revisions[-1]
428
base_tree = self.b1.repository.revision_tree(rev.revision_id)
429
to_tree = to_tree.branch.repository.revision_tree(rev.revision_id)
431
# TODO: make sure the target tree is identical to base tree
432
# we might also check the working tree.
434
base_files = list(base_tree.list_files())
435
to_files = list(to_tree.list_files())
436
self.assertEqual(len(base_files), len(to_files))
437
for base_file, to_file in zip(base_files, to_files):
438
self.assertEqual(base_file, to_file)
440
for path, status, kind, fileid, entry in base_files:
441
# Check that the meta information is the same
442
self.assertEqual(base_tree.get_file_size(fileid),
443
to_tree.get_file_size(fileid))
444
self.assertEqual(base_tree.get_file_sha1(fileid),
445
to_tree.get_file_sha1(fileid))
446
# Check that the contents are the same
447
# This is pretty expensive
448
# self.assertEqual(base_tree.get_file(fileid).read(),
449
# to_tree.get_file(fileid).read())
451
def test_bundle(self):
456
self.tree1 = BzrDir.create_standalone_workingtree('b1')
457
self.b1 = self.tree1.branch
459
open(pjoin('b1/one'), 'wb').write('one\n')
460
self.tree1.add('one')
461
self.tree1.commit('add one', rev_id='a@cset-0-1')
463
bundle = self.get_valid_bundle(None, 'a@cset-0-1')
464
bundle = self.get_valid_bundle(None, 'a@cset-0-1',
465
message='With a specialized message')
467
# Make sure we can handle files with spaces, tabs, other
472
, 'b1/dir/filein subdir.c'
473
, 'b1/dir/WithCaps.txt'
474
, 'b1/dir/trailing space '
477
, 'b1/sub/sub/nonempty.txt'
478
# Tabs are not valid in filenames on windows
481
open('b1/sub/sub/emptyfile.txt', 'wb').close()
482
open('b1/dir/nolastnewline.txt', 'wb').write('bloop')
483
tt = TreeTransform(self.tree1)
484
tt.new_file('executable', tt.root, '#!/bin/sh\n', 'exe-1', True)
489
, 'dir/filein subdir.c'
491
, 'dir/trailing space '
492
, 'dir/nolastnewline.txt'
495
, 'sub/sub/nonempty.txt'
496
, 'sub/sub/emptyfile.txt'
498
self.tree1.commit('add whitespace', rev_id='a@cset-0-2')
500
bundle = self.get_valid_bundle('a@cset-0-1', 'a@cset-0-2')
502
# Check a rollup bundle
503
bundle = self.get_valid_bundle(None, 'a@cset-0-2')
507
['sub/sub/nonempty.txt'
508
, 'sub/sub/emptyfile.txt'
511
tt = TreeTransform(self.tree1)
512
trans_id = tt.trans_id_tree_file_id('exe-1')
513
tt.set_executability(False, trans_id)
515
self.tree1.commit('removed', rev_id='a@cset-0-3')
517
bundle = self.get_valid_bundle('a@cset-0-2', 'a@cset-0-3')
518
self.assertRaises(TestamentMismatch, self.get_invalid_bundle,
519
'a@cset-0-2', 'a@cset-0-3')
520
# Check a rollup bundle
521
bundle = self.get_valid_bundle(None, 'a@cset-0-3')
524
# Now move the directory
525
self.tree1.rename_one('dir', 'sub/dir')
526
self.tree1.commit('rename dir', rev_id='a@cset-0-4')
528
bundle = self.get_valid_bundle('a@cset-0-3', 'a@cset-0-4')
529
# Check a rollup bundle
530
bundle = self.get_valid_bundle(None, 'a@cset-0-4')
533
open('b1/sub/dir/WithCaps.txt', 'ab').write('\nAdding some text\n')
534
open('b1/sub/dir/trailing space ', 'ab').write('\nAdding some\nDOS format lines\n')
535
open('b1/sub/dir/nolastnewline.txt', 'ab').write('\n')
536
self.tree1.rename_one('sub/dir/trailing space ',
537
'sub/ start and end space ')
538
self.tree1.commit('Modified files', rev_id='a@cset-0-5')
539
bundle = self.get_valid_bundle('a@cset-0-4', 'a@cset-0-5')
541
# Handle international characters
542
f = open(u'b1/with Dod\xe9', 'wb')
544
u'With international man of mystery\n'
545
u'William Dod\xe9\n').encode('utf-8'))
546
self.tree1.add([u'with Dod\xe9'])
547
# BUG: (sort of) You must set verbose=False, so that python doesn't try
548
# and print the name of William Dode as part of the commit
549
self.tree1.commit(u'i18n commit from William Dod\xe9',
550
rev_id='a@cset-0-6', committer=u'William Dod\xe9',
552
bundle = self.get_valid_bundle('a@cset-0-5', 'a@cset-0-6')
553
self.tree1.rename_one('sub/dir/WithCaps.txt', 'temp')
554
self.tree1.rename_one('with space.txt', 'WithCaps.txt')
555
self.tree1.rename_one('temp', 'with space.txt')
556
self.tree1.commit(u'swap filenames', rev_id='a@cset-0-7',
558
bundle = self.get_valid_bundle('a@cset-0-6', 'a@cset-0-7')
559
other = self.get_checkout('a@cset-0-6')
560
other.rename_one('sub/dir/nolastnewline.txt', 'sub/nolastnewline.txt')
561
other.commit('rename file', rev_id='a@cset-0-7b')
562
merge([other.basedir, -1], [None, None], this_dir=self.tree1.basedir)
563
self.tree1.commit(u'Merge', rev_id='a@cset-0-8',
565
bundle = self.get_valid_bundle('a@cset-0-7', 'a@cset-0-8')
567
def test_symlink_bundle(self):
568
if not has_symlinks():
569
raise TestSkipped("No symlink support")
570
self.tree1 = BzrDir.create_standalone_workingtree('b1')
571
self.b1 = self.tree1.branch
572
tt = TreeTransform(self.tree1)
573
tt.new_symlink('link', tt.root, 'bar/foo', 'link-1')
575
self.tree1.commit('add symlink', rev_id='l@cset-0-1')
576
self.get_valid_bundle(None, 'l@cset-0-1')
577
tt = TreeTransform(self.tree1)
578
trans_id = tt.trans_id_tree_file_id('link-1')
579
tt.adjust_path('link2', tt.root, trans_id)
580
tt.delete_contents(trans_id)
581
tt.create_symlink('mars', trans_id)
583
self.tree1.commit('rename and change symlink', rev_id='l@cset-0-2')
584
self.get_valid_bundle('l@cset-0-1', 'l@cset-0-2')
585
tt = TreeTransform(self.tree1)
586
trans_id = tt.trans_id_tree_file_id('link-1')
587
tt.delete_contents(trans_id)
588
tt.create_symlink('jupiter', trans_id)
590
self.tree1.commit('just change symlink target', rev_id='l@cset-0-3')
591
self.get_valid_bundle('l@cset-0-2', 'l@cset-0-3')
592
tt = TreeTransform(self.tree1)
593
trans_id = tt.trans_id_tree_file_id('link-1')
594
tt.delete_contents(trans_id)
596
self.tree1.commit('Delete symlink', rev_id='l@cset-0-4')
597
self.get_valid_bundle('l@cset-0-3', 'l@cset-0-4')
599
def test_binary_bundle(self):
600
self.tree1 = BzrDir.create_standalone_workingtree('b1')
601
self.b1 = self.tree1.branch
602
tt = TreeTransform(self.tree1)
603
tt.new_file('file', tt.root, '\x00\xff', 'binary-1')
604
tt.new_file('file2', tt.root, '\x00\xff', 'binary-2')
606
self.tree1.commit('add binary', rev_id='b@cset-0-1')
607
self.get_valid_bundle(None, 'b@cset-0-1')
608
tt = TreeTransform(self.tree1)
609
trans_id = tt.trans_id_tree_file_id('binary-1')
610
tt.delete_contents(trans_id)
612
self.tree1.commit('delete binary', rev_id='b@cset-0-2')
613
self.get_valid_bundle('b@cset-0-1', 'b@cset-0-2')
614
tt = TreeTransform(self.tree1)
615
trans_id = tt.trans_id_tree_file_id('binary-2')
616
tt.adjust_path('file3', tt.root, trans_id)
617
tt.delete_contents(trans_id)
618
tt.create_file('filecontents\x00', trans_id)
620
self.tree1.commit('rename and modify binary', rev_id='b@cset-0-3')
621
self.get_valid_bundle('b@cset-0-2', 'b@cset-0-3')
622
tt = TreeTransform(self.tree1)
623
trans_id = tt.trans_id_tree_file_id('binary-2')
624
tt.delete_contents(trans_id)
625
tt.create_file('\x00filecontents', trans_id)
627
self.tree1.commit('just modify binary', rev_id='b@cset-0-4')
628
self.get_valid_bundle('b@cset-0-3', 'b@cset-0-4')
630
def test_last_modified(self):
631
self.tree1 = BzrDir.create_standalone_workingtree('b1')
632
self.b1 = self.tree1.branch
633
tt = TreeTransform(self.tree1)
634
tt.new_file('file', tt.root, 'file', 'file')
636
self.tree1.commit('create file', rev_id='a@lmod-0-1')
638
tt = TreeTransform(self.tree1)
639
trans_id = tt.trans_id_tree_file_id('file')
640
tt.delete_contents(trans_id)
641
tt.create_file('file2', trans_id)
643
self.tree1.commit('modify text', rev_id='a@lmod-0-2a')
645
other = self.get_checkout('a@lmod-0-1')
646
tt = TreeTransform(other)
647
trans_id = tt.trans_id_tree_file_id('file')
648
tt.delete_contents(trans_id)
649
tt.create_file('file2', trans_id)
651
other.commit('modify text in another tree', rev_id='a@lmod-0-2b')
652
merge([other.basedir, -1], [None, None], this_dir=self.tree1.basedir)
653
self.tree1.commit(u'Merge', rev_id='a@lmod-0-3',
655
self.tree1.commit(u'Merge', rev_id='a@lmod-0-4')
656
bundle = self.get_valid_bundle('a@lmod-0-2a', 'a@lmod-0-4')
added
removed
bzrlib/tests/test_bundle.py
