/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
4988.10.3 by John Arbash Meinel
Merge bzr.dev 5007, resolve conflict, update NEWS
1
# Copyright (C) 2008, 2009, 2010 Canonical Ltd
3380.1.4 by Aaron Bentley
Split interrepository fetch tests into their own file
2
#
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.
7
#
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.
12
#
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
4183.7.1 by Sabin Iacob
update FSF mailing address
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
3380.1.4 by Aaron Bentley
Split interrepository fetch tests into their own file
16
17
18
import sys
19
20
from bzrlib import (
21
    errors,
3735.2.135 by Robert Collins
Permit fetching bzr.dev [deal with inconsistent inventories.]
22
    inventory,
23
    osutils,
3380.1.4 by Aaron Bentley
Split interrepository fetch tests into their own file
24
    repository,
3735.2.135 by Robert Collins
Permit fetching bzr.dev [deal with inconsistent inventories.]
25
    versionedfile,
3380.1.4 by Aaron Bentley
Split interrepository fetch tests into their own file
26
    )
27
from bzrlib.errors import (
28
    NoSuchRevision,
29
    )
6341.1.4 by Jelmer Vernooij
Move more functionality to vf_search.
30
from bzrlib.vf_search import (
4476.3.11 by Andrew Bennetts
All fetch and interrepo tests passing.
31
    SearchResult,
32
    )
3380.1.4 by Aaron Bentley
Split interrepository fetch tests into their own file
33
from bzrlib.revision import (
34
    NULL_REVISION,
35
    Revision,
36
    )
37
from bzrlib.tests import (
38
    TestNotApplicable,
39
    )
4523.1.3 by Martin Pool
Rename to per_interrepository
40
from bzrlib.tests.per_interrepository import (
3380.1.4 by Aaron Bentley
Split interrepository fetch tests into their own file
41
    TestCaseWithInterRepository,
42
    )
4523.1.3 by Martin Pool
Rename to per_interrepository
43
from bzrlib.tests.per_interrepository.test_interrepository import (
3616.2.3 by Mark Hammond
Fix test failures due to missing check_repo_format_for_funky_id_on_win32
44
    check_repo_format_for_funky_id_on_win32
45
    )
3380.1.4 by Aaron Bentley
Split interrepository fetch tests into their own file
46
47
4634.35.22 by Andrew Bennetts
Use monkey patching to avoid skipping (mostly) tests that try to create damaged repos on 2a.
48
3380.1.4 by Aaron Bentley
Split interrepository fetch tests into their own file
49
class TestInterRepository(TestCaseWithInterRepository):
50
4634.35.22 by Andrew Bennetts
Use monkey patching to avoid skipping (mostly) tests that try to create damaged repos on 2a.
51
    def disable_commit_write_group_paranoia(self, repo):
52
        pack_coll = getattr(repo, '_pack_collection', None)
53
        if pack_coll is not None:
54
            # Monkey-patch the pack collection instance to allow storing
55
            # incomplete revisions.
56
            pack_coll._check_new_inventories = lambda: []
57
3380.1.4 by Aaron Bentley
Split interrepository fetch tests into their own file
58
    def test_fetch(self):
59
        tree_a = self.make_branch_and_tree('a')
60
        self.build_tree(['a/foo'])
61
        tree_a.add('foo', 'file1')
62
        tree_a.commit('rev1', rev_id='rev1')
63
        def check_push_rev1(repo):
64
            # ensure the revision is missing.
65
            self.assertRaises(NoSuchRevision, repo.get_revision, 'rev1')
4110.2.5 by Martin Pool
Deprecate passing pbs in to fetch()
66
            # fetch with a limit of NULL_REVISION
3380.1.4 by Aaron Bentley
Split interrepository fetch tests into their own file
67
            repo.fetch(tree_a.branch.repository,
4110.2.5 by Martin Pool
Deprecate passing pbs in to fetch()
68
                       revision_id=NULL_REVISION)
3380.1.4 by Aaron Bentley
Split interrepository fetch tests into their own file
69
            # nothing should have been pushed
70
            self.assertFalse(repo.has_revision('rev1'))
71
            # fetch with a default limit (grab everything)
72
            repo.fetch(tree_a.branch.repository)
73
            # check that b now has all the data from a's first commit.
74
            rev = repo.get_revision('rev1')
75
            tree = repo.revision_tree('rev1')
76
            tree.lock_read()
