/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/tests/test_fetch.py

  • Committer: Jelmer Vernooij
  • Date: 2020-04-05 19:11:34 UTC
  • mto: (7490.7.16 work)
  • mto: This revision was merged to the branch mainline in revision 7501.
  • Revision ID: jelmer@jelmer.uk-20200405191134-0aebh8ikiwygxma5
Populate the .gitignore file.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_fetch.py
1
 
# Copyright (C) 2005, 2007, 2010 Canonical Ltd
 
1
# Copyright (C) 2005-2011, 2016 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
 
import os
18
 
import re
19
 
import sys
20
 
 
21
 
import bzrlib
22
 
from bzrlib import (
23
 
    bzrdir,
 
17
from .. import (
24
18
    errors,
25
19
    osutils,
26
 
    merge,
27
 
    repository,
 
20
    revision as _mod_revision,
 
21
    )
 
22
from ..bzr import (
 
23
    bzrdir,
28
24
    versionedfile,
29
25
    )
30
 
from bzrlib.branch import Branch
31
 
from bzrlib.bzrdir import BzrDir
32
 
from bzrlib.repofmt import knitrepo
33
 
from bzrlib.tests import TestCaseWithTransport
34
 
from bzrlib.tests.test_revision import make_branches
35
 
from bzrlib.trace import mutter
36
 
from bzrlib.upgrade import Convert
37
 
from bzrlib.workingtree import WorkingTree
 
26
from ..branch import Branch
 
27
from ..bzr import knitrepo
 
28
from . import TestCaseWithTransport
 
29
from .test_revision import make_branches
 
30
from ..upgrade import Convert
 
31
from ..workingtree import WorkingTree
38
32
 
39
33
# These tests are a bit old; please instead add new tests into
40
34
# per_interrepository/ so they'll run on all relevant
44
38
def has_revision(branch, revision_id):
45
39
    return branch.repository.has_revision(revision_id)
46
40
 
 
41
 
 
42
def revision_history(branch):
 
43
    branch.lock_read()
 
44
    try:
 
45
        graph = branch.repository.get_graph()
 
46
        history = list(graph.iter_lefthand_ancestry(branch.last_revision(),
 
47
                                                    [_mod_revision.NULL_REVISION]))
 
48
    finally:
 
49
        branch.unlock()
 
50
    history.reverse()
 
51
    return history
 
52
 
 
53
 
47
54
def fetch_steps(self, br_a, br_b, writable_a):
48
55
    """A foreign test method for testing fetch locally and remotely."""
49
56
 
50
57
    # TODO RBC 20060201 make this a repository test.
51
58
    repo_b = br_b.repository
52
 
    self.assertFalse(repo_b.has_revision(br_a.revision_history()[3]))
53
 
    self.assertTrue(repo_b.has_revision(br_a.revision_history()[2]))
54
 
    self.assertEquals(len(br_b.revision_history()), 7)
55
 
    br_b.fetch(br_a, br_a.revision_history()[2])
 
59
    self.assertFalse(repo_b.has_revision(revision_history(br_a)[3]))
 
60
    self.assertTrue(repo_b.has_revision(revision_history(br_a)[2]))
 
61
    self.assertEqual(len(revision_history(br_b)), 7)
 
62
    br_b.fetch(br_a, revision_history(br_a)[2])
56
63
    # branch.fetch is not supposed to alter the revision history
57
 
    self.assertEquals(len(br_b.revision_history()), 7)
58
 
    self.assertFalse(repo_b.has_revision(br_a.revision_history()[3]))
 
64
    self.assertEqual(len(revision_history(br_b)), 7)
 
65
    self.assertFalse(repo_b.has_revision(revision_history(br_a)[3]))
59
66
 
60
67
    # fetching the next revision up in sample data copies one revision
61
 
    br_b.fetch(br_a, br_a.revision_history()[3])
62
 
    self.assertTrue(repo_b.has_revision(br_a.revision_history()[3]))
63
 
    self.assertFalse(has_revision(br_a, br_b.revision_history()[6]))
64
 
    self.assertTrue(br_a.repository.has_revision(br_b.revision_history()[5]))
 
68
    br_b.fetch(br_a, revision_history(br_a)[3])
 
69
    self.assertTrue(repo_b.has_revision(revision_history(br_a)[3]))
 
70
    self.assertFalse(has_revision(br_a, revision_history(br_b)[6]))
 
71
    self.assertTrue(br_a.repository.has_revision(revision_history(br_b)[5]))
65
72
 
66
73
    # When a non-branch ancestor is missing, it should be unlisted...
67
74
    # as its not reference from the inventory weave.
69
76
    br_b4.fetch(br_b)
70
77
 
71
78
    writable_a.fetch(br_b)
72
 
    self.assertTrue(has_revision(br_a, br_b.revision_history()[3]))
73
 
    self.assertTrue(has_revision(br_a, br_b.revision_history()[4]))
 
79
    self.assertTrue(has_revision(br_a, revision_history(br_b)[3]))
 
80
    self.assertTrue(has_revision(br_a, revision_history(br_b)[4]))
74
81
 
75
82
    br_b2 = self.make_branch('br_b2')
76
83
    br_b2.fetch(br_b)
77
 
    self.assertTrue(has_revision(br_b2, br_b.revision_history()[4]))
78
 
    self.assertTrue(has_revision(br_b2, br_a.revision_history()[2]))
79
 
    self.assertFalse(has_revision(br_b2, br_a.revision_history()[3]))
 
84
    self.assertTrue(has_revision(br_b2, revision_history(br_b)[4]))
 
85
    self.assertTrue(has_revision(br_b2, revision_history(br_a)[2]))
 
86
    self.assertFalse(has_revision(br_b2, revision_history(br_a)[3]))
80
87
 
81
88
    br_a2 = self.make_branch('br_a2')
82
89
    br_a2.fetch(br_a)
83
 
    self.assertTrue(has_revision(br_a2, br_b.revision_history()[4]))
84
 
    self.assertTrue(has_revision(br_a2, br_a.revision_history()[3]))
85
 
    self.assertTrue(has_revision(br_a2, br_a.revision_history()[2]))
 
90
    self.assertTrue(has_revision(br_a2, revision_history(br_b)[4]))
 
91
    self.assertTrue(has_revision(br_a2, revision_history(br_a)[3]))
 
92
    self.assertTrue(has_revision(br_a2, revision_history(br_a)[2]))
86
93
 
87
94
    br_a3 = self.make_branch('br_a3')
88
95
    # pulling a branch with no revisions grabs nothing, regardless of
90
97
    br_a3.fetch(br_a2)
91
98
    for revno in range(4):
92
99
        self.assertFalse(
93
 
            br_a3.repository.has_revision(br_a.revision_history()[revno]))
94
 
    br_a3.fetch(br_a2, br_a.revision_history()[2])
 
100
            br_a3.repository.has_revision(revision_history(br_a)[revno]))
 
