/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 bzrlib/tests/test_fetch.py

  • Committer: Richard Wilbur
  • Date: 2016-02-04 19:07:28 UTC
  • mto: This revision was merged to the branch mainline in revision 6618.
  • Revision ID: richard.wilbur@gmail.com-20160204190728-p0zvfii6zase0fw7
Update COPYING.txt from the original http://www.gnu.org/licenses/gpl-2.0.txt  (Only differences were in whitespace.)  Thanks to Petr Stodulka for pointing out the discrepancy.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_fetch.py
1
 
# Copyright (C) 2005-2011, 2016 Canonical Ltd
 
1
# Copyright (C) 2005-2011 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
 
from .. import (
 
17
from bzrlib import (
 
18
    bzrdir,
18
19
    errors,
19
20
    osutils,
20
21
    revision as _mod_revision,
21
 
    )
22
 
from ..bzr import (
23
 
    bzrdir,
24
22
    versionedfile,
25
23
    )
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
 
24
from bzrlib.branch import Branch
 
25
from bzrlib.repofmt import knitrepo
 
26
from bzrlib.tests import TestCaseWithTransport
 
27
from bzrlib.tests.test_revision import make_branches
 
28
from bzrlib.upgrade import Convert
 
29
from bzrlib.workingtree import WorkingTree
32
30
 
33
31
# These tests are a bit old; please instead add new tests into
34
32
# per_interrepository/ so they'll run on all relevant
58
56
    repo_b = br_b.repository
59
57
    self.assertFalse(repo_b.has_revision(revision_history(br_a)[3]))
60
58
    self.assertTrue(repo_b.has_revision(revision_history(br_a)[2]))
61
 
    self.assertEqual(len(revision_history(br_b)), 7)
 
59
    self.assertEquals(len(revision_history(br_b)), 7)
62
60
    br_b.fetch(br_a, revision_history(br_a)[2])
63
61
    # branch.fetch is not supposed to alter the revision history
64
 
    self.assertEqual(len(revision_history(br_b)), 7)
 
62
    self.assertEquals(len(revision_history(br_b)), 7)
65
63
    self.assertFalse(repo_b.has_revision(revision_history(br_a)[3]))
66
64
 
67
65
    # fetching the next revision up in sample data copies one revision
141
139
        # root revision to change for each commit, even though the content,
142
140
        # parent, name, and other attributes are unchanged.
143
141
        tree = self.make_branch_and_tree('tree', knit1_format)
144
 
        tree.set_root_id(b'tree-root')
145
 
        tree.commit('rev1', rev_id=b'rev1')
146
 
        tree.commit('rev2', rev_id=b'rev2')
 
142
        tree.set_root_id('tree-root')
 
143
        tree.commit('rev1', rev_id='rev1')
 
144
        tree.commit('rev2', rev_id='rev2')
147
145
 
148
146
        # Now we convert it to a knit2 repository so that it has a root knit
149
147
        Convert(tree.basedir, knit2_format)
188
186
        """Merge brings across history from unrelated source"""
189
187
        wt1 = self.make_branch_and_tree('br1')
190
188
        br1 = wt1.branch
191
 
        wt1.commit(message='rev 1-1', rev_id=b'1-1')
192
 
        wt1.commit(message='rev 1-2', rev_id=b'1-2')
 
189
        wt1.commit(message='rev 1-1', rev_id='1-1')
 
190
        wt1.commit(message='rev 1-2', rev_id='1-2')
193
191
        wt2 = self.make_branch_and_tree('br2')
194
192
        br2 = wt2.branch
195
 
        wt2.commit(message='rev 2-1', rev_id=b'2-1')
 
193
        wt2.commit(message='rev 2-1', rev_id='2-1')
196
194
        wt2.merge_from_branch(br1, from_revision='null:')
197
195
        self._check_revs_present(br2)
198
196
 
200
198
        """Merge brings across history from source"""
201
199
        wt1 = self.make_branch_and_tree('br1')
202
200
        br1 = wt1.branch
203
 
        wt1.commit(message='rev 1-1', rev_id=b'1-1')
204
 
        dir_2 = br1.controldir.sprout('br2')
 
201
        wt1.commit(message='rev 1-1', rev_id='1-1')
 
202
        dir_2 = br1.bzrdir.sprout('br2')
205
203
        br2 = dir_2.open_branch()
206
 
        wt1.commit(message='rev 1-2', rev_id=b'1-2')
 
204
        wt1.commit(message='rev 1-2', rev_id='1-2')
207
205
        wt2 = dir_2.open_workingtree()
208
 
        wt2.commit(message='rev 2-1', rev_id=b'2-1')
 
206
        wt2.commit(message='rev 2-1', rev_id='2-1')
209
207
        wt2.merge_from_branch(br1)
210
208
        self._check_revs_present(br2)
211
209
 
223
221
        super(TestMergeFileHistory, self).setUp()
224
222
        wt1 = self.make_branch_and_tree('br1')
225
223
        br1 = wt1.branch
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')
 
224
        self.build_tree_contents([('br1/file', 'original contents\n')])
 
225
        wt1.add('file', 'this-file-id')
 
226
        wt1.commit(message='rev 1-1', rev_id='1-1')
 
227
        dir_2 = br1.bzrdir.sprout('br2')
230
228
        br2 = dir_2.open_branch()
231
229
        wt2 = dir_2.open_workingtree()
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')
 
230
        self.build_tree_contents([('br1/file', 'original from 1\n')])
 
231
        wt1.commit(message='rev 1-2', rev_id='1-2')
 
232
        self.build_tree_contents([('br1/file', 'agreement\n')])
 
233
        wt1.commit(message='rev 1-3', rev_id='1-3')
 
234
        self.build_tree_contents([('br2/file', 'contents in 2\n')])
 
235
        wt2.commit(message='rev 2-1', rev_id='2-1')
 
236
        self.build_tree_contents([('br2/file', 'agreement\n')])
 
237
        wt2.commit(message='rev 2-2', rev_id='2-2')
240
238
 
241
239
    def test_merge_fetches_file_history(self):
242
240
        """Merge brings across file histories"""
251
249
                             ('2-2', 'agreement\n')]:
252
250
            self.assertEqualDiff(
253
251
                br2.repository.revision_tree(
254
 
                    rev_id).get_file_text('file'), text)
 
252
                    rev_id).get_file_text('this-file-id'), text)
255
253
 
256
254
 
257
255
class TestKnitToPackFetch(TestCaseWithTransport):
275
273
        tree = self.make_branch_and_tree('source', format='dirstate')
276
274
        target = self.make_repository('target', format='pack-0.92')
277
275
        self.build_tree(['source/file'])
278
 
        tree.set_root_id(b'root-id')
279
 
        tree.add('file', b'file-id')
280
 
        tree.commit('one', rev_id=b'rev-one')
 
276
        tree.set_root_id('root-id')
 
277
        tree.add('file', 'file-id')
 
278
        tree.commit('one', rev_id='rev-one')
281
279
        source = tree.branch.repository
282
280
        source.texts = versionedfile.RecordingVersionedFilesDecorator(
283
281
                        source.texts)
315
313
        tree = self.make_branch_and_tree('source', format='dirstate')
316
314
        target = self.make_repository('target', format='pack-0.92')
317
315
        self.build_tree(['source/file'])
318
 
        tree.set_root_id(b'root-id')
319
 
        tree.add('file', b'file-id')
320
 
        tree.commit('one', rev_id=b'rev-one')
 
316
        tree.set_root_id('root-id')
 
317
        tree.add('file', 'file-id')
 
318
        tree.commit('one', rev_id='rev-one')
321
319
        source = tree.branch.repository
322
320
        source.texts = versionedfile.RecordingVersionedFilesDecorator(
323
321
                        source.texts)
360
358
        tree = self.make_branch_and_tree('source', format='dirstate')
361
359
        target = self.make_repository('target', format='pack-0.92')
362
360
        self.build_tree(['source/file'])
363
 
        tree.set_root_id(b'root-id')
364
 
        tree.add('file', b'file-id')
365
 
        tree.commit('one', rev_id=b'rev-one')
 
361
        tree.set_root_id('root-id')
 
362
        tree.add('file', 'file-id')
 
363
        tree.commit('one', rev_id='rev-one')
366
364
        # Hack the KVF for revisions so that it "accidentally" allows a delta
367
365
        tree.branch.repository.revisions._max_delta_chain = 200
368
 
        tree.commit('two', rev_id=b'rev-two')
 
366
        tree.commit('two', rev_id='rev-two')
369
367
        source = tree.branch.repository
370
368
        # Ensure that we stored a delta
371
369
        source.lock_read()
372
370
        self.addCleanup(source.unlock)
373
 
        record = next(source.revisions.get_record_stream([('rev-two',)],
374
 
            'unordered', False))
 