77
            self.addCleanup(tree.unlock)
78
            tree.get_file_text('file1')
5837.2.2 by Jelmer Vernooij
Fix more uses of Tree.__iter__
79
            for file_id in tree.all_file_ids():
6405.2.10 by Jelmer Vernooij
Fix more tests.
80
                if tree.kind(file_id) == "file":
3380.1.4 by Aaron Bentley
Split interrepository fetch tests into their own file
81
                    tree.get_file(file_id).read()
82
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
83
        # makes a target version repo
3380.1.4 by Aaron Bentley
Split interrepository fetch tests into their own file
84
        repo_b = self.make_to_repository('b')
85
        check_push_rev1(repo_b)
86
3735.2.135 by Robert Collins
Permit fetching bzr.dev [deal with inconsistent inventories.]
87
    def test_fetch_inconsistent_last_changed_entries(self):
88
        """If an inventory has odd data we should still get what it references.
3735.31.2 by John Arbash Meinel
Cleanup trailing whitespace, get test_source to pass by removing asserts.
89
3735.2.135 by Robert Collins
Permit fetching bzr.dev [deal with inconsistent inventories.]
90
        This test tests that we do fetch a file text created in a revision not
91
        being fetched, but referenced from the revision we are fetching when the
92
        adjacent revisions to the one being fetched do not reference that text.
93
        """
94
        tree = self.make_branch_and_tree('source')
95
        revid = tree.commit('old')
96
        to_repo = self.make_to_repository('to_repo')
97
        to_repo.fetch(tree.branch.repository, revid)
98
        # Make a broken revision and fetch it.
99
        source = tree.branch.repository
100
        source.lock_write()
101
        self.addCleanup(source.unlock)
102
        source.start_write_group()
103
        try:
104
            # We need two revisions: OLD and NEW. NEW will claim to need a file
105
            # 'FOO' changed in 'OLD'. OLD will not have that file at all.
106
            source.texts.insert_record_stream([
107
                versionedfile.FulltextContentFactory(('foo', revid), (), None,
108
                'contents')])
109
            basis = source.revision_tree(revid)
110
            parent_id = basis.path2id('')
111
            entry = inventory.make_entry('file', 'foo-path', parent_id, 'foo')
112
            entry.revision = revid
113
            entry.text_size = len('contents')
114
            entry.text_sha1 = osutils.sha_string('contents')
115
            inv_sha1, _ = source.add_inventory_by_delta(revid, [
116
                (None, 'foo-path', 'foo', entry)], 'new', [revid])
117
            rev = Revision(timestamp=0,
118
                           timezone=None,
119
                           committer="Foo Bar <foo@example.com>",
120
                           message="Message",
121
                           inventory_sha1=inv_sha1,
122
                           revision_id='new',
123
                           parent_ids=[revid])
124
            source.add_revision(rev.revision_id, rev)
125
        except:
126
            source.abort_write_group()
127
            raise
128
        else:
129
            source.commit_write_group()
130
        to_repo.fetch(source, 'new')
131
        to_repo.lock_read()
132
        self.addCleanup(to_repo.unlock)
133
        self.assertEqual('contents',
134
            to_repo.texts.get_record_stream([('foo', revid)],
135
            'unordered', True).next().get_bytes_as('fulltext'))
136
4634.61.1 by Andrew Bennetts
Fix cross-format pulls from stacked branches via smart server, add tests for same.
137
    def test_fetch_from_stacked_smart(self):
138
        self.setup_smart_server_with_call_log()
139
        self.test_fetch_from_stacked()
140
141
    def test_fetch_from_stacked_smart_old(self):
142
        self.setup_smart_server_with_call_log()
143
        self.disable_verb('Repository.get_stream_1.19')
144
        self.test_fetch_from_stacked()
145
146
    def test_fetch_from_stacked(self):
147
        """Fetch from a stacked branch succeeds."""
148
        if not self.repository_format.supports_external_lookups:
149
            raise TestNotApplicable("Need stacking support in the source.")
150
        builder = self.make_branch_builder('full-branch')
151
        builder.start_series()
152
        builder.build_snapshot('first', None, [
153
            ('add', ('', 'root-id', 'directory', '')),
154
            ('add', ('file', 'file-id', 'file', 'content\n'))])
155
        builder.build_snapshot('second', ['first'], [
156
            ('modify', ('file-id', 'second content\n'))])