101
    br_a3.fetch(br_a2, revision_history(br_a)[2])
95
102
    # pull the 3 revisions introduced by a@u-0-3
96
 
    br_a3.fetch(br_a2, br_a.revision_history()[3])
 
103
    br_a3.fetch(br_a2, revision_history(br_a)[3])
97
104
    # NoSuchRevision should be raised if the branch is missing the revision
98
105
    # that was requested.
99
106
    self.assertRaises(errors.NoSuchRevision, br_a3.fetch, br_a2, 'pizza')
104
111
    # construct.  One way would be to uncommit and gc the revision, but not
105
112
    # every branch supports that.  -- mbp 20070814
106
113
 
107
 
    #TODO: test that fetch correctly does reweaving when needed. RBC 20051008
 
114
    # TODO: test that fetch correctly does reweaving when needed. RBC 20051008
108
115
    # Note that this means - updating the weave when ghosts are filled in to
109
116
    # add the right parents.
110
117
 
112
119
class TestFetch(TestCaseWithTransport):
113
120
 
114
121
    def test_fetch(self):
115
 
        #highest indices a: 5, b: 7
 
122
        # highest indices a: 5, b: 7
116
123
        br_a, br_b = make_branches(self, format='dirstate-tags')
117
124
        fetch_steps(self, br_a, br_b, br_a)
118
125
 
134
141
        # root revision to change for each commit, even though the content,
135
142
        # parent, name, and other attributes are unchanged.
136
143
        tree = self.make_branch_and_tree('tree', knit1_format)
137
 
        tree.set_root_id('tree-root')
