← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_foreign.py

  • Committer: Vincent Ladeuil
  • Date: 2017-01-30 14:30:10 UTC
  • mfrom: (6615.3.7 merges)
  • mto: This revision was merged to the branch mainline in revision 6621.
  • Revision ID: v.ladeuil+lp@free.fr-20170130143010-p31t1ranfeqbaeki
Merge  2.7 into trunk including fix for bug #1657238

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_foreign.py
1
 
# Copyright (C) 2008 Canonical Ltd
 
1
# Copyright (C) 2008-2012, 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
20
20
 
21
21
from bzrlib import (
22
22
    branch,
 
23
    bzrdir,
 
24
    controldir,
23
25
    errors,
24
26
    foreign,
25
27
    lockable_files,
26
28
    lockdir,
 
29
    repository,
 
30
    revision,
 
31
    tests,
27
32
    trace,
28
 
    )
29
 
from bzrlib.bzrdir import (
30
 
    BzrDir,
31
 
    BzrDirFormat,
32
 
    BzrDirMeta1,
33
 
    BzrDirMetaFormat1,
34
 
    format_registry,
35
 
    )
36
 
from bzrlib.inventory import Inventory
37
 
from bzrlib.revision import (
38
 
    NULL_REVISION,
39
 
    Revision,
40
 
    )
41
 
from bzrlib.tests import (
42
 
    TestCase,
43
 
    TestCaseWithTransport,
44
 
    )
 
33
    vf_repository,
 
34
    )
 
35
 
 
36
from bzrlib.repofmt import groupcompress_repo
45
37
 
46
38
# This is the dummy foreign revision control system, used 
47
39
# mainly here in the testsuite to test the foreign VCS infrastructure.
87
79
        self.mapping_registry = DummyForeignVcsMappingRegistry()
88
80
        self.mapping_registry.register("v1", DummyForeignVcsMapping(self),
89
81
                                       "Version 1")
 
82
        self.abbreviation = "dummy"
90
83
 
91
84
    def show_foreign_revid(self, foreign_revid):
92
85
        return { "dummy ding": "%s/%s\\%s" % foreign_revid }
93
86
 
 
87
    def serialize_foreign_revid(self, foreign_revid):
 
88
        return "%s|%s|%s" % foreign_revid
 
89
 
94
90
 
95
91
class DummyForeignVcsBranch(branch.BzrBranch6,foreign.ForeignBranch):
96
92
    """A Dummy VCS Branch."""
97
93
 
 
94
    @property
 
95
    def user_transport(self):
 
96
        return self.bzrdir.user_transport
 
97
 
98
98
    def __init__(self, _format, _control_files, a_bzrdir, *args, **kwargs):
99
99
        self._format = _format
100
100
        self._base = a_bzrdir.transport.base
101
101
        self._ignore_fallbacks = False