157
        builder.build_snapshot('third', ['second'], [
158
            ('modify', ('file-id', 'third content\n'))])
159
        builder.finish_series()
160
        branch = builder.get_branch()
161
        repo = self.make_repository('stacking-base')
162
        trunk = repo.bzrdir.create_branch()
163
        trunk.repository.fetch(branch.repository, 'second')
164
        repo = self.make_repository('stacked')
165
        stacked_branch = repo.bzrdir.create_branch()
166
        stacked_branch.set_stacked_on_url(trunk.base)
167
        stacked_branch.repository.fetch(branch.repository, 'third')
168
        target = self.make_to_repository('target')
169
        target.fetch(stacked_branch.repository, 'third')
170
        target.lock_read()
171
        self.addCleanup(target.unlock)
172
        all_revs = set(['first', 'second', 'third'])
173
        self.assertEqual(all_revs, set(target.get_parent_map(all_revs)))
174
4476.3.15 by Andrew Bennetts
Partially working fallback for pre-1.17 servers.
175
    def test_fetch_parent_inventories_at_stacking_boundary_smart(self):
176
        self.setup_smart_server_with_call_log()
177
        self.test_fetch_parent_inventories_at_stacking_boundary()
178
179
    def test_fetch_parent_inventories_at_stacking_boundary_smart_old(self):
180
        self.setup_smart_server_with_call_log()
4476.3.82 by Andrew Bennetts
Mention another bug fix in NEWS, and update verb name, comments, and NEWS additions for landing on 1.19 rather than 1.18.
181
        self.disable_verb('Repository.insert_stream_1.19')
4476.3.15 by Andrew Bennetts
Partially working fallback for pre-1.17 servers.
182
        self.test_fetch_parent_inventories_at_stacking_boundary()
183
4257.3.1 by Andrew Bennetts
Add failing test.
184
    def test_fetch_parent_inventories_at_stacking_boundary(self):
4257.3.9 by Andrew Bennetts
Add fix to InterDifferingSerializer too, although it's pretty ugly.
185
        """Fetch to a stacked branch copies inventories for parents of
186
        revisions at the stacking boundary.
187
188
        This is necessary so that the server is able to determine the file-ids
189
        altered by all revisions it contains, which means that it needs both
190
        the inventory for any revision it has, and the inventories of all that
191
        revision's parents.
4597.1.2 by John Arbash Meinel
Fix the second half of bug #402778
192
193
        However, we should also skip any revisions which are ghosts in the
194
        parents.
4257.3.9 by Andrew Bennetts
Add fix to InterDifferingSerializer too, although it's pretty ugly.
195
        """
4597.1.5 by John Arbash Meinel
Split the 'ghost' test into a second test.
196
        if not self.repository_format_to.supports_external_lookups:
4257.3.1 by Andrew Bennetts
Add failing test.
197
            raise TestNotApplicable("Need stacking support in the target.")
198
        builder = self.make_branch_builder('branch')
199
        builder.start_series()
200
        builder.build_snapshot('base', None, [
4597.1.1 by John Arbash Meinel
fix a critical bug #402778
201
            ('add', ('', 'root-id', 'directory', '')),
202
            ('add', ('file', 'file-id', 'file', 'content\n'))])
203
        builder.build_snapshot('left', ['base'], [
204
            ('modify', ('file-id', 'left content\n'))])
205
        builder.build_snapshot('right', ['base'], [
206
            ('modify', ('file-id', 'right content\n'))])
4597.1.5 by John Arbash Meinel
Split the 'ghost' test into a second test.
207
        builder.build_snapshot('merge', ['left', 'right'], [
4597.1.1 by John Arbash Meinel
fix a critical bug #402778
208
            ('modify', ('file-id', 'left and right content\n'))])
4257.3.1 by Andrew Bennetts
Add failing test.
209
        builder.finish_series()
210
        branch = builder.get_branch()
211
        repo = self.make_to_repository('trunk')
212
        trunk = repo.bzrdir.create_branch()
213
        trunk.repository.fetch(branch.repository, 'left')
214
        trunk.repository.fetch(branch.repository, 'right')
215
        repo = self.make_to_repository('stacked')
216
        stacked_branch = repo.bzrdir.create_branch()
217
        stacked_branch.set_stacked_on_url(trunk.base)
218
        stacked_branch.repository.fetch(branch.repository, 'merge')