138
 
        tree.commit('rev1', rev_id='rev1')
139
 
        tree.commit('rev2', rev_id='rev2')
 
144
        tree.set_root_id(b'tree-root')
 
145
        tree.commit('rev1', rev_id=b'rev1')
 
146
        tree.commit('rev2', rev_id=b'rev2')
140
147
 
141
148
        # Now we convert it to a knit2 repository so that it has a root knit
142
149
        Convert(tree.basedir, knit2_format)
143
150
        tree = WorkingTree.open(tree.basedir)
144
151
        branch = self.make_branch('branch', format=knit2_format)
145
 
        branch.pull(tree.branch, stop_revision='rev1')
 
152
        branch.pull(tree.branch, stop_revision=b'rev1')
146
153
        repo = branch.repository
147
154
        repo.lock_read()
148
155
        try:
149
156
            # Make sure fetch retrieved only what we requested
150
 
            self.assertEqual({('tree-root', 'rev1'):()},
151
 
                repo.texts.get_parent_map(
152
 
                    [('tree-root', 'rev1'), ('tree-root', 'rev2')]))
 
157
            self.assertEqual({(b'tree-root', b'rev1'): ()},
 
158
                             repo.texts.get_parent_map(
 
159
                [(b'tree-root', b'rev1'), (b'tree-root', b'rev2')]))
153
160
        finally:
154
161
            repo.unlock()
155
162
        branch.pull(tree.branch)
158
165
        repo.lock_read()
159
166
        try:
160
167
            # Make sure fetch retrieved only what we requested
161
 
            self.assertEqual({('tree-root', 'rev2'):(('tree-root', 'rev1'),)},
162
 
                repo.texts.get_parent_map([('tree-root', 'rev2')]))
 
168
            self.assertEqual({(b'tree-root', b'rev2'): ((b'tree-root', b'rev1'),)},
 
169
                             repo.texts.get_parent_map([(b'tree-root', b'rev2')]))
163
170
        finally:
164
171
            repo.unlock()
165
172
 
166
173
    def test_fetch_incompatible(self):
167
174
        knit_tree = self.make_branch_and_tree('knit', format='knit')
168
175
        knit3_tree = self.make_branch_and_tree('knit3',
169
 
            format='dirstate-with-subtree')
 
176
                                               format='dirstate-with-subtree')
170
177
        knit3_tree.commit('blah')
171
178
        e = self.assertRaises(errors.IncompatibleRepositories,
172
179
                              knit_tree.branch.fetch, knit3_tree.branch)
173
180
        self.assertContainsRe(str(e),
174
 
            r"(?m).*/knit.*\nis not compatible with\n.*/knit3/.*\n"
175
 
            r"different rich-root support")
 
181
                              r"(?m).*/knit.*\nis not compatible with\n.*/knit3/.*\n"
 
182
                              r"different rich-root support")
176
183
 
177
184
 
178
185
class TestMergeFetch(TestCaseWithTransport):
181
188
        """Merge brings across history from unrelated source"""
182
189
        wt1 = self.make_branch_and_tree('br1')
183
190
        br1 = wt1.branch
184
 
        wt1.commit(message='rev 1-1', rev_id='1-1')
185
 
        wt1.commit(message='rev 1-2', rev_id='1-2')
 
191
        wt1.commit(message='rev 1-1', rev_id=b'1-1')
 
192
        wt1.commit(message='rev 1-2', rev_id=b'1-2')
186
193
        wt2 = self.make_branch_and_tree('br2')
187
194
        br2 = wt2.branch
188
 
        wt2.commit(message='rev 2-1', rev_id='2-1')
189
 
        wt2.merge_from_branch(br1, from_revision='null:')
 
195
        wt2.commit(message='rev 2-1', rev_id=b'2-1')
 
196
        wt2.merge_from_branch(br1, from_revision=b'null:')
190
197
        self._check_revs_present(br2)
191
198
 
192
199
    def test_merge_fetches(self):
193
200
        """Merge brings across history from source"""
194
201
        wt1 = self.make_branch_and_tree('br1')
195
202
        br1 = wt1.branch
196
 
        wt1.commit(message='rev 1-1', rev_id='1-1')
197
 
        dir_2 = br1.bzrdir.sprout('br2')
 
203
        wt1.commit(message='rev 1-1', rev_id=b'1-1')
 