102
 
        foreign.ForeignBranch.__init__(self, 
 
102
        self.bzrdir = a_bzrdir
 
103
        foreign.ForeignBranch.__init__(self,
103
104
            DummyForeignVcsMapping(DummyForeignVcs()))
104
 
        branch.BzrBranch6.__init__(self, _format, _control_files, a_bzrdir, 
 
105
        branch.BzrBranch6.__init__(self, _format, _control_files, a_bzrdir,
105
106
            *args, **kwargs)
106
107
 
107
 
 
108
 
class InterToDummyVcsBranch(branch.GenericInterBranch,
109
 
                            foreign.InterToForeignBranch):
 
108
    def _get_checkout_format(self, lightweight=False):
 
109
        """Return the most suitable metadir for a checkout of this branch.
 
110
        Weaves are used if this branch's repository uses weaves.
 
111
        """
 
112
        return self.bzrdir.checkout_metadir()
 
113
 
 
114
    def import_last_revision_info_and_tags(self, source, revno, revid,
 
115
                                           lossy=False):
 
116
        interbranch = InterToDummyVcsBranch(source, self)
 
117
        result = interbranch.push(stop_revision=revid, lossy=True)
 
118
        if lossy:
 
119
            revid = result.revidmap[revid]
 
120
        return (revno, revid)
 
121
 
 
122
 
 
123
class DummyForeignCommitBuilder(vf_repository.VersionedFileRootCommitBuilder):
 
124
 
 
125
    def _generate_revision_if_needed(self):
 
126
        mapping = DummyForeignVcsMapping(DummyForeignVcs())
 
127
        if self._lossy:
 
128
            self._new_revision_id = mapping.revision_id_foreign_to_bzr(
 
129
                (str(self._timestamp), str(self._timezone), "UNKNOWN"))
 
130
            self.random_revid = False
 
131
        elif self._new_revision_id is not None:
 
132
            self.random_revid = False
 
133
        else:
 
134
            self._new_revision_id = self._gen_revision_id()
 
135
            self.random_revid = True
 
136
 
 
137
 
 
138
class DummyForeignVcsRepository(groupcompress_repo.CHKInventoryRepository,
 
139
    foreign.ForeignRepository):
 
140
    """Dummy foreign vcs repository."""
 
141
 
 
142
 
 
143
class DummyForeignVcsRepositoryFormat(groupcompress_repo.RepositoryFormat2a):
 
144
 
 
145
    repository_class = DummyForeignVcsRepository
 
146
    _commit_builder_class = DummyForeignCommitBuilder
 
147
 
 
148
    @classmethod
 
149
    def get_format_string(cls):
 
150
        return "Dummy Foreign Vcs Repository"
 
151
 
 
152
    def get_format_description(self):
 
153
        return "Dummy Foreign Vcs Repository"
 
154
 
 
155
 
 
156
def branch_history(graph, revid):
 
157
    ret = list(graph.iter_lefthand_ancestry(revid,
 
158
        (revision.NULL_REVISION,)))
 
159
    ret.reverse()
 
160
    return ret
 
161
 
 
162
 
 
163
class InterToDummyVcsBranch(branch.GenericInterBranch):
110
164
 
111
165
    @staticmethod
112
166
    def is_compatible(source, target):
113
167
        return isinstance(target, DummyForeignVcsBranch)
114
168
 
115
 
    def lossy_push(self, stop_revision=None):
 
169
    def push(self, overwrite=False, stop_revision=None, lossy=False):
 
170
        if not lossy:
 
171
            raise errors.NoRoundtrippingSupport(self.source, self.target)
116
172
        result = branch.BranchPushResult()
117
173
        result.source_branch = self.source
118
174
        result.target_branch = self.target
119
175
        result.old_revno, result.old_revid = self.target.last_revision_info()
120
176
        self.source.lock_read()
121
177
        try:
 
178
            graph = self.source.repository.get_graph()
122
179
            # This just handles simple cases, but that's good enough for tests
123
 
            my_history = self.target.revision_history()
124
 
            their_history = self.source.revision_history()
 
180
            my_history = branch_history(self.target.repository.get_graph(),
 
181
                result.old_revid)
 
182
            if stop_revision is None:
 
183
                stop_revision = self.source.last_revision()
 
184
            their_history = branch_history(graph, stop_revision)
125
185
            if their_history[:min(len(my_history), len(their_history))] != my_history:
126
186
                raise errors.DivergedBranches(self.target, self.source)
127
187
            todo = their_history[len(my_history):]
133
193
                    return (tree.get_file(file_id), None)
134
194
                tree.get_file_with_stat = get_file_with_stat
135
195
                new_revid = self.target.mapping.revision_id_foreign_to_bzr(
136
 
                    (str(rev.timestamp), str(rev.timezone), 
 
196
                    (str(rev.timestamp), str(rev.timezone),
137
197
                        str(self.target.revno())))
138
198
                parent_revno, parent_revid= self.target.last_revision_info()
139
 
                if parent_revid == NULL_REVISION:
 
199
                if parent_revid == revision.NULL_REVISION:
140
200
                    parent_revids = []
141
201
                else:
142
202
                    parent_revids = [parent_revid]
143
203
                builder = self.target.get_commit_builder(parent_revids, 
144
 
                        self.target.get_config(), rev.timestamp,
 
204
                        self.target.get_config_stack(), rev.timestamp,
145
205
                        rev.timezone, rev.committer, rev.properties,
146
206
                        new_revid)
147
207
                try:
148
 
                    for path, ie in tree.inventory.iter_entries():
 
208
                    parent_tree = self.target.repository.revision_tree(
 
209
                        parent_revid)
 
210
                    for path, ie in tree.iter_entries_by_dir():
149
211
                        new_ie = ie.copy()
150
212
                        new_ie.revision = None
151
213
                        builder.record_entry_contents(new_ie, 
152
 
                            [self.target.repository.revision_tree(parent_revid).inventory],
 
214
                            [parent_tree.root_inventory],
153
215
                            path, tree, 
154
216
                            (ie.kind, ie.text_size, ie.executable, ie.text_sha1))
155
217
                    builder.finish_inventory()
170
232
 
171
233
class DummyForeignVcsBranchFormat(branch.BzrBranchFormat6):
172
234
 
173
 
    def get_format_string(self):
 
235
    @classmethod
 
236
    def get_format_string(cls):
174
237
        return "Branch for Testing"
175
238
 
176
 
    def __init__(self):
177
 
        super(DummyForeignVcsBranchFormat, self).__init__()
178
 
        self._matchingbzrdir = DummyForeignVcsDirFormat()
 
239
    @property
 
240
    def _matchingbzrdir(self):
 
241
        return DummyForeignVcsDirFormat()
179
242
 
180
 
    def open(self, a_bzrdir, _found=False):
 
243
    def open(self, a_bzrdir, name=None, _found=False, ignore_fallbacks=False,
 
244
            found_repository=None):
 
245
        if name is None:
 
246
            name = a_bzrdir._get_selected_branch()
181
247
        if not _found:
182
248
            raise NotImplementedError
183
249
        try:
184
 
            transport = a_bzrdir.get_branch_transport(None)
 
250
            transport = a_bzrdir.get_branch_transport(None, name=name)
185
251
            control_files = lockable_files.LockableFiles(transport, 'lock',
186
252
                                                         lockdir.LockDir)
 
253
            if found_repository is None:
 
254
                found_repository = a_bzrdir.find_repository()
187
255
            return DummyForeignVcsBranch(_format=self,
188
256
                              _control_files=control_files,
189
257
                              a_bzrdir=a_bzrdir,
190
 
                              _repository=a_bzrdir.find_repository())
 
258
                              _repository=found_repository,
 
259
                              name=name)
191
260
        except errors.NoSuchFile:
192
261
            raise errors.NotBranchError(path=transport.base)
193
262
 
194
263
 
195
 
class DummyForeignVcsDirFormat(BzrDirMetaFormat1):
 
264
class DummyForeignVcsDirFormat(bzrdir.BzrDirMetaFormat1):
196
265
    """BzrDirFormat for the dummy foreign VCS."""
197
266
 
198
267
    @classmethod
210
279
    def get_branch_format(self):
211
280
        return DummyForeignVcsBranchFormat()
212
281
 
213
 
    @classmethod
214
 
    def probe_transport(klass, transport):
215
 
        """Return the .bzrdir style format present in a directory."""
216
 
        if not transport.has('.dummy'):
217
 
            raise errors.NotBranchError(path=transport.base)
218
 
        return klass()
 
282
    @property
 
283
    def repository_format(self):
 
284
        return DummyForeignVcsRepositoryFormat()
219
285
 
220
286
    def initialize_on_transport(self, transport):
221
287
        """Initialize a new bzrdir in the base directory of a Transport."""
239
305
        return DummyForeignVcsDir(transport, self)
240
306
 
241
307
 
242
 
class DummyForeignVcsDir(BzrDirMeta1):
 
308
class DummyForeignVcsDir(bzrdir.BzrDirMeta1):
243
309
 
244
310
    def __init__(self, _transport, _format):
245
311
        self._format = _format
249
315
        self._control_files = lockable_files.LockableFiles(self.transport,
250
316
            "lock", lockable_files.TransportLock)
251
317
 
252
 
    def open_branch(self, ignore_fallbacks=True):
 
318
    def create_workingtree(self):
 
319
        # dirstate requires a ".bzr" entry to exist
 
320
        self.root_transport.put_bytes(".bzr", "foo")
 
321
        return super(DummyForeignVcsDir, self).create_workingtree()
 
322
 
 
323
    def open_branch(self, name=None, unsupported=False, ignore_fallbacks=True,
 
324
                    possible_transports=None):
 
325
        if name is None:
 
326
            name = self._get_selected_branch()
 
327
        if name != "":
 
328
            raise errors.NoColocatedBranchSupport(self)
253
329
        return self._format.get_branch_format().open(self, _found=True)
254
330
 
255
331
    def cloning_metadir(self, stacked=False):
256
332
        """Produce a metadir suitable for cloning with."""
257
 
        return format_registry.make_bzrdir("default")
 
333
        return controldir.format_registry.make_bzrdir("default")
 
334
 
 
335
    def checkout_metadir(self):
 
336
        return self.cloning_metadir()
258
337
 
259
338
    def sprout(self, url, revision_id=None, force_new_repo=False,
260
339
               recurse='down', possible_transports=None,
261
340
               accelerator_tree=None, hardlink=False, stacked=False,
262
341
               source_branch=None):
263
 
        # dirstate doesn't cope with accelerator_trees well 
 
342
        # dirstate doesn't cope with accelerator_trees well
264
343
        # that have a different control dir
265
 
        return super(DummyForeignVcsDir, self).sprout(url=url, 
266
 
                revision_id=revision_id, force_new_repo=force_new_repo, 
267
 
                recurse=recurse, possible_transports=possible_transports, 
268
 
                hardlink=hardlink, stacked=stacked, source_branch=source_branch)
269
 
 
270
 
 
271
 
class ForeignVcsRegistryTests(TestCase):
 
344
        return super(DummyForeignVcsDir, self).sprout(
 
345
            url=url,
 
346
            revision_id=revision_id, force_new_repo=force_new_repo,
 
347
            recurse=recurse, possible_transports=possible_transports,
 
348
            hardlink=hardlink, stacked=stacked, source_branch=source_branch)
 
349
 
 
350
 
 
351
def register_dummy_foreign_for_test(testcase):
 
352
    controldir.ControlDirFormat.register_prober(DummyForeignProber)
 
353
    testcase.addCleanup(controldir.ControlDirFormat.unregister_prober,
 
354
                        DummyForeignProber)
 
355
    repository.format_registry.register(DummyForeignVcsRepositoryFormat())
 
356
    testcase.addCleanup(repository.format_registry.remove,
 
357
                        DummyForeignVcsRepositoryFormat())
 
358
    branch.format_registry.register(DummyForeignVcsBranchFormat())
 
359
    testcase.addCleanup(branch.format_registry.remove,
 
360
                        DummyForeignVcsBranchFormat())
 
361
    # We need to register the optimiser to make the dummy appears really
 
362
    # different from a regular bzr repository.
 
363
    branch.InterBranch.register_optimiser(InterToDummyVcsBranch)
 
364
    testcase.addCleanup(branch.InterBranch.unregister_optimiser,
 
365
                        InterToDummyVcsBranch)
 
366
 
 
367
 
 
368
class DummyForeignProber(controldir.Prober):
 
369
 
 
370
    @classmethod
 
371
    def probe_transport(klass, transport):
 
372
        """Return the .bzrdir style format present in a directory."""
 
373
        if not transport.has('.dummy'):
 
374
            raise errors.NotBranchError(path=transport.base)
 
375
        return DummyForeignVcsDirFormat()
 
376
 
 
377
    @classmethod
 
378
    def known_formats(cls):
 
379
        return set([DummyForeignVcsDirFormat()])
 
380
 
 
381
 
 
382
class ForeignVcsRegistryTests(tests.TestCase):
272
383
    """Tests for the ForeignVcsRegistry class."""
273
384
 
274
385
    def test_parse_revision_id_no_dash(self):
285
396
        reg = foreign.ForeignVcsRegistry()
286
397
        vcs = DummyForeignVcs()
287
398
        reg.register("dummy", vcs, "Dummy VCS")
288
 
        self.assertEquals((("some", "foreign", "revid"), DummyForeignVcsMapping(vcs)),
289
 
                          reg.parse_revision_id("dummy-v1:some-foreign-revid"))
290
 
 
291
 
 
292
 
class ForeignRevisionTests(TestCase):
 
399
        self.assertEqual((
 
400
            ("some", "foreign", "revid"), DummyForeignVcsMapping(vcs)),
 
401
            reg.parse_revision_id("dummy-v1:some-foreign-revid"))
 
402
 
 
403
 
 
404
class ForeignRevisionTests(tests.TestCase):
293
405
    """Tests for the ForeignRevision class."""
294
406
 
295
407
    def test_create(self):
296
408
        mapp = DummyForeignVcsMapping(DummyForeignVcs())
297
409
        rev = foreign.ForeignRevision(("a", "foreign", "revid"),
298
410
                                      mapp, "roundtripped-revid")
299
 
        self.assertEquals("", rev.inventory_sha1)
300
 
        self.assertEquals(("a", "foreign", "revid"), rev.foreign_revid)
301
 
        self.assertEquals(mapp, rev.mapping)
302
 
 
303
 
 
304
 
class WorkingTreeFileUpdateTests(TestCaseWithTransport):
 
411
        self.assertEqual("", rev.inventory_sha1)
 
412
        self.assertEqual(("a", "foreign", "revid"), rev.foreign_revid)
 
413
        self.assertEqual(mapp, rev.mapping)
 
414
 
 
415
 
 
416
class WorkingTreeFileUpdateTests(tests.TestCaseWithTransport):
305
417
    """Tests for update_workingtree_fileids()."""
306
418
 
307
419
    def test_update_workingtree(self):
309
421
        self.build_tree_contents([('br1/bla', 'original contents\n')])
310
422
        wt.add('bla', 'bla-a')
311
423
        wt.commit('bla-a')
 
424
        root_id = wt.get_root_id()
312
425
        target = wt.bzrdir.sprout('br2').open_workingtree()
313
426
        target.unversion(['bla-a'])
314
427
        target.add('bla', 'bla-b')
319
432
        foreign.update_workingtree_fileids(wt, target_basis)
320
433
        wt.lock_read()
321
434
        try:
322
 
            self.assertEquals(["TREE_ROOT", "bla-b"], list(wt.inventory))
 
435
            self.assertEqual(set([root_id, "bla-b"]), set(wt.all_file_ids()))
323
436
        finally:
324
437
            wt.unlock()
325
438
 
326
439
 
327
 
class DummyForeignVcsTests(TestCaseWithTransport):
 
440
class DummyForeignVcsTests(tests.TestCaseWithTransport):
328
441
    """Very basic test for DummyForeignVcs."""
329
442
 
330
443
    def setUp(self):
331
 
        BzrDirFormat.register_control_format(DummyForeignVcsDirFormat)
332
 
        branch.InterBranch.register_optimiser(InterToDummyVcsBranch)
333
 
        self.addCleanup(self.unregister)
334
444
        super(DummyForeignVcsTests, self).setUp()
335
 
 
336
 
    def unregister(self):
337
 
        try:
338
 
            BzrDirFormat.unregister_control_format(DummyForeignVcsDirFormat)
339
 
        except ValueError:
340
 
            pass
341
 
        branch.InterBranch.unregister_optimiser(InterToDummyVcsBranch)
 
445
        register_dummy_foreign_for_test(self)
342
446
 
343
447
    def test_create(self):
344
448
        """Test we can create dummies."""
345
449
        self.make_branch_and_tree("d", format=DummyForeignVcsDirFormat())
346
 
        dir = BzrDir.open("d")
347
 
        self.assertEquals("A Dummy VCS Dir", dir._format.get_format_string())
 
450
        dir = controldir.ControlDir.open("d")
 
451
        self.assertEqual("A Dummy VCS Dir", dir._format.get_format_string())
348
452
        dir.open_repository()
349
453
        dir.open_branch()
350
454
        dir.open_workingtree()
352
456
    def test_sprout(self):
353
457
        """Test we can clone dummies and that the format is not preserved."""
354
458
        self.make_branch_and_tree("d", format=DummyForeignVcsDirFormat())
355
 
        dir = BzrDir.open("d")
 
459
        dir = controldir.ControlDir.open("d")
356
460
        newdir = dir.sprout("e")
357
 
        self.assertNotEquals("A Dummy VCS Dir", newdir._format.get_format_string())
 
461
        self.assertNotEqual("A Dummy VCS Dir",
 
462
                            newdir._format.get_format_string())
 
463
 
 
464
    def test_push_not_supported(self):
 
465
        source_tree = self.make_branch_and_tree("source")
 
466
        target_tree = self.make_branch_and_tree(
 
467
            "target", format=DummyForeignVcsDirFormat())
 
468
        self.assertRaises(errors.NoRoundtrippingSupport,
 
469
                          source_tree.branch.push, target_tree.branch)
358
470
 
359
471
    def test_lossy_push_empty(self):
360
472
        source_tree = self.make_branch_and_tree("source")
361
 
        target_tree = self.make_branch_and_tree("target", 
362
 
            format=DummyForeignVcsDirFormat())
363
 
        pushresult = source_tree.branch.lossy_push(target_tree.branch)
364
 
        self.assertEquals(NULL_REVISION, pushresult.old_revid)
365
 
        self.assertEquals(NULL_REVISION, pushresult.new_revid)
366
 
        self.assertEquals({}, pushresult.revidmap)
 
473
        target_tree = self.make_branch_and_tree(
 
474
            "target", format=DummyForeignVcsDirFormat())
 
475
        pushresult = source_tree.branch.push(target_tree.branch, lossy=True)
 
476
        self.assertEqual(revision.NULL_REVISION, pushresult.old_revid)
 
477
        self.assertEqual(revision.NULL_REVISION, pushresult.new_revid)
 
478
        self.assertEqual({}, pushresult.revidmap)
367
479
 
368
480
    def test_lossy_push_simple(self):
369
481
        source_tree = self.make_branch_and_tree("source")
370
482
        self.build_tree(['source/a', 'source/b'])
371
483
        source_tree.add(['a', 'b'])
372
484
        revid1 = source_tree.commit("msg")
373
 
        target_tree = self.make_branch_and_tree("target", 
374
 
            format=DummyForeignVcsDirFormat())
 
485
        target_tree = self.make_branch_and_tree(
 
486
            "target", format=DummyForeignVcsDirFormat())
375
487
        target_tree.branch.lock_write()
376
488
        try:
377
 
            pushresult = source_tree.branch.lossy_push(target_tree.branch)
 
489
            pushresult = source_tree.branch.push(
 
490
                target_tree.branch, lossy=True)
378
491
        finally:
379
492
            target_tree.branch.unlock()
380
 
        self.assertEquals(NULL_REVISION, pushresult.old_revid)
381
 
        self.assertEquals({revid1:target_tree.branch.last_revision()}, 
382
 
                           pushresult.revidmap)
383
 
        self.assertEquals(pushresult.revidmap[revid1], pushresult.new_revid)
 
493
        self.assertEqual(revision.NULL_REVISION, pushresult.old_revid)
 
494
        self.assertEqual({revid1: target_tree.branch.last_revision()},
 
495
                         pushresult.revidmap)
 
496
        self.assertEqual(pushresult.revidmap[revid1], pushresult.new_revid)