219
        unstacked_repo = stacked_branch.bzrdir.open_repository()
220
        unstacked_repo.lock_read()
221
        self.addCleanup(unstacked_repo.unlock)
4476.3.73 by Andrew Bennetts
Remove smelly if guard from interrepo fetch stacking test, it's not necessary.
222
        self.assertFalse(unstacked_repo.has_revision('left'))
223
        self.assertFalse(unstacked_repo.has_revision('right'))
4257.3.1 by Andrew Bennetts
Add failing test.
224
        self.assertEqual(
4257.3.2 by Andrew Bennetts
Check during fetch if we are going to be missing data necessary to calculate altered fileids for stacked revisions.
225
            set([('left',), ('right',), ('merge',)]),
4257.3.1 by Andrew Bennetts
Add failing test.
226
            unstacked_repo.inventories.keys())
4597.1.1 by John Arbash Meinel
fix a critical bug #402778
227
        # And the basis inventories have been copied correctly
228
        trunk.lock_read()
229
        self.addCleanup(trunk.unlock)
230
        left_tree, right_tree = trunk.repository.revision_trees(
231
            ['left', 'right'])
232
        stacked_branch.lock_read()
233
        self.addCleanup(stacked_branch.unlock)
234
        (stacked_left_tree,
235
         stacked_right_tree) = stacked_branch.repository.revision_trees(
236
            ['left', 'right'])
6405.2.7 by Jelmer Vernooij
Fix more tests.
237
        self.assertEqual(
238
            left_tree.root_inventory, stacked_left_tree.root_inventory)
239
        self.assertEqual(
240
            right_tree.root_inventory, stacked_right_tree.root_inventory)
4257.3.1 by Andrew Bennetts
Add failing test.
241
4476.3.81 by Andrew Bennetts
Merge bzr.dev. Fix some minor fallout. per_interrepository/test_fetch.py has some duplicated assertions as a first pass at resolving conflicts.
242
        # Finally, it's not enough to see that the basis inventories are
243
        # present.  The texts introduced in merge (and only those) should be
244
        # present, and also generating a stream should succeed without blowing
245
        # up.
4476.3.11 by Andrew Bennetts
All fetch and interrepo tests passing.
246
        self.assertTrue(unstacked_repo.has_revision('merge'))
4476.3.81 by Andrew Bennetts
Merge bzr.dev. Fix some minor fallout. per_interrepository/test_fetch.py has some duplicated assertions as a first pass at resolving conflicts.
247
        expected_texts = set([('file-id', 'merge')])
248
        if stacked_branch.repository.texts.get_parent_map([('root-id',
249
            'merge')]):
250
            # If a (root-id,merge) text exists, it should be in the stacked
251
            # repo.
252
            expected_texts.add(('root-id', 'merge'))
253
        self.assertEqual(expected_texts, unstacked_repo.texts.keys())
4476.3.11 by Andrew Bennetts
All fetch and interrepo tests passing.
254
        self.assertCanStreamRevision(unstacked_repo, 'merge')
255
256
    def assertCanStreamRevision(self, repo, revision_id):
257
        exclude_keys = set(repo.all_revision_ids()) - set([revision_id])
258
        search = SearchResult([revision_id], exclude_keys, 1, [revision_id])
259
        source = repo._get_source(repo._format)
260
        for substream_kind, substream in source.get_stream(search):
261
            # Consume the substream
262
            list(substream)
4257.3.1 by Andrew Bennetts
Add failing test.
263
4597.1.5 by John Arbash Meinel
Split the 'ghost' test into a second test.
264
    def test_fetch_across_stacking_boundary_ignores_ghost(self):
265
        if not self.repository_format_to.supports_external_lookups:
266
            raise TestNotApplicable("Need stacking support in the target.")
267
        to_repo = self.make_to_repository('to')
268
        builder = self.make_branch_builder('branch')
269
        builder.start_series()
270
        builder.build_snapshot('base', None, [
271
            ('add', ('', 'root-id', 'directory', '')),
272
            ('add', ('file', 'file-id', 'file', 'content\n'))])
273
        builder.build_snapshot('second', ['base'], [
274
            ('modify', ('file-id', 'second content\n'))])
275
        builder.build_snapshot('third', ['second', 'ghost'], [
276
            ('modify', ('file-id', 'third content\n'))])
277
        builder.finish_series()
278
        branch = builder.get_branch()
279
        repo = self.make_to_repository('trunk')