204
        dir_2 = br1.controldir.sprout('br2')
198
205
        br2 = dir_2.open_branch()
199
 
        wt1.commit(message='rev 1-2', rev_id='1-2')
 
206
        wt1.commit(message='rev 1-2', rev_id=b'1-2')
200
207
        wt2 = dir_2.open_workingtree()
201
 
        wt2.commit(message='rev 2-1', rev_id='2-1')
 
208
        wt2.commit(message='rev 2-1', rev_id=b'2-1')
202
209
        wt2.merge_from_branch(br1)
203
210
        self._check_revs_present(br2)
204
211
 
205
212
    def _check_revs_present(self, br2):
206
 
        for rev_id in '1-1', '1-2', '2-1':
 
213
        for rev_id in [b'1-1', b'1-2', b'2-1']:
207
214
            self.assertTrue(br2.repository.has_revision(rev_id))
208
215
            rev = br2.repository.get_revision(rev_id)
209
216
            self.assertEqual(rev.revision_id, rev_id)
216
223
        super(TestMergeFileHistory, self).setUp()
217
224
        wt1 = self.make_branch_and_tree('br1')
218
225
        br1 = wt1.branch
219
 
        self.build_tree_contents([('br1/file', 'original contents\n')])
220
 
        wt1.add('file', 'this-file-id')
221
 
        wt1.commit(message='rev 1-1', rev_id='1-1')
222
 
        dir_2 = br1.bzrdir.sprout('br2')
 
226
        self.build_tree_contents([('br1/file', b'original contents\n')])
 
227
        wt1.add('file', b'this-file-id')
 
228
        wt1.commit(message='rev 1-1', rev_id=b'1-1')
 
229
        dir_2 = br1.controldir.sprout('br2')
223
230
        br2 = dir_2.open_branch()
224
231
        wt2 = dir_2.open_workingtree()
225
 
        self.build_tree_contents([('br1/file', 'original from 1\n')])
226
 
        wt1.commit(message='rev 1-2', rev_id='1-2')
227
 
        self.build_tree_contents([('br1/file', 'agreement\n')])
228
 
        wt1.commit(message='rev 1-3', rev_id='1-3')
229
 
        self.build_tree_contents([('br2/file', 'contents in 2\n')])
230
 
        wt2.commit(message='rev 2-1', rev_id='2-1')
231
 
        self.build_tree_contents([('br2/file', 'agreement\n')])
232
 
        wt2.commit(message='rev 2-2', rev_id='2-2')
 
232
        self.build_tree_contents([('br1/file', b'original from 1\n')])
 
233
        wt1.commit(message='rev 1-2', rev_id=b'1-2')
 
234
        self.build_tree_contents([('br1/file', b'agreement\n')])
 
235
        wt1.commit(message='rev 1-3', rev_id=b'1-3')
 
236
        self.build_tree_contents([('br2/file', b'contents in 2\n')])
 
237
        wt2.commit(message='rev 2-1', rev_id=b'2-1')
 
238
        self.build_tree_contents([('br2/file', b'agreement\n')])
 
239
        wt2.commit(message='rev 2-2', rev_id=b'2-2')
233
240
 
234
241
    def test_merge_fetches_file_history(self):
235
242
        """Merge brings across file histories"""
238
245
        wt2 = WorkingTree.open('br2').merge_from_branch(br1)
239
246
        br2.lock_read()
240
247
        self.addCleanup(br2.unlock)
241
 
        for rev_id, text in [('1-2', 'original from 1\n'),
242
 
                             ('1-3', 'agreement\n'),
243
 
                             ('2-1', 'contents in 2\n'),
244
 
                             ('2-2', 'agreement\n')]:
 
248
        for rev_id, text in [(b'1-2', b'original from 1\n'),
 
249
                             (b'1-3', b'agreement\n'),
 
250
                             (b'2-1', b'contents in 2\n'),
 
251
                             (b'2-2', b'agreement\n')]:
245
252
            self.assertEqualDiff(
246
253
                br2.repository.revision_tree(
247
 
                    rev_id).get_file_text('this-file-id'), text)
 
254
                    rev_id).get_file_text('file'), text)
248
255
 
249
256
 
250
257
class TestKnitToPackFetch(TestCaseWithTransport):
268
275
        tree = self.make_branch_and_tree('source', format='dirstate')