371
        record = source.revisions.get_record_stream([('rev-two',)],
 
372
            'unordered', False).next()
375
373
        self.assertEqual('knit-delta-gz', record.storage_kind)
376
374
        target.fetch(tree.branch.repository, revision_id='rev-two')
377
375
        # The record should get expanded back to a fulltext
378
376
        target.lock_read()
379
377
        self.addCleanup(target.unlock)
380
 
        record = next(target.revisions.get_record_stream([('rev-two',)],
381
 
            'unordered', False))
 
378
        record = target.revisions.get_record_stream([('rev-two',)],
 
379
            'unordered', False).next()
382
380
        self.assertEqual('knit-ft-gz', record.storage_kind)
383
381
 
384
382
    def test_fetch_with_fallback_and_merge(self):
403
401
        # well and the deltas get bigger.
404
402
        to_add = [
405
403
            ('add', ('', 'TREE_ROOT', 'directory', None))]
406
 
        for i in range(10):
 
404
        for i in xrange(10):
407
405
            fname = 'file%03d' % (i,)
408
406
            fileid = '%s-%s' % (fname, osutils.rand_chars(64))
409
407
            to_add.append(('add', (fname, fileid, 'file', 'content\n')))
410
 
        builder.build_snapshot(None, to_add, revision_id='A')
411
 
        builder.build_snapshot(['A'], [], revision_id='B')
412
 
        builder.build_snapshot(['A'], [], revision_id='C')
413
 
        builder.build_snapshot(['C'], [], revision_id='D')
414
 
        builder.build_snapshot(['D'], [], revision_id='E')
415
 
        builder.build_snapshot(['E', 'B'], [], revision_id='F')
 
408
        builder.build_snapshot('A', None, to_add)
 
409
        builder.build_snapshot('B', ['A'], [])
 
410
        builder.build_snapshot('C', ['A'], [])
 
411
        builder.build_snapshot('D', ['C'], [])
 
412
        builder.build_snapshot('E', ['D'], [])
 
413
        builder.build_snapshot('F', ['E', 'B'], [])
416
414
        builder.finish_series()
417
415
        source_branch = builder.get_branch()
418
 
        source_branch.controldir.sprout('base', revision_id='B')
 
416
        source_branch.bzrdir.sprout('base', revision_id='B')
419
417
        target_branch = self.make_branch('target', format='1.6')
420
418
        target_branch.set_stacked_on_url('../base')
421
419
        source = source_branch.repository
487
485
 
488
486
    def test_fetch_ghosts(self):
489
487
        self.make_tree_and_repo()
490
 
        self.tree.commit('first commit', rev_id=b'left-parent')
 
488
        self.tree.commit('first commit', rev_id='left-parent')
491
489
        self.tree.add_parent_tree_id('ghost-parent')
492
 
        fork = self.tree.controldir.sprout('fork', 'null:').open_workingtree()
493
 
        fork.commit('not a ghost', rev_id=b'not-ghost-parent')
 
490
        fork = self.tree.bzrdir.sprout('fork', 'null:').open_workingtree()
 
491
        fork.commit('not a ghost', rev_id='not-ghost-parent')
494
492
        self.tree.branch.repository.fetch(fork.branch.repository,
495
493
                                     'not-ghost-parent')
496
494
        self.tree.add_parent_tree_id('not-ghost-parent')
497
 
        self.tree.commit('second commit', rev_id=b'second-id')
 
495
        self.tree.commit('second commit', rev_id='second-id')
498
496
        self.repo.fetch(self.tree.branch.repository, 'second-id')
499
497
        root_id = self.tree.get_root_id()
500
498
        self.assertEqual(
503
501
 
504
502
    def make_two_commits(self, change_root, fetch_twice):
505
503
        self.make_tree_and_repo()
506
 
        self.tree.commit('first commit', rev_id=b'first-id')
 
504
        self.tree.commit('first commit', rev_id='first-id')
507
505
        if change_root:
508
 
            self.tree.set_root_id(b'unique-id')
509
 
        self.tree.commit('second commit', rev_id=b'second-id')
 
506
            self.tree.set_root_id('unique-id')
 
507
        self.tree.commit('second commit', rev_id='second-id')
510
508
        if fetch_twice:
511
509
            self.repo.fetch(self.tree.branch.repository, 'first-id')
512
510
        self.repo.fetch(self.tree.branch.repository, 'second-id')