280
        trunk = repo.bzrdir.create_branch()
281
        trunk.repository.fetch(branch.repository, 'second')
282
        repo = self.make_to_repository('stacked')
283
        stacked_branch = repo.bzrdir.create_branch()
284
        stacked_branch.set_stacked_on_url(trunk.base)
285
        stacked_branch.repository.fetch(branch.repository, 'third')
286
        unstacked_repo = stacked_branch.bzrdir.open_repository()
287
        unstacked_repo.lock_read()
288
        self.addCleanup(unstacked_repo.unlock)
289
        self.assertFalse(unstacked_repo.has_revision('second'))
290
        self.assertFalse(unstacked_repo.has_revision('ghost'))
291
        self.assertEqual(
292
            set([('second',), ('third',)]),
293
            unstacked_repo.inventories.keys())
294
        # And the basis inventories have been copied correctly
295
        trunk.lock_read()
296
        self.addCleanup(trunk.unlock)
297
        second_tree = trunk.repository.revision_tree('second')
298
        stacked_branch.lock_read()
299
        self.addCleanup(stacked_branch.unlock)
300
        stacked_second_tree = stacked_branch.repository.revision_tree('second')
6471.1.5 by Jelmer Vernooij
Compare trees rather than inventories.
301
        self.assertEqual(second_tree, stacked_second_tree)
4476.3.81 by Andrew Bennetts
Merge bzr.dev. Fix some minor fallout. per_interrepository/test_fetch.py has some duplicated assertions as a first pass at resolving conflicts.
302
        # Finally, it's not enough to see that the basis inventories are
303
        # present.  The texts introduced in merge (and only those) should be
304
        # present, and also generating a stream should succeed without blowing
305
        # up.
306
        self.assertTrue(unstacked_repo.has_revision('third'))
307
        expected_texts = set([('file-id', 'third')])
308
        if stacked_branch.repository.texts.get_parent_map([('root-id',
309
            'third')]):
310
            # If a (root-id,third) text exists, it should be in the stacked
311
            # repo.
312
            expected_texts.add(('root-id', 'third'))
313
        self.assertEqual(expected_texts, unstacked_repo.texts.keys())
314
        self.assertCanStreamRevision(unstacked_repo, 'third')
4597.1.5 by John Arbash Meinel
Split the 'ghost' test into a second test.
315
4627.3.4 by Andrew Bennetts
Add a (long) test that fails without the fix.
316
    def test_fetch_from_stacked_to_stacked_copies_parent_inventories(self):
317
        """Fetch from a stacked branch copies inventories for parents of
318
        revisions at the stacking boundary.
319
320
        Specifically, fetch will copy the parent inventories from the
321
        source for which the corresponding revisions are not present.  This
322
        will happen even when the source repository has no fallbacks configured
323
        (as is the case during upgrade).
324
        """
325
        if not self.repository_format.supports_external_lookups:
326
            raise TestNotApplicable("Need stacking support in the source.")
327
        if not self.repository_format_to.supports_external_lookups:
328
            raise TestNotApplicable("Need stacking support in the target.")
329
        builder = self.make_branch_builder('branch')
330
        builder.start_series()
331
        builder.build_snapshot('base', None, [
332
            ('add', ('', 'root-id', 'directory', '')),
333
            ('add', ('file', 'file-id', 'file', 'content\n'))])
334
        builder.build_snapshot('left', ['base'], [
335
            ('modify', ('file-id', 'left content\n'))])
336
        builder.build_snapshot('right', ['base'], [
337
            ('modify', ('file-id', 'right content\n'))])
338
        builder.build_snapshot('merge', ['left', 'right'], [
339
            ('modify', ('file-id', 'left and right content\n'))])
340
        builder.finish_series()
341
        branch = builder.get_branch()
342
        repo = self.make_repository('old-trunk')
343
        # Make a pair of equivalent trunk repos in the from and to formats.
344
        old_trunk = repo.bzrdir.create_branch()
345
        old_trunk.repository.fetch(branch.repository, 'left')
346
        old_trunk.repository.fetch(branch.repository, 'right')
347
        repo = self.make_to_repository('new-trunk')
348
        new_trunk = repo.bzrdir.create_branch()
349
        new_trunk.repository.fetch(branch.repository, 'left')
350
        new_trunk.repository.fetch(branch.repository, 'right')
