/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_foreign.py

  • Committer: Jelmer Vernooij
  • Date: 2018-07-08 14:45:27 UTC
  • mto: This revision was merged to the branch mainline in revision 7036.
  • Revision ID: jelmer@jelmer.uk-20180708144527-codhlvdcdg9y0nji
Fix a bunch of merge tests.

Show diffs side-by-side

added added

removed removed

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