269
276
        target = self.make_repository('target', format='pack-0.92')
270
277
        self.build_tree(['source/file'])
271
 
        tree.set_root_id('root-id')
272
 
        tree.add('file', 'file-id')
273
 
        tree.commit('one', rev_id='rev-one')
 
278
        tree.set_root_id(b'root-id')
 
279
        tree.add('file', b'file-id')
 
280
        tree.commit('one', rev_id=b'rev-one')
274
281
        source = tree.branch.repository
275
282
        source.texts = versionedfile.RecordingVersionedFilesDecorator(
276
 
                        source.texts)
 
283
            source.texts)
277
284
        source.signatures = versionedfile.RecordingVersionedFilesDecorator(
278
 
                        source.signatures)
 
285
            source.signatures)
279
286
        source.revisions = versionedfile.RecordingVersionedFilesDecorator(
280
 
                        source.revisions)
 
287
            source.revisions)
281
288
        source.inventories = versionedfile.RecordingVersionedFilesDecorator(
282
 
                        source.inventories)
 
289
            source.inventories)
283
290
        # precondition
284
291
        self.assertTrue(target._format._fetch_uses_deltas)
285
 
        target.fetch(source, revision_id='rev-one')
286
 
        self.assertEqual(('get_record_stream', [('file-id', 'rev-one')],
 
292
        target.fetch(source, revision_id=b'rev-one')
 
293
        self.assertEqual(('get_record_stream', [(b'file-id', b'rev-one')],
287
294
                          target._format._fetch_order, False),
288
295
                         self.find_get_record_stream(source.texts.calls))
289
 
        self.assertEqual(('get_record_stream', [('rev-one',)],
290
 
          target._format._fetch_order, False),
291
 
          self.find_get_record_stream(source.inventories.calls, 2))
292
 
        self.assertEqual(('get_record_stream', [('rev-one',)],
 
296
        self.assertEqual(('get_record_stream', [(b'rev-one',)],
 
297
                          target._format._fetch_order, False),
 
298
                         self.find_get_record_stream(source.inventories.calls, 2))
 
299
        self.assertEqual(('get_record_stream', [(b'rev-one',)],
293
300
                          target._format._fetch_order, False),
294
301
                         self.find_get_record_stream(source.revisions.calls))
295
302
        # XXX: Signatures is special, and slightly broken. The
300
307
        # So we know there will be extra calls, but the *last* one is the one
301
308
        # we care about.
302
309
        signature_calls = source.signatures.calls[-1:]
303
 
        self.assertEqual(('get_record_stream', [('rev-one',)],
 
310
        self.assertEqual(('get_record_stream', [(b'rev-one',)],
304
311
                          target._format._fetch_order, False),
305
312
                         self.find_get_record_stream(signature_calls))
306
313
 
308
315
        tree = self.make_branch_and_tree('source', format='dirstate')
309
316
        target = self.make_repository('target', format='pack-0.92')
310
317
        self.build_tree(['source/file'])
311
 
        tree.set_root_id('root-id')
312
 
        tree.add('file', 'file-id')
313
 
        tree.commit('one', rev_id='rev-one')
 
318
        tree.set_root_id(b'root-id')
 
319
        tree.add('file', b'file-id')
 
320
        tree.commit('one', rev_id=b'rev-one')
314
321
        source = tree.branch.repository
315
322
        source.texts = versionedfile.RecordingVersionedFilesDecorator(
316
 
                        source.texts)
 
323
            source.texts)
317
324
        source.signatures = versionedfile.RecordingVersionedFilesDecorator(
318
 
                        source.signatures)
 
325
            source.signatures)
319
326
        source.revisions = versionedfile.RecordingVersionedFilesDecorator(
320
 
                        source.revisions)
 
327
            source.revisions)
321
328
        source.inventories = versionedfile.RecordingVersionedFilesDecorator(
322
 
                        source.inventories)
 
329
            source.inventories)
323
330
        # XXX: This won't work in general, but for the dirstate format it does.
324
331
        self.overrideAttr(target._format, '_fetch_uses_deltas', False)
325
 
        target.fetch(source, revision_id='rev-one')
326
 
        self.assertEqual(('get_record_stream', [('file-id', 'rev-one')],
 
332
        target.fetch(source, revision_id=b'rev-one')
 
333
        self.assertEqual(('get_record_stream', [(b'file-id', b'rev-one')],
327
334
                          target._format._fetch_order, True),
328
335
                         self.find_get_record_stream(source.texts.calls))
329
 
        self.assertEqual(('get_record_stream', [('rev-one',)],
330
 
            target._format._fetch_order, True),
331
 
            self.find_get_record_stream(source.inventories.calls, 2))
332
 
        self.assertEqual(('get_record_stream', [('rev-one',)],
 
336
        self.assertEqual(('get_record_stream', [(b'rev-one',)],
 
337
                          target._format._fetch_order, True),
 
338
                         self.find_get_record_stream(source.inventories.calls, 2))
 
339
        self.assertEqual(('get_record_stream', [(b'rev-one',)],
333
340
                          target._format._fetch_order, True),
334
341
                         self.find_get_record_stream(source.revisions.calls))
335
342
        # XXX: Signatures is special, and slightly broken. The
340
347
        # So we know there will be extra calls, but the *last* one is the one
341
348
        # we care about.
342
349
        signature_calls = source.signatures.calls[-1:]
343
 
        self.assertEqual(('get_record_stream', [('rev-one',)],
 
350
        self.assertEqual(('get_record_stream', [(b'rev-one',)],
344
351
                          target._format._fetch_order, True),
345
352
                         self.find_get_record_stream(signature_calls))
346
353
 
353
360
        tree = self.make_branch_and_tree('source', format='dirstate')
354
361
        target = self.make_repository('target', format='pack-0.92')
355
362
        self.build_tree(['source/file'])
356
 
        tree.set_root_id('root-id')
357
 
        tree.add('file', 'file-id')
358
 
        tree.commit('one', rev_id='rev-one')
 
363
        tree.set_root_id(b'root-id')
 
364
        tree.add('file', b'file-id')
 
365
        tree.commit('one', rev_id=b'rev-one')
359
366
        # Hack the KVF for revisions so that it "accidentally" allows a delta
360
367
        tree.branch.repository.revisions._max_delta_chain = 200
361
 
        tree.commit('two', rev_id='rev-two')
 
368
        tree.commit('two', rev_id=b'rev-two')
362
369
        source = tree.branch.repository
363
370
        # Ensure that we stored a delta
364
371
        source.lock_read()
365
372
        self.addCleanup(source.unlock)
366
 
        record = source.revisions.get_record_stream([('rev-two',)],
367
 
            'unordered', False).next()
 
373
        record = next(source.revisions.get_record_stream([(b'rev-two',)],
 
374
                                                         'unordered', False))
368
375
        self.assertEqual('knit-delta-gz', record.storage_kind)
369
 
        target.fetch(tree.branch.repository, revision_id='rev-two')
 
376
        target.fetch(tree.branch.repository, revision_id=b'rev-two')
370
377
        # The record should get expanded back to a fulltext
371
378
        target.lock_read()
372
379
        self.addCleanup(target.unlock)
373
 
        record = target.revisions.get_record_stream([('rev-two',)],
374
 
            'unordered', False).next()
 
380
        record = next(target.revisions.get_record_stream([(b'rev-two',)],
 
381
                                                         'unordered', False))
375
382
        self.assertEqual('knit-ft-gz', record.storage_kind)
376
383
 
377
384
    def test_fetch_with_fallback_and_merge(self):
395
402
        # random ids because otherwise the inventory fulltext compresses too
396
403
        # well and the deltas get bigger.
397
404
        to_add = [
398
 
            ('add', ('', 'TREE_ROOT', 'directory', None))]
399
 
        for i in xrange(10):
 
405
            ('add', ('', b'TREE_ROOT', 'directory', None))]
 
406
        for i in range(10):
400
407
            fname = 'file%03d' % (i,)
401
 
            fileid = '%s-%s' % (fname, osutils.rand_chars(64))
402
 
            to_add.append(('add', (fname, fileid, 'file', 'content\n')))
403
 
        builder.build_snapshot('A', None, to_add)
404
 
        builder.build_snapshot('B', ['A'], [])
405
 
        builder.build_snapshot('C', ['A'], [])
406
 
        builder.build_snapshot('D', ['C'], [])
407
 
        builder.build_snapshot('E', ['D'], [])
408
 
        builder.build_snapshot('F', ['E', 'B'], [])
 
408
            fileid = ('%s-%s' %
 
409
                      (fname, osutils.rand_chars(64))).encode('ascii')
 
410
            to_add.append(('add', (fname, fileid, 'file', b'content\n')))
 
411
        builder.build_snapshot(None, to_add, revision_id=b'A')
 
412
        builder.build_snapshot([b'A'], [], revision_id=b'B')
 
413
        builder.build_snapshot([b'A'], [], revision_id=b'C')
 
414
        builder.build_snapshot([b'C'], [], revision_id=b'D')
 
415
        builder.build_snapshot([b'D'], [], revision_id=b'E')
 
416
        builder.build_snapshot([b'E', b'B'], [], revision_id=b'F')
409
417
        builder.finish_series()
410
418
        source_branch = builder.get_branch()
411
 
        source_branch.bzrdir.sprout('base', revision_id='B')
 
419
        source_branch.controldir.sprout('base', revision_id=b'B')
412
420
        target_branch = self.make_branch('target', format='1.6')
413
421
        target_branch.set_stacked_on_url('../base')
414
422
        source = source_branch.repository
415
423
        source.lock_read()
416
424
        self.addCleanup(source.unlock)
417
425
        source.inventories = versionedfile.OrderingVersionedFilesDecorator(
418
 
                        source.inventories,
419
 
                        key_priority={('E',): 1, ('D',): 2, ('C',): 4,
420
 
                                      ('F',): 3})
 
426
            source.inventories,
 
427
            key_priority={(b'E',): 1, (b'D',): 2, (b'C',): 4,
 
428
                          (b'F',): 3})
421
429
        # Ensure that the content is yielded in the proper order, and given as
422
430
        # the expected kinds
423
431
        records = [(record.key, record.storage_kind)
424
432
                   for record in source.inventories.get_record_stream(
425
 
                        [('D',), ('C',), ('E',), ('F',)], 'unordered', False)]
426
 
        self.assertEqual([(('E',), 'knit-delta-gz'), (('D',), 'knit-delta-gz'),
427
 
                          (('F',), 'knit-delta-gz'), (('C',), 'knit-delta-gz')],
428
 
                          records)
 
433
            [(b'D',), (b'C',), (b'E',), (b'F',)], 'unordered', False)]
 
434
        self.assertEqual([((b'E',), 'knit-delta-gz'), ((b'D',), 'knit-delta-gz'),
 
435
                          ((b'F',), 'knit-delta-gz'), ((b'C',), 'knit-delta-gz')],
 
436
                         records)
429
437
 
430
438
        target_branch.lock_write()
431
439
        self.addCleanup(target_branch.unlock)
432
440
        target = target_branch.repository
433
 
        target.fetch(source, revision_id='F')
 
441
        target.fetch(source, revision_id=b'F')
434
442
        # 'C' should be expanded to a fulltext, but D and E should still be
435
443
        # deltas
436
444
        stream = target.inventories.get_record_stream(
437
 
            [('C',), ('D',), ('E',), ('F',)],
 
445
            [(b'C',), (b'D',), (b'E',), (b'F',)],
438
446
            'unordered', False)
439
447
        kinds = dict((record.key, record.storage_kind) for record in stream)
440
 
        self.assertEqual({('C',): 'knit-ft-gz', ('D',): 'knit-delta-gz',
441
 
                          ('E',): 'knit-delta-gz', ('F',): 'knit-delta-gz'},
 
448
        self.assertEqual({(b'C',): 'knit-ft-gz', (b'D',): 'knit-delta-gz',
 
449
                          (b'E',): 'knit-delta-gz', (b'F',): 'knit-delta-gz'},
442
450
                         kinds)
443
451
 
444
452
 
464
472
 
465
473
    def test_fetch_order_AB(self):
466
474
        """See do_fetch_order_test"""
467
 
        self.do_fetch_order_test('A', 'B')
 
475
        self.do_fetch_order_test(b'A', b'B')
468
476
 
469
477
    def test_fetch_order_BA(self):
470
478
        """See do_fetch_order_test"""
471
 
        self.do_fetch_order_test('B', 'A')
 
479
        self.do_fetch_order_test(b'B', b'A')
472
480
 
473
481
    def get_parents(self, file_id, revision_id):
474
482
        self.repo.lock_read()
475
483
        try:
476
 
            parent_map = self.repo.texts.get_parent_map([(file_id, revision_id)])
 
484
            parent_map = self.repo.texts.get_parent_map(
 
485
                [(file_id, revision_id)])
477
486
            return parent_map[(file_id, revision_id)]
478
487
        finally:
479
488
            self.repo.unlock()
480
489
 
481
490
    def test_fetch_ghosts(self):
482
491
        self.make_tree_and_repo()
483
 
        self.tree.commit('first commit', rev_id='left-parent')
484
 
        self.tree.add_parent_tree_id('ghost-parent')
485
 
        fork = self.tree.bzrdir.sprout('fork', 'null:').open_workingtree()
486
 
        fork.commit('not a ghost', rev_id='not-ghost-parent')
 
492
        self.tree.commit('first commit', rev_id=b'left-parent')
 
493
        self.tree.add_parent_tree_id(b'ghost-parent')
 
494
        fork = self.tree.controldir.sprout('fork', b'null:').open_workingtree()
 
495
        fork.commit('not a ghost', rev_id=b'not-ghost-parent')
487
496
        self.tree.branch.repository.fetch(fork.branch.repository,
488
 
                                     'not-ghost-parent')
489
 
        self.tree.add_parent_tree_id('not-ghost-parent')
490
 
        self.tree.commit('second commit', rev_id='second-id')
491
 
        self.repo.fetch(self.tree.branch.repository, 'second-id')
492
 
        root_id = self.tree.get_root_id()
 
497
                                          b'not-ghost-parent')
 
498
        self.tree.add_parent_tree_id(b'not-ghost-parent')
 
499
        self.tree.commit('second commit', rev_id=b'second-id')
 
500
        self.repo.fetch(self.tree.branch.repository, b'second-id')
 
501
        root_id = self.tree.path2id('')
493
502
        self.assertEqual(
494
 
            ((root_id, 'left-parent'), (root_id, 'not-ghost-parent')),
495
 
            self.get_parents(root_id, 'second-id'))
 
503
            ((root_id, b'left-parent'), (root_id, b'not-ghost-parent')),
 
504
            self.get_parents(root_id, b'second-id'))
496
505
 
497
506
    def make_two_commits(self, change_root, fetch_twice):
498
507
        self.make_tree_and_repo()
499
 
        self.tree.commit('first commit', rev_id='first-id')
 
508
        self.tree.commit('first commit', rev_id=b'first-id')
500
509
        if change_root:
501
 
            self.tree.set_root_id('unique-id')
502
 
        self.tree.commit('second commit', rev_id='second-id')
 
510
            self.tree.set_root_id(b'unique-id')
 
511
        self.tree.commit('second commit', rev_id=b'second-id')
503
512
        if fetch_twice:
504
 
            self.repo.fetch(self.tree.branch.repository, 'first-id')
505
 
        self.repo.fetch(self.tree.branch.repository, 'second-id')
 
513
            self.repo.fetch(self.tree.branch.repository, b'first-id')
 
514
        self.repo.fetch(self.tree.branch.repository, b'second-id')
506
515
 
507
516
    def test_fetch_changed_root(self):
508
517
        self.make_two_commits(change_root=True, fetch_twice=False)
509
 
        self.assertEqual((), self.get_parents('unique-id', 'second-id'))
 
518
        self.assertEqual((), self.get_parents(b'unique-id', b'second-id'))
510
519
 
511
520
    def test_two_fetch_changed_root(self):
512
521
        self.make_two_commits(change_root=True, fetch_twice=True)
513
 
        self.assertEqual((), self.get_parents('unique-id', 'second-id'))
 
522
        self.assertEqual((), self.get_parents(b'unique-id', b'second-id'))
514
523
 
515
524
    def test_two_fetches(self):
516
525
        self.make_two_commits(change_root=False, fetch_twice=True)
517
 
        self.assertEqual((('TREE_ROOT', 'first-id'),),
518
 
            self.get_parents('TREE_ROOT', 'second-id'))
 
526
        self.assertEqual(((b'TREE_ROOT', b'first-id'),),
 
527
                         self.get_parents(b'TREE_ROOT', b'second-id'))