351
        # Make the source; a repo stacked on old_trunk contained just the data
352
        # for 'merge'.
353
        repo = self.make_repository('old-stacked')
354
        old_stacked_branch = repo.bzrdir.create_branch()
355
        old_stacked_branch.set_stacked_on_url(old_trunk.base)
356
        old_stacked_branch.repository.fetch(branch.repository, 'merge')
357
        # Make the target, a repo stacked on new_trunk.
358
        repo = self.make_to_repository('new-stacked')
359
        new_stacked_branch = repo.bzrdir.create_branch()
360
        new_stacked_branch.set_stacked_on_url(new_trunk.base)
361
        old_unstacked_repo = old_stacked_branch.bzrdir.open_repository()
362
        new_unstacked_repo = new_stacked_branch.bzrdir.open_repository()
363
        # Reopen the source and target repos without any fallbacks, and fetch
364
        # 'merge'.
365
        new_unstacked_repo.fetch(old_unstacked_repo, 'merge')
366
        # Now check the results.  new_unstacked_repo should contain all the
367
        # data necessary to stream 'merge' (i.e. the parent inventories).
368
        new_unstacked_repo.lock_read()
369
        self.addCleanup(new_unstacked_repo.unlock)
370
        self.assertFalse(new_unstacked_repo.has_revision('left'))
371
        self.assertFalse(new_unstacked_repo.has_revision('right'))
372
        self.assertEqual(
373
            set([('left',), ('right',), ('merge',)]),
374
            new_unstacked_repo.inventories.keys())
375
        # And the basis inventories have been copied correctly
376
        new_trunk.lock_read()
377
        self.addCleanup(new_trunk.unlock)
378
        left_tree, right_tree = new_trunk.repository.revision_trees(
379
            ['left', 'right'])
380
        new_stacked_branch.lock_read()
381
        self.addCleanup(new_stacked_branch.unlock)
382
        (stacked_left_tree,
383
         stacked_right_tree) = new_stacked_branch.repository.revision_trees(
384
            ['left', 'right'])
6470.1.1 by Jelmer Vernooij
Use inventories directly in fewer places.
385
        self.assertEqual(left_tree, stacked_left_tree)
386
        self.assertEqual(right_tree, stacked_right_tree)
4627.3.4 by Andrew Bennetts
Add a (long) test that fails without the fix.
387
        # Finally, it's not enough to see that the basis inventories are
388
        # present.  The texts introduced in merge (and only those) should be
389
        # present, and also generating a stream should succeed without blowing
390
        # up.
391
        self.assertTrue(new_unstacked_repo.has_revision('merge'))
392
        expected_texts = set([('file-id', 'merge')])
393
        if new_stacked_branch.repository.texts.get_parent_map([('root-id',
394
            'merge')]):
395
            # If a (root-id,merge) text exists, it should be in the stacked
396
            # repo.
397
            expected_texts.add(('root-id', 'merge'))
398
        self.assertEqual(expected_texts, new_unstacked_repo.texts.keys())
399
        self.assertCanStreamRevision(new_unstacked_repo, 'merge')
400
3380.1.4 by Aaron Bentley
Split interrepository fetch tests into their own file
401
    def test_fetch_missing_basis_text(self):
402
        """If fetching a delta, we should die if a basis is not present."""
403
        tree = self.make_branch_and_tree('tree')
404
        self.build_tree(['tree/a'])
405
        tree.add(['a'], ['a-id'])
406
        tree.commit('one', rev_id='rev-one')
407
        self.build_tree_contents([('tree/a', 'new contents\n')])
408
        tree.commit('two', rev_id='rev-two')
409
410
        to_repo = self.make_to_repository('to_repo')
411
        # We build a broken revision so that we can test the fetch code dies
412
        # properly. So copy the inventory and revision, but not the text.
413
        to_repo.lock_write()
414
        try:
415
            to_repo.start_write_group()
4634.35.13 by Andrew Bennetts
Fix test_fetch_missing_basis_text to skip if commit_write_group on the target repo prevents making a broken revision.
416
            try:
417
                inv = tree.branch.repository.get_inventory('rev-one')
418
                to_repo.add_inventory('rev-one', inv, [])
419
                rev = tree.branch.repository.get_revision('rev-one')
420
                to_repo.add_revision('rev-one', rev, inv=inv)
4634.35.22 by Andrew Bennetts
Use monkey patching to avoid skipping (mostly) tests that try to create damaged repos on 2a.
421
                self.disable_commit_write_group_paranoia(to_repo)
422
                to_repo.commit_write_group()
4634.35.13 by Andrew Bennetts
Fix test_fetch_missing_basis_text to skip if commit_write_group on the target repo prevents making a broken revision.
423
            except:
424
                to_repo.abort_write_group(suppress_errors=True)
425
                raise
3380.1.4 by Aaron Bentley
Split interrepository fetch tests into their own file
426
        finally:
427
            to_repo.unlock()
428
3350.3.21 by Robert Collins
Merge bzr.dev.
429
        # Implementations can either ensure that the target of the delta is
430
        # reconstructable, or raise an exception (which stream based copies
431
        # generally do).
3380.1.4 by Aaron Bentley
Split interrepository fetch tests into their own file
432
        try:
433
            to_repo.fetch(tree.branch.repository, 'rev-two')
3830.3.12 by Martin Pool
Review cleanups: unify has_key impls, add missing_keys(), clean up exception blocks
434
        except (errors.BzrCheckError, errors.RevisionNotPresent), e:
435
            # If an exception is raised, the revision should not be in the
436
            # target.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
437
            #
3830.3.9 by Martin Pool
Simplify kvf insert_record_stream; add has_key shorthand methods; update stacking effort tests
438
            # Can also just raise a generic check errors; stream insertion
439
            # does this to include all the missing data
440
            self.assertRaises((errors.NoSuchRevision, errors.RevisionNotPresent),
441
                              to_repo.revision_tree, 'rev-two')
3380.1.4 by Aaron Bentley
Split interrepository fetch tests into their own file
442
        else:
3350.3.21 by Robert Collins
Merge bzr.dev.
443
            # If not exception is raised, then the text should be
3380.1.4 by Aaron Bentley
Split interrepository fetch tests into their own file
444
            # available.
445
            to_repo.lock_read()
446
            try:
3350.3.21 by Robert Collins
Merge bzr.dev.
447
                rt = to_repo.revision_tree('rev-two')
448
                self.assertEqual('new contents\n',
3380.1.4 by Aaron Bentley
Split interrepository fetch tests into their own file
449
                                 rt.get_file_text('a-id'))
450
            finally:
451
                to_repo.unlock()
452
453
    def test_fetch_missing_revision_same_location_fails(self):
454
        repo_a = self.make_repository('.')
455
        repo_b = repository.Repository.open('.')
5728.3.1 by Martin Pool
Remove apparently no-longer-called check_old_format_lock_error
456
        self.assertRaises(errors.NoSuchRevision,
457
            repo_b.fetch, repo_a, revision_id='XXX')
3380.1.4 by Aaron Bentley
Split interrepository fetch tests into their own file
458
459
    def test_fetch_same_location_trivial_works(self):
460
        repo_a = self.make_repository('.')
461
        repo_b = repository.Repository.open('.')
5728.3.1 by Martin Pool
Remove apparently no-longer-called check_old_format_lock_error
462
        repo_a.fetch(repo_b)
3380.1.4 by Aaron Bentley
Split interrepository fetch tests into their own file
463
464
    def test_fetch_missing_text_other_location_fails(self):
465
        source_tree = self.make_branch_and_tree('source')
466
        source = source_tree.branch.repository
467
        target = self.make_to_repository('target')
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
468
3380.1.4 by Aaron Bentley
Split interrepository fetch tests into their own file
469
        # start by adding a file so the data knit for the file exists in
470
        # repositories that have specific files for each fileid.
471
        self.build_tree(['source/id'])
472
        source_tree.add(['id'], ['id'])
473
        source_tree.commit('a', rev_id='a')
474
        # now we manually insert a revision with an inventory referencing
4634.35.14 by Andrew Bennetts
Fix more tests to cope with new commit_write_group strictness.
475
        # file 'id' at revision 'b', but we do not insert revision b.
3380.1.4 by Aaron Bentley
Split interrepository fetch tests into their own file
476
        # this should ensure that the new versions of files are being checked
477
        # for during pull operations
478
        inv = source.get_inventory('a')
479
        source.lock_write()
3380.1.5 by Aaron Bentley
Merge with make-it-work
480
        self.addCleanup(source.unlock)
3380.1.4 by Aaron Bentley
Split interrepository fetch tests into their own file
481
        source.start_write_group()
482
        inv['id'].revision = 'b'
483
        inv.revision_id = 'b'
484
        sha1 = source.add_inventory('b', inv, ['a'])
485
        rev = Revision(timestamp=0,
486
                       timezone=None,
487
                       committer="Foo Bar <foo@example.com>",
488
                       message="Message",
489
                       inventory_sha1=sha1,
490
                       revision_id='b')
491
        rev.parent_ids = ['a']
492
        source.add_revision('b', rev)
4634.35.22 by Andrew Bennetts
Use monkey patching to avoid skipping (mostly) tests that try to create damaged repos on 2a.
493
        self.disable_commit_write_group_paranoia(source)
494
        source.commit_write_group()
3380.1.4 by Aaron Bentley
Split interrepository fetch tests into their own file
495
        self.assertRaises(errors.RevisionNotPresent, target.fetch, source)
496
        self.assertFalse(target.has_revision('b'))
497
498
    def test_fetch_funky_file_id(self):
499
        from_tree = self.make_branch_and_tree('tree')
500
        if sys.platform == 'win32':
501
            from_repo = from_tree.branch.repository
502
            check_repo_format_for_funky_id_on_win32(from_repo)
503
        self.build_tree(['tree/filename'])
504
        from_tree.add('filename', 'funky-chars<>%&;"\'')
505
        from_tree.commit('commit filename')
506
        to_repo = self.make_to_repository('to')
3350.3.21 by Robert Collins
Merge bzr.dev.
507
        to_repo.fetch(from_tree.branch.repository, from_tree.get_parent_ids()[0])
3380.1.4 by Aaron Bentley
Split interrepository fetch tests into their own file
508
3380.1.6 by Aaron Bentley
Ensure fetching munges sha1s
509
    def test_fetch_revision_hash(self):
510
        """Ensure that inventory hashes are updated by fetch"""
511
        from_tree = self.make_branch_and_tree('tree')
512
        from_tree.commit('foo', rev_id='foo-id')
513
        to_repo = self.make_to_repository('to')
514
        to_repo.fetch(from_tree.branch.repository)
4988.3.2 by Jelmer Vernooij
Call get_revision on the right object.
515
        recorded_inv_sha1 = to_repo.get_revision('foo-id').inventory_sha1
4597.1.4 by John Arbash Meinel
Fix one test that assumed get_inventory_xml worked.
516
        to_repo.lock_read()
517
        self.addCleanup(to_repo.unlock)
518
        stream = to_repo.inventories.get_record_stream([('foo-id',)],
519
                                                       'unordered', True)
520
        bytes = stream.next().get_bytes_as('fulltext')
521
        computed_inv_sha1 = osutils.sha_string(bytes)
3380.1.6 by Aaron Bentley
Ensure fetching munges sha1s
522
        self.assertEqual(computed_inv_sha1, recorded_inv_sha1)
523
3380.1.4 by Aaron Bentley
Split interrepository fetch tests into their own file
524
525
class TestFetchDependentData(TestCaseWithInterRepository):
526
527
    def test_reference(self):
528
        from_tree = self.make_branch_and_tree('tree')
529
        to_repo = self.make_to_repository('to')
530
        if (not from_tree.supports_tree_reference() or
531
            not from_tree.branch.repository._format.supports_tree_reference or
532
            not to_repo._format.supports_tree_reference):
533
            raise TestNotApplicable("Need subtree support.")
534
        subtree = self.make_branch_and_tree('tree/subtree')
535
        subtree.commit('subrev 1')
536
        from_tree.add_reference(subtree)
537
        tree_rev = from_tree.commit('foo')
538
        # now from_tree has a last-modified of subtree of the rev id of the
539
        # commit for foo, and a reference revision of the rev id of the commit
540
        # for subrev 1
541
        to_repo.fetch(from_tree.branch.repository, tree_rev)
542
        # to_repo should have a file_graph for from_tree.path2id('subtree') and
543
        # revid tree_rev.
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
544
        file_id = from_tree.path2id('subtree')
3380.1.4 by Aaron Bentley
Split interrepository fetch tests into their own file
545
        to_repo.lock_read()
546
        try:
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
547
            self.assertEqual({(file_id, tree_rev):()},
548
                to_repo.texts.get_parent_map([(file_id, tree_rev)]))
3380.1.4 by Aaron Bentley
Split interrepository fetch tests into their own file
549
        finally:
550
            to_repo.unlock()